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

Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender

Browse Source
This commit is contained in:
rahmatrafli1
2024-12-05 16:09:57 +07:00
parent 6f59dfc85c 81e1d13cff
commit d486cd735a
16 changed files with 641 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Helpers/Lpj.php
View File

@@ -289,5 +289,10 @@
{ {
return Penilaian::whereHas('userPenilai', function ($query) use ($userId) { return Penilaian::whereHas('userPenilai', function ($query) use ($userId) {
$query->where('user_id', $userId); $query->where('user_id', $userId);
})->count(); })
->whereHas('permohonan', function ($query) {
$query->where('status', 'assign');
})
->count();
} }

2
app/Http/Controllers/ActivityController.php
View File

@@ -250,6 +250,8 @@ class ActivityController extends Controller
]) ])
->whereHas('userPenilai', function ($q) use ($id) { ->whereHas('userPenilai', function ($q) use ($id) {
$q->where('user_id', $id); $q->where('user_id', $id);
})->whereHas('permohonan', function ($q) {
$q->where('status', 'assign');
}); });

19
app/Http/Controllers/PenilaiController.php
View File

@@ -54,6 +54,25 @@ class PenilaiController extends Controller
// //
} }
public function sederhana()
{
return view('lpj::laporan.sederhana_index');
}
public function standard()
{
return view('lpj::laporan.standard_index');
}
public function resume(){
return view('lpj::resume.index');
}
public function memo(){
return view('lpj::resume.index');
}
/** /**
* Show the specified resource. * Show the specified resource.
*/ */

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

@@ -12,12 +12,16 @@ use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use Modules\Lpj\Models\Debiture;
use Modules\Lpj\Models\Permohonan; use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\Branch; use Modules\Lpj\Models\Branch;
use Modules\Lpj\Models\Surveyor; use Modules\Lpj\Models\Surveyor;
use Modules\Lpj\Models\BentukTanah; use Modules\Lpj\Models\BentukTanah;
use Modules\Lpj\Models\KonturTanah; use Modules\Lpj\Models\KonturTanah;
use Modules\Location\Models\Province; use Modules\Location\Models\Province;
use Modules\Location\Models\City;
use Modules\Location\Models\District;
use Modules\Location\Models\Village;
use Modules\Lpj\Models\PosisiKavling; use Modules\Lpj\Models\PosisiKavling;
use Modules\Lpj\Models\KondisiFisikTanah; use Modules\Lpj\Models\KondisiFisikTanah;
use Modules\Lpj\Models\KetinggianTanah; use Modules\Lpj\Models\KetinggianTanah;
@@ -709,10 +713,14 @@ class SurveyorController extends Controller
$branches = Branch::all(); $branches = Branch::all();
$provinces = Province::all(); $provinces = Province::all();
$debitur = Debiture::find($permohonan->debiture_id);
$cities = City::where('province_code', $debitur->province_code)->get();
$districts = District::where('city_code', $debitur->city_code)->get();
$villages = Village::where('district_code', $debitur->district_code)->get();
$surveyor = $id; $surveyor = $id;
$branches = Branch::all(); $branches = Branch::all();
$provinces = Province::all();
$bentukTanah = BentukTanah::all(); $bentukTanah = BentukTanah::all();
$konturTanah = KonturTanah::all(); $konturTanah = KonturTanah::all();
$posisiKavling = PosisiKavling::all(); $posisiKavling = PosisiKavling::all();
@@ -755,6 +763,10 @@ class SurveyorController extends Controller
'surveyor', 'surveyor',
'branches', 'branches',
'provinces', 'provinces',
'debitur',
'cities',
'districts',
'villages',
'bentukTanah', 'bentukTanah',
'konturTanah', 'konturTanah',
'posisiKavling', 'posisiKavling',
@@ -1460,11 +1472,11 @@ class SurveyorController extends Controller
private function getAssetData(array $data): array private function getAssetData(array $data): array
{ {
$alamatData = [ $alamatData = [
'nama_jalan' => $data['nama_jalan'] ?? null, 'address' => $data['address'] ?? null,
'desa_kelurahan' => $data['desa_kelurahan'] ?? null, 'village_code' => $data['village_code'] ?? null,
'kecamatan' => $data['kecamatan'] ?? null, 'district_code' => $data['district_code'] ?? null,
'kota_kabupaten' => $data['kota_kabupaten'] ?? null, 'city_code' => $data['city_code'] ?? null,
'provinsi' => $data['provinsi'] ?? null, 'province_code' => $data['province_code'] ?? null,
]; ];
return [ return [

10
app/Http/Requests/FormSurveyorRequest.php
View File

@@ -528,11 +528,11 @@ class FormSurveyorRequest extends FormRequest
'hub_cadeb_penghuni_sesuai' => 'nullable', 'hub_cadeb_penghuni_sesuai' => 'nullable',
'hub_cadeb_penghuni_tidak_sesuai' => 'nullable', 'hub_cadeb_penghuni_tidak_sesuai' => 'nullable',
'nama_jalan' => 'nullable', 'address' => 'nullable',
'desa_kelurahan' => 'nullable', 'village_code' => 'nullable',
'kecamatan' => 'nullable', 'district_code' => 'nullable',
'kota_kabupaten' => 'nullable', 'city_code' => 'nullable',
'provinsi' => 'nullable', 'province_code' => 'nullable',
'kordinat_lng' => 'nullable', 'kordinat_lng' => 'nullable',
'kordinat_lat' => 'nullable', 'kordinat_lat' => 'nullable',
]; ];

5
app/Models/Penilaian.php
View File

@@ -32,11 +32,6 @@ class Penilaian extends Model
return $this->belongsTo(Teams::class, 'teams_id', 'id'); return $this->belongsTo(Teams::class, 'teams_id', 'id');
} }
public function users()
{
return $this->belongsTo(User::class, 'user_id', 'id');
}
public function userPenilai() public function userPenilai()
{ {
return $this->hasMany(PenilaianTeam::class, 'penilaian_id', 'id'); return $this->hasMany(PenilaianTeam::class, 'penilaian_id', 'id');

4
app/Models/TeamsUsers.php
View File

@@ -32,9 +32,9 @@ class TeamsUsers extends Model
return $this->belongsTo(User::class, 'user_id', 'id'); return $this->belongsTo(User::class, 'user_id', 'id');
} }
public function penilaian() public function penilaianTeam()
{ {
return $this->belongsTo(Penilaian::class, 'teams_id', 'id'); return $this->belongsTo(PenilaianTeam::class, 'team_id', 'id');
} }
} }

