diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index e61863d..8eb6ead 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -570,7 +570,7 @@ class PenilaiController extends Controller }); } - $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?,?, ?, ?, ?, ?)', ['assign', 'survey-completed', 'proses-laporan', 'paparan', 'proses-paparan', 'paparan', 'revisi-laporan', 'revisi-paparan', 'request-freeze', 'freeze', 'reject-freeze']); + $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?,?, ?, ?, ?, ?, ?)', ['assign', 'survey-completed', 'proses-laporan', 'paparan', 'proses-paparan', 'paparan', 'revisi-laporan', 'revisi-paparan', 'request-freeze', 'freeze', 'reject-freeze','unfreeze-sla']); if (!Auth::user()->hasRole('administrator')) { $query->whereHas('penilaian.userPenilai', function ($q) { diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 11da675..78849d4 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -450,7 +450,7 @@ class PenilaianController extends Controller public function otorisatorUpdate(Request $request, $id, $context) { - if ($context === 'Freze SLA') { + if ($context === 'Freze SLA' || $context === 'Unfreeze SLA') { $authorization = Authorization::with(['user'])->find($id); if (!$authorization) { return response()->json([ @@ -595,6 +595,14 @@ class PenilaianController extends Controller ]); } break; + case 'unfreeze sla': + $authorization->update([ + 'request' => 'unfreeze-sla', + ]); + $permohonan->update([ + 'status' => 'unfreeze-sla', + ]); + break; default: return response()->json([ @@ -891,7 +899,7 @@ class PenilaianController extends Controller public function revisiLaporan(Request $request, $id) { - // dd($request->all()); + // dd($id); if($request->dataHeader=='Paparan' || $request->dataHeader=='Freze SLA'){ $authorization = Authorization::find($id); $permohonan = Permohonan::find($authorization->permohonan_id); @@ -906,7 +914,7 @@ class PenilaianController extends Controller } $status = 'revisi-paparan'; - }else if($permohonan->status === 'freeze'){ + }else if($permohonan->status === 'request-freeze'){ if ($authorization) { $authorization->delete(); } diff --git a/app/Http/Controllers/SLAController.php b/app/Http/Controllers/SLAController.php index 3256aee..159995c 100644 --- a/app/Http/Controllers/SLAController.php +++ b/app/Http/Controllers/SLAController.php @@ -71,7 +71,7 @@ class SLAController extends Controller // abort(403, 'Sorry! You are not allowed to view users.'); } - $query = Authorization::query()->with('permohonan.debiture','user','approveSo','approveEo','approveDd')->where('jenis','sla'); + $query = Authorization::query()->with('permohonan.debiture', 'user', 'approveSo', 'approveEo', 'approveDd')->where('jenis', 'sla')->where('request', 'freeze'); // Pencarian berdasarkan parameter search if ($request->has('search') && !empty($request->get('search'))) { diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 8cbdafe..2cc6438 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -766,9 +766,15 @@ class SurveyorController extends Controller $permohonan->update([ 'status' => 'survey-completed', - 'submitted_at' => now() ]); + $penilaian = Penilaian::where('nomor_registrasi', $permohonan->nomor_registrasi)->first(); + + $penilaian->update([ + 'status' => 'survey-completed', + ]); + + if($permohonan->jenisPenilaian->name=="External") { LaporanExternal::updateOrCreate( ['permohonan_id' => $permohonan->id], diff --git a/resources/views/penilai/components/footer.blade.php b/resources/views/penilai/components/footer.blade.php index e91d01d..5f521a1 100644 --- a/resources/views/penilai/components/footer.blade.php +++ b/resources/views/penilai/components/footer.blade.php @@ -43,7 +43,7 @@ 'foto_gistaru' => 'Gistaru', 'foto_bhumi' => 'Bhumi', 'foto_argis_region' => 'Blad Tata Ruang ', - 'foto_tempat' => 'Tempat', + 'foto_tempat' => 'Peta Lokasi', ]; // Memindahkan foto_tempat ke depan jika ada if (($key = array_search('upload_gs', $fotoTypes)) !== false) { diff --git a/resources/views/penilai/components/header.blade.php b/resources/views/penilai/components/header.blade.php index b16c777..3d1829b 100644 --- a/resources/views/penilai/components/header.blade.php +++ b/resources/views/penilai/components/header.blade.php @@ -123,7 +123,7 @@ } } use Modules\Usermanagement\Models\User; - $surveyorUser = User::where('id', $surveyor->userPenilaiTeam->id)->first(); + $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first(); $data = rtrim($data, ', '); @endphp @@ -138,12 +138,12 @@

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

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

-

User: {{ $surveyorUser->name }}

+

User: {{ $penilaiUser->name }}

diff --git a/resources/views/penilai/components/print-memo.blade.php b/resources/views/penilai/components/print-memo.blade.php index 8dea9cd..a6e0aa2 100644 --- a/resources/views/penilai/components/print-memo.blade.php +++ b/resources/views/penilai/components/print-memo.blade.php @@ -35,32 +35,29 @@

MEMO ANTAR KANTOR

+

NO: {{ $nomorLaporan ?? '' }}

+
- + - + - - - - - - + - + @@ -86,12 +83,12 @@
KepadaKepada : {{ $memo['kepada'] ?? '' }}
DariDari : {{ $memo['dari'] ?? '' }}
No memo:{{ $nomorLaporan ?? '-' }}
TanggalTanggal : {{ formatTanggalIndonesia($memo['tanggal']) }}
PerihalPerihal : {{ $memo['perihal'] ?? '' }}
- + - + @@ -99,7 +96,7 @@ @include('lpj::component.print-out-dokument') - + @@ -118,7 +115,7 @@ @foreach ($alamatFields as $label => $field) @if (!empty($alamat[$field])) - + @@ -139,25 +136,25 @@
Nama Calon DebiturNama Calon Debitur : {{ $permohonan->debiture->name ?? '' }}
Jenis AsetJenis Aset : {{ $data ?? '' }}
Atas NamaAtas Nama : {{ $permohonan->debiture->name ?? '' }}
{{ $label }}{{ $label }} : {{ $alamat[$field] }}
- + - + - + - + diff --git a/resources/views/penilai/components/print-out-call-report.blade.php b/resources/views/penilai/components/print-out-call-report.blade.php index 8a8fe03..00303af 100644 --- a/resources/views/penilai/components/print-out-call-report.blade.php +++ b/resources/views/penilai/components/print-out-call-report.blade.php @@ -39,25 +39,26 @@
Tanggal KunjunganTanggal Kunjungan : {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}
SurveyorSurveyor : {{ $surveyor->userPenilaiTeam->name ?? '' }}
Pihak PemohonPihak Pemohon : {{ $permohonan->user->name ?? '' }} - {{ $permohonan->debiture->branch->name ?? '' }}
Pihak Cadeb/DebiturPihak Cadeb/Debitur : {{ $permohonan->debiture->name ?? '' }}
+
- + - + - + - + @@ -75,24 +76,24 @@
KepadaKepada : {{ $report['kepada'] ?? '' }}
DariDari : {{ $report['dari'] ?? '' }}
TanggalTanggal : {{ formatTanggalIndonesia($report['tanggal']) }}
PerihalPerihal : {{ $report['perihal'] ?? '' }}
- + - + - + @if (!empty($report['lokasi']['address'])) - + - + - + - + - @@ -142,25 +143,25 @@
Nama DebiturNama Debitur : {{ $permohonan->debiture->name ?? '' }}
KJPPKJPP : {{ preg_replace('/^K\\d+ - /', '', $permohonan->penawaran->nama_kjpp_sebelumnya ?? '-') }}
Jenis AsetJenis Aset : {{ $data ?? '' }}
Lokasi Objek PenilaianLokasi Objek Penilaian : {{ $report['lokasi']['address'] ?? '' }}, {{ $alamat['village_code'] ?? '' }} {{ $alamat['district_code'] ?? '' }}, @@ -103,22 +104,22 @@ @include('lpj::component.print-out-dokument')
Tanggal PenilaianTanggal Penilaian : {{ isset($permohonan->penilaian->tanggal_kunjungan) ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '' }}
Lelang keLelang ke : {{ $report['lelang_kjpp'] ?? '' }}
Nilai Pasar Wajar (NPW)Nilai Pasar Wajar (NPW) : {{ isset($report['nilai_pasar_kjpp']) ? formatRupiah($report['nilai_pasar_kjpp']) : '-' }}
+ Nilai Likuidasi {{ isset($report['persentase_likuidasi_kjpp']) ? '(' . $report['persentase_likuidasi_kjpp'] . '%)' : '-' }}
- + - + - + - + diff --git a/resources/views/penilai/index.blade.php b/resources/views/penilai/index.blade.php index ecfa4c7..a13c512 100644 --- a/resources/views/penilai/index.blade.php +++ b/resources/views/penilai/index.blade.php @@ -165,13 +165,15 @@ tujuan_penilaian_id: { title: 'Tujuan Penilaian', render: (item, data) => { - return data.tujuan_penilaian && data.tujuan_penilaian.name ? `${data.tujuan_penilaian.name}` : '-'; + return data.tujuan_penilaian && data.tujuan_penilaian.name ? + `${data.tujuan_penilaian.name}` : '-'; }, }, jenis_fasilitas_kredit_id: { title: 'Fasilitas Kredit', render: (item, data) => { - return data.jenisfasilitas_kredit && data.jenisfasilitas_kredit.name ? `${data.jenisfasilitas_kredit.name}` : '-'; + return data.jenisfasilitas_kredit && data.jenisfasilitas_kredit.name ? + `${data.jenisfasilitas_kredit.name}` : '-'; }, }, jenis_laporan: { @@ -183,7 +185,7 @@ tanggal_survei: { title: 'Tanggal Survei', render: (item, data) => { - if(data.penilaian.waktu_penilaian){ + if (data.penilaian.waktu_penilaian) { return `${formatDate(new Date(data.penilaian.waktu_penilaian))}`; } return `${formatDate(new Date(data.penilaian.created_at))}`; @@ -196,19 +198,19 @@ const tipe_laporan = data.penilai?.type; const nilai_plafond = data.penilaian.nilaiPlafond?.name; let waktu_penilaian = new Date(data.penilaian.created_at); - if(data.penilaian.waktu_penilaian){ + if (data.penilaian.waktu_penilaian) { waktu_penilaian = new Date(data.penilaian.waktu_penilaian); } - if(tujuan_penilaian.name==="RAP"){ + if (tujuan_penilaian.name === "RAP") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 3); } else { - if(tipe_laporan==="sederhana"){ + if (tipe_laporan === "sederhana") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 2); - } else if(tipe_laporan==="standar"){ - if(nilai_plafond==="2 M - 5 M"){ + } else if (tipe_laporan === "standar") { + if (nilai_plafond === "2 M - 5 M") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 3); - } else if(nilai_plafond==="< 2M"){ + } else if (nilai_plafond === "< 2M") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 3); } else { waktu_penilaian.setDate(waktu_penilaian.getDate() + 5); @@ -232,7 +234,10 @@ actions: { title: 'Action', render: (item, data) => { - if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data.status === 'paparan' || data.status === 'proses-paparan' || data.status === 'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data.status === 'revisi-paparan' || data.status === 'reject-freeze' || data.status === 'freeze' || data.status === 'request-freeze') { + if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data + .status === 'paparan' || data.status === 'proses-paparan' || data.status === + 'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data + .status === 'revisi-paparan' || data.status === 'unfreeze-sla') { return `
@@ -245,9 +250,17 @@
`; - } else { + } else if (data.status === 'freeze' || data.status === 'request-freeze') { + return ` +
+ + + +
`; + } else + { return `
- +
` @@ -268,56 +281,56 @@ -@endpush + + @endpush diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php index 7f69ede..39e8bd2 100644 --- a/resources/views/surveyor/components/print-out/main.blade.php +++ b/resources/views/surveyor/components/print-out/main.blade.php @@ -203,10 +203,10 @@
Staf Subdit Appraisal Staf Subdit Appraisal : {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}
Pihak KJPPPihak KJPP : {{ $forminspeksi['signature']['kjjp']['name'] ?? $report['pihak_kjjpp'] ?? '' }}
Pihak BAGI Cab Pihak BAGI Cab : {{ $permohonan->user->name ?? '' }} - {{ $permohonan->debiture->branch->name ?? '' }}
Debitur/perwakilan debitur Debitur/perwakilan debitur : {{ $permohonan->debiture->name ?? '' }}

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

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

User: {{ $surveyorUser->name }}