diff --git a/app/Http/Controllers/Web/Ekosistem/KolomBasisDataController.php b/app/Http/Controllers/Web/Ekosistem/KolomBasisDataController.php index d832187..3813976 100644 --- a/app/Http/Controllers/Web/Ekosistem/KolomBasisDataController.php +++ b/app/Http/Controllers/Web/Ekosistem/KolomBasisDataController.php @@ -61,6 +61,8 @@ class KolomBasisDataController extends Controller 'relasi_kolom_id' => ['nullable', 'string'], 'relasi_kolom_label' => ['nullable', 'string'], 'enum_opsi' => ['nullable', 'json'], + 'is_active' => ['nullable', 'boolean'], + 'is_browse' => ['nullable', 'boolean'], ]); if (!empty($validated['enum_opsi'])) { @@ -139,6 +141,8 @@ class KolomBasisDataController extends Controller 'relasi_kolom_id' => ['nullable', 'string'], 'relasi_kolom_label' => ['nullable', 'string'], 'enum_opsi' => ['nullable', 'json'], + 'is_active' => ['nullable', 'boolean'], + 'is_browse' => ['nullable', 'boolean'], ]); $kolom->update([...$validated, diff --git a/app/Http/Controllers/Web/Ekosistem/ValueBasisDataController.php b/app/Http/Controllers/Web/Ekosistem/ValueBasisDataController.php index 61b45b7..84828cb 100644 --- a/app/Http/Controllers/Web/Ekosistem/ValueBasisDataController.php +++ b/app/Http/Controllers/Web/Ekosistem/ValueBasisDataController.php @@ -44,7 +44,10 @@ class ValueBasisDataController extends Controller if (!$tabel) { abort(404, 'Data tabel tidak ditemukan.'); } - $kolom = KolomBasisData::where('tabel_id', $tabelId)->get(); + $kolom = KolomBasisData::where('tabel_id', $tabelId) + ->where('is_active', true) + ->where('is_browse', true) + ->get(); if ($kolom->isEmpty()) { abort(404, 'Data kolom tidak ditemukan untuk tabel ini.'); } @@ -162,7 +165,8 @@ class ValueBasisDataController extends Controller if (!$tabel) { abort(404, 'Data tabel tidak ditemukan.'); } - $kolom = KolomBasisData::where('tabel_id', $tabelId)->get(); + $kolom = KolomBasisData::where('tabel_id', $tabelId) + ->where('is_active', true)->get(); if ($kolom->isEmpty()) { abort(404, 'Data kolom tidak ditemukan untuk tabel ini.'); } @@ -210,7 +214,8 @@ class ValueBasisDataController extends Controller if (!$tabel) { abort(404, 'Data tabel tidak ditemukan.'); } - $kolom = KolomBasisData::where('tabel_id', $tabelId)->get(); + $kolom = KolomBasisData::where('tabel_id', $tabelId) + ->where('is_active', true)->get(); if ($kolom->isEmpty()) { abort(404, 'Data kolom tidak ditemukan untuk tabel ini.'); } @@ -278,7 +283,8 @@ class ValueBasisDataController extends Controller if (!$tabel) { abort(404, 'Data tabel tidak ditemukan.'); } - $kolom = KolomBasisData::where('tabel_id', $tabelId)->get(); + $kolom = KolomBasisData::where('tabel_id', $tabelId) + ->where('is_active', true)->get(); if ($kolom->isEmpty()) { abort(404, 'Data kolom tidak ditemukan untuk tabel ini.'); } @@ -334,7 +340,8 @@ class ValueBasisDataController extends Controller if (!$tabel) { abort(404, 'Data tabel tidak ditemukan.'); } - $kolom = KolomBasisData::where('tabel_id', $tabelId)->get(); + $kolom = KolomBasisData::where('tabel_id', $tabelId) + ->where('is_active', true)->get(); if ($kolom->isEmpty()) { abort(404, 'Data kolom tidak ditemukan untuk tabel ini.'); } @@ -396,7 +403,8 @@ class ValueBasisDataController extends Controller if (!$tabel) { abort(404, 'Data tabel tidak ditemukan.'); } - $kolom = KolomBasisData::where('tabel_id', $tabelId)->get(); + $kolom = KolomBasisData::where('tabel_id', $tabelId) + ->where('is_active', true)->get(); if ($kolom->isEmpty()) { abort(404, 'Data kolom tidak ditemukan untuk tabel ini.'); } diff --git a/app/Models/Ekosistem/KolomBasisData.php b/app/Models/Ekosistem/KolomBasisData.php index e5c4b4a..01f648f 100644 --- a/app/Models/Ekosistem/KolomBasisData.php +++ b/app/Models/Ekosistem/KolomBasisData.php @@ -26,6 +26,8 @@ class KolomBasisData extends Model 'relasi_kolom_id', 'relasi_kolom_label', 'enum_opsi', + 'is_active', + 'is_browse', ]; protected $casts = [ diff --git a/database/migrations/2026_05_07_103739_update_basis_data_table_2.php b/database/migrations/2026_05_07_103739_update_basis_data_table_2.php new file mode 100644 index 0000000..a187a6b --- /dev/null +++ b/database/migrations/2026_05_07_103739_update_basis_data_table_2.php @@ -0,0 +1,27 @@ +boolean('is_active')->default('true'); + $table->boolean('is_browse')->default('false'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + } +}; diff --git a/resources/views/ekosistem/kolom-basis-data/add.blade.php b/resources/views/ekosistem/kolom-basis-data/add.blade.php index 523edd2..c26e289 100644 --- a/resources/views/ekosistem/kolom-basis-data/add.blade.php +++ b/resources/views/ekosistem/kolom-basis-data/add.blade.php @@ -59,6 +59,28 @@ +
+ +
+
+ +
diff --git a/resources/views/ekosistem/kolom-basis-data/edit.blade.php b/resources/views/ekosistem/kolom-basis-data/edit.blade.php index bb03cd3..94af81d 100644 --- a/resources/views/ekosistem/kolom-basis-data/edit.blade.php +++ b/resources/views/ekosistem/kolom-basis-data/edit.blade.php @@ -56,6 +56,28 @@ +
+ +
+
+ +
@@ -107,6 +129,8 @@ $('#relasi-form-kolom-update').hide(); $('#relasi-form-kolom-label-update').hide(); } + $('#update-kolom-is_active').prop('checked', res.data.is_active === 1 || res.data.is_active === true); + $('#update-kolom-is_browse').prop('checked', res.data.is_browse === 1 || res.data.is_browse === true); offcanvasUpdate.show(); } });