6
resources/views/activity/progres_activity/index.blade.php
View File

@@ -49,11 +49,11 @@
<div data-accordion="true"> <div data-accordion="true">
@php @php
$sortedTeamsActivity = $teamsActivity->sortBy(function ($item) { $sortedTeamsActivity = $teamsActivity->sortBy(function ($item) {
return $item->team->regions->penilaiTeam return $item->team->regions->penilaiTeam
->filter(function ($penilaiTeam) use ($item) { ->filter(function ($penilaiTeam) {
return $penilaiTeam->user_id == $item->user->id; $permohonan = optional($penilaiTeam->penilaian)->permohonan;
return $permohonan !== null;
}) })
->count(); ->count();
}); });

4
resources/views/penilai/lampiran.blade.php
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>

46
resources/views/penilai/show.blade.php
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,16 +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">{{ $permohonan->debiture->address }}, Kel. <p class="flex w-full text-gray-600 font-medium text-sm">
{{ $permohonan->debiture->village->name }}, Kec. {{ $permohonan->debiture->district->name }}, {{ formatAlamat($permohonan->debiture) }}
{{ ucwords(strtolower($permohonan->debiture->city->name)) }}, Kode Pos. </p>
{{ $permohonan->debiture->postal_code }}</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">
@@ -53,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">
@@ -76,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">
@@ -91,6 +95,8 @@
</div> </div>
</div> </div>
@foreach ($permohonan->debiture->documents as $dokumen) @foreach ($permohonan->debiture->documents as $dokumen)
<div class="card"> <div class="card">
<div class="card-body grid gap-5"> <div class="card-body grid gap-5">
@@ -105,17 +111,20 @@
</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">{{ $surveyor->userPenilaiTeam->name }} <p class="flex w-full text-gray-600 font-medium text-sm">
{{ $surveyor->userPenilaiTeam->name }}
</p> </p>
<p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->region->name }}</p> <p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->region->name }}
</p>
</div> </div>
<label class="form-label max-w-56"> <label class="form-label max-w-56">
Penilai Penilai
</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">{{ $penilai->userPenilaiTeam->name }} <p class="flex w-full text-gray-600 font-medium text-sm">
{{ $penilai->userPenilaiTeam->name }}
</p> </p>
<p class="flex w-full text-gray-600 font-medium text-sm"> <p class="flex w-full text-gray-600 font-medium text-sm">
@@ -162,7 +171,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">
PJ/001/001</p> </p>
</div> </div>
</div> </div>
@@ -190,7 +199,7 @@
<div class="dropdown-content w-full max-w-56 py-2"> <div class="dropdown-content w-full max-w-56 py-2">
<div class="menu menu-default flex flex-col w-full"> <div class="menu menu-default flex flex-col w-full">
<div class="menu-item"> <div class="menu-item">
<a class="menu-link" href="#"> <a class="menu-link" href="{{ route('penilai.memo', $permohonan->id) }}">
<span class="menu-icon"> <span class="menu-icon">
<i class="ki-outline ki-badge"> <i class="ki-outline ki-badge">
</i> </i>
@@ -201,7 +210,7 @@
</a> </a>
</div> </div>
<div class="menu-item"> <div class="menu-item">
<a class="menu-link" href="#"> <a class="menu-link" href="{{ route('penilai.resume', $permohonan->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>
@@ -258,6 +267,7 @@
</div> </div>
@endforeach @endforeach
</div> </div>
@@ -308,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) }}";
} }
}) })
} }

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

