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

perbaikan status survey dan pelaporan

Browse Source
This commit is contained in:
majid
2025-02-17 13:47:18 +07:00
parent f626aeecfe
commit 21a3f560e9
5 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -496,7 +496,7 @@ class PenilaiController extends Controller
});
}
$query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?)', ['assign','done', 'proses-laporan', 'paparan', 'proses-paparan','paparan']);
$query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?)', ['assign','survey-completed', 'proses-laporan', 'paparan', 'proses-paparan','paparan']);
if (!Auth::user()->hasRole('administrator')) {
$query->whereHas('penilaian.userPenilai', function ($q) {

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

@@ -483,7 +483,7 @@ class PenilaianController extends Controller
]);
} elseif (Auth::user()->roles[0]->name === 'DD Appraisal') {
$permohonan->update([
'status' => 'proses-laporan',
'status' => 'done',
'approval_dd' => Auth::user()->id,
'approval_dd_at' => now(),
'keterangan' => $request->message,

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

@@ -815,7 +815,7 @@ class SurveyorController extends Controller
// If validation passes, update permohonan status
$permohonan = Permohonan::findOrFail($id);
$permohonan->update([
'status' => 'done',
'status' => 'survey-completed',
'submitted_at' => now()
]);

33
resources/views/activity/activitydetail.blade.php
View File

@@ -15,7 +15,7 @@
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
<div class="card">
<div class="card-header bg-agi-50" id="advanced_settings_appearance">
<h3 class="card-title">
<h3 class="card-title uppercase">
Activity Permohonan
</h3>
<div class="flex items-center gap-2">
@@ -54,8 +54,33 @@
</div>
</div>
<div class="card border border-agi-100 grow" id="activity_2024">
@include('lpj::component.history-permohonan')
</div>
@if ($permohonan->status === 'done')
<div class="card border border-agi-100 grow" id="activity_2024">
<div class="card-header bg-agi-50">
<h3 class="card-title uppercase">
Hasil Laporan Penilaian
</h3>
</div>
<div class="card-body">
<a class="btn btn-info" {{-- href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1" --}}>
LAMPIRAN FOTO DAN DOKUMEN
</a>
<a {{-- href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}" --}} class="btn btn-light">
<i class="ki-filled ki-printer"></i> Hasil Inspeksi
</a>
<a class="btn btn-success" {{-- onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', '{{ request('inspeksiId') }}', {{ request('jaminanId') }}, )" --}}>
<i class="ki-filled ki-printer"></i> Print Laporan
</a>
</div>
</div>
@endif
<div class="card border border-agi-100 grow" id="activity_2024">
@include('lpj::component.history-permohonan')
</div>
</div>
@endsection

2
resources/views/penilai/index.blade.php
View File

@@ -191,7 +191,7 @@
actions: {
title: 'Action',
render: (item, data) => {
if (data.status === 'done' || data.status === 'proses-laporan' || data.status === 'paparan' || data.status === 'proses-paparan' || data.status === 'paparan') {
if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data.status === 'paparan' || data.status === 'proses-paparan' || data.status === 'paparan') {
return `
<div class="flex flex-nowrap justify-center gap-1.5">
<a class="btn btn-sm btn-outline btn-info" href="penilai/${data.id}/show">