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

Merge pull request 'feature/senior-officer' (#133) from feature/senior-officer into staging

Browse Source 
Reviewed-on: #133
This commit is contained in:
putrakuningan
2025-03-19 04:10:30 +01:00
parent fe5f643906 39c5214075
commit 47b585062b
9 changed files with 54 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/PenilaianController.php
View File

@@ -514,10 +514,10 @@ class PenilaianController extends Controller
$status = 'done'; $status = 'done';
} }
if($status=='done'){ if ($status == 'done') {
$_permohonan = Permohonan::with(['documents.jenisJaminan','penilaian._user_penilai','penilai','documents.detail.jenisLegalitasJaminan'])->find(6); $_permohonan = Permohonan::with(['documents.jenisJaminan','penilaian._user_penilai','penilai','documents.detail.jenisLegalitasJaminan'])->find(6);
if(isset($_permohonan->penilai->lpj)){ if (isset($_permohonan->penilai->lpj)) {
$npw = json_decode($_permohonan->penilai->lpj, true); $npw = json_decode($_permohonan->penilai->lpj, true);
$npw = $npw['total_nilai_pasar_wajar'] ?? 0; $npw = $npw['total_nilai_pasar_wajar'] ?? 0;
} }
@@ -559,7 +559,7 @@ class PenilaianController extends Controller
]); ]);
} elseif (Auth::user()->roles[0]->name === 'EO Appraisal' || Auth::user()->roles[0]->name === 'administrator' && $authorization->approve_so && $authorization->approve_eo === null) { } elseif (Auth::user()->roles[0]->name === 'EO Appraisal' || Auth::user()->roles[0]->name === 'administrator' && $authorization->approve_so && $authorization->approve_eo === null) {
$status = '2'; $status = '2';
if (!in_array($permohonan->nilai_plafond_id, [1, 4])) { if (!in_array($permohonan->nilai_plafond_id, [1, 2])) {
$status = '1'; $status = '1';
$permohonan->update([ $permohonan->update([
'status' => $authorization->request 'status' => $authorization->request
@@ -603,7 +603,7 @@ class PenilaianController extends Controller
]); ]);
} elseif (Auth::user()->roles[0]->name === 'EO Appraisal') { } elseif (Auth::user()->roles[0]->name === 'EO Appraisal') {
$status = '2'; $status = '2';
if (!in_array($permohonan->nilai_plafond_id, [1,4])) { if (!in_array($permohonan->nilai_plafond_id, [1,2])) {
$status = '1'; $status = '1';
$permohonan->update([ $permohonan->update([
'status' => $authorization->request 'status' => $authorization->request

2
resources/views/component/print-out-dokument.blade.php
View File

@@ -27,7 +27,7 @@
@else @else
{{ $item }} {{ $item }}
@if ($key == 'luas_bangunan' || $key == 'luas_tanah') @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
<sup>m2</sup> <span>m²</span>
@endif @endif
@endif @endif
</td> </td>

2
resources/views/penilai/components/analisa/apartement-kantor.blade.php
View File

@@ -18,7 +18,7 @@
@endphp @endphp
<td style="width: 25%; padding: 2px; vertical-align: top;">Luas Unit</td> <td style="width: 25%; padding: 2px; vertical-align: top;">Luas Unit</td>
<td style="width: 1%; padding: 2px; vertical-align: top;">:</td> <td style="width: 1%; padding: 2px; vertical-align: top;">:</td>
<td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }}</td> <td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <span>m²</span></td>
</tr> </tr>
<tr> <tr>
<td style="width: 25%; padding: 2px; vertical-align: top;">Bentuk Unit</td> <td style="width: 25%; padding: 2px; vertical-align: top;">Bentuk Unit</td>

2
resources/views/penilai/components/analisa/bangunan.blade.php
View File

@@ -22,7 +22,7 @@
: '-'); : '-');
@endphp @endphp
{{ $output }} <sup>m2</sup> {{ $output }} <span>m²</span>
</td> </td>
</tr> </tr>

2
resources/views/penilai/components/analisa/tanah.blade.php
View File

@@ -16,7 +16,7 @@
@endphp @endphp
<td style="width: 25%; padding: 2px; vertical-align: top;">Luas Tanah</td> <td style="width: 25%; padding: 2px; vertical-align: top;">Luas Tanah</td>
<td style=" width:1%; padding: 2px; vertical-align: top;">:</td> <td style=" width:1%; padding: 2px; vertical-align: top;">:</td>
<td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <sup>m2</sup></td> <td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <span>m²</span></td>
</tr> </tr>
<tr> <tr>
@php @php

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

@@ -270,7 +270,7 @@
@endphp @endphp
<td style="padding: 2px; vertical-align: top;">Luas Tanah</td> <td style="padding: 2px; vertical-align: top;">Luas Tanah</td>
<td style="padding: 2px; vertical-align: top;">:</td> <td style="padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <sup>m2</sup></td> <td style="padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <span>m²</span></td>
</tr> </tr>
<tr> <tr>
<td style="padding: 2px; vertical-align: top;">Bentuk Tanah</td> <td style="padding: 2px; vertical-align: top;">Bentuk Tanah</td>
@@ -373,7 +373,7 @@
: '-'); : '-');
@endphp @endphp
{{ $output }} <sup>m2</sup> {{ $output }} <span>m²</span>
</td> </td>
</tr> </tr>

4
resources/views/penilaian/otorisator/show.blade.php
View File

@@ -216,7 +216,7 @@
</button> </button>
@endif @endif
@if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null) @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2]))
<button onclick="otorisatorData({{ $authorization->id }},'EO')" type="button" <button onclick="otorisatorData({{ $authorization->id }},'EO')" type="button"
class="btn btn-primary"> class="btn btn-primary">
<i class="ki-filled ki-double-check"></i> <i class="ki-filled ki-double-check"></i>
@@ -224,7 +224,7 @@
</button> </button>
@endif @endif
@if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd == null) @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [1, 4]))
<button onclick="otorisatorData({{ $authorization->id }},'DD')" type="button" <button onclick="otorisatorData({{ $authorization->id }},'DD')" type="button"
class="btn btn-primary"> class="btn btn-primary">
<i class="ki-filled ki-double-check"></i> <i class="ki-filled ki-double-check"></i>

