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

fix(surveyoe/penilai/so/dd/eo): penambahan akses menu dd, eo di resume dan laporan, penambahan tanggal data di data pembanding dan properti sejenis di rap

Browse Source
This commit is contained in:
majid
2025-03-03 09:09:22 +07:00
parent bfc515f3ed
commit f928cf1d76
7 changed files with 131 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1090,7 +1090,7 @@ class SurveyorController extends Controller
'address', 'village_code', 'district_code', 'city_code', 'province_code', 'address', 'village_code', 'district_code', 'city_code', 'province_code',
'nama', 'type','warna','lokasi', 'total', 'diskon', 'harga_diskon', 'nama', 'type','warna','lokasi', 'total', 'diskon', 'harga_diskon',
'sumber_data', 'harga', 'tahun','transmisi','telepon', 'sumber_data', 'harga', 'tahun','transmisi','telepon',
'kordinat_lat', 'kordinat_lng', 'tahun_pembuatan','merek_buatan','kapasitas','power','kondisi' 'kordinat_lat', 'kordinat_lng', 'tahun_pembuatan','merek_buatan','kapasitas','power','kondisi','tanggal'
]; ];
@@ -1100,7 +1100,7 @@ class SurveyorController extends Controller
'tahun', 'luas_tanah', 'luas_bangunan', 'tahun_bangunan', 'tahun', 'luas_tanah', 'luas_bangunan', 'tahun_bangunan',
'status_nara_sumber', 'harga', 'harga_diskon', 'diskon', 'total', 'nama_nara_sumber', 'status_nara_sumber', 'harga', 'harga_diskon', 'diskon', 'total', 'nama_nara_sumber',
'peruntukan', 'penawaran', 'telepon','hak_properti', 'peruntukan', 'penawaran', 'telepon','hak_properti',
'kordinat_lat', 'kordinat_lng', 'jenis_aset','foto_objek' 'kordinat_lat', 'kordinat_lng', 'jenis_aset','foto_objek','tanggal'
]; ];
} }
@@ -1155,7 +1155,7 @@ class SurveyorController extends Controller
'address', 'village_code', 'district_code', 'city_code', 'province_code', 'address', 'village_code', 'district_code', 'city_code', 'province_code',
'luas_tanah', 'luas_tanah_bagunan', 'total', 'diskon', 'harga_diskon', 'luas_tanah', 'luas_tanah_bagunan', 'total', 'diskon', 'harga_diskon',
'status_nara_sumber', 'harga', 'nama_nara_sumber','hak_properti','telepon', 'status_nara_sumber', 'harga', 'nama_nara_sumber','hak_properti','telepon',
'kordinat_lat', 'kordinat_lng', 'jenis_aset','penawaran', 'kordinat_lat', 'kordinat_lng', 'jenis_aset','penawaran', 'tanggal',
]; ];
$inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id')) $inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id'))
@@ -2776,6 +2776,7 @@ class SurveyorController extends Controller
'target_market' => $data['target_market'] ?? null, 'target_market' => $data['target_market'] ?? null,
'kerjasama_dengan_bank' => $data['kerjasama_dengan_bank'] ?? null, 'kerjasama_dengan_bank' => $data['kerjasama_dengan_bank'] ?? null,
'rute_menuju_lokasi' => $data['rute_menuju_lokasi'] ?? null, 'rute_menuju_lokasi' => $data['rute_menuju_lokasi'] ?? null,
'properti_sejenis' => $data['properti_sejenis'] ?? null,
]; ];
return $rapData; return $rapData;

2
module.json
View File

@@ -333,6 +333,8 @@
"pemohon-ao", "pemohon-ao",
"pemohon-eo", "pemohon-eo",
"admin", "admin",
"DD Appraisal",
"EO Appraisal",
"senior-officer" "senior-officer"
] ]
} }

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

