diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index a18f8d5..3c88325 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -437,10 +437,10 @@ class PenilaianController extends Controller $header = $headers[$type] ?? 'Pelaporan'; $authorization = null; if ($header === 'SLA') { - $authorization = Authorization::with(['user'])->find($id); - $permohonan = Permohonan::find($authorization->permohonan_id); + $authorization = Authorization::with(['user','permohonan.lampiranDokumen.jenisLampiran'])->find($id); + $permohonan = Permohonan::with(['lampiranDokumen.jenisLampiran'])->find($authorization->permohonan_id); } else { - $permohonan = Permohonan::find($id); + $permohonan = Permohonan::with(['lampiranDokumen.jenisLampiran'])->find($id); } if ($header === 'SLA') { return view('lpj::penilaian.otorisator.sla', compact('permohonan', 'header', 'authorization')); diff --git a/resources/views/penilaian/otorisator/sla.blade.php b/resources/views/penilaian/otorisator/sla.blade.php index c5f399a..e119b58 100644 --- a/resources/views/penilaian/otorisator/sla.blade.php +++ b/resources/views/penilaian/otorisator/sla.blade.php @@ -82,18 +82,18 @@ {{ $authorization->keterangan ?? '' }} - - - - - - - - - - - - + + + + + + + + + + + +
Pemohon{{ $authorization->user->name }}
Alasan{{ $authorization->keterangan }}
Tanggal Permohonan{{ formatTanggalIndonesia($authorization->created_at, 1) }}
Pemohon{{ $authorization->user->name }}
Alasan{{ $authorization->keterangan }}
Tanggal Permohonan{{ formatTanggalIndonesia($authorization->created_at, 1) }}
@@ -116,28 +116,28 @@
+ + + + + + @if ($authorization->approve_eo != null) - - - + + - @if ($authorization->approve_eo != null) - - - - - - @endif - @if (in_array($authorization->nilai_eafond_id, [1, 4]) && $authorization->approve_dd != null) - - - - - - @endif + @endif + @if (in_array($authorization->nilai_eafond_id, [1, 4]) && $authorization->approve_dd != null) + + + + + + @endif
Diperiksa Oleh{{ getUser($authorization->approve_so)->name ?? 'N/A' }}{{ $authorization->approve_so_at ? formatTanggalIndonesia($authorization->approve_so_at, 1) : 'N/A' }} +
Diperiksa Oleh{{ getUser($authorization->approve_so)->name ?? 'N/A' }}{{ $authorization->approve_so_at ? formatTanggalIndonesia($authorization->approve_so_at, 1) : 'N/A' }} + Disetujui Oleh (EO){{ getUser($authorization->approve_eo)->name ?? 'N/A' }}{{ $authorization->approve_eo_at ? formatTanggalIndonesia($authorization->approve_eo_at, 1) : 'N/A' }}
Disetujui Oleh (EO){{ getUser($authorization->approve_eo)->name ?? 'N/A' }}{{ $authorization->approve_eo_at ? formatTanggalIndonesia($authorization->approve_eo_at, 1) : 'N/A' }} -
Disetujui Oleh (DD){{ getUser($authorization->approve_dd)->name ?? 'N/A' }}{{ $authorization->approve_dd_at ? formatTanggalIndonesia($authorization->approve_dd_at, 1) : 'N/A' }} -
Disetujui Oleh (DD){{ getUser($authorization->approve_dd)->name ?? 'N/A' }}{{ $authorization->approve_dd_at ? formatTanggalIndonesia($authorization->approve_dd_at, 1) : 'N/A' }} +
@@ -161,14 +161,14 @@ @if ($dataHeader == 'pelaporan') + href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}"> Lihat Laporan @endif @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer']) && $authorization->approve_so == null) @@ -178,7 +178,7 @@ $authorization->approve_so && $authorization->approve_eo == null) @@ -189,117 +189,135 @@ $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [1, 4])) @endif @if ( - (Auth::user()->hasAnyRole(['administrator', 'senior-officer']) && - $authorization->approve_so != null && - $authorization->approve_eo != null) || - $authorization->approve_dd != null) - + (Auth::user()->hasAnyRole(['administrator', 'senior-officer']) && + $authorization->approve_so != null && + $authorization->approve_eo != null) || + $authorization->approve_dd != null + ) + @php + $memoDeviasiExists = false; + if ($authorization->permohonan && $authorization->permohonan->lampiranDokumen) { + $memoDeviasiExists = $authorization->permohonan->lampiranDokumen() + ->whereHas('jenisLampiran', function($query) { + $query->where('nama', 'memo-deviasi'); + }) + ->exists(); + } + @endphp + + @if ($memoDeviasiExists) + + @else + + Memo Deviasi Belum Ada + + @endif @endif - @endsection + @endsection - @push('scripts') - + }); + } + @endpush diff --git a/routes/web.php b/routes/web.php index 8c36181..676f125 100644 --- a/routes/web.php +++ b/routes/web.php @@ -60,7 +60,6 @@ Route::middleware(['auth'])->group(function () { Route::get('datatables', [JenisLampiranController::class, 'dataForDatatables'])->name('datatables'); Route::get('export', [JenisLampiranController::class, 'export'])->name('export'); }); - Route::delete('jenis-lampiran/{id}', [JenisLampiranController::class, 'destroy'])->name('jenis-lampiran.destroy'); Route::resource('jenis-lampiran', JenisLampiranController::class); Route::name('custom-field.')->prefix('custom-field')->group(function () {