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 5996974..b1c1825 100644 --- a/resources/views/component/detail-jaminan.blade.php +++ b/resources/views/component/detail-jaminan.blade.php @@ -390,7 +390,7 @@ @endforelse
- @if(Auth::user()->hasRole(['Penilai', 'administrator','penilai'])) + @if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin']))
@csrf diff --git a/resources/views/penawaran/kirimEmail.blade.php b/resources/views/penawaran/kirimEmail.blade.php index 988aee8..2205e5c 100644 --- a/resources/views/penawaran/kirimEmail.blade.php +++ b/resources/views/penawaran/kirimEmail.blade.php @@ -131,12 +131,12 @@ @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 6ab6d02..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) @@ -133,12 +132,12 @@ @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 5601349..2be8a60 100644 --- a/resources/views/penawaran/surat_tender.blade.php +++ b/resources/views/penawaran/surat_tender.blade.php @@ -116,12 +116,12 @@ @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 18c4d8d..65c6a72 100644 --- a/resources/views/penawaran/surat_tender_download.blade.php +++ b/resources/views/penawaran/surat_tender_download.blade.php @@ -131,12 +131,12 @@ @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 1d5a66f..8053741 100644 --- a/resources/views/penawaran/surat_tender_kjpp.blade.php +++ b/resources/views/penawaran/surat_tender_kjpp.blade.php @@ -114,12 +114,12 @@ @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 b5bad50..73e08d8 100644 --- a/resources/views/penawaran/surat_tender_kjpp_download.blade.php +++ b/resources/views/penawaran/surat_tender_kjpp_download.blade.php @@ -133,12 +133,12 @@ @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/surveyor/components/print-out/apartement-kantor.blade.php b/resources/views/surveyor/components/print-out/apartement-kantor.blade.php index 80663a2..00e0e2c 100644 --- a/resources/views/surveyor/components/print-out/apartement-kantor.blade.php +++ b/resources/views/surveyor/components/print-out/apartement-kantor.blade.php @@ -1,5 +1,5 @@ -
- +
+
diff --git a/resources/views/surveyor/components/print-out/bangunan.blade.php b/resources/views/surveyor/components/print-out/bangunan.blade.php index 06503df..1b62c61 100644 --- a/resources/views/surveyor/components/print-out/bangunan.blade.php +++ b/resources/views/surveyor/components/print-out/bangunan.blade.php @@ -1,5 +1,5 @@ -
- +
+
diff --git a/resources/views/surveyor/components/print-out/fakta.blade.php b/resources/views/surveyor/components/print-out/fakta.blade.php index 72216e8..164e81f 100644 --- a/resources/views/surveyor/components/print-out/fakta.blade.php +++ b/resources/views/surveyor/components/print-out/fakta.blade.php @@ -1,5 +1,5 @@ -
- +
+
diff --git a/resources/views/surveyor/components/print-out/informasi.blade.php b/resources/views/surveyor/components/print-out/informasi.blade.php index 680a015..f1b2a27 100644 --- a/resources/views/surveyor/components/print-out/informasi.blade.php +++ b/resources/views/surveyor/components/print-out/informasi.blade.php @@ -1,8 +1,6 @@ -
+
- - + style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">

Informasi Dinas Tata Ruang

diff --git a/resources/views/surveyor/components/print-out/lingkungan.blade.php b/resources/views/surveyor/components/print-out/lingkungan.blade.php index 889b231..2c1dd76 100644 --- a/resources/views/surveyor/components/print-out/lingkungan.blade.php +++ b/resources/views/surveyor/components/print-out/lingkungan.blade.php @@ -1,5 +1,5 @@ -
- +
+
@@ -212,9 +219,9 @@

FORM INSPEKSI {{ $data ?? '' }}

-
+
diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php index 008b754..e7401a4 100644 --- a/resources/views/surveyor/components/print-out/main.blade.php +++ b/resources/views/surveyor/components/print-out/main.blade.php @@ -168,6 +168,7 @@ if ($permohonan->debiture && $permohonan->documents) { foreach ($permohonan->documents as $dokumen) { $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first(); + $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first(); $teams = $permohonan->region->teams; if ($teams) { @@ -188,6 +189,8 @@ } } } + use Modules\Usermanagement\Models\User; + $surveyorUser = User::where('id', $surveyor->userPenilaiTeam->id)->first(); @endphp @@ -199,9 +202,13 @@
-

Tanggal: {{ date('Y-m-d') }}

-

Waktu: {{ date('H:i:s') }}

-

User: {{ Auth::user()->name }}

+

+ Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('d-m-Y') }} +

+

+ Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('H:i') }} +

+

User: {{ $surveyorUser->name }}

+ style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -282,7 +289,7 @@
+ style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -301,7 +308,7 @@
+ style="width: 100%; border: 1px solid #000; border-collapse: collapse;">
@@ -360,7 +367,7 @@
+ style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -382,9 +389,9 @@
-
+
+ style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -503,7 +510,7 @@
-
+
diff --git a/resources/views/surveyor/components/print-out/rap.blade.php b/resources/views/surveyor/components/print-out/rap.blade.php index 63c12c7..a2fb575 100644 --- a/resources/views/surveyor/components/print-out/rap.blade.php +++ b/resources/views/surveyor/components/print-out/rap.blade.php @@ -1,6 +1,6 @@ -
+
+ style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -35,9 +35,9 @@
-
+
+ style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -77,9 +77,9 @@
-
+
+ style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -150,10 +150,10 @@ -
+
@isset($forminspeksi['partisi']) + style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -183,11 +183,11 @@
@endisset
-
+
@isset($forminspeksi['jumlah_unit']) + style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -211,11 +211,11 @@ @endisset -
+
@isset($forminspeksi['batas_batas_perumahan']) + style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -238,10 +238,10 @@ @endisset -
+
@isset($forminspeksi['fasus_fasum']) + style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -264,10 +264,10 @@ @endisset -
+
@isset($forminspeksi['progres_penjualan']) + style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -291,10 +291,10 @@ @endisset -
+
@isset($forminspeksi['harga_unit']) + style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -316,10 +316,10 @@
@endisset
-
+
@isset($forminspeksi['target_market']) + style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -342,10 +342,10 @@ @endisset -
+
@isset($forminspeksi['kerjasama_dengan_bank']) + style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -369,10 +369,10 @@ @endisset -
+
@isset($forminspeksi['rute_menuju_lokasi']) + style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -393,10 +393,10 @@
@endisset
-
+
@isset($forminspeksi['properti_sejenis']) + style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -419,11 +419,11 @@ @endisset -
+
@if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta'])) + style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
@@ -467,12 +467,12 @@ @endif -
+
@isset($forminspeksi['fakta']['keterangan']) + style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
diff --git a/resources/views/surveyor/components/print-out/tanah.blade.php b/resources/views/surveyor/components/print-out/tanah.blade.php index ace5938..1654c21 100644 --- a/resources/views/surveyor/components/print-out/tanah.blade.php +++ b/resources/views/surveyor/components/print-out/tanah.blade.php @@ -1,6 +1,6 @@ -
+
+ style="width: 100%; border: 1px solid #000; border-collapse: collapse; "> @@ -96,7 +96,7 @@ {{ isset($forminspeksi['tanah']['bentuk_tanah']['lainnya']) ? ' (' . $forminspeksi['tanah']['bentuk_tanah']['lainnya'] . ')' : '' }} @endif - + @endforeach