@@ -416,6 +416,17 @@
</table> </table>
@endisset @endisset
@isset($forminspeksi['properti_sejenis'])
<h2 style="text-transform: uppercase;">PROPERTI SEJENIS</h2>
<table>
<tr>
<td>
{{ $forminspeksi['properti_sejenis'] ?? '' }}
</td>
</tr>
</table>
@endisset
@if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta'])) @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta']))
<h2 style="text-transform: uppercase;">ATURAN TATA KOTA</h2> <h2 style="text-transform: uppercase;">ATURAN TATA KOTA</h2>
<table> <table>
@@ -434,12 +445,17 @@
@endphp @endphp
@if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta'])) @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta']))
@foreach ($informasi as $key) @foreach ($informasi as $key)
@if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-') @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-')
<p> - {{ ucfirst(str_replace('_', ' ', $key)) }}: @php
{{ $forminspeksi['fakta'][$key] }}</p> $displayKey = ucfirst(str_replace('_', ' ', $key));
@endif if (strlen($key) == 3) {
@endforeach $displayKey = strtoupper($key);
}
@endphp
<p> - {{ $displayKey }}: {{ $forminspeksi['fakta'][$key] }}</p>
@endif
@endforeach
@endif @endif
</table> </table>
@endif @endif

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