@@ -65,11 +65,8 @@
src="{{ isset($fotoForm['object_jaminan'][0]['foto_objek']) ? asset('storage/' . $fotoForm['object_jaminan'][0]['foto_objek']) : '' }}" src="{{ isset($fotoForm['object_jaminan'][0]['foto_objek']) ? asset('storage/' . $fotoForm['object_jaminan'][0]['foto_objek']) : '' }}"
class="max-w-[200px] {{ isset($fotoForm['object_jaminan'][0]['foto_objek']) ? '' : 'hidden' }}" class="max-w-[200px] {{ isset($fotoForm['object_jaminan'][0]['foto_objek']) ? '' : 'hidden' }}"
alt="Uploaded Image"> alt="Uploaded Image">
<input type="file" <input type="file" name="foto_objek" class="file-input"
name="foto_objek" accept="image/*" onchange="previewImage(this, 'uploadedImage1')">
class="file-input"
accept="image/*"
onchange="previewImage(this, 'uploadedImage1')">
</div> </div>
</td> </td>
@@ -95,7 +92,9 @@
<select name="jenis_aset" class="select"> <select name="jenis_aset" class="select">
<option value="">Pilih Jenis Aset</option> <option value="">Pilih Jenis Aset</option>
@foreach ($data['jenisJaminan'] as $item) @foreach ($data['jenisJaminan'] as $item)
<option value="{{ $item->name }}" {{ ($inspectionData['asset']['jenis_asset']['sesuai'] ?? '') == $item->name ? 'selected' : '' }}>{{ $item->name }}</option> <option value="{{ $item->name }}"
{{ ($inspectionData['asset']['jenis_asset']['sesuai'] ?? '') == $item->name ? 'selected' : '' }}>
{{ $item->name }}</option>
@endforeach @endforeach
</select> </select>
@@ -104,7 +103,9 @@
<select name="jenis_aset_pembanding[]" class="select"> <select name="jenis_aset_pembanding[]" class="select">
<option value="">Pilih Jenis Aset</option> <option value="">Pilih Jenis Aset</option>
@foreach ($data['jenisJaminan'] as $item) @foreach ($data['jenisJaminan'] as $item)
<option value="{{ $item->name }}" {{ ($inspectionData['jenis_aset'] ?? '') == $item->name ? 'selected' : '' }}>{{ $item->name }}</option> <option value="{{ $item->name }}"
{{ ($inspectionData['jenis_aset'] ?? '') == $item->name ? 'selected' : '' }}>
{{ $item->name }}</option>
@endforeach @endforeach
</select> </select>
</td> </td>
@@ -375,7 +376,8 @@
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
try { try {
const inspectionData = {!! isset($inspectionData) ? json_encode($inspectionData) : 'null' !!}; const inspectionData = {!! isset($inspectionData) ? json_encode($inspectionData) : 'null' !!};
const comparisons = {!! isset($comparisons) ? json_encode($comparisons) : '' !!}; const comparisons = {!! isset($comparisons) ? json_encode($comparisons) : 'null' !!};
console.log('Inspection Data:', inspectionData); // Debug console.log('Inspection Data:', inspectionData); // Debug
console.log('Comparisons:', comparisons); // Debug console.log('Comparisons:', comparisons); // Debug

51
resources/views/surveyor/components/foto.blade.php
View File

@@ -14,8 +14,7 @@
Data Jaminan Data Jaminan
</h3> </h3>
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<a href="{{ route('surveyor.show', ['id' => request('foto')]) }}" <a href="{{ route('surveyor.show', ['id' => request('foto')]) }}" 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>
</div> </div>
@@ -342,13 +341,16 @@
name="name_objek[]" value="{{ $view['label'] }}" /> name="name_objek[]" value="{{ $view['label'] }}" />
<div class="w-full grid gap-5"> <div class="w-full grid gap-5">
<img id="foto_object_jaminan_preview_{{ $view['index'] }}" <img id="foto_object_jaminan_preview_{{ $view['index'] }}"
src="{{ isset($formFoto['object_jaminan'][$view['index']]['foto_object']) ? asset('storage/' . $formFoto['object_jaminan'][$view['index']]['foto_object']) : '' }}" src="{{ isset($formFoto['object_jaminan'][$view['index']]['foto_objek']) ? asset('storage/' . $formFoto['object_jaminan'][$view['index']]['foto_objek']) : '' }}"
alt="{{ $view['label'] }}" class="mb-2 w-48 h-auto" alt="{{ $view['label'] }}" class="mb-2 h-auto"
style="{{ isset($formFoto['object_jaminan'][$view['index']]['foto_object']) ? '' : 'display: none;' }} width: 30rem;">
style="{{ isset($formFoto['object_jaminan'][$view['index']]['foto_objek']) ? 'width: 30rem;' : 'display: none;' }}"
onerror="this.style.display='none';" />
<div class="input-group w-full flex gap-2"> <div class="input-group w-full flex gap-2">
<input type="file" name="foto_objek[]" <input type="file" name="foto_objek[]"
class="file-input file-input-bordered w-full" class="file-input file-input-bordered w-full"
accept="image/*" capture="camera"> accept="image/*" capture="camera"
onchange="previewImage(this, 'foto_object_jaminan_preview_{{ $view['index'] }}')">
<button type="button" id="btnCamera" <button type="button" id="btnCamera"
class="btn btn-light" class="btn btn-light"
data-modal-toggle="#cameraModal"> data-modal-toggle="#cameraModal">
@@ -391,7 +393,7 @@
<label class="form-label max-w-56"> <label class="form-label max-w-56">
<span class="form-label">Foto Lantai 1</span> <span class="form-label">Foto Lantai 1</span>
</label> </label>
<div class="w-full grid gap-5"> <div class="input-group w-full grid gap-5">
<img src="{{ asset('storage/' . old('foto_lantai_unit', $item['foto_lantai_unit'])) }}" <img src="{{ asset('storage/' . old('foto_lantai_unit', $item['foto_lantai_unit'])) }}"
alt="Gambar Pendamping" style="width: 30rem;"> alt="Gambar Pendamping" style="width: 30rem;">
<input type="hidden" name="name_lantai_unit[]" value="lantai"> <input type="hidden" name="name_lantai_unit[]" value="lantai">
@@ -448,13 +450,16 @@
onchange="previewImage(this, 'foto_basement_preview')"> onchange="previewImage(this, 'foto_basement_preview')">
<div class="input-group w-full flex gap-2"> <div class="input-group w-full flex gap-2">
<input id="inputBasement" type="file" name="foto_basement" <input id="inputBasement" type="file" name="foto_basement"
class="file-input file-input-bordered w-full" accept="image/*" capture="camera"> class="file-input file-input-bordered w-full" accept="image/*"
<button type="button" id="btnCamera" class="btn btn-light" data-modal-toggle="#cameraModal"> capture="camera">
<button type="button" id="btnCamera" class="btn btn-light"
data-modal-toggle="#cameraModal">
<i class="ki-outline ki-abstract-33"></i> Camera <i class="ki-outline ki-abstract-33"></i> Camera
</button> </button>
</div> </div>
</div> </div>
<button type="button" class="btn btn-danger btn-sm delete-btn" style="display: none;" id="btnDelete"> <button type="button" class="btn btn-danger btn-sm delete-btn"
style="display: none;" id="btnDelete">
<i class="ki-filled ki-trash"></i> <i class="ki-filled ki-trash"></i>
</button> </button>
</div> </div>
@@ -484,7 +489,7 @@
@if (isset($formFoto['lingkungan']) && is_array($formFoto['lingkungan']) && count($formFoto['lingkungan']) > 0) @if (isset($formFoto['lingkungan']) && is_array($formFoto['lingkungan']) && count($formFoto['lingkungan']) > 0)
@foreach ($formFoto['lingkungan'] as $key => $item) @foreach ($formFoto['lingkungan'] as $key => $item)
<div id="inputContainerLingkungan_{{ $key }}" style="margin-top: 10px"> <div id="inputContainerLingkungan" style="margin-top: 10px">
<div class="flex w-full items-center justify-center gap-4 mb-4"> <div class="flex w-full items-center justify-center gap-4 mb-4">
<label class="form-label max-w-56"> <label class="form-label max-w-56">
<span class="form-label">Lingkungan</span> <span class="form-label">Lingkungan</span>
@@ -495,13 +500,16 @@
alt="Gambar Lingkungan" style="width: 30rem;"> alt="Gambar Lingkungan" style="width: 30rem;">
<input type="hidden" name="name_lingkungan[]" value="lingkungan"> <input type="hidden" name="name_lingkungan[]" value="lingkungan">
<div class="input-group w-full flex gap-2"> <div class="input-group w-full flex gap-2">
<input id="inputLingkungan_{{ $key }}" type="file" name="foto_lingkungan[]" <input id="inputLingkungan_{{ $key }}" type="file"
class="file-input file-input-bordered w-full" accept="image/*" capture="camera"> name="foto_lingkungan[]" class="file-input file-input-bordered w-full"
<button type="button" id="btnCamera" class="btn btn-light" data-modal-toggle="#cameraModal"> accept="image/*" capture="camera">
<button type="button" id="btnCamera" class="btn btn-light"
data-modal-toggle="#cameraModal">
<i class="ki-outline ki-abstract-33"></i> Camera <i class="ki-outline ki-abstract-33"></i> Camera
</button> </button>
</div> </div>
<button type="button" class="btn btn-danger btn-sm delete-btn" style="display: none;" id="btnDelete"> <button type="button" class="btn btn-danger btn-sm delete-btn"
style="display: none;" id="btnDelete">
<i class="ki-filled ki-trash"></i> <i class="ki-filled ki-trash"></i>
</button> </button>
</div> </div>
@@ -510,7 +518,7 @@
</div> </div>
@endforeach @endforeach
@else @else
<div id="inputContainerLingkungan_0" style="margin-top: 10px"> <div id="inputContainerLingkungan" style="margin-top: 10px">
<div class="flex w-full items-center justify-center gap-4 mb-4"> <div class="flex w-full items-center justify-center gap-4 mb-4">
<label class="form-label max-w-56"> <label class="form-label max-w-56">
<span class="form-label">Lingkungan</span> <span class="form-label">Lingkungan</span>
@@ -519,11 +527,13 @@
<input type="hidden" name="name_lingkungan[]" value="lingkungan"> <input type="hidden" name="name_lingkungan[]" value="lingkungan">
<input id="inputLingkungan_0" type="file" name="foto_lingkungan[]" <input id="inputLingkungan_0" type="file" name="foto_lingkungan[]"
class="file-input file-input-bordered w-full" accept="image/*" capture="camera"> class="file-input file-input-bordered w-full" accept="image/*" capture="camera">
<button type="button" id="btnCamera" class="btn btn-light" data-modal-toggle="#cameraModal"> <button type="button" id="btnCamera" class="btn btn-light"
data-modal-toggle="#cameraModal">
<i class="ki-outline ki-abstract-33"></i> Camera <i class="ki-outline ki-abstract-33"></i> Camera
</button> </button>
</div> </div>
<button type="button" class="btn btn-danger btn-sm delete-btn" style="display: none;" id="btnDelete"> <button type="button" class="btn btn-danger btn-sm delete-btn" style="display: none;"
id="btnDelete">
<i class="ki-filled ki-trash"></i> <i class="ki-filled ki-trash"></i>
</button> </button>
</div> </div>
@@ -532,6 +542,7 @@
@endif @endif
</div> </div>
</div> </div>
<div class="card bg-white rounded-lg shadow-md"> <div class="card bg-white rounded-lg shadow-md">
<div class="card-body"> <div class="card-body">
<div class=" text-white py-4 flex items-center justify-between"> <div class=" text-white py-4 flex items-center justify-between">
@@ -693,7 +704,3 @@
} }
} }
</style> </style>

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

