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 -
+ $jaminanId = $dokumen->id; + $currentInspeksi = $inspeksiData[$jaminanId] ?? null; + $tanahBangunanTypes = ['KAPAL', 'PESAWAT', 'ALAT BERAT']; + @endphp +
-
-

- Hasil Laporan Penilaian -

+
+

+ Hasil Laporan Penilaian +

+
+ + +
+ @endforeach + @endif + + +
+
+

+ Lampiran Dokumen +

+
+
+
+ @forelse($permohonan->lampiranDokumen as $lampiran) +
+

{{ $lampiran->nama_file }}

+

Keterangan : {{ $lampiran->keterangan }}

+
+ + @if(Auth::user()->hasRole('administrator')) +
+ @csrf + @method('DELETE') + +
+ @endif +
+
+ @empty +

Tidak ada lampiran dokumen.

+ @endforelse
-
- - - LAMPIRAN FOTO DAN DOKUMEN - - - Hasil Inspeksi - - - Print Laporan - + @if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin'])) +
+ @csrf + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+
+ @endif
-
- @endforeach - @endif +
-
- @include('lpj::component.history-permohonan') -
+
+ @include('lpj::component.history-permohonan') +
@endsection @include('lpj::surveyor.js.utils') diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php index 59d5661..b1c1825 100644 --- a/resources/views/component/detail-jaminan.blade.php +++ b/resources/views/component/detail-jaminan.blade.php @@ -275,6 +275,7 @@ @php $document = $dokumen; @endphp @foreach($document->detail as $detail) + @if(isset($detail->dokumen_jaminan)) + @endif @endforeach
@@ -340,6 +341,7 @@

@@ -388,7 +390,7 @@ @endforelse - @if(Auth::user()->hasRole(['penilai', 'administrator'])) + @if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin']))
@csrf diff --git a/resources/views/debitur/components/jaminan.blade.php b/resources/views/debitur/components/jaminan.blade.php index 1af9f4b..9853fbf 100644 --- a/resources/views/debitur/components/jaminan.blade.php +++ b/resources/views/debitur/components/jaminan.blade.php @@ -76,17 +76,17 @@
@foreach($document->detail as $detail) -
+ @if(isset($detail->dokumen_jaminan)) +
{{ $loop->index+1 }}. {{ $detail->jenisLegalitasJaminan->name }} -
-   +
+   +
-
-
+
- @if(isset($detail->dokumen_jaminan)) @php $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) ? json_decode($detail->dokumen_jaminan) : [$detail->dokumen_jaminan]; $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) ? json_decode($detail->dokumen_nomor) : ($detail->dokumen_nomor ? [$detail->dokumen_nomor] : []); @@ -127,19 +127,18 @@ @endif @endif @endforeach + +
+ + keterangan + +

+ {{ $detail->keterangan }} +

+
+
+
@endif - - -
- - keterangan - -

- {{ $detail->keterangan }} -

-
-
-
@endforeach
diff --git a/resources/views/penawaran/kirimEmail.blade.php b/resources/views/penawaran/kirimEmail.blade.php index 817d5a6..2205e5c 100644 --- a/resources/views/penawaran/kirimEmail.blade.php +++ b/resources/views/penawaran/kirimEmail.blade.php @@ -126,17 +126,17 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = null; @endphp + @php $luastanah = $luasbangunan = 0; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') @php - $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @if($k=='luas_bangunan') @php - $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @endforeach diff --git a/resources/views/penawaran/kirimEmailKJPP.blade.php b/resources/views/penawaran/kirimEmailKJPP.blade.php index 791212f..a245d64 100644 --- a/resources/views/penawaran/kirimEmailKJPP.blade.php +++ b/resources/views/penawaran/kirimEmailKJPP.blade.php @@ -106,8 +106,7 @@
Aset Jaminan: @foreach ($permohonan->documents as $document) {{ $document->jenisJaminan->name }} - @endforeach - Lokasi Jaminan: @foreach ($permohonan->documents as $document) + @endforeachLokasi Jaminan: @foreach ($permohonan->documents as $document) {{ $document->address }}, Kel. @foreach ($villages as $village) {{ $village->name }} @endforeach, Kec. @foreach ($districts as $district) @@ -128,17 +127,17 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = null; @endphp + @php $luastanah = $luasbangunan = 0; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') @php - $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @if($k=='luas_bangunan') @php - $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @endforeach diff --git a/resources/views/penawaran/surat_tender.blade.php b/resources/views/penawaran/surat_tender.blade.php index d7ad287..2be8a60 100644 --- a/resources/views/penawaran/surat_tender.blade.php +++ b/resources/views/penawaran/surat_tender.blade.php @@ -111,17 +111,17 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = null; @endphp + @php $luastanah = $luasbangunan = 0; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') @php - $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @if($k=='luas_bangunan') @php - $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @endforeach diff --git a/resources/views/penawaran/surat_tender_download.blade.php b/resources/views/penawaran/surat_tender_download.blade.php index db007cc..65c6a72 100644 --- a/resources/views/penawaran/surat_tender_download.blade.php +++ b/resources/views/penawaran/surat_tender_download.blade.php @@ -126,17 +126,17 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = null; @endphp + @php $luastanah = $luasbangunan = 0; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') @php - $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @if($k=='luas_bangunan') @php - $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @endforeach diff --git a/resources/views/penawaran/surat_tender_kjpp.blade.php b/resources/views/penawaran/surat_tender_kjpp.blade.php index 8402599..8053741 100644 --- a/resources/views/penawaran/surat_tender_kjpp.blade.php +++ b/resources/views/penawaran/surat_tender_kjpp.blade.php @@ -109,17 +109,17 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = null; @endphp + @php $luastanah = $luasbangunan = 0; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') @php - $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @if($k=='luas_bangunan') @php - $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @endforeach diff --git a/resources/views/penawaran/surat_tender_kjpp_download.blade.php b/resources/views/penawaran/surat_tender_kjpp_download.blade.php index 7bd9b0b..73e08d8 100644 --- a/resources/views/penawaran/surat_tender_kjpp_download.blade.php +++ b/resources/views/penawaran/surat_tender_kjpp_download.blade.php @@ -128,17 +128,17 @@ @foreach ($permohonan->documents as $document) @foreach ($document->detail as $index => $detail) @if($detail->details) - @php $luastanah = $luasbangunan = null; @endphp + @php $luastanah = $luasbangunan = 0; @endphp @foreach (json_decode($detail->details) as $key => $value) @foreach($value as $k => $v) @if($k=='luas_tanah') @php - $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @if($k=='luas_bangunan') @php - $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); + $luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v)); @endphp @endif @endforeach diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index c8d856a..cb3ea4e 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -85,7 +85,6 @@
-