daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging-temp' into fix/sertipikat-pemohon-surveyor

Browse Source
This commit is contained in:
majid
2025-03-07 17:19:24 +07:00
parent 3e9d9e3769 03d28479c4
commit 5300254a6d
26 changed files with 367 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/LaporanExternalController.php
View File

@@ -151,7 +151,7 @@ class LaporanExternalController extends Controller
$filteredRecords = $query->count();
// Get the data for the current page
$data = $query->get();
$data = $query->with(['permohonan.debiture','permohonan.penawaran.tujuanPenilaianKjpp'])->get();
// Calculate the page count
$pageCount = ceil($totalRecords / $request->get('size'));

2
app/Http/Controllers/PenilaiController.php
View File

@@ -1698,7 +1698,7 @@ class PenilaiController extends Controller
$permohonan->update([
'status' => 'revisi-survey',
'keterangan' => $request->message,
'keterangan' => $request->keterangan,
'submitted_at' => now()
]);

6
app/Http/Controllers/SpkController.php
View File

@@ -388,11 +388,15 @@ use Illuminate\Support\Facades\Auth;
public function updateSla(Request $request, $id): JsonResponse
{
$request->validate([
'sla' => 'required|integer|min:1',
]);
$permohonan = Permohonan::where('nomor_registrasi','=',$id)->first();
$penawaran = PenawaranTender::find($id);
$permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first();
$permohonan->sla = $request->sla;
$permohonan->save();

21
app/Http/Controllers/SurveyorController.php
View File

@@ -236,6 +236,7 @@ class SurveyorController extends Controller
'alat-berat' => 'getAlatBeratData',
'lingkungan' => 'getLingkunganData',
'fakta' => 'getFactData',
'informasi' => 'getFactData',
'rap' => 'getRapData',
];
@@ -966,8 +967,11 @@ class SurveyorController extends Controller
'keterangan' => 'required',
]);
$penilaian = Penilaian::findOrFail($id);
$permohonan = Permohonan::where('nomor_registrasi', $penilaian->nomor_registrasi)->first();
;
if (Carbon::parse($validate['waktu_penilaian']) <= Carbon::parse($penilaian->tanggal_kunjungan)) {
return response()->json([
'success' => false,
@@ -985,7 +989,9 @@ class SurveyorController extends Controller
SendJadwalKunjunganEmailJob::dispatch($emailData);
$permohonan->update([
'status' => 'request-jadwal',
]);
$penilaian->update([
@@ -1471,8 +1477,8 @@ class SurveyorController extends Controller
'dokument_id' => 'required',
'name_foto_objek' => 'nullable|string',
'nomor_registrasi' => 'required|string',
'foto_objek' => 'nullable|image|max:'.$maxSize,
'foto_objek_pembanding.*' => 'nullable|image|max:'.$maxSize,
'foto_objek' => 'nullable|jpeg|png|jpg|gif|svg|max:'.$maxSize,
'foto_objek_pembanding.*' => 'nullable|jpeg|png|jpg|gif|svg|max:'.$maxSize,
]);
$tanahBangunanTypes = ['KAPAL', 'PESAWAT', 'KENDARAAN', 'ALAT BERAT', 'MESIN'];
@@ -2106,7 +2112,7 @@ class SurveyorController extends Controller
});
}
$query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ? ,?,?)', ['assign', 'survey', 'proses-survey', 'request-reschedule', 'reschedule', 'rejected-reschedule', 'approved-reschedule', 'revisi-survey' ]);
$query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ? ,?,?, ?)', ['assign', 'survey', 'proses-survey', 'request-reschedule', 'reschedule', 'rejected-reschedule', 'approved-reschedule', 'revisi-survey', 'request-jadwal' ]);
if (!Auth::user()->hasRole('administrator')) {
@@ -2456,7 +2462,7 @@ class SurveyorController extends Controller
'kordinat_lng' => $data['kordinat_lng'] ?? null,
'kordinat_lat' => $data['kordinat_lat'] ?? null,
'nomor_nib' => $data['nomor_nib'] ?? null
// 'nomor_nib' => $data['nomor_nib'] ?? null
]
];
}
@@ -2668,7 +2674,8 @@ class SurveyorController extends Controller
'foto_bhumi',
'foto_argis_region',
'foto_tempat',
'foto_sentuh_tanahku'
'foto_sentuh_tanahku',
'upload_gs'
];
if ($inspeksi) {
@@ -3638,7 +3645,7 @@ class SurveyorController extends Controller
$namaDebiture = $permohonan->debiture->name . '-' . $permohonan->nomor_registrasi;
$fileName = 'inspeksi-' . $namaDebiture . '-data.pdf';
return $pdf->download($fileName);
return $pdf->stream($fileName);
}
public function approveReschedule(Request $request, $id)

179
resources/views/component/detail-jaminan.blade.php
View File

