perbaikan status survey dan pelaporan
This commit is contained in:
@@ -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')) {
|
if (!Auth::user()->hasRole('administrator')) {
|
||||||
$query->whereHas('penilaian.userPenilai', function ($q) {
|
$query->whereHas('penilaian.userPenilai', function ($q) {
|
||||||
|
|||||||
@@ -483,7 +483,7 @@ class PenilaianController extends Controller
|
|||||||
]);
|
]);
|
||||||
} elseif (Auth::user()->roles[0]->name === 'DD Appraisal') {
|
} elseif (Auth::user()->roles[0]->name === 'DD Appraisal') {
|
||||||
$permohonan->update([
|
$permohonan->update([
|
||||||
'status' => 'proses-laporan',
|
'status' => 'done',
|
||||||
'approval_dd' => Auth::user()->id,
|
'approval_dd' => Auth::user()->id,
|
||||||
'approval_dd_at' => now(),
|
'approval_dd_at' => now(),
|
||||||
'keterangan' => $request->message,
|
'keterangan' => $request->message,
|
||||||
|
|||||||
@@ -815,7 +815,7 @@ class SurveyorController extends Controller
|
|||||||
// If validation passes, update permohonan status
|
// If validation passes, update permohonan status
|
||||||
$permohonan = Permohonan::findOrFail($id);
|
$permohonan = Permohonan::findOrFail($id);
|
||||||
$permohonan->update([
|
$permohonan->update([
|
||||||
'status' => 'done',
|
'status' => 'survey-completed',
|
||||||
'submitted_at' => now()
|
'submitted_at' => now()
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
|
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header bg-agi-50" id="advanced_settings_appearance">
|
<div class="card-header bg-agi-50" id="advanced_settings_appearance">
|
||||||
<h3 class="card-title">
|
<h3 class="card-title uppercase">
|
||||||
Activity Permohonan
|
Activity Permohonan
|
||||||
</h3>
|
</h3>
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
@@ -54,8 +54,33 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card border border-agi-100 grow" id="activity_2024">
|
|
||||||
@include('lpj::component.history-permohonan')
|
@if ($permohonan->status === 'done')
|
||||||
</div>
|
<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>
|
</div>
|
||||||
@endsection
|
@endsection
|
||||||
|
|||||||
@@ -191,7 +191,7 @@
|
|||||||
actions: {
|
actions: {
|
||||||
title: 'Action',
|
title: 'Action',
|
||||||
render: (item, data) => {
|
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 `
|
return `
|
||||||
<div class="flex flex-nowrap justify-center gap-1.5">
|
<div class="flex flex-nowrap justify-center gap-1.5">
|
||||||
<a class="btn btn-sm btn-outline btn-info" href="penilai/${data.id}/show">
|
<a class="btn btn-sm btn-outline btn-info" href="penilai/${data.id}/show">
|
||||||
|
|||||||
Reference in New Issue
Block a user