ariefajar
/
MIF_E31221322
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/master-rule' of https://github.com/arieeefajar/Tugas_Akhir into fix/master-rule

This commit is contained in:
arieeefajar 2025-03-25 18:45:10 +07:00
parent 2911f39c79 2450d3af4f
commit bcd9a86888
7 changed files with 42 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/MasterData/IndicatorController.php
View File

@ -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();

1
database/migrations/2025_01_28_120615_create_indicator_table.php
View File

@ -14,7 +14,6 @@ public function up(): void
Schema::create('indicators', function (Blueprint $table) {
$table->id();
$table->string('name');
$table->string('description');
$table->timestamps();
});
}

6
database/migrations/2025_02_06_084905_create_rule_table.php
View File

@ -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();
});

10
database/seeders/IndicatorSeeder.php
View File

@ -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) {

34
database/seeders/RuleSeeder.php
View File

@ -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) {

4
public/assets/js/pages/customJs/master-data/indikator/index.js
View File

@ -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 })],

26
resources/views/master-data/indikator/index.blade.php
View File

@ -61,7 +61,6 @@
<th class="sort" data-sort="indicator_name">
Name
</th>
<th class="sort" data-sort="description">Description</th>
<th class="sort" data-sort="action">Action</th>
</tr>
</thead>
@ -73,9 +72,8 @@
<a href="javascript:void(0);"
class="fw-medium link-primary">#VZ2101</a>
</td>
<td class="indicator_name">{{ $indicator->name }}</td>
<td class="status">
<span>{{ $indicator->description }}</span>
<span>{{ $indicator->name }}</span>
</td>
<td>
<div class="d-flex gap-2 justify-content-center">
@ -151,7 +149,7 @@ class="fw-medium link-primary">#VZ2101</a>
readonly />
</div>
<div class="mb-3">
<div>
<label for="indicatorname-field" class="form-label">Indikator</label>
<input type="text" id="indicatorname-field" class="form-control" name="name"
value="{{ old('name') }}" placeholder="Masukan Nama Indikator" required
@ -160,15 +158,6 @@ class="fw-medium link-primary">#VZ2101</a>
Masukan Nama Indikator
</div>
</div>
<div>
<label for="description-field" class="form-label">Description</label>
<textarea name="description" id="description-field" id="description-field" rows="5" class="form-control"
placeholder="Masukan Deskripsi" required>{{ old('description') }}</textarea>
<div class="invalid-feedback">
Masukan Deskripsi
</div>
</div>
</div>
<div class="modal-footer">
<div class="hstack gap-2 justify-content-end">
@ -205,7 +194,7 @@ class="fw-medium link-primary">#VZ2101</a>
readonly />
</div>
<div class="mb-3">
<div>
<label for="indicatorname-field" class="form-label">Indikator</label>
<input type="text" id="indicatorname-field" class="form-control" name="name"
value="{{ old('name') }}" placeholder="Masukan Nama Indikator" required
@ -214,15 +203,6 @@ class="fw-medium link-primary">#VZ2101</a>
Masukan Nama Indikator
</div>
</div>
<div>
<label for="description-field" class="form-label">Description</label>
<textarea name="description" id="description-field" id="description-field" rows="5" class="form-control"
placeholder="Masukan Deskripsi" required>{{ old('description') }}</textarea>
<div class="invalid-feedback">
Masukan Deskripsi
</div>
</div>
</div>
<div class="modal-footer">
<div class="hstack gap-2 justify-content-end">