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

Merge pull request #33 from arieeefajar/fix/assessment-history-officer 

fix(assessment-history-officer): set treshold value
This commit is contained in:
Arie Fajar Bachtiar 2025-04-08 00:11:32 +07:00 committed by GitHub
parent 1dab513cbf f54cf71984
commit b93c5acdef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/Http/Controllers/AssesmentFormController.php
View File

@ -97,12 +97,12 @@ public function store(Request $request)
} }
$landName = Land::find($request->land)->owner; $landName = Land::find($request->land)->owner;
// dd($cf_e, $cf_h, $cf_he, $cf_he_array, $cf_combined, $hasil);
DB::beginTransaction(); DB::beginTransaction();
try { try {
$evaluation = new Evaluation; $evaluation = new Evaluation;
$evaluation->land_id = $request->land; $evaluation->land_id = $request->land;
$evaluation->threshold_value = $hasil;
$evaluation->cf_value = $cf_combined; $evaluation->cf_value = $cf_combined;
$evaluation->user_id = auth()->user()->id; $evaluation->user_id = auth()->user()->id;
$evaluation->save(); $evaluation->save();
@ -123,47 +123,5 @@ public function store(Request $request)
toast($th->getMessage(), 'error')->position('top-right')->autoclose(3000); toast($th->getMessage(), 'error')->position('top-right')->autoclose(3000);
return redirect()->back(); return redirect()->back();
} }
// $cfValue = [];
// foreach ($cf_e as $id => $value) {
// if (isset($rules[$id])) {
// $rule = $rules[$id];
// $cfValue[$id] = $rule->mb * $value;
// } else {
// toast("Rule untuk indikator ID {$id} tidak ditemukan.", 'error')->position('top-right')->autoclose(3000);
// return redirect()->back();
// }
// }
// $cfCombine = array_shift($cfValue);
// foreach ($cfValue as $cf) {
// $cfCombine = $cfCombine + $cf * (1 - $cfCombine);
// }
// DB::beginTransaction();
// try {
// $evaluation = new Evaluation;
// $evaluation->land_id = $request->land;
// $evaluation->cf_value = $cfCombine;
// $evaluation->user_id = auth()->user()->id;
// $evaluation->save();
// foreach ($indicators as $id => $value) {
// $evaluationDetail = new EvaluationDetail();
// $evaluationDetail->evaluation_id = $evaluation->id;
// $evaluationDetail->indicator_id = $id;
// $evaluationDetail->md_value = $value;
// $evaluationDetail->save();
// }
// DB::commit();
// $presentase = round($cfCombine * 100, 2);
// toast('Data berhasil disimpan', 'success')->position('top-right')->autoclose(3000);
// return redirect()->back()->with('presentase', $presentase);
// } catch (\Throwable $th) {
// DB::rollBack();
// toast('Terjadi kesalahan', 'error')->position('top-right')->autoclose(3000);
// return redirect()->back();
// }
} }
} }

1
database/migrations/2025_02_06_085110_create_evaluation_table.php
View File

@ -14,6 +14,7 @@ public function up(): void
Schema::create('evaluation', function (Blueprint $table) { Schema::create('evaluation', function (Blueprint $table) {
$table->id(); $table->id();
$table->unsignedBigInteger('land_id'); $table->unsignedBigInteger('land_id');
$table->string('threshold_value');
$table->double('cf_value', 15, 10); $table->double('cf_value', 15, 10);
$table->unsignedBigInteger('user_id'); $table->unsignedBigInteger('user_id');
$table->timestamps(); $table->timestamps();

3
resources/views/assessment/officer.blade.php
View File

@ -61,6 +61,7 @@
<th class="sort" data-sort="customer_name"> <th class="sort" data-sort="customer_name">
Lahan Lahan
</th> </th>
<th class="sort" data-sort="threshold">Rekomendasi</th>
<th class="sort" data-sort="status"> <th class="sort" data-sort="status">
Nilai Presentase Nilai Presentase
</th> </th>
@ -76,6 +77,8 @@
class="fw-medium link-primary">#VZ2101</a> class="fw-medium link-primary">#VZ2101</a>
</td> </td>
<td class="customer_name">{{ $evaluation->land->owner }}</td> <td class="customer_name">{{ $evaluation->land->owner }}</td>
<td class="threshold text-capitalize">{{ $evaluation->threshold_value }}
</td>
<td class="status"> <td class="status">
<span>{{ number_format($evaluation->cf_value, 2) * 100 }}%</span> <span>{{ number_format($evaluation->cf_value, 2) * 100 }}%</span>
</td> </td>