@@ -68,36 +68,36 @@
{{ $penawaran->tujuanPenilaianKjpp->name }}
</span>
</div>
@else
@else
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Tujan Permohonan:
</h3>
<span class="text-2sm text-gray-700">
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Tujan Permohonan:
</h3>
<span class="text-2sm text-gray-700">
{{ $permohonan->tujuanPenilaian->name }}
</span>
</div>
</div>
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Nilai Plafond:
</h3>
<span class="text-2sm text-gray-700">
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Nilai Plafond:
</h3>
<span class="text-2sm text-gray-700">
{{ $permohonan->nilaiPlafond->name }}
</span>
</div>
</div>
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Status Bayar:
</h3>
<span
class="text-md font-bold {{ $permohonan->status_bayar === 'belum_bayar' ? 'text-red-600' : 'text-green-600' }} uppercase">
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Status Bayar:
</h3>
<span
class="text-md font-bold {{ $permohonan->status_bayar === 'belum_bayar' ? 'text-red-600' : 'text-green-600' }} uppercase">
{{ str_replace('_', ' ', $permohonan->status_bayar) }}
</span>
</div>
@endif
</div>
@endif
</div>
</div>
@@ -263,84 +263,82 @@
</div>
</div>
@endif
<div class="card-table scrollable-x-auto pb-3">
<a href="{{ route('debitur.jaminan.bulk.download', ['id' => $permohonan->debiture->id, 'jaminan' => $dokumen->id]) }}"
class="ml-6 btn btn-dark dark:btn-light">
<i class="ki-outline ki-cloud-download"></i> Download Semua Dokumen
</a>
<table class="table align-middle text-sm text-gray-500">
@foreach ($dokumen->detail as $detail)
<tr>
<td class="py-2 text-gray-600 font-normal max-w-[100px]">
{{ $loop->index + 1 }}. {{ $detail->jenisLegalitasJaminan->name }}
</td>
<td class="py-2 text-gray-800 font-normal text-2sm">
{{ $detail->name ?? '' }}
</td>
</tr>
@if(isset($detail->details))
@if(json_decode($detail->details))
@foreach (json_decode($detail->details) as $key => $value)
<tr>
<td class="py-3 capitalize">
{{formatLabel($key)}}
</td>
<td class="py-2 text-gray-800 font-normal text-2sm">
{{ $value ?? "" }}
</td>
</tr>
@endforeach
@endif
@endif
<tr>
<td class="py-3 max-w-[100px] align-top">
Dokumen Jaminan
</td>
<td class="py-3 text-gray-700 text-2sm font-normal">
@php $document = $dokumen; @endphp
@foreach($document->detail as $detail)
<tr>
<td colspan="2">
<strong class="text-2xs text-gray-600 uppercase">
{{ $loop->index+1 }}. {{ $detail->jenisLegalitasJaminan->name }}
</strong>
</td>
</tr>
@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]
: []);
@endphp
@foreach ($dokumen_jaminan as $index => $dokumen)
<div class="flex w-full lg:w-[30%]">
@if (in_array(Auth::user()->roles[0]->name, ['administrator', 'pemohon-eo']))
@if (!empty($dokumen_nomor))
<span class="flex-1 mt-2 text-info">Nomor Dokumen :
{{ $dokumen_nomor[$index] }}</span>
@endif
<a href="{{ route('debitur.jaminan.download', ['id' => $permohonan->debiture->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
class="flex-none badge badge-sm badge-outline mt-2 mr-2">
{{ basename($dokumen) }}
<i class="ki-filled ki-cloud-download"></i>
</a>
@endif
<span class="flex-none badge badge-sm badge-outline badge-warning mt-2"
onclick="viewPDF('{{ Storage::url($dokumen_jaminan[$index]) }}')"><i
class="ki-filled ki-eye mr-2"></i>Preview</span>
</div>
<br>
@endforeach
@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] : []);
@endphp
@foreach($dokumen_jaminan as $index => $dokumen)
<tr>
<td>
<span class="text-2xs text-gray-600 uppercase pl-3">
{{ $loop->index+1 }}. Nomor : {{ $dokumen_nomor[$index] }}
</span>
</td>
<td class="text-left">
@if(in_array(Auth::user()->roles[0]->name,['administrator','pemohon-eo']))
<a href="{{ route('debitur.jaminan.download', ['id' => $permohonan->debiture->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
class="flex-none badge badge-sm badge-outline mt-2 mr-2">
{{ basename($dokumen) }}
<i class="ki-filled ki-cloud-download"></i>
</a>
@endif
<span class="badge badge-sm badge-outline badge-warning mt-2" onclick="viewPDF('{{ Storage::url($dokumen_jaminan[$index]) }}')">
<i class="ki-filled ki-eye mr-2"></i>Preview
</span>
</td>
</tr>
</td>
</tr>
<tr>
<td class="py-3 max-w-[100px]">
Keterangan
</td>
<td class="py-3 text-gray-700 text-2sm font-normal">
{{ $detail->keterangan ?? '' }}
</td>
</tr>
@if(isset($detail->details) && json_decode($detail->details)[$index])
@foreach (json_decode($detail->details)[$index] as $key => $value)
<tr>
<td>
<span class="text-2xs text-gray-600 uppercase pl-3">
- {{ str_replace("_"," ",$key) ?? "" }}
</span>
</td>
<td class="text-left">
<p class="text-2xs text-gray-600 max-w-[250px]">
{{ $value }}
</p>
</td>
</tr>
@endforeach
@endif
@endforeach
@endif
<tr>
<td>
<span class="text-2xs text-gray-600 uppercase pl-3">
- keterangan
</span>
</td>
<td class="text-right">
<p class="text-2xs text-gray-600 max-w-[250px]">
{{ $detail->keterangan }}
</p>
</td>
</tr>
@endforeach
</table>
</div>
</div>
@@ -349,6 +347,9 @@
</div>
@if (!isset($status))
</div>
@include('lpj::component.history-permohonan')
@endif
@include('lpj::component.pdfviewer')

