From e466e5e7ff3bf36c5a8095f0cf1270dae342ac94 Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 30 Oct 2024 14:29:01 +0700 Subject: [PATCH] update camera dan otorisator --- app/Http/Controllers/PenilaianController.php | 22 +- module.json | 2 +- resources/views/penilaian/form.blade.php | 63 +- .../penilaian/otorisator/index.blade.php | 16 +- .../views/surveyor/components/foto.blade.php | 2 +- .../surveyor/components/inspeksi.blade.php | 2 +- .../views/surveyor/js/camera-editor.blade.php | 585 ++++++++++++++++++ routes/breadcrumbs.php | 3 +- 8 files changed, 660 insertions(+), 35 deletions(-) create mode 100644 resources/views/surveyor/js/camera-editor.blade.php diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 3ae9cde..c25f341 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -105,12 +105,19 @@ class PenilaianController extends Controller $jenisPenilaian = JenisPenilaian::find($idPenilaian); - $teamPenilai = Teams::with(['regions', 'teamsUsers', 'teamsUsers.user', ]) + $teamPenilai = Teams::with(['regions', 'teamsUsers', 'teamsUsers.user']) ->whereHas('regions', function ($q) use ($idRegion) { $q->where('id', $idRegion); })->get(); + $existingTeamIds = $teamPenilai->pluck('id')->toArray(); + + $updateTeamPenilai = Teams::with(['regions', 'teamsUsers', 'teamsUsers.user']) + ->whereNotIn('id', $existingTeamIds) + ->get(); + + $regionName = null; foreach ($teamPenilai as $item) { $regionName = $item->regions; @@ -120,7 +127,7 @@ class PenilaianController extends Controller $penilaian = Penilaian::where('nomor_registrasi', $permohonan->nomor_registrasi)->first(); - return view('lpj::penilaian.form', compact('permohonan', 'teamPenilai', 'jenisPenilaian', 'penilaian', 'regionName')); + return view('lpj::penilaian.form', compact('permohonan', 'teamPenilai', 'jenisPenilaian', 'penilaian', 'regionName', 'updateTeamPenilai')); } /** @@ -274,7 +281,10 @@ class PenilaianController extends Controller $status = 'proses paparan'; break; case 'Pembayaran': - $status = 'proses pembayaran'; + $status = 'proses'; + break; + case 'Pembatalan': + $status = 'order'; break; default: $status = ''; @@ -300,7 +310,11 @@ class PenilaianController extends Controller if (!empty($otorisator)) { - $query->whereRaw('LOWER(status) = ?', [strtolower($status)]); + if ($status == 'proses') { + $query->whereIn('status_bayar', ['sudah_bayar', 'belum_bayar']); + }else{ + $query->whereRaw('LOWER(status) = ?', [strtolower($status)]); + } } // Sorting berdasarkan sortField dan sortOrder diff --git a/module.json b/module.json index ed66671..1334cbd 100644 --- a/module.json +++ b/module.json @@ -148,7 +148,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["ssenior-officero"] + "roles": ["senior-officer"] } ] }, diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php index 8ac5c47..d068566 100644 --- a/resources/views/penilaian/form.blade.php +++ b/resources/views/penilaian/form.blade.php @@ -352,7 +352,7 @@ +
@error('penilaian_id') {{ $message }} @enderror + + +
@@ -528,6 +557,7 @@ } else if (selectedValue === 'berbeda') { sameSurveyorPenilai.classList.add('hidden'); differentSurveyorPenilai.classList.remove('hidden'); + } else { sameSurveyorPenilai.classList.add('hidden'); differentSurveyorPenilai.classList.add('hidden'); @@ -541,23 +571,28 @@ if (selectedValue === 'pilih_dari_region') { surveyorRegion.classList.remove('hidden'); + surveyorRegion.classList.add('flex'); }else{ surveyorRegion.classList.add('hidden'); } }); + document.getElementById('penilaian_id').addEventListener('change', function() { + const selectedValue = this.value; + const penilaiRegion = document.getElementById('penilaiRegion'); + + if (selectedValue === 'pilih_dari_region') { + penilaiRegion.classList.remove('hidden'); + penilaiRegion.classList.add('flex'); + }else{ + penilaiRegion.classList.add('hidden'); + } + }); + + - function handleRegionBerbeda(params) { - const surveyor = document.getElementById('btnSurveyor'); - const penilai = document.getElementById('btnPenilai'); - const surveyorId = document.getElementById('surveyorRegion'); - - surveyor.addEventListener('click', function() { - surveyorId.classList.add('hidden'); - }); - } diff --git a/resources/views/penilaian/otorisator/index.blade.php b/resources/views/penilaian/otorisator/index.blade.php index 8b03517..1743f8e 100644 --- a/resources/views/penilaian/otorisator/index.blade.php +++ b/resources/views/penilaian/otorisator/index.blade.php @@ -57,10 +57,7 @@ Tujuan Penilaian - - Status - - + Action @@ -126,6 +123,8 @@ const element = document.querySelector('#permohonan-table'); const searchInput = document.getElementById('search'); + + const apiUrl = element.getAttribute('data-api-url'); const dataTableOptions = { apiEndpoint: apiUrl, @@ -171,19 +170,10 @@ return `${data.tujuan_penilaian.name}`; }, }, - status: { - title: 'Status' - }, actions: { title: 'Status', render: (item, data) => { return `
- - - - - - diff --git a/resources/views/surveyor/components/foto.blade.php b/resources/views/surveyor/components/foto.blade.php index b31698f..9cf3d7d 100644 --- a/resources/views/surveyor/components/foto.blade.php +++ b/resources/views/surveyor/components/foto.blade.php @@ -610,7 +610,7 @@ @push('scripts') - + @include('lpj::surveyor.js.camera-editor') +@endpush diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index 556342e..2ea8c02 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -550,7 +550,8 @@ Breadcrumbs::for('basicdata.editData', function (BreadcrumbTrail $trail, $type = $otorisatorSurveyor = [ 'pelaporan' => 'Pelaporan', 'pembayaran' => 'Pembayaran', - 'pembayaran' => 'Pembayaran' + 'pembatalan' => 'Pembatalan', + 'sla' => 'SLA', ]; foreach ($otorisatorSurveyor as $route => $title) {