43
resources/views/surveyor/components/denah.blade.php
View File

@@ -94,7 +94,7 @@
<div class="flex flex-wrap gap-4"> <div class="flex flex-wrap gap-4">
<div class="flex w-full items-center justify-center gap-4"> <div class="flex w-full items-center justify-center gap-4">
<label class="form-label max-w-56"> <label class="form-label max-w-56">
<span class="form-label">Total Luas</span> <span class="form-label"> Luas</span>
</label> </label>
<input type="text" name="luas_denah[]" <input type="text" name="luas_denah[]"
class="input w-full number-format" class="input w-full number-format"
@@ -151,7 +151,7 @@
<div class="flex flex-wrap gap-4"> <div class="flex flex-wrap gap-4">
<div class="flex w-full items-center justify-center gap-4"> <div class="flex w-full items-center justify-center gap-4">
<label class="form-label max-w-56"> <label class="form-label max-w-56">
<span class="form-label">Total Luas</span> <span class="form-label"> Luas</span>
</label> </label>
<input type="text" name="luas_denah[]" class="input w-full number-format" <input type="text" name="luas_denah[]" class="input w-full number-format"
onkeyup="formatNumber(this)"> onkeyup="formatNumber(this)">
@@ -164,6 +164,17 @@
</div> </div>
<div class="w-full p-4">
<div class="flex flex-wrap gap-4">
<div class="flex w-full items-center justify-center gap-4">
<label class="form-label max-w-56">
<span class="form-label">Total Luas</span>
</label>
<input type="text" name="total_luas" id="totalLuas" class="input w-full number-format" readonly>
</div>
</div>
</div>
<div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px"> <div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px">
<button type="button" class="btn btn-success" id="saveButton" onclick="submitDenah()"> <button type="button" class="btn btn-success" id="saveButton" onclick="submitDenah()">
<span id="saveButtonText">Save</span> <span id="saveButtonText">Save</span>
@@ -229,6 +240,32 @@
}); });
}); });
function calculateTotalLuas() {
let totalLuas = 0;
const luasInputs = document.querySelectorAll('input[name="luas_denah[]"]');
luasInputs.forEach(input => {
const value = parseFloat(input.value.replace(/[^0-9.]/g, ''));
if (!isNaN(value)) {
totalLuas += value;
}
});
const totalLuasInput = document.getElementById('totalLuas');
totalLuasInput.value = totalLuas ? `${totalLuas.toLocaleString()} m²` : '';
}
// Tambahkan event listener untuk setiap input luas_denah[]
document.addEventListener('input', function (e) {
if (e.target && e.target.name === 'luas_denah[]') {
calculateTotalLuas();
}
});
// Jalankan hitung ulang saat halaman dimuat (jika ada nilai default)
document.addEventListener('DOMContentLoaded', calculateTotalLuas);
function createDenahElement(index) { function createDenahElement(index) {
const denahItem = document.createElement('div'); const denahItem = document.createElement('div');
denahItem.className = 'denah-item grid gap-5 mb-5 border p-4 rounded'; denahItem.className = 'denah-item grid gap-5 mb-5 border p-4 rounded';
@@ -267,7 +304,7 @@
<div class="flex flex-wrap gap-4"> <div class="flex flex-wrap gap-4">
<div class="flex w-full items-center justify-center gap-4"> <div class="flex w-full items-center justify-center gap-4">
<label class="form-label max-w-56"> <label class="form-label max-w-56">
<span class="form-label">Total Luas</span> <span class="form-label"> Luas</span>
</label> </label>
<input type="text" name="luas_denah[]" <input type="text" name="luas_denah[]"
class="input w-full number-format" class="input w-full number-format"

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

@@ -21,12 +21,12 @@
class="btn btn-xs btn-info"> class="btn btn-xs btn-info">
<i class="ki-filled ki-exit-left"></i> Back <i class="ki-filled ki-exit-left"></i> Back
</a> </a>
@elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor']) && Route::currentRouteName('penilai.show')) @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor', 'penilai']))
@if (Request::is('surveyor/inspeksi/*/create') && request()->has('dokument') && request()->has('jenis_jaminan')) @if (Request::is('surveyor/inspeksi/*/create') && request()->has('dokument') && request()->has('jenis_jaminan'))
<a href="{{ route('surveyor.show', $permohonan->id) }}" class="btn btn-xs btn-info"> <a href="{{ route('surveyor.show', $permohonan->id) }}" class="btn btn-xs btn-info">
<i class="ki-filled ki-exit-left"></i> Back <i class="ki-filled ki-exit-left"></i> Back
</a> </a>
@else @elseif (Request::is('penilai/*/*'))
<a href="{{ route('penilai.show', $permohonan->id) }}" class="btn btn-xs btn-info"> <a href="{{ route('penilai.show', $permohonan->id) }}" class="btn btn-xs btn-info">
<i class="ki-filled ki-exit-left"></i> Back <i class="ki-filled ki-exit-left"></i> Back
</a> </a>