diff --git a/Website/htdocs/mpmanager/app/Models/UsageType.php b/Website/htdocs/mpmanager/app/Models/UsageType.php index 26a00cda7..8a1f4dc76 100644 --- a/Website/htdocs/mpmanager/app/Models/UsageType.php +++ b/Website/htdocs/mpmanager/app/Models/UsageType.php @@ -5,7 +5,9 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -class UsageType extends Model +class UsageType extends MasterModel { use HasFactory; + + protected $table = 'usage_types'; } diff --git a/Website/htdocs/mpmanager/database/migrations/2024_02_07_100345_create_usage_types_table.php b/Website/htdocs/mpmanager/database/migrations/2024_02_07_100345_create_usage_types_table.php deleted file mode 100644 index 33ec312c1..000000000 --- a/Website/htdocs/mpmanager/database/migrations/2024_02_07_100345_create_usage_types_table.php +++ /dev/null @@ -1,31 +0,0 @@ -create('usage_types', function (Blueprint $table) { - $table->id(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::connection('micropowermanager')->dropIfExists('usage_types'); - } -}; diff --git a/Website/htdocs/mpmanager/database/migrations/base/2024_02_07_100345_create_usage_types_table.php b/Website/htdocs/mpmanager/database/migrations/base/2024_02_07_100345_create_usage_types_table.php index 33ec312c1..8098456f2 100644 --- a/Website/htdocs/mpmanager/database/migrations/base/2024_02_07_100345_create_usage_types_table.php +++ b/Website/htdocs/mpmanager/database/migrations/base/2024_02_07_100345_create_usage_types_table.php @@ -13,8 +13,10 @@ */ public function up() { - Schema::connection('micropowermanager')->create('usage_types', function (Blueprint $table) { + Schema::connection('micro_power_manager')->create('usage_types', function (Blueprint $table) { $table->id(); + $table->string('name'); + $table->string('value'); $table->timestamps(); }); } @@ -26,6 +28,6 @@ public function up() */ public function down() { - Schema::connection('micropowermanager')->dropIfExists('usage_types'); + Schema::connection('micro_power_manager')->dropIfExists('usage_types'); } }; diff --git a/Website/htdocs/mpmanager/database/migrations/micropowermanager/2024_02_07_100345_create_usage_types_table.php b/Website/htdocs/mpmanager/database/migrations/micropowermanager/2024_02_07_100345_create_usage_types_table.php deleted file mode 100644 index 33ec312c1..000000000 --- a/Website/htdocs/mpmanager/database/migrations/micropowermanager/2024_02_07_100345_create_usage_types_table.php +++ /dev/null @@ -1,31 +0,0 @@ -create('usage_types', function (Blueprint $table) { - $table->id(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::connection('micropowermanager')->dropIfExists('usage_types'); - } -}; diff --git a/Website/htdocs/mpmanager/database/migrations/micropowermanager/2024_02_07_102305_add_usage_type_column_to_main_settings_table.php b/Website/htdocs/mpmanager/database/migrations/micropowermanager/2024_02_07_102305_add_usage_type_column_to_main_settings_table.php index 949431bc1..46b43e7cf 100644 --- a/Website/htdocs/mpmanager/database/migrations/micropowermanager/2024_02_07_102305_add_usage_type_column_to_main_settings_table.php +++ b/Website/htdocs/mpmanager/database/migrations/micropowermanager/2024_02_07_102305_add_usage_type_column_to_main_settings_table.php @@ -4,8 +4,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration -{ +return new class extends Migration { /** * Run the migrations. * @@ -13,8 +12,16 @@ */ public function up() { - Schema::connection('micropowermanager')->table('main_settings', function (Blueprint $table) { - // + Schema::connection('shard')->table('main_settings', function (Blueprint $table) { + $table->enum('usage_type', [ + 'mini-grid', + 'shs', + 'e-bike', + 'mini-grid&shs', + 'mini-grid&e-bike', + 'shs&e-bike', + 'mini-grid&shs&e-bike' + ])->default('mini-grid&shs&e-bike')->after('id'); }); } @@ -25,7 +32,7 @@ public function up() */ public function down() { - Schema::connection('micropowermanager')->table('main_settings', function (Blueprint $table) { + Schema::connection('shard')->table('main_settings', function (Blueprint $table) { // }); } diff --git a/Website/htdocs/mpmanager/database/seeders/ShardingDatabaseSeeder.php b/Website/htdocs/mpmanager/database/seeders/ShardingDatabaseSeeder.php index 0e3e48bac..1bf1d8a07 100644 --- a/Website/htdocs/mpmanager/database/seeders/ShardingDatabaseSeeder.php +++ b/Website/htdocs/mpmanager/database/seeders/ShardingDatabaseSeeder.php @@ -10,5 +10,6 @@ public function run() { $this->call(MpmPluginsSeeder::class); $this->call(ProtectedPagesSeeder::class); + $this->call(UsageTypeSeeder::class); } } diff --git a/Website/htdocs/mpmanager/database/seeders/UsageTypeSeeder.php b/Website/htdocs/mpmanager/database/seeders/UsageTypeSeeder.php index 3b000c360..b53139652 100644 --- a/Website/htdocs/mpmanager/database/seeders/UsageTypeSeeder.php +++ b/Website/htdocs/mpmanager/database/seeders/UsageTypeSeeder.php @@ -3,6 +3,7 @@ namespace Database\Seeders; use Illuminate\Database\Seeder; +use Illuminate\Support\Facades\DB; class UsageTypeSeeder extends Seeder { @@ -13,6 +14,36 @@ class UsageTypeSeeder extends Seeder */ public function run() { - // + DB::connection('micro_power_manager')->table('usage_types')->insert(array( + [ + 'name' => 'Mini-Grid', + 'value' => 'mini-grid', + ], + [ + 'name' => 'Solar Home System', + 'value' => 'shs', + ], + [ + 'name' => 'EBike Rental', + 'value' => 'e-bike', + ], + [ + 'name' => 'Mini-Grid & Solar Home System', + 'value' => 'mini-grid&shs', + ], + [ + 'name' => 'Mini-Grid & EBike Rental', + 'value' => 'mini-grid&e-bike', + ], + [ + 'name' => 'Solar Home & EBike Rental', + 'value' => 'shs&e-bike', + ], + [ + 'name' => 'Mini-Grid & Solar Home System & EBike Rental', + 'value' => 'mini-grid&shs&e-bike', + ] + ) + ); } }