Merge branch 'staging' into feature/senior-officer
This commit is contained in:
@@ -305,7 +305,7 @@ class PenilaiController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function show($id)
|
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]);
|
// return response()->json(['permohonan' => $permohonan]);
|
||||||
|
|||||||
@@ -815,7 +815,7 @@ class TenderController extends Controller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return redirect()->route('tender.penawaran.ulang.index')
|
return redirect()->back()
|
||||||
->with('success', 'Email Penawaran Berhasil Terkirim!');
|
->with('success', 'Email Penawaran Berhasil Terkirim!');
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
// Log email gagal untuk setiap KJPP
|
// 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!');
|
->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) {
|
} catch (\Exception $e) {
|
||||||
// Log email gagal
|
// Log email gagal
|
||||||
foreach ($kjpps as $email) {
|
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!');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -235,4 +235,9 @@
|
|||||||
{
|
{
|
||||||
return $this->hasMany(LampiranDokumen::class);
|
return $this->hasMany(LampiranDokumen::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function laporanExternal()
|
||||||
|
{
|
||||||
|
return $this->belongsTo(LaporanExternal::class,'id','permohonan_id');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,45 +57,111 @@
|
|||||||
|
|
||||||
@if ($permohonan->status === 'done')
|
@if ($permohonan->status === 'done')
|
||||||
|
|
||||||
@foreach ($permohonan->documents as $dokumen)
|
@foreach ($permohonan->documents as $dokumen)
|
||||||
@php
|
@php
|
||||||
$inspeksiId = null;
|
$inspeksiId = null;
|
||||||
|
|
||||||
foreach ($dokumen->inspeksi as $item) {
|
foreach ($dokumen->inspeksi as $item) {
|
||||||
$inspeksiId = $item->id;
|
$inspeksiId = $item->id;
|
||||||
}
|
}
|
||||||
|
|
||||||
$jaminanId = $dokumen->id;
|
$jaminanId = $dokumen->id;
|
||||||
$currentInspeksi = $inspeksiData[$jaminanId] ?? null;
|
$currentInspeksi = $inspeksiData[$jaminanId] ?? null;
|
||||||
$tanahBangunanTypes = ['KAPAL', 'PESAWAT', 'ALAT BERAT'];
|
$tanahBangunanTypes = ['KAPAL', 'PESAWAT', 'ALAT BERAT'];
|
||||||
@endphp
|
@endphp
|
||||||
<div class="card border border-agi-100 grow" id="activity_2024">
|
<div class="card border border-agi-100 grow" id="activity_2024">
|
||||||
|
|
||||||
<div class="card-header bg-agi-50">
|
<div class="card-header bg-agi-50">
|
||||||
<h3 class="card-title uppercase">
|
<h3 class="card-title uppercase">
|
||||||
Hasil Laporan Penilaian
|
Hasil Laporan Penilaian
|
||||||
</h3>
|
</h3>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="card-body">
|
||||||
|
|
||||||
|
<a class="btn btn-info" href="{{ route('penilai.lampiran') }}?permohonanId={{ $permohonan->id }}&documentId={{ $dokumen->id }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $dokumen->jenis_jaminan_id }}&statusLpj=1">
|
||||||
|
LAMPIRAN FOTO DAN DOKUMEN
|
||||||
|
</a>
|
||||||
|
<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> Hasil Inspeksi
|
||||||
|
</a>
|
||||||
|
<a class="btn btn-success" onclick="checkLaporan('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }}, 0 )">
|
||||||
|
<i class="ki-filled ki-printer"></i> Print Laporan
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endforeach
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<!-- New section for Lampiran Dokumen -->
|
||||||
|
<div class="card border border-agi-100 min-w-full mt-5">
|
||||||
|
<div class="card-header light:bg-agi-50">
|
||||||
|
<h3 class="card-title">
|
||||||
|
Lampiran Dokumen
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
|
||||||
|
@forelse($permohonan->lampiranDokumen as $lampiran)
|
||||||
|
<div class="border p-4 rounded-lg">
|
||||||
|
<h4 class="font-semibold mb-2">{{ $lampiran->nama_file }}</h4>
|
||||||
|
<p class="text-sm text-gray-600 mb-2">Keterangan : {{ $lampiran->keterangan }}</p>
|
||||||
|
<div class="flex justify-between items-center">
|
||||||
|
<div>
|
||||||
|
<a href="{{ Storage::url($lampiran->path_file) }}" target="_blank" class="text-blue-600 hover:underline">
|
||||||
|
<i class="ki-filled ki-eye mr-2"></i>View
|
||||||
|
</a>
|
||||||
|
<a href="{{ Storage::url($lampiran->path_file) }}" download="{{ Storage::url($lampiran->path_file) }}" class="text-green-600 hover:underline ml-4">
|
||||||
|
<i class="ki-filled ki-cloud-download mr-2"></i>Download
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
@if(Auth::user()->hasRole('administrator'))
|
||||||
|
<form action="{{ route('lampiran.delete', $lampiran->id) }}" method="POST" onsubmit="return confirm('Are you sure you want to delete this lampiran?');">
|
||||||
|
@csrf
|
||||||
|
@method('DELETE')
|
||||||
|
<button type="submit" class="text-red-600 hover:underline">
|
||||||
|
<i class="ki-filled ki-trash mr-2"></i>Delete
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@empty
|
||||||
|
<p class="col-span-3 text-center text-gray-500">Tidak ada lampiran dokumen.</p>
|
||||||
|
@endforelse
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card-body">
|
@if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin']))
|
||||||
|
<form action="{{ route('lampiran.upload',) }}" method="POST" enctype="multipart/form-data" class="mt-6">
|
||||||
<a class="btn btn-info" href="{{ route('penilai.lampiran') }}?permohonanId={{ $permohonan->id }}&documentId={{ $dokumen->id }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $dokumen->jenis_jaminan_id }}&statusLpj=1">
|
@csrf
|
||||||
LAMPIRAN FOTO DAN DOKUMEN
|
<input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
|
||||||
</a>
|
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||||
<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">
|
<div>
|
||||||
<i class="ki-filled ki-printer"></i> Hasil Inspeksi
|
<label for="nama_file" class="block text-sm font-medium text-gray-700">Nama File</label>
|
||||||
</a>
|
<input type="text" name="nama_file" id="nama_file" required class="input mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md">
|
||||||
<a class="btn btn-success" onclick="checkLaporan('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }}, 0 )">
|
</div>
|
||||||
<i class="ki-filled ki-printer"></i> Print Laporan
|
<div>
|
||||||
</a>
|
<label for="file" class=" block text-sm font-medium text-gray-700">File</label>
|
||||||
|
<input type="file" name="file" id="file" required class="file-input mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md">
|
||||||
|
</div>
|
||||||
|
<div class="md:col-span-2">
|
||||||
|
<label for="keterangan" class="block text-sm font-medium text-gray-700">Keterangan</label>
|
||||||
|
<textarea name="keterangan" id="keterangan" rows="3" class="textarea mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md"></textarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="mt-4">
|
||||||
|
<button type="submit" class="inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
|
||||||
|
Upload Lampiran
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
@endif
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@endforeach
|
|
||||||
@endif
|
|
||||||
|
|
||||||
<div class="card border border-agi-100 grow" id="activity_2024">
|
<div class="card border border-agi-100 grow" id="activity_2024">
|
||||||
@include('lpj::component.history-permohonan')
|
@include('lpj::component.history-permohonan')
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@endsection
|
@endsection
|
||||||
@include('lpj::surveyor.js.utils')
|
@include('lpj::surveyor.js.utils')
|
||||||
|
|||||||
@@ -275,6 +275,7 @@
|
|||||||
<table class="table align-middle text-sm text-gray-500">
|
<table class="table align-middle text-sm text-gray-500">
|
||||||
@php $document = $dokumen; @endphp
|
@php $document = $dokumen; @endphp
|
||||||
@foreach($document->detail as $detail)
|
@foreach($document->detail as $detail)
|
||||||
|
@if(isset($detail->dokumen_jaminan))
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2">
|
<td colspan="2">
|
||||||
<strong class="text-2xs text-gray-600 uppercase">
|
<strong class="text-2xs text-gray-600 uppercase">
|
||||||
@@ -340,6 +341,7 @@
|
|||||||
</p>
|
</p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
@@ -388,7 +390,7 @@
|
|||||||
@endforelse
|
@endforelse
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@if(Auth::user()->hasRole(['penilai', 'administrator']))
|
@if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin']))
|
||||||
<form action="{{ route('lampiran.upload',) }}" method="POST" enctype="multipart/form-data" class="mt-6">
|
<form action="{{ route('lampiran.upload',) }}" method="POST" enctype="multipart/form-data" class="mt-6">
|
||||||
@csrf
|
@csrf
|
||||||
<input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
|
<input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
|
||||||
|
|||||||
@@ -76,17 +76,17 @@
|
|||||||
<div class="border-t border-gray-300 border-dashed">
|
<div class="border-t border-gray-300 border-dashed">
|
||||||
</div>
|
</div>
|
||||||
@foreach($document->detail as $detail)
|
@foreach($document->detail as $detail)
|
||||||
<div class="flex items-center justify-between flex-wrap my-2.5 gap-2">
|
@if(isset($detail->dokumen_jaminan))
|
||||||
|
<div class="flex items-center justify-between flex-wrap my-2.5 gap-2">
|
||||||
<span class="text-2xs text-gray-600 uppercase">
|
<span class="text-2xs text-gray-600 uppercase">
|
||||||
<strong>{{ $loop->index+1 }}. {{ $detail->jenisLegalitasJaminan->name }}</strong>
|
<strong>{{ $loop->index+1 }}. {{ $detail->jenisLegalitasJaminan->name }}</strong>
|
||||||
</span>
|
</span>
|
||||||
<div>
|
<div>
|
||||||
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="border-t border-gray-300 border-dashed"></div>
|
||||||
<div class="border-t border-gray-300 border-dashed"></div>
|
|
||||||
|
|
||||||
@if(isset($detail->dokumen_jaminan))
|
|
||||||
@php
|
@php
|
||||||
$dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) ? json_decode($detail->dokumen_jaminan) : [$detail->dokumen_jaminan];
|
$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] : []);
|
$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
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|
||||||
|
<div class="flex items-start justify-between flex-wrap my-2.5 gap-2">
|
||||||
|
<span class="text-2xs text-gray-600 uppercase pl-3">
|
||||||
|
keterangan
|
||||||
|
</span>
|
||||||
|
<p class="text-2xs text-gray-600 text-right max-w-[250px]">
|
||||||
|
{{ $detail->keterangan }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="border-t border-gray-300 border-dashed mb-3.5">
|
||||||
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
|
|
||||||
<div class="flex items-start justify-between flex-wrap my-2.5 gap-2">
|
|
||||||
<span class="text-2xs text-gray-600 uppercase pl-3">
|
|
||||||
keterangan
|
|
||||||
</span>
|
|
||||||
<p class="text-2xs text-gray-600 text-right max-w-[250px]">
|
|
||||||
{{ $detail->keterangan }}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div class="border-t border-gray-300 border-dashed mb-3.5">
|
|
||||||
</div>
|
|
||||||
@endforeach
|
@endforeach
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -126,17 +126,17 @@
|
|||||||
@foreach ($permohonan->documents as $document)
|
@foreach ($permohonan->documents as $document)
|
||||||
@foreach ($document->detail as $index => $detail)
|
@foreach ($document->detail as $index => $detail)
|
||||||
@if($detail->details)
|
@if($detail->details)
|
||||||
@php $luastanah = $luasbangunan = null; @endphp
|
@php $luastanah = $luasbangunan = 0; @endphp
|
||||||
@foreach (json_decode($detail->details) as $key => $value)
|
@foreach (json_decode($detail->details) as $key => $value)
|
||||||
@foreach($value as $k => $v)
|
@foreach($value as $k => $v)
|
||||||
@if($k=='luas_tanah')
|
@if($k=='luas_tanah')
|
||||||
@php
|
@php
|
||||||
$luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
$luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
@endphp
|
@endphp
|
||||||
@endif
|
@endif
|
||||||
@if($k=='luas_bangunan')
|
@if($k=='luas_bangunan')
|
||||||
@php
|
@php
|
||||||
$luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
$luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
@endphp
|
@endphp
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|||||||
@@ -106,8 +106,7 @@
|
|||||||
<div class="content-max">
|
<div class="content-max">
|
||||||
Aset Jaminan: @foreach ($permohonan->documents as $document)
|
Aset Jaminan: @foreach ($permohonan->documents as $document)
|
||||||
{{ $document->jenisJaminan->name }}
|
{{ $document->jenisJaminan->name }}
|
||||||
@endforeach
|
@endforeach<span class="flex-wrap">Lokasi Jaminan: @foreach ($permohonan->documents as $document)
|
||||||
<span class="flex-wrap">Lokasi Jaminan: @foreach ($permohonan->documents as $document)
|
|
||||||
{{ $document->address }}, Kel. @foreach ($villages as $village)
|
{{ $document->address }}, Kel. @foreach ($villages as $village)
|
||||||
{{ $village->name }}
|
{{ $village->name }}
|
||||||
@endforeach, Kec. @foreach ($districts as $district)
|
@endforeach, Kec. @foreach ($districts as $district)
|
||||||
@@ -128,17 +127,17 @@
|
|||||||
@foreach ($permohonan->documents as $document)
|
@foreach ($permohonan->documents as $document)
|
||||||
@foreach ($document->detail as $index => $detail)
|
@foreach ($document->detail as $index => $detail)
|
||||||
@if($detail->details)
|
@if($detail->details)
|
||||||
@php $luastanah = $luasbangunan = null; @endphp
|
@php $luastanah = $luasbangunan = 0; @endphp
|
||||||
@foreach (json_decode($detail->details) as $key => $value)
|
@foreach (json_decode($detail->details) as $key => $value)
|
||||||
@foreach($value as $k => $v)
|
@foreach($value as $k => $v)
|
||||||
@if($k=='luas_tanah')
|
@if($k=='luas_tanah')
|
||||||
@php
|
@php
|
||||||
$luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
$luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
@endphp
|
@endphp
|
||||||
@endif
|
@endif
|
||||||
@if($k=='luas_bangunan')
|
@if($k=='luas_bangunan')
|
||||||
@php
|
@php
|
||||||
$luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
$luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
@endphp
|
@endphp
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|||||||
@@ -111,17 +111,17 @@
|
|||||||
@foreach ($permohonan->documents as $document)
|
@foreach ($permohonan->documents as $document)
|
||||||
@foreach ($document->detail as $index => $detail)
|
@foreach ($document->detail as $index => $detail)
|
||||||
@if($detail->details)
|
@if($detail->details)
|
||||||
@php $luastanah = $luasbangunan = null; @endphp
|
@php $luastanah = $luasbangunan = 0; @endphp
|
||||||
@foreach (json_decode($detail->details) as $key => $value)
|
@foreach (json_decode($detail->details) as $key => $value)
|
||||||
@foreach($value as $k => $v)
|
@foreach($value as $k => $v)
|
||||||
@if($k=='luas_tanah')
|
@if($k=='luas_tanah')
|
||||||
@php
|
@php
|
||||||
$luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
$luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
@endphp
|
@endphp
|
||||||
@endif
|
@endif
|
||||||
@if($k=='luas_bangunan')
|
@if($k=='luas_bangunan')
|
||||||
@php
|
@php
|
||||||
$luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
$luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
@endphp
|
@endphp
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|||||||
@@ -126,17 +126,17 @@
|
|||||||
@foreach ($permohonan->documents as $document)
|
@foreach ($permohonan->documents as $document)
|
||||||
@foreach ($document->detail as $index => $detail)
|
@foreach ($document->detail as $index => $detail)
|
||||||
@if($detail->details)
|
@if($detail->details)
|
||||||
@php $luastanah = $luasbangunan = null; @endphp
|
@php $luastanah = $luasbangunan = 0; @endphp
|
||||||
@foreach (json_decode($detail->details) as $key => $value)
|
@foreach (json_decode($detail->details) as $key => $value)
|
||||||
@foreach($value as $k => $v)
|
@foreach($value as $k => $v)
|
||||||
@if($k=='luas_tanah')
|
@if($k=='luas_tanah')
|
||||||
@php
|
@php
|
||||||
$luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
$luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
@endphp
|
@endphp
|
||||||
@endif
|
@endif
|
||||||
@if($k=='luas_bangunan')
|
@if($k=='luas_bangunan')
|
||||||
@php
|
@php
|
||||||
$luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
$luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
@endphp
|
@endphp
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|||||||
@@ -109,17 +109,17 @@
|
|||||||
@foreach ($permohonan->documents as $document)
|
@foreach ($permohonan->documents as $document)
|
||||||
@foreach ($document->detail as $index => $detail)
|
@foreach ($document->detail as $index => $detail)
|
||||||
@if($detail->details)
|
@if($detail->details)
|
||||||
@php $luastanah = $luasbangunan = null; @endphp
|
@php $luastanah = $luasbangunan = 0; @endphp
|
||||||
@foreach (json_decode($detail->details) as $key => $value)
|
@foreach (json_decode($detail->details) as $key => $value)
|
||||||
@foreach($value as $k => $v)
|
@foreach($value as $k => $v)
|
||||||
@if($k=='luas_tanah')
|
@if($k=='luas_tanah')
|
||||||
@php
|
@php
|
||||||
$luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
$luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
@endphp
|
@endphp
|
||||||
@endif
|
@endif
|
||||||
@if($k=='luas_bangunan')
|
@if($k=='luas_bangunan')
|
||||||
@php
|
@php
|
||||||
$luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
$luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
@endphp
|
@endphp
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|||||||
@@ -128,17 +128,17 @@
|
|||||||
@foreach ($permohonan->documents as $document)
|
@foreach ($permohonan->documents as $document)
|
||||||
@foreach ($document->detail as $index => $detail)
|
@foreach ($document->detail as $index => $detail)
|
||||||
@if($detail->details)
|
@if($detail->details)
|
||||||
@php $luastanah = $luasbangunan = null; @endphp
|
@php $luastanah = $luasbangunan = 0; @endphp
|
||||||
@foreach (json_decode($detail->details) as $key => $value)
|
@foreach (json_decode($detail->details) as $key => $value)
|
||||||
@foreach($value as $k => $v)
|
@foreach($value as $k => $v)
|
||||||
@if($k=='luas_tanah')
|
@if($k=='luas_tanah')
|
||||||
@php
|
@php
|
||||||
$luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
$luastanah += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
@endphp
|
@endphp
|
||||||
@endif
|
@endif
|
||||||
@if($k=='luas_bangunan')
|
@if($k=='luas_bangunan')
|
||||||
@php
|
@php
|
||||||
$luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
$luasbangunan += (int) preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
@endphp
|
@endphp
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|||||||
@@ -85,7 +85,6 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
@@ -224,7 +223,7 @@
|
|||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full card-footer mt-2 ">
|
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full card-footer mt-2 ">
|
||||||
<div class="flex gap-5">
|
<div class="flex gap-5">
|
||||||
<a class="btn btn-primary"
|
<a class="btn btn-primary"
|
||||||
href="{{ route('penilai.lampiran') }}?permohonanId={{ $permohonan->id }}&documentId={{ $dokumen->id }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $dokumen->jenis_jaminan_id }}">
|
href="{{ route('penilai.lampiran') }}?permohonanId={{ $permohonan->id }}&documentId={{ $dokumen->id }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $dokumen->jenis_jaminan_id }}">
|
||||||
Lampiran Foto dan Dokumen
|
Lampiran Foto dan Dokumen
|
||||||
</a>
|
</a>
|
||||||
@if (strtolower($permohonan->tujuanPenilaian->name) != 'rap')
|
@if (strtolower($permohonan->tujuanPenilaian->name) != 'rap')
|
||||||
@@ -233,7 +232,7 @@
|
|||||||
</a>
|
</a>
|
||||||
@endif
|
@endif
|
||||||
<a class="btn btn-primary"
|
<a class="btn btn-primary"
|
||||||
onclick="paparan({{ $permohonan->id }}, {{ $dokumen->id }}, {{ $inspeksiId }}, {{ $dokumen->jenis_jaminan_id }})">
|
onclick="paparan({{ $permohonan->id }}, {{ $dokumen->id }}, {{ $inspeksiId }}, {{ $dokumen->jenis_jaminan_id }})">
|
||||||
Paparan
|
Paparan
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
@@ -248,7 +247,7 @@
|
|||||||
@if (strtolower($permohonan->tujuanPenilaian->name) == 'rap')
|
@if (strtolower($permohonan->tujuanPenilaian->name) == 'rap')
|
||||||
<div class="menu-item">
|
<div class="menu-item">
|
||||||
<a class="menu-link"
|
<a class="menu-link"
|
||||||
onclick="rap('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
|
onclick="rap('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
|
||||||
<span class="menu-icon">
|
<span class="menu-icon">
|
||||||
<i class="ki-outline ki-message-programming">
|
<i class="ki-outline ki-message-programming">
|
||||||
</i>
|
</i>
|
||||||
@@ -264,7 +263,7 @@
|
|||||||
{{-- existing di --}}
|
{{-- existing di --}}
|
||||||
<div class="menu-item">
|
<div class="menu-item">
|
||||||
<a class="menu-link"
|
<a class="menu-link"
|
||||||
onclick="memo('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
|
onclick="memo('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
|
||||||
<span class="menu-icon">
|
<span class="menu-icon">
|
||||||
<i class="ki-outline ki-badge">
|
<i class="ki-outline ki-badge">
|
||||||
</i>
|
</i>
|
||||||
@@ -278,7 +277,7 @@
|
|||||||
@if ($permohonan->status_bayar === 'belum_bayar')
|
@if ($permohonan->status_bayar === 'belum_bayar')
|
||||||
<div class="menu-item">
|
<div class="menu-item">
|
||||||
<a class="menu-link"
|
<a class="menu-link"
|
||||||
onclick="resume('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
|
onclick="resume('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
|
||||||
<span class="menu-icon">
|
<span class="menu-icon">
|
||||||
<i class="ki-outline ki-profile-circle">
|
<i class="ki-outline ki-profile-circle">
|
||||||
</i>
|
</i>
|
||||||
@@ -294,7 +293,7 @@
|
|||||||
|
|
||||||
<div class="menu-item">
|
<div class="menu-item">
|
||||||
<a class="menu-link"
|
<a class="menu-link"
|
||||||
onclick="seletSederhanaStandart('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }}, '{{ $permohonan->jenisFasilitasKredit->name }}', '{{ $permohonan->status_bayar }}')">
|
onclick="seletSederhanaStandart('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }}, '{{ $permohonan->jenisFasilitasKredit->name }}', '{{ $permohonan->status_bayar }}')">
|
||||||
<span class="menu-icon">
|
<span class="menu-icon">
|
||||||
<i class="ki-outline ki-setting-2"></i>
|
<i class="ki-outline ki-setting-2"></i>
|
||||||
</span>
|
</span>
|
||||||
@@ -304,7 +303,7 @@
|
|||||||
@endif
|
@endif
|
||||||
<div class="menu-item">
|
<div class="menu-item">
|
||||||
<a class="menu-link"
|
<a class="menu-link"
|
||||||
onclick="callReport('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
|
onclick="callReport('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
|
||||||
<span class="menu-icon">
|
<span class="menu-icon">
|
||||||
<i class="ki-outline ki-profile-circle">
|
<i class="ki-outline ki-profile-circle">
|
||||||
</i>
|
</i>
|
||||||
@@ -323,23 +322,62 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@if($permohonan->jenisPenilaian->name=="External")
|
||||||
|
@if(isset($permohonan->laporanExternal->file_resume) || isset($permohonan->laporanExternal->file_laporan))
|
||||||
|
<div class="dropdown" data-dropdown="true" data-dropdown-trigger="click">
|
||||||
|
<button class="dropdown-toggle btn btn-primary">
|
||||||
|
Laporan External
|
||||||
|
</button>
|
||||||
|
<div class="dropdown-content w-full max-w-56 py-2 !ml-[200px] !mt-[-20px]">
|
||||||
|
<div class="menu menu-default flex flex-col w-full">
|
||||||
|
@if(isset($permohonan->laporanExternal->file_resume) && !empty($permohonan->laporanExternal->file_resume))
|
||||||
|
<div class="menu-item">
|
||||||
|
<a class="menu-link" onclick="viewPDF('{{ Storage::url($permohonan->laporanExternal->file_resume) }}')">
|
||||||
|
<span class="menu-icon">
|
||||||
|
<i class="ki-outline ki-badge"></i>
|
||||||
|
</span>
|
||||||
|
<span class="menu-title">
|
||||||
|
Resume
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
@if(isset($permohonan->laporanExternal->file_laporan) && !empty($permohonan->laporanExternal->file_laporan))
|
||||||
|
|
||||||
|
<div class="menu-item">
|
||||||
|
<a class="menu-link" onclick="viewPDF('{{ Storage::url($permohonan->laporanExternal->file_laporan) }}')">
|
||||||
|
<span class="menu-icon">
|
||||||
|
<i class="ki-outline ki-setting-2"></i>
|
||||||
|
</span>
|
||||||
|
<span class="menu-title">
|
||||||
|
Laporan
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex justify-end gap-5">
|
<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]) }}"
|
<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">
|
class="btn btn-light">
|
||||||
<i class="ki-filled ki-printer"></i> Cetak Hasil Inspeksi
|
<i class="ki-filled ki-printer"></i> Cetak Hasil Inspeksi
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a class="btn btn-outline btn-info "
|
<a class="btn btn-outline btn-info "
|
||||||
onclick="checkLaporan('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }}, 1 )">
|
onclick="checkLaporan('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }}, 1 )">
|
||||||
<i class="ki-filled ki-eye"></i>
|
<i class="ki-filled ki-eye"></i>
|
||||||
Lihat Laporan
|
Lihat Laporan
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a class="btn btn-success"
|
<a class="btn btn-success"
|
||||||
onclick="checkLaporan('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }}, 0 )">
|
onclick="checkLaporan('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }}, 0 )">
|
||||||
<i class="ki-filled ki-printer"></i>
|
<i class="ki-filled ki-printer"></i>
|
||||||
Cetak Laporan
|
Cetak Laporan
|
||||||
</a>
|
</a>
|
||||||
@@ -354,16 +392,14 @@
|
|||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a class="btn btn-warning"
|
<a class="btn btn-warning"
|
||||||
{{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' ? 'disabled' : '' }}
|
{{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' ? 'disabled' : '' }}
|
||||||
onclick="revisiSurveyor('{{ $permohonan->id }}', '{{ $permohonan->debiture->name }}', '{{ $permohonan->nomor_registrasi }}')">
|
onclick="revisiSurveyor('{{ $permohonan->id }}', '{{ $permohonan->debiture->name }}', '{{ $permohonan->nomor_registrasi }}')">
|
||||||
<i class="ki-filled ki-arrow-circle-right"></i>
|
<i class="ki-filled ki-arrow-circle-right"></i>
|
||||||
REVISI
|
REVISI
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
@@ -412,13 +448,14 @@
|
|||||||
<div class="flex justify-center items-center gap-2">
|
<div class="flex justify-center items-center gap-2">
|
||||||
<input type="file" id="kertas_kerja" class="file-input">
|
<input type="file" id="kertas_kerja" class="file-input">
|
||||||
<button type="button" class="btn btn-outline btn-success"
|
<button type="button" class="btn btn-outline btn-success"
|
||||||
onclick="uploadKertasKerja({{ $permohonan->id }}, '{{ $documentId }}', '{{ $inspeksiId }}', '{{ $jenisJaminanId }}')">Upload</button>
|
onclick="uploadKertasKerja({{ $permohonan->id }}, '{{ $documentId }}', '{{ $inspeksiId }}', '{{ $jenisJaminanId }}')">Upload
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex justify-between items-center">
|
<div class="flex justify-between items-center">
|
||||||
@if (isset($permohonan->penilai) && isset($permohonan->penilai->kertas_kerja) && $permohonan->penilai->kertas_kerja)
|
@if (isset($permohonan->penilai) && isset($permohonan->penilai->kertas_kerja) && $permohonan->penilai->kertas_kerja)
|
||||||
<span data-modal-dismiss="true" class="btn btn-warning btn-outline"
|
<span data-modal-dismiss="true" class="btn btn-warning btn-outline"
|
||||||
onclick="viewPDF('{{ Storage::url($permohonan->penilai->kertas_kerja) }}')"><i
|
onclick="viewPDF('{{ Storage::url($permohonan->penilai->kertas_kerja) }}')"><i
|
||||||
class="ki-filled ki-eye mr-2"></i>Lihat Kertas Kerja</span>
|
class="ki-filled ki-eye mr-2"></i>Lihat Kertas Kerja</span>
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
@@ -448,8 +485,8 @@
|
|||||||
|
|
||||||
} else {
|
} else {
|
||||||
fetch(
|
fetch(
|
||||||
`{{ url('/penilai/check-status-lpj') }}?permohonanId=${permohonanId}&documentId=${documentId}&inspeksiId=${inspeksiId}`
|
`{{ url('/penilai/check-status-lpj') }}?permohonanId=${permohonanId}&documentId=${documentId}&inspeksiId=${inspeksiId}`
|
||||||
)
|
)
|
||||||
.then(response => response.json())
|
.then(response => response.json())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
if (data.status) {
|
if (data.status) {
|
||||||
@@ -505,18 +542,18 @@
|
|||||||
|
|
||||||
function saveStatusLpj(permohonanId, documentId, inspeksiId, type, jaminanId) {
|
function saveStatusLpj(permohonanId, documentId, inspeksiId, type, jaminanId) {
|
||||||
fetch(`{{ url('/penilai/save-status-lpj') }}`, {
|
fetch(`{{ url('/penilai/save-status-lpj') }}`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
'X-CSRF-TOKEN': '{{ csrf_token() }}',
|
'X-CSRF-TOKEN': '{{ csrf_token() }}',
|
||||||
},
|
},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
permohonan_id: permohonanId,
|
permohonan_id: permohonanId,
|
||||||
document_id: documentId,
|
document_id: documentId,
|
||||||
inspeksi_id: inspeksiId,
|
inspeksi_id: inspeksiId,
|
||||||
type: type,
|
type: type,
|
||||||
}),
|
}),
|
||||||
}).then(response => response.json())
|
}).then(response => response.json())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
if (data.success) {
|
if (data.success) {
|
||||||
if (type === 'standard') {
|
if (type === 'standard') {
|
||||||
@@ -552,12 +589,12 @@
|
|||||||
formData.append('kertas_kerja', kertasKerja);
|
formData.append('kertas_kerja', kertasKerja);
|
||||||
|
|
||||||
fetch(`{{ url('/penilai/import/kertas-kerja') }}`, {
|
fetch(`{{ url('/penilai/import/kertas-kerja') }}`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'X-CSRF-TOKEN': '{{ csrf_token() }}',
|
'X-CSRF-TOKEN': '{{ csrf_token() }}',
|
||||||
},
|
},
|
||||||
body: formData,
|
body: formData,
|
||||||
})
|
})
|
||||||
.then(response => response.json()) // Pastikan respons diurai menjadi JSON
|
.then(response => response.json()) // Pastikan respons diurai menjadi JSON
|
||||||
.then(data => {
|
.then(data => {
|
||||||
if (data.success) {
|
if (data.success) {
|
||||||
@@ -641,7 +678,7 @@
|
|||||||
headers: {
|
headers: {
|
||||||
'X-CSRF-TOKEN': '{{ csrf_token() }}'
|
'X-CSRF-TOKEN': '{{ csrf_token() }}'
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function (response) {
|
||||||
if (response.success) {
|
if (response.success) {
|
||||||
// window.location.reload();
|
// window.location.reload();
|
||||||
hideLoadingSwal();
|
hideLoadingSwal();
|
||||||
@@ -651,7 +688,7 @@
|
|||||||
Swal.fire('Perhatian!', response.message, 'warning');
|
Swal.fire('Perhatian!', response.message, 'warning');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function (xhr, status, error) {
|
||||||
console.log('Error checking button status:', error, status, xhr);
|
console.log('Error checking button status:', error, status, xhr);
|
||||||
if (xhr.responseJSON.message) {
|
if (xhr.responseJSON.message) {
|
||||||
// window.location.reload();
|
// window.location.reload();
|
||||||
|
|||||||
Reference in New Issue
Block a user