@@ -100,7 +100,7 @@
<h1 class="text-md font-medium text-gray-900">Deskripsi Aset jaminan</h1> <h1 class="text-md font-medium text-gray-900">Deskripsi Aset jaminan</h1>
</div> </div>
<div class="grid gap-5"> <div class="grid gap-5 w-full">
<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">Jenis Aset</label> <label class="form-label max-w-56">Jenis Aset</label>
<div> <div>
@@ -153,7 +153,7 @@
<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">Alamat</label> <label class="form-label max-w-56">Alamat</label>
<div> <div class="w-full">
@foreach ($permohonan->debiture->documents as $dokumen) @foreach ($permohonan->debiture->documents as $dokumen)
<span class="text-2sm text-gray-700"> <span class="text-2sm text-gray-700">
{{ formatAlamat($dokumen) }} {{ formatAlamat($dokumen) }}
@@ -186,69 +186,117 @@
<em id="error-alamat" class="alert text-danger text-sm"></em> <em id="error-alamat" class="alert text-danger text-sm"></em>
</div> </div>
<div id="alamat_form" class="grid gap-2 mt-5"> <div id="alamat_form" class="grid gap-2 mt-5" style="{{ isset($forminspeksi['asset']['alamat']['tidak sesuai']) ? '' : 'display: none;' }}">
@php <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
$fields = [ <label for="address" class="form-label max-w-56">Jl.</label>
[
'label' => 'Jl.',
'name' => 'nama_jalan',
'id' => 'nama_jalan',
'readonly' => false,
],
[
'label' => 'Provinsi',
'name' => 'provinsi',
'id' => 'provinsi',
'type' => 'select',
'options' => $provinces,
],
[
'label' => 'Kota/Kabupaten',
'name' => 'kota_kabupaten',
'id' => 'kota_kabupaten',
'type' => 'select',
'options' => $provinces,
],
[
'label' => 'Kecamatan',
'name' => 'kecamatan',
'id' => 'kecamatan',
'type' => 'select',
'options' => $provinces,
],
[
'label' => 'Kelurahan',
'name' => 'desa_kelurahan',
'id' => 'desa_kelurahan',
'type' => 'select',
'options' => $provinces,
],
];
@endphp
@foreach ($fields as $field)
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">{{ $field['label'] }}</label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
@if (isset($field['type']) && $field['type'] === 'select') <input type="text" id="address" name="address" class="input w-full"
<select id="{{ $field['id'] }}" name="{{ $field['name'] }}" class="select w-full"> placeholder="Masukkan Jl."
<option value="">{{ $field['label'] }}</option> value="{{ isset($forminspeksi['asset']['alamat']['tidak sesuai']['address'])
@foreach ($field['options'] as $option) ? $forminspeksi['asset']['alamat']['tidak sesuai']['address']
<option value="{{ $option->code }}">{{ $option->name }}</option> : (isset($forminspeksi['asset']['alamat']['sesuai']['address'])
? $forminspeksi['asset']['alamat']['sesuai']['address']
: old('address')) }}">
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="province_code" class="form-label max-w-56">Provinsi</label>
<div class="flex flex-wrap items-baseline w-full">
<select id="province_code" name="province_code" class="input w-full" >
<option value="">Select Province</option>
@foreach ($provinces as $province)
@if (isset($debitur))
<option value="{{ $province->code }}"
{{ isset($debitur->province_code) && $debitur->province_code == $province->code ? 'selected' : '' }}>
{{ $province->name }}
</option>
@else
<option value="{{ $province->code }}">
{{ $province->name }}
</option>
@endif
@endforeach @endforeach
</select> </select>
@else
<input type="text" id="{{ $field['id'] }}" name="{{ $field['name'] }}" class="input"
{{ $field['readonly'] ? 'readonly' : '' }}>
@endif
</div> </div>
</div> </div>
@endforeach
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="city_code" class="form-label max-w-56">Kota/Kabupaten</label>
<div class="flex flex-wrap items-baseline w-full">
<select id="city_code" name="city_code" class="select w-full">
<option value="">Pilih Kota/Kabupaten</option>
@if (isset($cities))
@foreach ($cities as $city)
@if (isset($debitur))
<option value="{{ $city->code }}"
{{ isset($debitur->city_code) && $debitur->city_code == $city->code ? 'selected' : '' }}>
{{ $city->name }}
</option>
@else
<option value="{{ $city->code }}">
{{ $city->name }}
</option>
@endif
@endforeach
@endif
</select>
</div> </div>
</div> </div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="district_code" class="form-label max-w-56">Kecamatan</label>
<div class="flex flex-wrap items-baseline w-full">
<select id="district_code" name="district_code" class="select w-full">
<option value="">Pilih Kecamatan</option>
@if (isset($districts))
@foreach ($districts as $district)
@if (isset($debitur))
<option value="{{ $district->code }}"
{{ isset($debitur->district_code) && $debitur->district_code == $district->code ? 'selected' : '' }}>
{{ $district->name }}
</option>
@else
<option value="{{ $district->code }}">
{{ $district->name }}
</option>
@endif
@endforeach
@endif
</select>
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="village_code" class="form-label max-w-56">Kelurahan</label>
<div class="flex flex-wrap items-baseline w-full">
<select id="village_code" name="village_code" class="select w-full">
<option value="">Pilih Kelurahan</option>
@if (isset($villages))
@foreach ($villages as $village)
@if (isset($debitur))
<option value="{{ $village->code }}"
{{ isset($debitur->village_code) && $debitur->village_code == $village->code ? 'selected' : '' }}>
{{ $village->name }}
</option>
@else
<option value="{{ $village->code }}">
{{ $village->name }}
</option>
@endif
@endforeach
@endif
</select>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

