Merge remote-tracking branch 'composer/feature/senior-officer' into staging

# Conflicts:
#	resources/views/penilai/show.blade.php
This commit is contained in:
Daeng Deni Mardaeni
2024-12-05 14:40:59 +07:00
2 changed files with 164 additions and 151 deletions

View File

@@ -155,12 +155,12 @@
<div class="flex items-center justify-between mt-5"> <div class="flex items-center justify-between mt-5">
<div class="grid gap-5"> <div class="grid gap-5">
<h2 class=" font-semibold text-xl"> <h2 class=" font-semibold text-xl">
{{ $item['nama_objek'] }} {{ $item['name_objek'] }}
</h2> </h2>
<div class="flex items-center"> <div class="flex items-center">
<img src="{{ Storage::url($item['foto_object']) }}" alt=""> <img src="{{ Storage::url($item['foto_objek']) }}" alt="">
</div> </div>
</div> </div>

View File

@@ -22,13 +22,15 @@
Nomor Registrasi Nomor Registrasi
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->nomor_registrasi }}</p> <p class="flex w-full text-gray-600 font-medium text-sm">
{{ isset($permohonan->nomor_registrasi) ? $permohonan->nomor_registrasi : '' }}</p>
</div> </div>
<label class="form-label max-w-56"> <label class="form-label max-w-56">
Nama Debitur Nama Debitur
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->debiture->name }}</p> <p class="flex w-full text-gray-600 font-medium text-sm">
{{ isset($permohonan->debiture->name) ? $permohonan->debiture->name : '' }}</p>
</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">
@@ -36,13 +38,16 @@
Cabang Cabang
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->branch->name }}</p> <p class="flex w-full text-gray-600 font-medium text-sm">
{{ isset($permohonan->branch->name) ? $permohonan->branch->name : '' }}</p>
</div> </div>
<label class="form-label max-w-56"> <label class="form-label max-w-56">
Alamat Jaminan Alamat Jaminan
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm">{{ formatAlamat($permohonan->debiture) }}</p> <p class="flex w-full text-gray-600 font-medium text-sm">
{{ formatAlamat($permohonan->debiture) }}
</p>
</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">
@@ -50,14 +55,16 @@
Nama AO/Pemohon Nama AO/Pemohon
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->user->name }}</p> <p class="flex w-full text-gray-600 font-medium text-sm">
{{ isset($permohonan->user->name) ? $permohonan->user->name : '' }}</p>
</div> </div>
<label class="form-label max-w-56"> <label class="form-label max-w-56">
Fasilitas Kredit Fasilitas Kredit
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm"> <p class="flex w-full text-gray-600 font-medium text-sm">
{{ $permohonan->jenisFasilitasKredit->name }}</p> {{ isset($permohonan->jenisFasilitasKredit->name) ? $permohonan->jenisFasilitasKredit->name : '' }}
</p>
</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">
@@ -73,7 +80,7 @@
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm"> <p class="flex w-full text-gray-600 font-medium text-sm">
{{ $permohonan->debiture->cif }}</p> {{ isset($permohonan->debiture->cif) ? $permohonan->debiture->cif : '' }}</p>
</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">
@@ -88,173 +95,179 @@
</div> </div>
</div> </div>
@foreach ($permohonan->debiture->documents as $dokumen)
<div class="card">
<div class="card-body grid gap-5">
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@php
$surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
$penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
@endphp
<label class="form-label max-w-56">
Surveyor
</label>
<div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm">{{ $surveyor->userPenilaiTeam->name }} @foreach ($permohonan->debiture->documents as $dokumen)
</p> <div class="card">
<div class="card-body grid gap-5">
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@php
$surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
$penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
<p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->region->name }}</p> @endphp
<label class="form-label max-w-56">
Surveyor
</label>
<div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm">
{{ $surveyor->userPenilaiTeam->name }}
</p>
<p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->region->name }}
</p>
</div>
<label class="form-label max-w-56">
Penilai
</label>
<div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm">
{{ $penilai->userPenilaiTeam->name }}
</p>
<p class="flex w-full text-gray-600 font-medium text-sm">
{{ $permohonan->region->name }}
</p>
</div>
</div> </div>
<label class="form-label max-w-56"> <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
Penilai <label class="form-label max-w-56">
</label> Tujuan Penilaian
<div class="flex flex-wrap items-baseline w-full"> </label>
<p class="flex text-gray-600 font-medium text-sm w-full">
<p class="flex w-full text-gray-600 font-medium text-sm">{{ $penilai->userPenilaiTeam->name }} {{ $permohonan->tujuanPenilaian->name }}</p>
</p> <label class="form-label max-w-56">
Jenis Jaminan
<p class="flex w-full text-gray-600 font-medium text-sm"> </label>
{{ $permohonan->region->name }} <p class="flex text-gray-600 font-medium text-sm w-full">
@foreach ($permohonan->debiture->documents as $document)
{{ $document->jenisjaminan->name }}
@endforeach
</p> </p>
</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"> Tanggal Survei
Tujuan Penilaian </label>
</label> <div class="flex flex-wrap items-baseline w-full">
<p class="flex text-gray-600 font-medium text-sm w-full"> <p class="flex w-full text-gray-600 font-medium text-sm">
{{ $permohonan->tujuanPenilaian->name }}</p> {{ formatTanggalIndonesia($permohonan->created_at) }}</p>
<label class="form-label max-w-56"> </div>
Jenis Jaminan
</label>
<p class="flex text-gray-600 font-medium text-sm w-full">
@foreach ($permohonan->debiture->documents as $document)
{{ $document->jenisjaminan->name }}
@endforeach
</p>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Tanggal Survei
</label>
<div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm">
{{ formatTanggalIndonesia($permohonan->created_at) }}</p>
</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"> Tanggal Laporan
Tanggal Laporan </label>
</label> <div class="flex flex-wrap items-baseline w-full">
<div class="flex flex-wrap items-baseline w-full"> <p class="flex w-full text-gray-600 font-medium text-sm">
<p class="flex w-full text-gray-600 font-medium text-sm"> {{ formatTanggalIndonesia($permohonan->created_at) }}</p>
{{ formatTanggalIndonesia($permohonan->created_at) }}</p> </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"> No. Laporan
No. Laporan </label>
</label> <div class="flex flex-wrap items-baseline w-full">
<div class="flex flex-wrap items-baseline w-full"> <p class="flex w-full text-gray-600 font-medium text-sm">
<p class="flex w-full text-gray-600 font-medium text-sm"> </p>
PJ/001/001</p> </div>
</div> </div>
</div> </div>
</div> <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full card-footer mt-2 ">
<div class="flex gap-5">
<a class="btn btn-primary" href="{{ route('penilai.lampiran', $permohonan->id) }}">
LAMPIRAN FOTO DAN DOKUMEN
</a>
<a class="btn btn-primary" data-modal-toggle="#modal_2">
KERTAS KERJA
</a>
<a class="btn btn-primary" href="#">
PAPARAN
</a>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full card-footer mt-2 "> <div class="dropdown" data-dropdown="true" data-dropdown-trigger="click">
<div class="flex gap-5"> <button class="dropdown-toggle btn btn-primary">
<a class="btn btn-primary" href="{{ route('penilai.lampiran', $permohonan->id) }}"> WORKSHEET
LAMPIRAN FOTO DAN DOKUMEN </button>
</a> <div class="dropdown-content w-full max-w-56 py-2">
<div class="menu menu-default flex flex-col w-full">
<div class="menu-item">
<a class="menu-link" href="{{ route('penilai.memo', $permohonan->id) }}">
<span class="menu-icon">
<i class="ki-outline ki-badge">
</i>
</span>
<span class="menu-title">
MEMO
</span>
</a>
</div>
<div class="menu-item">
<a class="menu-link" href="{{ route('penilai.resume', $permohonan->id) }}">
<span class="menu-icon">
<i class="ki-outline ki-profile-circle">
</i>
</span>
<span class="menu-title">
RESUME
</span>
</a>
</div>
<div class="menu-item">
<a class="menu-link" onclick="seletSederhanaStandart()">
<span class="menu-icon">
<i class="ki-outline ki-setting-2">
</i>
</span>
<span class="menu-title">
LPJ
</span>
<a class="btn btn-primary" data-modal-toggle="#modal_2"> </a>
KERTAS KERJA </div>
</a> <div class="menu-item">
<a class="btn btn-primary" href="#"> <a class="menu-link" href="#">
PAPARAN <span class="menu-icon">
</a> <i class="ki-outline ki-message-programming">
</i>
<div class="dropdown" data-dropdown="true" data-dropdown-trigger="click"> </span>
<button class="dropdown-toggle btn btn-primary"> <span class="menu-title">
WORKSHEET RAP
</button> </span>
<div class="dropdown-content w-full max-w-56 py-2"> </a>
<div class="menu menu-default flex flex-col w-full"> </div>
<div class="menu-item">
<a class="menu-link" href="#">
<span class="menu-icon">
<i class="ki-outline ki-badge">
</i>
</span>
<span class="menu-title">
MEMO
</span>
</a>
</div>
<div class="menu-item">
<a class="menu-link" href="#">
<span class="menu-icon">
<i class="ki-outline ki-profile-circle">
</i>
</span>
<span class="menu-title">
RESUME
</span>
</a>
</div>
<div class="menu-item">
<a class="menu-link" onclick="seletSederhanaStandart()">
<span class="menu-icon">
<i class="ki-outline ki-setting-2">
</i>
</span>
<span class="menu-title">
LPJ
</span>
</a>
</div>
<div class="menu-item">
<a class="menu-link" href="#">
<span class="menu-icon">
<i class="ki-outline ki-message-programming">
</i>
</span>
<span class="menu-title">
RAP
</span>
</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="flex justify-end gap-5"> <div class="flex justify-end gap-5">
<a class="btn btn-success" href="#"> <a class="btn btn-success" href="#">
SAVE SAVE
</a> </a>
<a class="btn btn-success" href="#"> <a class="btn btn-success" href="#">
REPORT REPORT
</a> </a>
<a class="btn btn-success" href="#"> <a class="btn btn-success" href="#">
PRINT OUT PRINT OUT
</a> </a>
</div>
</div> </div>
</div> </div>
@endforeach
</div>
@endforeach
</div> </div>
@@ -305,9 +318,9 @@
denyButtonText: 'No', denyButtonText: 'No',
}).then((result) => { }).then((result) => {
if (result.isConfirmed) { if (result.isConfirmed) {
window.location.href = "{{ route('penilai.standard', $permohonan->id) }}";
} else if (result.isDenied) { } else if (result.isDenied) {
Swal.fire('Changes are not saved', '', 'info') window.location.href = "{{ route('penilai.sederhana', $permohonan->id) }}";
} }
}) })
} }