diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index ec4cf45..c06db93 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -11,6 +11,12 @@ class LaporanController extends Controller /** * Display a listing of the resource. */ + + public function index() + { + return view('lpj::laporan.index'); + } + public function sederhana_index() { return view('lpj::laporan.sederhana_index'); diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 2be57e5..ca0e74f 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -190,7 +190,6 @@ class PenilaiController extends Controller */ public function paparan(Request $request) { - $permohonanId = $request->query('permohonanId'); $permohonanId = $request->query('permohonanId'); $documentId = $request->query('documentId'); @@ -198,9 +197,15 @@ class PenilaiController extends Controller $jaminanId = $request->query('jaminanId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); - $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); - - return view('lpj::penilai.components.paparan'); + $penilai = Penilai::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); + $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where + ('dokument_id', $documentId)->first(); + $formFoto = null; + if ($inspeksi) { + $formFoto = json_decode($inspeksi->foto_form, true); + } + + return view('lpj::penilai.components.paparan', compact('permohonan', 'formFoto', 'penilai')); } @@ -240,10 +245,10 @@ class PenilaiController extends Controller }); } - // Apply whereHas to check penilai_id, role, and user_id specifically for 'penilai' role + $query->whereHas('penilaian.userPenilai', function ($q) { - $q->where('role', 'penilai') // Ensure the role is 'penilai' - ->where('user_id', Auth::user()->id); // Ganti dengan Auth::user()->id jika dinamis + $q->where('role', 'penilai') + ->where('user_id', Auth::user()->id); }); // Apply sorting if provided @@ -296,21 +301,15 @@ class PenilaiController extends Controller ]); } - public function export_kertas_kerja($id, $jaminanId) + public function export_kertas_kerja(Request $request) { - $data = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $jaminanId)->first(); - // $data = null; - // $headerInfo = [ - // 'tanggal_penilaian' => '', - // 'nama_pemilik' => '', - // 'nama_pemberi_tugas' => '', - // 'lokasi_lengkap' => '', - // 'nama_debitur' => '' - // ]; + $permohonanId = $request->query('permohonanId'); + $documentId = $request->query('documentId'); + $inspeksiId = $request->query('inspeksiId'); + $jaminanId = $request->query('jaminanId'); - // $datas = json_decode($data->data_pembanding); - // return response()->json(['data' =>$datas ]); + $data = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); // return view('lpj::component.kertas-kerja', compact('data')); return Excel::download(new KertasKerjaExport($data), 'kertas-kerja.xlsx'); @@ -487,7 +486,8 @@ class PenilaiController extends Controller } } - public function storeLpjSederhanadanStandard(Request $request){ + public function storeLpjSederhanadanStandard(Request $request) + { try { diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 5515aaa..b7d4ed6 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -359,7 +359,7 @@ class PenilaianController extends Controller 'pembatalan' => 'Pembatalan', 'sla' => 'SLA', ]; - + $header = $headers[$type] ?? 'Pelaporan'; return view('lpj::penilaian.otorisator.index', compact('header')); @@ -380,7 +380,7 @@ class PenilaianController extends Controller return view('lpj::penilaian.otorisator.show', compact('permohonan', 'header')); } - public function otorisatorUpdate($id, $context) + public function otorisatorUpdate(Request $request, $id, $context) { $permohonan = Permohonan::find($id); @@ -396,28 +396,30 @@ class PenilaianController extends Controller $newStatus = $permohonan->status_bayar === 'sudah_bayar' ? 'belum_bayar' : 'sudah_bayar'; $permohonan->update([ - 'status_bayar' => $newStatus + 'status_bayar' => $newStatus, + 'keterangan' => $request->message ]); break; case 'pembatalan': - $permohonan->update([ - 'authorized_status' => 1, + 'status' => 'batal', + 'keterangan' => $request->message ]); break; case 'pelaporan': - $permohonan->update([ - 'status' => 'disetujui', + 'status' => 'proses-laporan', + 'keterangan' => $request->message ]); break; case 'sla': $permohonan->update([ - 'status' => 'order', + 'status' => 'proses-sla', + 'keterangan' => $request->message ]); break; @@ -449,10 +451,10 @@ class PenilaianController extends Controller // Tentukan status berdasarkan otorisator $status = match ($otorisator) { - 'Pelaporan' => 'proses laporan', + 'Pelaporan' => 'proses-laporan', 'Pembayaran' => 'proses', - 'Pembatalan' => 'proses', - 'SLA' => 'proses', + 'Pembatalan' => 'batal', + 'SLA' => 'freeze', default => '', }; @@ -477,10 +479,13 @@ class PenilaianController extends Controller if (!empty($otorisator)) { if ($status == 'proses') { $query->whereIn('status_bayar', ['sudah_bayar', 'belum_bayar']); + } elseif ($status == 'proses-laporan') { + $query->whereRaw('LOWER(status) = ?', [strtolower($status)]); + } elseif ($status == 'batal') { + $query->whereRaw('LOWER(status) = ?', [strtolower($status)]); + } elseif ($status == 'freeze') { + $query->whereRaw('LOWER(status) = ?', [strtolower($status)]); } - // else { - // $query->whereRaw('LOWER(status) = ?', [strtolower($status)]); - // } } // Filter berdasarkan region user yang login diff --git a/module.json b/module.json index f884f24..762ae31 100644 --- a/module.json +++ b/module.json @@ -323,33 +323,6 @@ "pemohon-eo", "admin", "senior-officer" - ], - "sub": [ - { - "title": "Sederhana", - "path": "laporan.sederhana", - "classes": "", - "attributes": [], - "permission": "", - "roles": [ - "administrator", - "admin" - ] - }, - { - "title": "Standard", - "path": "laporan.standard", - "classes": "", - "attributes": [], - "permission": "", - "roles": [ - "administrator", - "pemohon-ao", - "pemohon-eo", - "admin", - "senior-officer" - ] - } ] }, { diff --git a/resources/views/component/kertas-kerja.blade.php b/resources/views/component/kertas-kerja.blade.php index 5a92aef..195bc23 100644 --- a/resources/views/component/kertas-kerja.blade.php +++ b/resources/views/component/kertas-kerja.blade.php @@ -464,79 +464,147 @@ -
Data Pembanding {{ $loop->iteration }}
- @endforeach - - - @php - $dataFoto = json_decode($data->foto_form, true); - @endphp -{{ Str::title(str_replace('_', ' ', $type)) }}
+ {{-- @else +Tidak ada gambar
+Tidak ada tipe foto yang tersedia
+ @endforelse +Data Pembanding {{ $loop->iteration }}
+ @else +Tidak ada gambar pembanding
+Tidak ada data pembanding
+ @endforelse +Tidak ada foto objek yang tersedia
+