diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 0afcc21..5d32d87 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -305,7 +305,7 @@ class PenilaiController extends Controller */ public function show($id) { - $permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian', 'documents.inspeksi'])->find($id); + $permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian', 'documents.inspeksi','jenisPenilaian','laporanExternal'])->find($id); // return response()->json(['permohonan' => $permohonan]); diff --git a/app/Http/Controllers/TenderController.php b/app/Http/Controllers/TenderController.php index 8b0571f..0d724d4 100644 --- a/app/Http/Controllers/TenderController.php +++ b/app/Http/Controllers/TenderController.php @@ -815,7 +815,7 @@ class TenderController extends Controller } } - return redirect()->route('tender.penawaran.ulang.index') + return redirect()->back() ->with('success', 'Email Penawaran Berhasil Terkirim!'); } catch (\Exception $e) { // Log email gagal untuk setiap KJPP @@ -871,7 +871,7 @@ class TenderController extends Controller } } - return redirect()->route('tender.penawaran.showKirimEmail', ['noreg' => $noreg]) + return redirect()->back() ->with('error', 'Email Penawaran Gagal Terkirim!'); } } @@ -1015,7 +1015,7 @@ class TenderController extends Controller } } - return redirect()->route('tender.penawaran.ulang.index')->with('success', 'Email Penawaran Berhasil Terkirim!'); + return redirect()->back()->with('success', 'Email Penawaran Berhasil Terkirim!'); } catch (\Exception $e) { // Log email gagal foreach ($kjpps as $email) { @@ -1067,7 +1067,7 @@ class TenderController extends Controller } } - return redirect()->route('tender.penawaran.showKirimEmail', ['noreg' => $noreg])->with('error', 'Email Penawaran Gagal Terkirim!'); + return redirect()->back()->with('error', 'Email Penawaran Gagal Terkirim!'); } } } diff --git a/app/Models/Permohonan.php b/app/Models/Permohonan.php index b3e881c..dc08b61 100644 --- a/app/Models/Permohonan.php +++ b/app/Models/Permohonan.php @@ -235,4 +235,9 @@ { return $this->hasMany(LampiranDokumen::class); } + + public function laporanExternal() + { + return $this->belongsTo(LaporanExternal::class,'id','permohonan_id'); + } } diff --git a/resources/views/activity/activitydetail.blade.php b/resources/views/activity/activitydetail.blade.php index 6afc8f0..3ecbaa8 100644 --- a/resources/views/activity/activitydetail.blade.php +++ b/resources/views/activity/activitydetail.blade.php @@ -57,45 +57,111 @@ @if ($permohonan->status === 'done') - @foreach ($permohonan->documents as $dokumen) - @php - $inspeksiId = null; + @foreach ($permohonan->documents as $dokumen) + @php + $inspeksiId = null; - foreach ($dokumen->inspeksi as $item) { - $inspeksiId = $item->id; - } + foreach ($dokumen->inspeksi as $item) { + $inspeksiId = $item->id; + } - $jaminanId = $dokumen->id; - $currentInspeksi = $inspeksiData[$jaminanId] ?? null; - $tanahBangunanTypes = ['KAPAL', 'PESAWAT', 'ALAT BERAT']; - @endphp -
Keterangan : {{ $lampiran->keterangan }}
+Tidak ada lampiran dokumen.
+ @endforelse| @@ -340,6 +341,7 @@ |