@@ -190,7 +190,7 @@
'total_pembanding[]': currentData.total, 'total_pembanding[]': currentData.total,
'diskon_pembanding[]': currentData.diskon, 'diskon_pembanding[]': currentData.diskon,
'telepon_pembanding[]': currentData.telepon, 'telepon_pembanding[]': currentData.telepon,
'penawaran_pembanding[]': currentData.penawaran, 'penawaran_pembanding[]': currentData.penawaran
} : { } : {
'jenis_aset_pembanding[]': currentData.jenis_aset, 'jenis_aset_pembanding[]': currentData.jenis_aset,
'luas_tanah_pembanding[]': currentData.luas_tanah, 'luas_tanah_pembanding[]': currentData.luas_tanah,
@@ -211,6 +211,8 @@
'hak_properti_pembanding[]': currentData.hak_properti, 'hak_properti_pembanding[]': currentData.hak_properti,
'telepon_pembanding[]': currentData.telepon, 'telepon_pembanding[]': currentData.telepon,
'penawaran_pembanding[]': currentData.penawaran, 'penawaran_pembanding[]': currentData.penawaran,
'tanggal_pembanding[]': currentData.tanggal
}; };
Object.entries(inputs).forEach(([name, value]) => { Object.entries(inputs).forEach(([name, value]) => {
@@ -359,10 +361,10 @@
} else if (!input.id.includes('province')) { } else if (!input.id.includes('province')) {
// Reset opsi untuk select lokasi // Reset opsi untuk select lokasi
input.innerHTML = `<option value="">Pilih ${ input.innerHTML = `<option value="">Pilih ${
input.id.includes('city') ? 'Kota/Kabupaten' : input.id.includes('city') ? 'Kota/Kabupaten' :
input.id.includes('district') ? 'Kecamatan' : input.id.includes('district') ? 'Kecamatan' :
'Desa/Kelurahan' 'Desa/Kelurahan'
}</option>`; }</option>`;
} }
if (input.id.includes('province')) { if (input.id.includes('province')) {
@@ -378,6 +380,8 @@
handleDistrictChange(this); handleDistrictChange(this);
}; };
} }
} }
if (input.type !== 'file' && input.tagName !== 'SELECT') { if (input.type !== 'file' && input.tagName !== 'SELECT') {

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

@@ -171,9 +171,20 @@
<td class="px-4 py-2"> <td class="px-4 py-2">
<input type="text" name="penawaran" class="input" <input type="text" name="penawaran" class="input"
value="{{ $inspectionData['asset']['penawaran'] ?? '' }}"> value="{{ $inspectionData['asset']['penawaran'] ?? '' }}">
{{-- <select class="input w-full" name="penawaran">
<option value="">Pilih</option>
<option value="Penawaran" {{ (isset($inspectionData['asset']['penawaran']) && $inspectionData['asset']['penawaran'] == 'Penawaran') ? 'selected' : '' }}>Penawaran</option>
<option value="Transaksi" {{ (isset($inspectionData['asset']['penawaran']) && $inspectionData['asset']['penawaran'] == 'Transaksi') ? 'selected' : '' }}>Transaksi</option>
</select> --}}
</td> </td>
<td class="px-4 py-2"> <td class="px-4 py-2">
<input type="text" name="penawaran_pembanding[]" class="input"> <input type="text" name="penawaran_pembanding[]" class="input">
{{-- <select class="input w-full" name="penawaran_pembanding[]">
<option value="">Pilih</option>
<option value="Penawaran" {{ (isset($inspectionData['penawaran']) && $inspectionData['penawaran'] == 'Penawaran') ? 'selected' : '' }}>Penawaran</option>
<option value="Transaksi" {{ (isset($inspectionData['penawaran']) && $inspectionData['penawaran'] == 'Transaksi') ? 'selected' : '' }}>Transaksi</option>
</select> --}}
</td> </td>
</tr> </tr>
@@ -210,6 +221,16 @@
</td> </td>
</tr> </tr>
<tr>
<td class="px-4 py-2">Tanggal Data</td>
<td class="px-4 py-2">
<input type="date" name="tanggal" class="input"
value="{{ $inspectionData['asset']['tanggal'] ?? '' }}">
</td>
<td class="px-4 py-2">
<input type="date" name="tanggal_pembanding[]" class="input">
</td>
</tr>
<!-- Lokasi --> <!-- Lokasi -->
<tr class="bg-gray-100"> <tr class="bg-gray-100">

58
resources/views/surveyor/components/print-out/rap.blade.php
View File

@@ -174,7 +174,7 @@
<tr> <tr>
<td style="text-align: center; border: 1px solid #000;"> <td style="text-align: center; border: 1px solid #000;">
</td> </td>
<td style=" border: 1px solid #000;"> <td style=" border: 1px solid #000;">
<table> <table>
@@ -201,7 +201,7 @@
</tr> </tr>
<tr> <tr>
<td style="text-align: center; border: 1px solid #000;"> <td style="text-align: center; border: 1px solid #000;">
</td> </td>
<td style=" border: 1px solid #000;"> <td style=" border: 1px solid #000;">
<table> <table>
@@ -228,7 +228,7 @@
</tr> </tr>
<tr> <tr>
<td style="text-align: center; border: 1px solid #000;"> <td style="text-align: center; border: 1px solid #000;">
</td> </td>
<td style=" border: 1px solid #000;"> <td style=" border: 1px solid #000;">
<table> <table>
@@ -254,7 +254,7 @@
</tr> </tr>
<tr> <tr>
<td style="text-align: center; border: 1px solid #000;"> <td style="text-align: center; border: 1px solid #000;">
</td> </td>
<td style=" border: 1px solid #000;"> <td style=" border: 1px solid #000;">
<table> <table>
@@ -281,7 +281,7 @@
</tr> </tr>
<tr> <tr>
<td style="text-align: center; border: 1px solid #000;"> <td style="text-align: center; border: 1px solid #000;">
</td> </td>
<td style=" border: 1px solid #000;"> <td style=" border: 1px solid #000;">
<table> <table>
@@ -307,7 +307,7 @@
</tr> </tr>
<tr> <tr>
<td style="text-align: center; border: 1px solid #000;"> <td style="text-align: center; border: 1px solid #000;">
</td> </td>
<td style=" border: 1px solid #000;"> <td style=" border: 1px solid #000;">
<table> <table>
@@ -333,7 +333,7 @@
</tr> </tr>
<tr> <tr>
<td style="text-align: center; border: 1px solid #000;"> <td style="text-align: center; border: 1px solid #000;">
</td> </td>
<td style=" border: 1px solid #000;"> <td style=" border: 1px solid #000;">
<table> <table>
@@ -347,7 +347,7 @@
</table> </table>
</td> </td>
</tr> </tr>
@endisset @endisset
@isset($forminspeksi['rute_menuju_lokasi']) @isset($forminspeksi['rute_menuju_lokasi'])
<tr> <tr>
@@ -360,7 +360,7 @@
</tr> </tr>
<tr> <tr>
<td style="text-align: center; border: 1px solid #000;"> <td style="text-align: center; border: 1px solid #000;">
</td> </td>
<td style=" border: 1px solid #000;"> <td style=" border: 1px solid #000;">
<table> <table>
@@ -373,12 +373,36 @@
</table> </table>
</td> </td>
</tr> </tr>
@endisset
@isset($forminspeksi['properti_sejenis'])
<tr>
<td style="text-align: center; border: 1px solid #000;">
P
</td>
<td style="text-align: center; border: 1px solid #000;">
PROPERTI SEJENIS
</td>
</tr>
<tr>
<td style="text-align: center; border: 1px solid #000;">
</td>
<td style=" border: 1px solid #000;">
<table>
<tr>
<td>
{{ $forminspeksi['properti_sejenis'] ?? '' }}
</td>
</tr>
</table>
</td>
</tr>
@endisset @endisset
@if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta'])) @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta']))
<tr> <tr>
<td style="text-align: center; border: 1px solid #000;"> <td style="text-align: center; border: 1px solid #000;">
P Q
</td> </td>
<td style="text-align: center; border: 1px solid #000;"> <td style="text-align: center; border: 1px solid #000;">
ATURAN TATA KOTA ATURAN TATA KOTA
@@ -386,7 +410,7 @@
</tr> </tr>
<tr> <tr>
<td style="text-align: center; border: 1px solid #000;"> <td style="text-align: center; border: 1px solid #000;">
</td> </td>
<td style=" border: 1px solid #000;"> <td style=" border: 1px solid #000;">
<table> <table>
@@ -403,7 +427,7 @@
'nama_petugas', 'nama_petugas',
]; ];
@endphp @endphp
@if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta'])) @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta']))
@foreach ($informasi as $key) @foreach ($informasi as $key)
@if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-') @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-')
@@ -415,14 +439,14 @@
</table> </table>
</td> </td>
</tr> </tr>
@endif @endif
@isset($forminspeksi['fakta']['keterangan']) @isset($forminspeksi['fakta']['keterangan'])
<tr> <tr>
<td style="text-align: center; border: 1px solid #000;"> <td style="text-align: center; border: 1px solid #000;">
P R
</td> </td>
<td style="text-align: center; border: 1px solid #000;"> <td style="text-align: center; border: 1px solid #000;">
CATATAN LAINNYA CATATAN LAINNYA
@@ -430,7 +454,7 @@
</tr> </tr>
<tr> <tr>
<td style="text-align: center; border: 1px solid #000;"> <td style="text-align: center; border: 1px solid #000;">
</td> </td>
<td style=" border: 1px solid #000;"> <td style=" border: 1px solid #000;">
<table> <table>
@@ -444,5 +468,5 @@
</table> </table>
</td> </td>
</tr> </tr>
@endisset @endisset

