From 0b5c4823d662b043fa67b3f1af9e601130c01843 Mon Sep 17 00:00:00 2001 From: arieeefajar Date: Tue, 25 Mar 2025 13:54:38 +0700 Subject: [PATCH 1/6] fix(master-rule): change indicator table and rule table --- ...25_01_28_120615_create_indicator_table.php | 1 - .../2025_02_06_084905_create_rule_table.php | 6 ++-- database/seeders/IndicatorSeeder.php | 10 +++--- database/seeders/RuleSeeder.php | 34 ++++++++++++++++--- 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/database/migrations/2025_01_28_120615_create_indicator_table.php b/database/migrations/2025_01_28_120615_create_indicator_table.php index b89d5c9..15902f1 100644 --- a/database/migrations/2025_01_28_120615_create_indicator_table.php +++ b/database/migrations/2025_01_28_120615_create_indicator_table.php @@ -14,7 +14,6 @@ public function up(): void Schema::create('indicators', function (Blueprint $table) { $table->id(); $table->string('name'); - $table->string('description'); $table->timestamps(); }); } diff --git a/database/migrations/2025_02_06_084905_create_rule_table.php b/database/migrations/2025_02_06_084905_create_rule_table.php index 631ce0d..89fdd2b 100644 --- a/database/migrations/2025_02_06_084905_create_rule_table.php +++ b/database/migrations/2025_02_06_084905_create_rule_table.php @@ -14,9 +14,9 @@ public function up(): void Schema::create('rule', function (Blueprint $table) { $table->id(); $table->unsignedBigInteger('indicator_id'); - $table->float('ideal_min'); - $table->float('ideal_max'); - $table->float('mb'); + $table->string('parameter_type'); + $table->string('description'); + $table->float('cf'); $table->timestamps(); }); diff --git a/database/seeders/IndicatorSeeder.php b/database/seeders/IndicatorSeeder.php index 702aaaa..76a5cc7 100644 --- a/database/seeders/IndicatorSeeder.php +++ b/database/seeders/IndicatorSeeder.php @@ -14,11 +14,11 @@ class IndicatorSeeder extends Seeder public function run(): void { $indicator = [ - ['name' => 'pH Tanah', 'description' => 'Indicator 1 Description'], - ['name' => 'Ketinggian Tempat', 'description' => 'Indicator 2 Description'], - ['name' => 'Ketersediaan Air', 'description' => 'Indicator 3 Description'], - ['name' => 'Curah Hujan', 'description' => 'Indicator 4 Description'], - ['name' => 'Isolasi', 'description' => 'Indicator 5 Description'] + ['name' => 'pH Tanah'], + ['name' => 'Ketinggian Tempat'], + ['name' => 'Ketersediaan Air'], + ['name' => 'Curah Hujan'], + ['name' => 'Isolasi'] ]; foreach ($indicator as $item) { diff --git a/database/seeders/RuleSeeder.php b/database/seeders/RuleSeeder.php index 4b85ad9..1c00cf5 100644 --- a/database/seeders/RuleSeeder.php +++ b/database/seeders/RuleSeeder.php @@ -14,11 +14,35 @@ class RuleSeeder extends Seeder public function run(): void { $rules = [ - ['indicator_id' => 1, 'ideal_min' => 5.5, 'ideal_max' => 7, 'mb' => 0.9], - ['indicator_id' => 2, 'ideal_min' => 0, 'ideal_max' => 1500, 'mb' => 0.8], - ['indicator_id' => 3, 'ideal_min' => 70, 'ideal_max' => 100, 'mb' => 0.7], - ['indicator_id' => 4, 'ideal_min' => 1000, 'ideal_max' => 2000, 'mb' => 0.9], - ['indicator_id' => 5, 'ideal_min' => 0, 'ideal_max' => 100, 'mb' => 0.8], + // pH Tanah + ['indicator_id' => 1, 'parameter_type' => "Sangat Asam", 'description' => "Tingkat keasaman pH tanah kurang dari 5.5", 'cf' => -0.6], + ['indicator_id' => 1, 'parameter_type' => "Asam", 'description' => "Tingkat keasaman pH tanah antara 5.5 - 6.0", 'cf' => 0.6], + ['indicator_id' => 1, 'parameter_type' => "Netral", 'description' => "Tingkat keasaman pH tanah antara 6.1 - 7.0", 'cf' => 1.0], + ['indicator_id' => 1, 'parameter_type' => "Basa", 'description' => "Tingkat keasaman pH tanah antara 7.1 - 7.5", 'cf' => 0.6], + ['indicator_id' => 1, 'parameter_type' => "Sangat Basa", 'description' => "Tingkat keasaman pH tanah lebih besar dari 7.5", 'cf' => -0.4], + + // Ketinggian Tempat + ['indicator_id' => 2, 'parameter_type' => "Rendah", 'description' => "Lahan berada di dataran rendah (<300 mdpl)", 'cf' => 1.0], + ['indicator_id' => 2, 'parameter_type' => "Sedang", 'description' => "Lahan berada di ketinggian sedang (300 - 700 mdpl)", 'cf' => 0.7], + ['indicator_id' => 2, 'parameter_type' => "Tinggi", 'description' => "Lahan berada di dataran tinggi (>700 mdpl)", 'cf' => -0.5], + + // Ketersediaan Air + ['indicator_id' => 3, 'parameter_type' => "Berlimpah", 'description' => "Irigasi teknis, air selalu tersedia sepanjang tahun", 'cf' => 1.0], + ['indicator_id' => 3, 'parameter_type' => "Cukup", 'description' => "Sumber air stabil, tetapi tidak selalu tersedia", 'cf' => 0.8], + ['indicator_id' => 3, 'parameter_type' => "Terbatas", 'description' => "Kadang-kadang mengalami kekeringan", 'cf' => -0.5], + ['indicator_id' => 3, 'parameter_type' => "Sangat Terbatas", 'description' => "Sering mengalami kekeringan", 'cf' => -0.8], + + // Curah Hujan + ['indicator_id' => 4, 'parameter_type' => "Rendah", 'description' => "Curah hujan kurang dari 1000 mm/tahun", 'cf' => -0.6], + ['indicator_id' => 4, 'parameter_type' => "Sedang", 'description' => "Curah hujan antara 1000 - 1500 mm/tahun", 'cf' => 0.6], + ['indicator_id' => 4, 'parameter_type' => "Tinggi", 'description' => "Curah hujan antara 1500 - 2000 mm/tahun", 'cf' => 0.8], + ['indicator_id' => 4, 'parameter_type' => "Sangat Tinggi", 'description' => "Curah hujan lebih dari 2000 mm/tahun", 'cf' => -0.4], + + // Isolasi (Jarak Antar Lahan) + ['indicator_id' => 5, 'parameter_type' => "Sangat Baik", 'description' => "Jarak antar lahan sangat dekat (0 - 50 meter)", 'cf' => 1.0], + ['indicator_id' => 5, 'parameter_type' => "Baik", 'description' => "Jarak antar lahan cukup dekat (50 - 200 meter)", 'cf' => 0.8], + ['indicator_id' => 5, 'parameter_type' => "Sedang", 'description' => "Jarak antar lahan cukup jauh (200 - 500 meter)", 'cf' => -0.4], + ['indicator_id' => 5, 'parameter_type' => "Buruk", 'description' => "Lahan sangat terisolasi (>500 meter)", 'cf' => -0.7], ]; foreach ($rules as $rule) { From 2450d3af4f55de7200b1dc7b9e645136cab61fe1 Mon Sep 17 00:00:00 2001 From: arieeefajar Date: Tue, 25 Mar 2025 14:05:33 +0700 Subject: [PATCH 2/6] fix(master-rule) fixed crud function indicator --- .../MasterData/IndicatorController.php | 14 +--------- .../customJs/master-data/indikator/index.js | 4 +-- .../master-data/indikator/index.blade.php | 26 +++---------------- 3 files changed, 5 insertions(+), 39 deletions(-) diff --git a/app/Http/Controllers/MasterData/IndicatorController.php b/app/Http/Controllers/MasterData/IndicatorController.php index 5d8dca7..730300b 100644 --- a/app/Http/Controllers/MasterData/IndicatorController.php +++ b/app/Http/Controllers/MasterData/IndicatorController.php @@ -11,7 +11,7 @@ class IndicatorController extends Controller { public function index() { - $indicators = Indicator::all(); + $indicators = Indicator::select('id', 'name')->orderBy('created_at', 'desc')->get(); return view('master-data.indikator.index', compact('indicators')); } @@ -21,15 +21,10 @@ public function store(Request $request) "name.required" => "Nama wajib diisi", "name.max" => "Nama maksimal 25 karakter", "name.string" => "Nama harus berupa string", - - "description.required" => "Deskripsi wajib diisi", - "description.max" => "Deskripsi maksimal 50 karakter", - "description.string" => "Deskripsi harus berupa string", ]; $validator = Validator::make($request->all(), [ 'name' => 'required|string|max:25', - 'description' => 'required|string|max:50', ], $customMessage); if ($validator->fails()) { @@ -39,7 +34,6 @@ public function store(Request $request) $indicator = new Indicator(); $indicator->name = $request->name; - $indicator->description = $request->description; try { $indicator->save(); @@ -57,15 +51,10 @@ public function update(Request $request, $id) "name.required" => "Nama wajib diisi", "name.max" => "Nama maksimal 25 karakter", "name.string" => "Nama harus berupa string", - - "description.required" => "Deskripsi wajib diisi", - "description.max" => "Deskripsi maksimal 50 karakter", - "description.string" => "Deskripsi harus berupa string", ]; $validator = Validator::make($request->all(), [ 'name' => 'required|string|max:25', - 'description' => 'required|string|max:50', ], $customMessage); if ($validator->fails()) { @@ -75,7 +64,6 @@ public function update(Request $request, $id) $indicator = Indicator::find($id); $indicator->name = $request->name; - $indicator->description = $request->description; try { $indicator->save(); diff --git a/public/assets/js/pages/customJs/master-data/indikator/index.js b/public/assets/js/pages/customJs/master-data/indikator/index.js index bf46060..a8d0dd2 100644 --- a/public/assets/js/pages/customJs/master-data/indikator/index.js +++ b/public/assets/js/pages/customJs/master-data/indikator/index.js @@ -20,10 +20,8 @@ document.addEventListener("DOMContentLoaded", function () { function updateData(indicator) { var form = document.getElementById("edit-form"); var indicatorName = form.querySelector('input[name="name"]'); - var description = form.querySelector('textarea[name="description"]'); indicatorName.value = indicator.name; - description.value = indicator.description; form.action = "/data-indikator/" + indicator.id; } @@ -50,7 +48,7 @@ checkAll && }); var perPage = 8, options = { - valueNames: ["id", "indicator_name", "status"], + valueNames: ["id", "status"], page: perPage, pagination: !0, plugins: [ListPagination({ left: 2, right: 2 })], diff --git a/resources/views/master-data/indikator/index.blade.php b/resources/views/master-data/indikator/index.blade.php index 9b12bdf..6b4018f 100644 --- a/resources/views/master-data/indikator/index.blade.php +++ b/resources/views/master-data/indikator/index.blade.php @@ -61,7 +61,6 @@ Name - Description Action @@ -73,9 +72,8 @@ #VZ2101 - {{ $indicator->name }} - {{ $indicator->description }} + {{ $indicator->name }}
@@ -151,7 +149,7 @@ class="fw-medium link-primary">#VZ2101 readonly />
-
+
#VZ2101 Masukan Nama Indikator
- -
- - -
- Masukan Deskripsi -
-
@@ -205,7 +194,7 @@ class="fw-medium link-primary">#VZ2101 readonly />
-
+
#VZ2101 Masukan Nama Indikator
- -
- - -
- Masukan Deskripsi -
-
From 9270eda907ba1e8b6309845af9cf05d327c02dc7 Mon Sep 17 00:00:00 2001 From: arieeefajar Date: Tue, 25 Mar 2025 19:05:00 +0700 Subject: [PATCH 3/6] fix(master-rule): fix view master rule --- .../Controllers/MasterData/RuleController.php | 3 ++- app/Models/Indicator.php | 6 +++++ .../views/master-data/aturan/index.blade.php | 22 +++++++++++++------ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/MasterData/RuleController.php b/app/Http/Controllers/MasterData/RuleController.php index 160bd29..4c21a42 100644 --- a/app/Http/Controllers/MasterData/RuleController.php +++ b/app/Http/Controllers/MasterData/RuleController.php @@ -12,8 +12,9 @@ class RuleController extends Controller { public function index() { - $rules = Rule::with('indicator')->orderBy('created_at', 'desc')->get(); + $rules = Indicator::with('rules')->get(); $indicators = Indicator::select('id', 'name')->get(); + // dd($rules); return view('master-data.aturan.index', compact('rules', 'indicators')); } diff --git a/app/Models/Indicator.php b/app/Models/Indicator.php index 50062cb..7e62ee2 100644 --- a/app/Models/Indicator.php +++ b/app/Models/Indicator.php @@ -11,4 +11,10 @@ class Indicator extends Model protected $table = 'indicators'; protected $guarded = []; + + + public function rules() + { + return $this->hasMany(Rule::class, 'indicator_id', 'id'); + } } diff --git a/resources/views/master-data/aturan/index.blade.php b/resources/views/master-data/aturan/index.blade.php index 254acf3..c827bef 100644 --- a/resources/views/master-data/aturan/index.blade.php +++ b/resources/views/master-data/aturan/index.blade.php @@ -61,10 +61,9 @@ Indikator - Ideal Min - Ideal Max + Jenis Indikator - Meansure Belief + CF(e) Action @@ -77,11 +76,20 @@ #VZ2101 - {{ $rule->indicator->name }} - {{ $rule->ideal_min }} - {{ $rule->ideal_max }} + {{ $rule->name }} + +
    + @foreach ($rule->rules as $item) +
  • {{ $item->parameter_type }}
    • + @endforeach +
+ - {{ $rule->mb }} +
    + @foreach ($rule->rules as $item) +
  • {{ $item->cf }}
    • + @endforeach +
From a6d7bd6bed55b93c54dacf835938302e41f4e795 Mon Sep 17 00:00:00 2001 From: arieeefajar Date: Wed, 26 Mar 2025 19:17:37 +0700 Subject: [PATCH 4/6] fix(master-rule): fix update function and create validation input cf Value --- .../Controllers/MasterData/RuleController.php | 59 +++--- .../customJs/master-data/aturan/index.js | 111 ++++++----- .../views/master-data/aturan/index.blade.php | 175 +++++++++++++----- 3 files changed, 209 insertions(+), 136 deletions(-) diff --git a/app/Http/Controllers/MasterData/RuleController.php b/app/Http/Controllers/MasterData/RuleController.php index 4c21a42..04c5b77 100644 --- a/app/Http/Controllers/MasterData/RuleController.php +++ b/app/Http/Controllers/MasterData/RuleController.php @@ -14,7 +14,6 @@ public function index() { $rules = Indicator::with('rules')->get(); $indicators = Indicator::select('id', 'name')->get(); - // dd($rules); return view('master-data.aturan.index', compact('rules', 'indicators')); } @@ -24,21 +23,20 @@ public function store(Request $request) 'indicator.required' => 'Harap pilih indikator', 'indicator.exists' => 'Indikator tidak ditemukan', - 'ideal_min.required' => 'Nilai minimum wajib diisi', - 'ideal_min.numeric' => 'Nilai minimum harus berupa angka', + 'parameter_type.required' => 'Jenis parameter wajib diisi', + 'parameter_type.string' => 'Jenis parameter harus berupa teks', + 'parameter_type.max' => 'Jenis parameter maksimal 25 karakter', - 'ideal_max.required' => 'Nilai maksimum wajib diisi', - 'ideal_max.numeric' => 'Nilai maksimum harus berupa angka', - - 'mb.required' => 'Nilai MB wajib diisi', - 'mb.numeric' => 'Nilai MB harus berupa angka', + 'description.required' => 'Deskripsi wajib diisi', + 'description.string' => 'Deskripsi harus berupa teks', + 'description.max' => 'Deskripsi maksimal 40 karakter', ]; $validator = Validator::make($request->all(), [ 'indicator' => 'required|exists:indicators,id', - 'ideal_min' => 'required|numeric', - 'ideal_max' => 'required|numeric', - 'mb' => 'required|numeric', + 'parameter_type' => 'required|string|max:25', + 'description' => 'required|string|max:40', + 'cf' => 'required|numeric|min:-8|max:1', ], $customMessage); if ($validator->fails()) { @@ -47,11 +45,10 @@ public function store(Request $request) } $rule = new Rule(); - $rule->indicator_id = $request->indicator; - $rule->ideal_min = $request->ideal_min; - $rule->ideal_max = $request->ideal_max; - $rule->mb = $request->mb; + $rule->parameter_type = $request->parameter_type; + $rule->description = $request->description; + $rule->cf = $request->cf; try { $rule->save(); @@ -65,25 +62,25 @@ public function store(Request $request) public function update(Request $request, $id) { + // dd($request->all()); $customMessage = [ - 'indicator.required' => 'Harap pilih indikator', - 'indicator.exists' => 'Indikator tidak ditemukan', + 'parameter_type.required' => 'Jenis parameter wajib diisi', + 'parameter_type.string' => 'Jenis parameter harus berupa teks', + 'parameter_type.max' => 'Jenis parameter maksimal 25 karakter', - 'ideal_min.required' => 'Nilai minimum wajib diisi', - 'ideal_min.numeric' => 'Nilai minimum harus berupa angka', + 'description.required' => 'Deskripsi wajib diisi', + 'description.string' => 'Deskripsi harus berupa teks', + 'description.max' => 'Deskripsi maksimal 40 karakter', - 'ideal_max.required' => 'Nilai maksimum wajib diisi', - 'ideal_max.numeric' => 'Nilai maksimum harus berupa angka', - - 'mb.required' => 'Nilai MB wajib diisi', - 'mb.numeric' => 'Nilai MB harus berupa angka', + 'cf.required' => 'Nilai CF wajib diisi', + 'cf.numeric' => 'Nilai CF harus berupa angka', + 'cf.max' => 'Nilai CF maksimal 1', ]; $validator = Validator::make($request->all(), [ - 'indicator' => 'required|exists:indicators,id', - 'ideal_min' => 'required|numeric', - 'ideal_max' => 'required|numeric', - 'mb' => 'required|numeric', + 'parameter_type' => 'required|string|max:25', + 'description' => 'required|string|max:40', + 'cf' => 'required|numeric|max:1', ], $customMessage); if ($validator->fails()) { @@ -92,9 +89,9 @@ public function update(Request $request, $id) } $rule = Rule::find($id); - $rule->ideal_min = $request->ideal_min; - $rule->ideal_max = $request->ideal_max; - $rule->mb = $request->mb; + $rule->parameter_type = $request->parameter_type; + $rule->description = $request->description; + $rule->cf = $request->cf; try { $rule->save(); diff --git a/public/assets/js/pages/customJs/master-data/aturan/index.js b/public/assets/js/pages/customJs/master-data/aturan/index.js index 6201edb..0dd5bd5 100644 --- a/public/assets/js/pages/customJs/master-data/aturan/index.js +++ b/public/assets/js/pages/customJs/master-data/aturan/index.js @@ -1,57 +1,15 @@ -document.addEventListener("DOMContentLoaded", function () { - const inputs = document.querySelectorAll( - "#idealmin-field, #idealmax-field", - "#mb-field" - ); - - const inputEdit = document.querySelectorAll( - "#idealmin-edit-field, #idealmax-edit-field", - "#mb-edit-field" - ); - var indicatorField = document.getElementById("indicator-field"); - var indicatorVal = new Choices(indicatorField); - var indicatorEditField = document.getElementById("indicator-edit-field"); - var indicatorEditVal = new Choices(indicatorEditField); - - inputs.forEach((input) => { - input.addEventListener("input", function () { - this.value = this.value.replace(/[^0-9.]/g, ""); - this.value = this.value.replace(/^(\.)/, ""); - if ((this.value.match(/\./g) || []).length > 1) { - this.value = this.value.substring( - 0, - this.value.lastIndexOf(".") - ); - } - }); - }); - - inputEdit.forEach((input) => { - input.addEventListener("input", function () { - this.value = this.value.replace(/[^0-9.]/g, ""); - this.value = this.value.replace(/^(\.)/, ""); - if ((this.value.match(/\./g) || []).length > 1) { - this.value = this.value.substring( - 0, - this.value.lastIndexOf(".") - ); - } - }); - }); -}); +document.addEventListener("DOMContentLoaded", function () {}); function updateData(rule) { var form = document.getElementById("edit-form"); - // var indicatorName = form.querySelector('input[id="indicatorname-field"]'); - var idealMin = form.querySelector('input[id="idealmin-edit-field"]'); - var idealMax = form.querySelector('input[id="idealmax-edit-field"]'); - var mb = form.querySelector('input[id="mb-edit-field"]'); - - // indicatorName.value = rule.indicator.name; - idealMin.value = rule.ideal_max; - idealMax.value = rule.ideal_min; - mb.value = rule.mb; + var indicatorType = form.querySelector("#indicator-type-edit-field"); + var description = form.querySelector("#description-edit-field"); + var cf = form.querySelector("#cf-edit-field"); form.action = "/data-aturan/" + rule.id; + + indicatorType.value = rule.parameter_type; + description.value = rule.description; + cf.value = rule.cf; } function deleteData(id) { @@ -59,16 +17,53 @@ function deleteData(id) { form.action = "/data-aturan/" + id; } +function validateCfInput(input) { + input.value = input.value.replace(",", "."); + + input.value = input.value.replace(/[^0-9.\-]/g, ""); + + if (input.value.includes("-") && !input.value.startsWith("-")) { + input.value = input.value.replace("-", ""); + } + + input.value = input.value.replace(/-+/g, "-"); + + if (input.value === "-") { + return; + } + + if (input.value.startsWith(".")) { + input.value = "0" + input.value; + } + + if (input.value.startsWith("-.")) { + input.value = "-0."; + } + + // **PERBAIKAN**: Hilangkan nol berlebih di depan angka, kecuali nol sebelum titik + input.value = input.value.replace(/^(-?)0+(\d)/, "$1$2"); + + // **BATASI INPUT**: Hanya satu titik desimal, dan maksimal 1 angka setelah titik + let match = input.value.match(/^-?\d*(\.\d{0,1})?/); + if (match) { + input.value = match[0]; + } + + let numValue = parseFloat(input.value); + + // **Batasi nilai antara -1.0 dan 1.0** + if (!isNaN(numValue)) { + if (numValue > 1) { + input.value = "1.0"; + } else if (numValue < -1) { + input.value = "-1.0"; + } + } +} + var perPage = 10, options = { - valueNames: [ - "id", - "indicator_name", - "range_min", - "range_max", - "mb", - "status", - ], + valueNames: ["id", "parameter_type", "description", "status"], page: perPage, pagination: !0, plugins: [ListPagination({ left: 2, right: 2 })], diff --git a/resources/views/master-data/aturan/index.blade.php b/resources/views/master-data/aturan/index.blade.php index c827bef..adbf80e 100644 --- a/resources/views/master-data/aturan/index.blade.php +++ b/resources/views/master-data/aturan/index.blade.php @@ -22,7 +22,101 @@
-
+
+
+
+ +
+
+
+ + @foreach ($rules as $rule) +
+
+
+
+

Indikator {{ $rule->name }}

+
+ +
+
+
+
+
+
+ + +
+
+
+
+ +
+ + + + + + + + + + + + @foreach ($rule->rules as $item) + + + + + + + + + @endforeach + +
NoJenis ParameterDeskirpsi + CF(e) + Action
{{ $loop->iteration }}{{ $item->parameter_type }}{{ $item->description }}{{ $item->cf }} +
+
+ +
+
+ +
+
+
+ + +
+
+
+
+
+
+ @endforeach + + {{--
@@ -34,14 +128,6 @@
-
- -
-
-
@@ -62,6 +148,7 @@ Indikator Jenis Indikator + Deskripsi CF(e) @@ -84,6 +171,13 @@ class="fw-medium link-primary">#VZ2101 @endforeach + +
    + @foreach ($rule->rules as $item) +
  • {{ $item->description }}
    • + @endforeach +
+
    @foreach ($rule->rules as $item) @@ -96,7 +190,7 @@ class="fw-medium link-primary">#VZ2101
    @@ -144,7 +238,7 @@ class="fw-medium link-primary">#VZ2101
-
+
--}} {{-- add modal --}} @@ -180,29 +274,29 @@ class="fw-medium link-primary">#VZ2101
- - + +
- Masukan Nilai Ideal Min + Masukan Jenis Indikator
- - + +
Masukan Nilai Ideal Max
- - + +
- Masukan Meansure Belief + Masukan Nilai CF
@@ -242,42 +336,29 @@ class="fw-medium link-primary">#VZ2101
- - + +
- Pilih Indikator + Masukan jenis parameter
- - + +
- Masukan Nilai Ideal Min -
-
- -
- - -
- Masukan Nilai Ideal Max + Masukan Deskirpsi
- - + +
- Masukan Meansure Belief + Masukan CF(e)
From 150a67f5ee1a510ec66703122083d32b392c832e Mon Sep 17 00:00:00 2001 From: arieeefajar Date: Wed, 26 Mar 2025 19:19:06 +0700 Subject: [PATCH 5/6] fix(master-rule): fix delete data function --- public/assets/js/pages/customJs/master-data/aturan/index.js | 2 -- resources/views/master-data/aturan/index.blade.php | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/public/assets/js/pages/customJs/master-data/aturan/index.js b/public/assets/js/pages/customJs/master-data/aturan/index.js index 0dd5bd5..9e4a6bb 100644 --- a/public/assets/js/pages/customJs/master-data/aturan/index.js +++ b/public/assets/js/pages/customJs/master-data/aturan/index.js @@ -1,5 +1,3 @@ -document.addEventListener("DOMContentLoaded", function () {}); - function updateData(rule) { var form = document.getElementById("edit-form"); var indicatorType = form.querySelector("#indicator-type-edit-field"); diff --git a/resources/views/master-data/aturan/index.blade.php b/resources/views/master-data/aturan/index.blade.php index adbf80e..d995f3b 100644 --- a/resources/views/master-data/aturan/index.blade.php +++ b/resources/views/master-data/aturan/index.blade.php @@ -89,7 +89,8 @@ class="fw-medium link-primary">#VZ2101
+ data-bs-target="#deleteRecordModal" + onclick="deleteData({{ $item->id }})">Hapus
From bbbfda3150188240e38af0139e47b82e8ee0e000 Mon Sep 17 00:00:00 2001 From: arieeefajar Date: Sat, 29 Mar 2025 12:33:15 +0700 Subject: [PATCH 6/6] fix(master-rule): fix indicator seeder and rule seeder --- database/seeders/IndicatorSeeder.php | 2 +- database/seeders/RuleSeeder.php | 26 +++++++++++--------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/database/seeders/IndicatorSeeder.php b/database/seeders/IndicatorSeeder.php index 76a5cc7..4c34a56 100644 --- a/database/seeders/IndicatorSeeder.php +++ b/database/seeders/IndicatorSeeder.php @@ -18,7 +18,7 @@ public function run(): void ['name' => 'Ketinggian Tempat'], ['name' => 'Ketersediaan Air'], ['name' => 'Curah Hujan'], - ['name' => 'Isolasi'] + ['name' => 'Isolasi Jarak'] ]; foreach ($indicator as $item) { diff --git a/database/seeders/RuleSeeder.php b/database/seeders/RuleSeeder.php index 1c00cf5..1dcd124 100644 --- a/database/seeders/RuleSeeder.php +++ b/database/seeders/RuleSeeder.php @@ -15,22 +15,19 @@ public function run(): void { $rules = [ // pH Tanah - ['indicator_id' => 1, 'parameter_type' => "Sangat Asam", 'description' => "Tingkat keasaman pH tanah kurang dari 5.5", 'cf' => -0.6], - ['indicator_id' => 1, 'parameter_type' => "Asam", 'description' => "Tingkat keasaman pH tanah antara 5.5 - 6.0", 'cf' => 0.6], - ['indicator_id' => 1, 'parameter_type' => "Netral", 'description' => "Tingkat keasaman pH tanah antara 6.1 - 7.0", 'cf' => 1.0], - ['indicator_id' => 1, 'parameter_type' => "Basa", 'description' => "Tingkat keasaman pH tanah antara 7.1 - 7.5", 'cf' => 0.6], - ['indicator_id' => 1, 'parameter_type' => "Sangat Basa", 'description' => "Tingkat keasaman pH tanah lebih besar dari 7.5", 'cf' => -0.4], + ['indicator_id' => 1, 'parameter_type' => "Asam", 'description' => "Tingkat keasaman pH tanah kurang dari 6", 'cf' => -0.6], + ['indicator_id' => 1, 'parameter_type' => "Ideal", 'description' => "Tingkat keasaman pH tanah antara 6.0 - 7.0", 'cf' => 0.8], + ['indicator_id' => 1, 'parameter_type' => "Basa", 'description' => "Tingkat keasaman pH tanah lebih dari 7.0", 'cf' => -0.8], // Ketinggian Tempat - ['indicator_id' => 2, 'parameter_type' => "Rendah", 'description' => "Lahan berada di dataran rendah (<300 mdpl)", 'cf' => 1.0], - ['indicator_id' => 2, 'parameter_type' => "Sedang", 'description' => "Lahan berada di ketinggian sedang (300 - 700 mdpl)", 'cf' => 0.7], - ['indicator_id' => 2, 'parameter_type' => "Tinggi", 'description' => "Lahan berada di dataran tinggi (>700 mdpl)", 'cf' => -0.5], + ['indicator_id' => 2, 'parameter_type' => "Rendah", 'description' => "Lahan berada di dataran rendah (<200 mdpl)", 'cf' => -0.6], + ['indicator_id' => 2, 'parameter_type' => "Sedang", 'description' => "Lahan berada di ketinggian sedang (250 - 600 mdpl)", 'cf' => 0.8], + ['indicator_id' => 2, 'parameter_type' => "Tinggi", 'description' => "Lahan berada di dataran tinggi (>600 mdpl)", 'cf' => -0.4], // Ketersediaan Air ['indicator_id' => 3, 'parameter_type' => "Berlimpah", 'description' => "Irigasi teknis, air selalu tersedia sepanjang tahun", 'cf' => 1.0], - ['indicator_id' => 3, 'parameter_type' => "Cukup", 'description' => "Sumber air stabil, tetapi tidak selalu tersedia", 'cf' => 0.8], - ['indicator_id' => 3, 'parameter_type' => "Terbatas", 'description' => "Kadang-kadang mengalami kekeringan", 'cf' => -0.5], - ['indicator_id' => 3, 'parameter_type' => "Sangat Terbatas", 'description' => "Sering mengalami kekeringan", 'cf' => -0.8], + ['indicator_id' => 3, 'parameter_type' => "Cukup", 'description' => "Sumber air stabil, tetapi tidak selalu tersedia", 'cf' => 0.6], + ['indicator_id' => 3, 'parameter_type' => "Terbatas", 'description' => "Kadang-kadang mengalami kekeringan", 'cf' => -0.6], // Curah Hujan ['indicator_id' => 4, 'parameter_type' => "Rendah", 'description' => "Curah hujan kurang dari 1000 mm/tahun", 'cf' => -0.6], @@ -39,10 +36,9 @@ public function run(): void ['indicator_id' => 4, 'parameter_type' => "Sangat Tinggi", 'description' => "Curah hujan lebih dari 2000 mm/tahun", 'cf' => -0.4], // Isolasi (Jarak Antar Lahan) - ['indicator_id' => 5, 'parameter_type' => "Sangat Baik", 'description' => "Jarak antar lahan sangat dekat (0 - 50 meter)", 'cf' => 1.0], - ['indicator_id' => 5, 'parameter_type' => "Baik", 'description' => "Jarak antar lahan cukup dekat (50 - 200 meter)", 'cf' => 0.8], - ['indicator_id' => 5, 'parameter_type' => "Sedang", 'description' => "Jarak antar lahan cukup jauh (200 - 500 meter)", 'cf' => -0.4], - ['indicator_id' => 5, 'parameter_type' => "Buruk", 'description' => "Lahan sangat terisolasi (>500 meter)", 'cf' => -0.7], + ['indicator_id' => 5, 'parameter_type' => "Telalu Dekat", 'description' => "Jarak antar lahan sangat dekat < 250 meter", 'cf' => -0.8], + ['indicator_id' => 5, 'parameter_type' => "Aman", 'description' => "Jarak antar lahan cukup jauh 250 - 400 meter", 'cf' => 0.8], + ['indicator_id' => 5, 'parameter_type' => "Jauh", 'description' => "Jarak antar lahan jauh > 400 meter", 'cf' => 1.0], ]; foreach ($rules as $rule) {