82
resources/views/surveyor/components/inspeksi.blade.php
View File

@@ -52,26 +52,59 @@
</div> </div>
</div> </div>
@endsection @endsection
@push('scripts') @push('scripts')
<script type="text/javascript"> <script type="text/javascript">
function updateAlamatFields(type) { function updateAlamatFields(status) {
if (type === 'sesuai') { // Ambil elemen formulir
// Update nilai form dengan data sesuai const addressForm = document.getElementById('alamat_form');
document.getElementById('nama_jalan').value = "{{ $dokumen->address ?? '' }}"; const inputs = addressForm.querySelectorAll('input, select');
document.getElementById('provinsi').value = "{{ $dokumen->province->code ?? '' }}"; const addressInput = document.getElementById('address');
document.getElementById('kota_kabupaten').value = "{{ $dokumen->city->code ?? '' }}";
document.getElementById('kecamatan').value = "{{ $dokumen->district->code ?? '' }}"; if (status === 'sesuai') {
document.getElementById('desa_kelurahan').value = "{{ $dokumen->village->code ?? '' }}"; addressInput.value = "{{ $dokumen->address ?? '' }}";
} else if (type === 'tidak sesuai') { inputs.forEach(element => {
// Reset nilai form untuk input manual if (element.tagName === 'INPUT') {
document.getElementById('nama_jalan').value = ''; element.setAttribute('readonly', true);
document.getElementById('provinsi').value = ''; } else if (element.tagName === 'SELECT') {
document.getElementById('kota_kabupaten').value = ''; element.setAttribute('disabled', true);
document.getElementById('kecamatan').value = ''; element.classList.add('disabled-input')
document.getElementById('desa_kelurahan').value = ''; }
});
addressForm.style.display = 'grid';
addressForm.disabled = true;
addressForm.classList.add('disabled-input')
} else if (status === 'tidak sesuai') {
addressForm.style.display = 'grid';
addressForm.removeAttribute('disabled');
addressForm.classList.remove('disabled-input')
const formInspeksi = @json($forminspeksi);
const addressInput = document.getElementById('address');
if (formInspeksi && formInspeksi.asset && formInspeksi.asset.alamat) {
if (formInspeksi.asset.alamat['tidak sesuai'] && formInspeksi.asset.alamat['tidak sesuai'].address) {
addressInput.value = formInspeksi.asset.alamat['tidak sesuai'].address;
} else if (formInspeksi.asset.alamat['sesuai'] && formInspeksi.asset.alamat['sesuai'].address) {
addressInput.value = formInspeksi.asset.alamat['sesuai'].address;
} else {
addressInput.value = "";
} }
} }
inputs.forEach(element => {
if (element.tagName === 'INPUT') {
element.removeAttribute('readonly');
} else if (element.tagName === 'SELECT') {
element.removeAttribute('disabled');
element.classList.remove('disabled-input')
}
});
}
}
function toggleFieldVisibility(fieldName, inputId, visibleValues = []) { function toggleFieldVisibility(fieldName, inputId, visibleValues = []) {
const selectedValue = $(`[name="${fieldName}"]:checked`).val(); const selectedValue = $(`[name="${fieldName}"]:checked`).val();
@@ -319,12 +352,21 @@
} }
} }
.scrollable-x-auto { div[disabled] {
overflow-x: auto; background-color: #f5f5f5;
max-width: 100%; color: #a0a0a0;
border: 1px solid #d1d1d1;
cursor: not-allowed;
pointer-events: none;
}
div[disabled]:hover {
background-color: #e8e8e8;
} }
.table { div.disabled-input {
min-width: 100%; opacity: 0.6;
transition: opacity 0.3s ease;
} }
</style> </style>