32
resources/views/surveyor/components/rap.blade.php
View File

@@ -693,4 +693,36 @@
</div> </div>
</div> </div>
<div class="card border border-agi-100 w-full rounded-lg shadow-md overflow-hidden">
<div class="card-header bg-agi-50">
<h3 class="card-title uppercase">
Properti Sejenis
</h3>
</div>
<div class="card-body">
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<div id="fakta-positif-container" class="flex flex-wrap items-baseline w-full">
@if (!empty($forminspeksi['properti_sejenis']))
<div class="properti_sejenis flex items-center gap-2 mt-2 textarea-group w-full">
<textarea class="textarea mt-2" name="properti_sejenis" rows="10">{{ old('properti_sejenis', $forminspeksi['properti_sejenis']) }}</textarea>
<button class="btn btn-danger btn-sm remove-btn" type="button" style="display: none;">
<i class="ki-outline ki-trash"></i>
</button>
</div>
@else
<div class="properti_sejenis flex items-center gap-2 mt-2 textarea-group w-full">
<textarea class="textarea mt-2" name="properti_sejenis" rows="10">{{ old('properti_sejenis') }}</textarea>
<button class="btn btn-danger btn-sm remove-btn" type="button" style="display: none;">
<i class="ki-outline ki-trash"></i>
</button>
</div>
@endif
</div>
</div>
</div>
</div>
@include('lpj::surveyor.components.informasi') @include('lpj::surveyor.components.informasi')