1
resources/views/debitur/components/dokumen.blade.php
View File

@@ -506,6 +506,7 @@
</div>
</form>
@push('scripts')
{{--Pemilik Jaminan--}}
<script>

1
resources/views/debitur/components/jaminan.blade.php
View File

@@ -189,6 +189,7 @@
@endif
</div>
@include('lpj::component.pdfviewer')
@push('scripts')

74
resources/views/laporan_external/index.blade.php
View File

@@ -36,8 +36,16 @@
<span class="sort"> <span class="sort-label"> Nomor Laporan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tgl_final_laporan">
<span class="sort"> <span class="sort-label"> Tanggal Final Laporan </span>
<th class="min-w-[150px]" data-datatable-column="nama_debitur">
<span class="sort"> <span class="sort-label"> Nama Debitur </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tujuan_penilaian">
<span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="jenis_jaminan">
<span class="sort"> <span class="sort-label"> Jenis Jaminan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="nilai_pasar">
@@ -48,30 +56,7 @@
<span class="sort"> <span class="sort-label"> Indikasi Nilai Likuidasi </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="indikasi_nilai_pasar_tanah">
<span class="sort"> <span class="sort-label"> Indikasi Nilai Pasar Tanah </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="estimasi_harga_bangunan">
<span class="sort"> <span class="sort-label"> Estimasi Harga Bangunan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="indikasi_nilai_pasar_bangunan">
<span class="sort"> <span class="sort-label"> Indikasi Nilai Pasar Bangunan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="indikasi_nilai_pasar_sarana_pelengkap">
<span class="sort"> <span class="sort-label"> Indikasi Nilai Pasar Sarana Pelengkap </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="indikasi_nilai_pasar_mesin">
<span class="sort"> <span class="sort-label"> Indikasi Nilai Pasar Mesin </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="indikasi_nilai_pasar_kendaraan_alat_berat">
<span class="sort"> <span class="sort-label"> Indikasi Nilai Pasar Kendaraan/Alat Berat </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="file_resume">
<span class="sort"> <span class="sort-label"> File Resume </span>
<span class="sort-icon"> </span> </span>
@@ -156,8 +141,23 @@
nomor_laporan: {
title: 'Nomor Laporan',
},
tgl_final_laporan: {
title: 'Tanggal Final Laporan',
nama_debitur: {
title: 'Nama Debitur',
render: (item, data) => {
return `${data.permohonan.debiture.name}`;
},
},
tujuan_penilaian: {
title: 'Tujuan Penilaian',
render: (item, data) => {
return `${data.permohonan.penawaran?.tujuanPenilaianKjpp.name}` ?? '';
}
},
jenis_jaminan: {
title: 'Jenis Jaminan',
render: (item, data) => {
return `${data.permohonan.dokumenjaminan[0]?.jenisjaminan?.name}` ?? '';
}
},
nilai_pasar: {
title: 'Nilai Pasar',
@@ -165,24 +165,6 @@
indikasi_nilai_likuidasi: {
title: 'Indikasi Nilai Likuidasi',
},
indikasi_nilai_pasar_tanah: {
title: 'Indikasi Nilai Pasar Tanah',
},
estimasi_harga_bangunan: {
title: 'Estimasi Harga Bangunan',
},
indikasi_nilai_pasar_bangunan: {
title: 'Indikasi Nilai Pasar Bangunan',
},
indikasi_nilai_pasar_sarana_pelengkap: {
title: 'Indikasi Nilai Pasar Sarana Pelengkap',
},
indikasi_nilai_pasar_mesin: {
title: 'Indikasi Nilai Pasar Mesin',
},
indikasi_nilai_pasar_kendaraan_alat_berat: {
title: 'Indikasi Nilai Pasar Kendaraan/Alat Berat',
},
file_resume: {
title: 'File Resume',
render: (item, data) => {

62
resources/views/penawaran/kirimEmail.blade.php
View File

@@ -124,35 +124,41 @@
@endphp
@foreach ($permohonan->documents as $document)
@foreach ($document->detail as $detail)
@php
$details = json_decode($detail->details);
@endphp
@foreach ($document->detail as $index => $detail)
@if($detail->details)
@php $luastanah = $luasbangunan = null; @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));
@endphp
@endif
@if($k=='luas_bangunan')
@php
$luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
@endphp
@endif
@endforeach
@endforeach
@if (isset($luastanah) && isset($luasbangunan))
{{ $n }}. {{ $detail->name }}<br>
Luas Tanah / Luas Bangunan: {{ $luastanah }} m<sup>2</sup> / {{ $luasbangunan }} m<sup>2</sup>
<br>
@php $n++; @endphp
@elseif (isset($luastanah))
{{ $n }}. {{ $detail->name }}<br>
Luas Tanah : {{ $luastanah }} m<sup>2</sup>
<br>
@php $n++; @endphp
@elseif (isset($luasbangunan))
{{ $n }}. {{ $detail->name }}<br>
Luas Bangunan: {{ $luasbangunan }} m<sup>2</sup>
<br>
@php $n++; @endphp
@endif
@if (isset($details->luas_tanah) && isset($details->luas_bangunan))
{{ $n }}. {{ $detail->name }}<br>
Luas Tanah / Luas Bangunan:
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
m<sup>2</sup>
/
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
m<sup>2</sup>
<br>
@php $n++; @endphp
@elseif (isset($details->luas_tanah))
{{ $n }}. {{ $detail->name }}<br>
Luas Tanah :
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
m<sup>2</sup>
<br>
@php $n++; @endphp
@elseif (isset($details->luas_bangunan))
{{ $n }}. {{ $detail->name }}<br>
Luas Bangunan:
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
m<sup>2</sup>
<br>
@php $n++; @endphp
@endif
@endforeach
@endforeach

83
resources/views/penilai/components/foto-jaminan.blade.php
View File

@@ -30,8 +30,9 @@
/* Image Styling */
.photo-item img {
width: 300px;
height: 300px;
width: auto;
height: 400px;
max-height: 400px;
object-fit: contain;
background-color: #f0f0f0;
border-radius: 5px;
@@ -46,24 +47,27 @@
/* Media Print */
@media print {
table {
width: 100%;
border-collapse: collapse;
}
td {
vertical-align: top;
text-align: center;
page-break-inside: avoid;
}
.photo-image {
width: auto;
height: 400px;
max-height: 400px;
}
.page-break {
page-break-after: always;
}
}
table {
width: 100%;
border-collapse: collapse;
}
td {
vertical-align: top;
text-align: center;
page-break-inside: avoid;
}
.photo-image {
width: auto;
height: 400px;
max-height: 400px;
}
.page-break {
page-break-after: always;
}
}
</style>
@isset($basicData['foto'])
@@ -81,8 +85,6 @@
@if ($groupedPhotos->isEmpty())
<p class="text-gray-500">Tidak ada foto yang tersedia.</p>
@else
@foreach ($mainPhotos as $category => $photos)
@php
$groupedBySubcategory = $photos->groupBy('sub');
@@ -91,12 +93,13 @@
@foreach ($groupedBySubcategory as $subcategory => $subPhotos)
@if (count($subPhotos) > 0)
@foreach ($subPhotos->chunk(2) as $chunkedPhotos)
<table width="100%" border="0" style="align-content: center; text-align: center; margin-bottom: 20px">
@foreach ($chunkedPhotos as $item)
@php
$imagePath = storage_path('app/public/' . $item['path']);
@endphp
<tr>
<table width="100%" border="0"
style="align-content: center; text-align: center; margin-bottom: 20px">
@foreach ($chunkedPhotos as $item)
@php
$imagePath = storage_path('app/public/' . $item['path']);
@endphp
<tr>
<td style="width: 100%; padding: 10px;" class="photo-item border">
<p style="font-weight: medium; font-size: 10px">{{ $category }} -
@isset($subcategory)
@@ -114,10 +117,10 @@
@endisset
</td>
</tr>
@endforeach
@if (count($chunkedPhotos) < 2)
<tr style="width: 100%;"></tr>
@endif
@endforeach
@if (count($chunkedPhotos) < 2)
<tr style="width: 100%;"></tr>
@endif
</table>
<div class="page-break"></div>
@endforeach
@@ -129,12 +132,13 @@
@foreach ($otherPhotos->groupBy('sub') as $subcategory => $subPhotos)
@if (count($subPhotos) > 0)
@foreach ($subPhotos->chunk(2) as $chunkedPhotos)
<table width="100%" border="0" style="align-content: center; text-align: center; margin-bottom: 20px">
@foreach ($chunkedPhotos as $item)
@php
$imagePath = storage_path('app/public/' . $item['path']);
@endphp
<tr>
<table width="100%" border="0"
style="align-content: center; text-align: center; margin-bottom: 20px">
@foreach ($chunkedPhotos as $item)
@php
$imagePath = storage_path('app/public/' . $item['path']);
@endphp
<tr>
<td style="width: 100%; padding: 10px;" class="photo-item border">
<p style="font-weight: medium; font-size: 10px">Lainnya -
@isset($subcategory)
@@ -151,7 +155,7 @@
<p style="font-size:9px">{{ $item['description'] }}</p>
@endisset
</td>
@endforeach
@endforeach
</tr>
@if (count($chunkedPhotos) < 2)
<tr style="width: 100%;"></tr>
@@ -163,4 +167,3 @@
@endif
@endif
@endisset

2
resources/views/penilai/components/print-out-call-report.blade.php
View File

@@ -138,7 +138,7 @@
@foreach (json_decode($detail->details) as $key => $value)
@if (!is_null($value) && $value !== '')
<tr>
<td style="padding: 2px;">{{ ucwords(str_replace('_', ' ', $key)) ?? '' }}</td>
<td style="padding: 2px;"> {{formatLabel($key)}}</td>
<td style=" padding: 2px;">:</td>
<td style="">{{ $value }}
@if ($key == 'luas_bangunan' || $key == 'luas_tanah')

9
resources/views/penilai/components/print-out-rap.blade.php
View File

@@ -175,7 +175,7 @@
@if (!is_null($value) && $value !== '')
<tr>
<td style="width: 20%; padding: 2px;">
{{ ucwords(str_replace('_', ' ', $key)) ?? '' }}
{{formatLabel($key)}}
</td>
<td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">
@@ -570,9 +570,9 @@
PETA
</h6>
</div>
<div class="photo-container">
<div style="text-align: center">
@php
$fotoTypes = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat'];
$fotoTypes = ['upload_gs','foto_sentuh_tanahku','foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat'];
// Memindahkan foto_tempat ke depan jika ada
if (($key = array_search('foto_tempat', $fotoTypes)) !== false) {
unset($fotoTypes[$key]);
@@ -607,9 +607,8 @@
</div>
</div>
<div class="page-break"></div>
<div class="section">
<div class="judul">
<h6 class="border" style="text-align: center">

4
resources/views/penilai/components/print-out-sederhana.blade.php
View File

@@ -197,7 +197,7 @@
@if (!is_null($value) && $value !== '')
<tr>
<td style="padding: 2px; vertical-align: top;">
{{ ucwords(str_replace('_', ' ', $key)) ?? '' }}
{{formatLabel($key)}}
</td>
<td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">
@@ -1095,7 +1095,7 @@
</div>
<div class="photo-container">
@php
$fotoTypes = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat', 'foto_sentuh_tanahku'];
$fotoTypes = ['upload_gs','foto_sentuh_tanahku','foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat'];
// Memindahkan foto_tempat ke depan jika ada
if (($key = array_search('foto_tempat', $fotoTypes)) !== false) {
unset($fotoTypes[$key]);

4
resources/views/penilai/components/print-out-standard.blade.php
View File

@@ -202,7 +202,7 @@
@foreach (json_decode($detail->details) as $key => $value)
@if (!is_null($value) && $value !== '')
<td style="width:25%; padding: 2px; vertical-align: top;">
{{ ucwords(str_replace('_', ' ', $key)) ?? '' }}</td>
{{formatLabel($key)}}</td>
<td style="width:1%; padding: 2px; vertical-align: top;">:</td>
<td style=" padding: 2px; vertical-align: top;">{{ $value }}
@if ($key == 'luas_bangunan' || $key == 'luas_tanah')
@@ -562,7 +562,7 @@
</table>
<div class="photo-container">
@php
$fotoTypes = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat','foto_sentuh_tanahku'];
$fotoTypes = ['upload_gs','foto_sentuh_tanahku','foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat'];
// Memindahkan foto_tempat ke depan jika ada
if (($key = array_search('foto_tempat', $fotoTypes)) !== false) {
unset($fotoTypes[$key]);

2
resources/views/penilai/components/print-resume.blade.php
View File

@@ -109,7 +109,7 @@
@foreach ($details as $key => $value)
@if (!is_null($value) && $value !== '')
<tr>
<td style="">{{ ucwords(str_replace('_', ' ', $key)) ?? '' }}</td>
<td style=""> {{formatLabel($key)}}</td>
<td style=" padding: 2px;">:</td>
<td style="">{{ $value }}
@if ($key == 'luas_bangunan' || $key == 'luas_tanah')

145
resources/views/penilai/show.blade.php
View File

@@ -99,10 +99,15 @@
Status Bayar
</label>
<div class="flex flex-wrap items-baseline w-full">
<span
class="text-md font-bold {{ $permohonan->status_bayar === 'belum_bayar' ? 'text-red-600' : 'text-green-600' }} uppercase">
{{ str_replace('_', ' ', $permohonan->status_bayar) }}
</span>
@if (strtolower($permohonan->tujuanPenilaian->name) ==
'penilaian ulang')
<span>-</span>
@else
<span
class="text-md font-bold {{ $permohonan->status_bayar === 'belum_bayar' ? 'text-red-600' : 'text-green-600' }} uppercase">
{{ str_replace('_', ' ', $permohonan->status_bayar) }}
</span>
@endif
</div>
</div>
@@ -190,17 +195,16 @@
</div>
@if ($permohonan->status == 'revisi-laporan')
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Catatan Revisi
</label>
<div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm">
{{ $permohonan->keterangan ?? '' }}
</p>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Catatan Revisi
</label>
<div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm">
{{ $permohonan->keterangan ?? '' }}
</p>
</div>
</div>
</div>
@endif
</div>
@@ -226,7 +230,8 @@
Kertas Kerja
</a>
@endif
<a class="btn btn-primary" onclick="paparan({{ $permohonan->id }}, {{ $dokumen->id }}, {{ $inspeksiId }}, {{ $dokumen->jenis_jaminan_id }})">
<a class="btn btn-primary"
onclick="paparan({{ $permohonan->id }}, {{ $dokumen->id }}, {{ $inspeksiId }}, {{ $dokumen->jenis_jaminan_id }})">
Paparan
</a>
@@ -295,9 +300,6 @@
</a>
</div>
@endif
@endif
{{-- @if ($permohonan->penilaian->jenis_penilaian_id == 2 && $permohonan->tujuanPenilaian->id == 4) --}}
<div class="menu-item">
<a class="menu-link"
onclick="callReport('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
@@ -310,6 +312,10 @@
</span>
</a>
</div>
@endif
{{-- @if ($permohonan->penilaian->jenis_penilaian_id == 2 && $permohonan->tujuanPenilaian->id == 4) --}}
{{-- @endif --}}
</div>
@@ -319,8 +325,8 @@
<div class="flex justify-end gap-5">
<a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => $dokumen->id, 'jenis_jaminan_id' => $dokumen->jenis_jaminan_id]) }}" class="btn btn-light"
>
<a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => $dokumen->id, 'jenis_jaminan_id' => $dokumen->jenis_jaminan_id]) }}"
class="btn btn-light">
<i class="ki-filled ki-printer"></i> Cetak Hasil Inspeksi
</a>
@@ -345,7 +351,9 @@
REPORT
</a>
<a class="btn btn-warning" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' ? 'disabled' : '' }} onclick="revisiSurveyor('{{ $permohonan->id }}', '{{$permohonan->debiture->name }}', '{{$permohonan->nomor_registrasi }}')">
<a class="btn btn-warning"
{{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' ? 'disabled' : '' }}
onclick="revisiSurveyor('{{ $permohonan->id }}', '{{ $permohonan->debiture->name }}', '{{ $permohonan->nomor_registrasi }}')">
<i class="ki-filled ki-arrow-circle-right"></i>
REVISI
</a>
@@ -407,10 +415,10 @@
</div>
<div class="flex justify-between items-center">
@if (isset($permohonan->penilai) && isset($permohonan->penilai->kertas_kerja) && $permohonan->penilai->kertas_kerja)
<span data-modal-dismiss="true" class="btn btn-warning btn-outline"
onclick="viewPDF('{{ Storage::url($permohonan->penilai->kertas_kerja) }}')"><i
class="ki-filled ki-eye mr-2"></i>Lihat Kertas Kerja</span>
@endif
<span data-modal-dismiss="true" class="btn btn-warning btn-outline"
onclick="viewPDF('{{ Storage::url($permohonan->penilai->kertas_kerja) }}')"><i
class="ki-filled ki-eye mr-2"></i>Lihat Kertas Kerja</span>
@endif
</div>
</div>
@@ -610,7 +618,8 @@
confirmButtonText: 'Yes'
}).then((result) => {
if (result.isConfirmed) {
window.location.href = `/penilai/${permohonanId}/edit?document_id=${documentId}&inspeksi_id=${inspeksiId}&jaminanId=${jaminanId}`;
window.location.href =
`/penilai/${permohonanId}/edit?document_id=${documentId}&inspeksi_id=${inspeksiId}&jaminanId=${jaminanId}`;
}
});
}
@@ -635,7 +644,7 @@
// window.location.reload();
hideLoadingSwal();
toastrSuccessBuild(response.message);
}else{
} else {
// hideLoadingSwal();
Swal.fire('Perhatian!', response.message, 'warning');
}
@@ -658,52 +667,52 @@
function revisiSurveyor(dataId, debitur, noreg) {
Swal.fire({
title: 'Apakah Anda yakin?',
text: `Untuk melakukan Revisi nomor registrasi ${noreg} atas nama debiture ${debitur} !`,
icon: 'warning',
input: 'textarea',
inputLabel: 'Keterangan',
inputPlaceholder: 'Masukkan keterangan...',
inputAttributes: {
'aria-label': 'Masukkan keterangan'
Swal.fire({
title: 'Apakah Anda yakin?',
text: `Untuk melakukan Revisi nomor registrasi ${noreg} atas nama debiture ${debitur} !`,
icon: 'warning',
input: 'textarea',
inputLabel: 'Keterangan',
inputPlaceholder: 'Masukkan keterangan...',
inputAttributes: {
'aria-label': 'Masukkan keterangan'
},
showCancelButton: true,
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: 'Ya, Lanjutkan!',
cancelButtonText: 'Batal',
}).then((result) => {
if (result.isConfirmed) {
const userMessage = result.value || '';
$.ajaxSetup({
headers: {
'X-CSRF-TOKEN': '{{ csrf_token() }}'
},
showCancelButton: true,
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: 'Ya, Lanjutkan!',
cancelButtonText: 'Batal',
}).then((result) => {
if (result.isConfirmed) {
const userMessage = result.value || '';
$.ajaxSetup({
headers: {
'X-CSRF-TOKEN': '{{ csrf_token() }}'
},
});
$.ajax({
url: `/penilai/revisi-surveyor/${dataId}`,
type: 'PUT',
data: {
message: userMessage
},
success: (response) => {
Swal.fire('Berhasil!', response.message , 'success').then(
});
$.ajax({
url: `/penilai/revisi-surveyor/${dataId}`,
type: 'PUT',
data: {
keterangan: userMessage
},
success: (response) => {
Swal.fire('Berhasil!', response.message, 'success').then(
() => {
window.location.href =
'{{ route('penilai.index') }}';
});
console.log(response);
},
error: (error) => {
console.error('Error:', error);
Swal.fire('Gagal!', 'Terjadi kesalahan saat melakukan Revisi.',
'error');
}
});
window.location.href =
'{{ route('penilai.index') }}';
});
console.log(response);
},
error: (error) => {
console.error('Error:', error);
Swal.fire('Gagal!', 'Terjadi kesalahan saat melakukan Revisi.',
'error');
}
});
}
});
}
</script>
@include('lpj::surveyor.js.utils')

19
resources/views/registrasi/js/editjs.blade.php
View File

@@ -200,23 +200,16 @@
});
$('#{{$route[0]}}_jenis_penilaian').on('change', function (e) {
var jenis_penilaian_id = $(this).val();
var idNya = $('#{{$route[0]}}_jenis_penilaian').find(":selected").val();
// var textNya = $('#{{$route[0]}}_jenis_penilaian').find(":selected").text();
if('1'==idNya)
{
if (jenis_penilaian_id === '1') {
// INTERNAL, show region
$("#{{ $route[0] }}_div_region").show();
}
else if('2' == idNya)
{
$("#{{ $route[0] }}_div_region").hide();
}
else if('0' == idNya)
{
// selain INTERNAL, hide region
$("#jenis_laporan").val('sederhana');
} else {
// For all other cases, hide region
$("#{{ $route[0] }}_div_region").hide();
$("#jenis_laporan").val('standar');
}
});

4
resources/views/surveyor/components/apartemen-kantor.blade.php
View File

@@ -61,8 +61,8 @@
value="{{ old('luas_unit_tidak_sesuai', $forminspeksi['luas_unit_tidak_sesuai'] ?? '') }}">
<i>M<sup>2</sup></i>
</div>
<button type="button" class="btn btn-md btn-primary"
onclick="updateAnalisa('analisa_unit')">Save</button>
{{-- <button type="button" class="btn btn-md btn-primary"
onclick="updateAnalisa('analisa_unit')">Save</button> --}}
</div>
</div>
<em id="error-luas_unit" class="alert text-danger text-sm"></em>

4
resources/views/surveyor/components/bangunan.blade.php
View File

@@ -68,10 +68,10 @@
value="{{ old('luas_tanah_bagunan_tidak_sesuai', $forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'] ?? '') }}">
</div>
<button type="button" class="btn btn-md btn-primary"
{{-- <button type="button" class="btn btn-md btn-primary"
onclick="updateAnalisa('analisa_bangunan')">
Save
</button>
</button> --}}
</div>
</div>

23
resources/views/surveyor/components/data-pembanding.blade.php
View File

@@ -356,9 +356,30 @@
if (preview) {
preview.id = newImageId;
preview.src = '';
preview.accept = ".jpg,.jpeg,.png";
preview.classList.add('hidden');
input.onchange = function() {
previewImage(this, newImageId);
const file = this.files[0];
if (file) {
const validExtensions = ['image/jpeg', 'image/png', 'image/gif',
'image/webp'
];
if (validExtensions.includes(file.type)) {
previewImage(this, newImageId);
} else {
Swal.fire({
icon: 'error',
title: 'Format Tidak Didukung',
text: 'Hanya file gambar dengan format JPG, PNG, GIF, atau WEBP yang diperbolehkan.',
position: 'top-end',
toast: true,
showConfirmButton: false,
timer: 3000,
timerProgressBar: true
});
this.value = '';
}
}
};
}
}

4
resources/views/surveyor/components/header.blade.php
View File

@@ -289,14 +289,14 @@
<div class="card-body w-full">
@include('lpj::component.detail-jaminan', ['status' => true])
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
{{-- <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label class="form-label font-medium max-w-56">Nomor NIB</label>
<div class="flex flex-wrap items-baseline w-full">
<input type="text" name="nomor_nib" class="input w-full"
value="{{ isset($forminspeksi['asset']['nomor_nib']) ? $forminspeksi['asset']['nomor_nib'] : '' }}"
placeholder="Masukkan Nomor NIB">
</div>
</div>
</div> --}}
<div class=" mx-auto rounded-lg overflow-hidden">
<div class="py-4 ">

21
resources/views/surveyor/components/informasi.blade.php
View File

@@ -115,6 +115,27 @@
@endforeach
@endif
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
<span class="form-label">Gambar Surat Ukur</span>
</label>
<div class="input-group w-full flex gap-2">
<input class="upload_gs" type="hidden" name="upload_gs" value="upload_gs">
<div class="w-full">
<input id="inputGistaru" type="file" name="upload_gs"
class="file-input file-input-bordered w-full"
accept=".jpg,.jpeg,.png,.gif,.bmp,.tiff,.tif,.webp,.svg"
onchange="previewImage(this, 'upload-gs-preview')">
<img id="upload-gs-preview"
src="{{ asset('storage/' . (isset($forminspeksi['upload_gs']) ? $forminspeksi['upload_gs'] : '')) }}"
alt="Foto Gs" class="mt-2 max-w-full h-auto"
style="{{ isset($forminspeksi['upload_gs']) ? '' : 'display: none;' }} max-width: 30rem;" />
</div>
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
<span class="form-label">Sentuh Tanahku</span>

4
resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php
View File

@@ -66,7 +66,7 @@
@endif
<input type="hidden" name="name_foto_objek" class="input"
value="{{ $mainPhoto['path'] ?? '' }}">
<input type="file" name="foto_objek" class="file-input" accept="image/*"
<input type="file" name="foto_objek" class="file-input" accept=".jpg,.jpeg,.png"
onchange="previewImage(this, 'uploadedImage1')">
</div>
@@ -75,7 +75,7 @@
<td class="px-4 py-2">
<div class="flex flex-col gap-2">
<img id="uploadedImage2" class="max-w-[200px] hidden" alt="Pembanding Image">
<input type="file" name="foto_objek_pembanding[]" class="file-input" accept="image/*"
<input type="file" name="foto_objek_pembanding[]" class="file-input" accept=".jpg,.jpeg,.png"
onchange="previewImage(this, 'uploadedImage2')">
</div>
</td>

2
resources/views/surveyor/components/print-out/main.blade.php
View File

@@ -365,7 +365,7 @@
<tr>
<td style="text-align: center; margin-top: 5px; ">
<h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
Jaminan
STATUS KEPEMILIKAN, HUBUNGAN DAN PENGHUNI
</h2>
</td>
</tr>

6
resources/views/surveyor/components/tanah.blade.php
View File

@@ -57,9 +57,9 @@
value="{{ old('luas_tanah_tidak_sesuai', $forminspeksi['tanah']['luas_tanah']['tidak sesuai'] ?? '') }}">
</div>
<button type="button" class="btn btn-md btn-primary"
{{-- <button type="button" class="btn btn-md btn-primary"
onclick="updateAnalisa('analisa_tanah')">Save
</button>
</button> --}}
</div>
</div>
<em id="error-luas_tanah" class="alert text-danger text-sm"></em>
@@ -191,7 +191,7 @@
@if (strcasecmp($item->name, 'Lebih Tinggi') == 0)
<input id="input-lebih-tinggi" type="text"
style="{{ isset($forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi']) && $forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi'] ? '' : 'display: none;' }}"
name="ketinggian_lebih_tinggi" class="input w-full mt-2" placeholder="m2"
name="ketinggian_lebih_tinggi" class="input w-full mt-2" placeholder="m"
value="{{ old('ketinggian_lebih_tinggi', $forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi'] ?? '') }}" />
@elseif (strcasecmp($item->name, 'Lebih Rendah') == 0)
<input id="input-lebih-rendah" type="text"

2
resources/views/surveyor/index.blade.php
View File

@@ -500,7 +500,7 @@
id: permohonanId,
waktu_penilaian: tanggal,
deskripsi_penilaian: keterangan,
keterangan:'Tanggal Kunjungan: ' + tanggal + ', Keterangan: ' + keterangan
keterangan:'Permintaan Jadwal Kujungan: ' + window.formatTanggalWaktuIndonesia(tanggal) + ', ' + keterangan
};
$.ajax({