90
resources/views/surveyor/js/camera-editor.blade.php
View File

@@ -202,8 +202,13 @@
function setupInputHandlers(containerId, buttonId, labelText, inputDataClass, buttonDeleteClass) { function setupInputHandlers(containerId, buttonId, labelText, inputDataClass, buttonDeleteClass) {
const inputContainer = document.getElementById(containerId);
const addButton = document.getElementById(buttonId); const addButton = document.getElementById(buttonId);
const inputContainer = document.getElementById(containerId);
if (!addButton || !inputContainer) {
console.error(`Element with ID ${containerId} or ${buttonId} not found.`);
return;
}
function updateLabels() { function updateLabels() {
const labels = inputContainer.querySelectorAll('.form-label span'); const labels = inputContainer.querySelectorAll('.form-label span');
@@ -221,27 +226,37 @@
function createNewInput() { function createNewInput() {
const newDiv = inputContainer.children[0].cloneNode(true); const newDiv = inputContainer.children[0].cloneNode(true);
// Reset semua input dalam elemen baru
const inputFile = newDiv.querySelector(`.${inputDataClass}`); const inputFile = newDiv.querySelector(`.${inputDataClass}`);
inputFile.id = `inputRute-${inputContainer.children.length}`;
// Reset input file value
if (inputFile) { if (inputFile) {
inputFile.value = ''; inputFile.id = `inputLingkungan-${inputContainer.children.length}`;
} inputFile.value = ''; // Reset input file
// Update the camera button to set currentInputField // Tambahkan event listener untuk preview
const cameraButton = newDiv.querySelector('#btnCamera'); inputFile.addEventListener('change', function () {
if (cameraButton) { const file = this.files[0];
cameraButton.addEventListener('click', function(e) { if (file) {
e.preventDefault(); const reader = new FileReader();
currentInputField = inputFile; // Set current input field to the new input reader.onload = function (e) {
modal.classList.remove('hidden'); const img = document.getElementById(
modal.classList.add('modal-open'); `foto_lingkungan_preview_${inputFile.id}`
editor.startCamera(); );
img.src = e.target.result;
img.style.display = 'block';
};
reader.readAsDataURL(file);
}
}); });
} }
// Add delete button functionality // Tambahkan logika reset untuk elemen preview
const imgPreview = newDiv.querySelector('img');
if (imgPreview) {
imgPreview.src = '';
imgPreview.style.display = 'none';
}
const deleteBtn = newDiv.querySelector(`.${buttonDeleteClass}`); const deleteBtn = newDiv.querySelector(`.${buttonDeleteClass}`);
if (deleteBtn) { if (deleteBtn) {
deleteBtn.addEventListener('click', function () { deleteBtn.addEventListener('click', function () {
@@ -251,21 +266,23 @@
}); });
} }
// Update preview container // Tambahkan container preview jika tidak ada
const previewContainer = document.createElement('div'); let previewContainer = newDiv.querySelector('.preview-container');
if (!previewContainer) {
previewContainer = document.createElement('div');
previewContainer.className = 'preview-container'; previewContainer.className = 'preview-container';
const img = document.createElement('img'); const img = document.createElement('img');
img.id = `foto_rute-preview-${inputFile.id}`; img.id = `foto_lingkungan_preview_${inputFile.id}`;
img.src = ''; img.src = '';
img.className = 'mt-2 h-auto'; img.className = 'mt-2 h-auto';
img.style.display = 'none'; img.style.display = 'none';
img.style.width = '30rem'; img.style.width = '30rem';
previewContainer.appendChild(img); previewContainer.appendChild(img);
// Append preview container to the new input group
const inputGroup = newDiv.querySelector('.input-group'); const inputGroup = newDiv.querySelector('.input-group');
inputGroup.appendChild(previewContainer); inputGroup.appendChild(previewContainer);
}
newDiv.style.marginTop = '10px'; newDiv.style.marginTop = '10px';
inputContainer.appendChild(newDiv); inputContainer.appendChild(newDiv);
@@ -273,13 +290,14 @@
handleDeleteButtons(); handleDeleteButtons();
} }
if (addButton) {
addButton.addEventListener('click', createNewInput); addButton.addEventListener('click', createNewInput);
}
const firstDeleteBtn = inputContainer.children[0].querySelector(`.${buttonDeleteClass}`); // Terapkan event listener pada elemen yang sudah ada
if (firstDeleteBtn) { const existingInputs = inputContainer.querySelectorAll(`.${inputDataClass}`);
firstDeleteBtn.addEventListener('click', function() { existingInputs.forEach((input, index) => {
const deleteBtn = input.closest('.flex').querySelector(`.${buttonDeleteClass}`);
if (deleteBtn) {
deleteBtn.addEventListener('click', function () {
if (inputContainer.children.length > 1) { if (inputContainer.children.length > 1) {
inputContainer.removeChild(this.closest('.flex')); inputContainer.removeChild(this.closest('.flex'));
handleDeleteButtons(); handleDeleteButtons();
@@ -288,8 +306,28 @@
}); });
} }
updateLabels(); input.addEventListener('change', function () {
const file = this.files[0];
if (file) {
const reader = new FileReader();
reader.onload = function (e) {
const img = document.getElementById(
`foto_lingkungan_preview_${index}`
);
img.src = e.target.result;
img.style.display = 'block';
};
reader.readAsDataURL(file);
} }
});
});
updateLabels();
handleDeleteButtons();
}
setupInputHandlers('inputContainerRute', 'btnRute', 'Foto Rute Menuju Lokasi', 'file-input', setupInputHandlers('inputContainerRute', 'btnRute', 'Foto Rute Menuju Lokasi', 'file-input',
'delete-btn'); 'delete-btn');

7
routes/web.php
View File

@@ -537,8 +537,13 @@ Route::middleware(['auth'])->group(function () {
Route::get('lampiran/{id}', [PenilaiController::class, 'lampiran'])->name('lampiran'); Route::get('lampiran/{id}', [PenilaiController::class, 'lampiran'])->name('lampiran');
Route::get('export/kertas-kerja', [PenilaiController::class, 'kertas_kerja'])->name('export.kertas-kerja'); Route::get('export/kertas-kerja', [PenilaiController::class, 'kertas_kerja'])->name('export.kertas-kerja');
Route::get('export/kertas-kerja', [PenilaiController::class, 'kertas_kerja'])->name('export.kertas-kerja');
Route::get('export/kertas-kerja', [PenilaiController::class, 'kertas_kerja'])->name('export.kertas-kerja');
Route::get('sederhana/{id}', [PenilaiController::class, 'sederhana'])->name('sederhana');
Route::get('standard/{id}', [PenilaiController::class, 'standard'])->name('standard');
Route::get('resume/{id}', [PenilaiController::class, 'standard'])->name('resume');
Route::get('memo/{id}', [PenilaiController::class, 'standard'])->name('memo');
}); });