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

fix(penilai):perbaikkan laporan lpj, paparan so, call report

Browse Source
This commit is contained in:
majid
2025-03-04 13:23:28 +07:00
committed by putrakuningan
parent 107726efe7
commit cf45ac7cbe
13 changed files with 92 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -482,14 +482,14 @@ class PenilaianController extends Controller
$permohonan->update([
'status_bayar' => $newStatus,
'keterangan' => $request->message,
'keterangan' => $request->keterangan,
]);
break;
case 'pembatalan':
$permohonan->update([
'status' => 'batal',
'keterangan' => $request->message,
'keterangan' => $request->keterangan,
]);
break;
@@ -509,7 +509,7 @@ class PenilaianController extends Controller
}
if ($approvalField) {
$this->updatePermohonan($permohonan, $status, $approvalField, $request->message);
$this->updatePermohonan($permohonan, $status, $approvalField, $request->keterangan);
}
break;
@@ -559,11 +559,12 @@ class PenilaianController extends Controller
'status_so' => '1',
'approve_so' => Auth::user()->id,
'approve_so_at' => now(),
'keterangan_so' => $request->message,
'keterangan_so' => $request->keterangan,
]);
$permohonan->update([
'tanggal_paparan' => $request->tanggalPaparan
'tanggal_paparan' => $request->tanggalPaparan,
'keterangan' => $request->keterangan
]);
} elseif (Auth::user()->roles[0]->name === 'EO Appraisal') {
$status = '2';
@@ -578,7 +579,7 @@ class PenilaianController extends Controller
'status_eo' => '1',
'approve_eo' => Auth::user()->id,
'approve_eo_at' => now(),
'keterangan_eo' => $request->message,
'keterangan_eo' => $request->keterangan,
]);
} elseif (Auth::user()->roles[0]->name === 'DD Appraisal' || Auth::user()->roles[0]->name === 'administrator' && $authorization->approve_so && $authorization->approve_dd === null) {
$authorization->update([
@@ -586,7 +587,7 @@ class PenilaianController extends Controller
'status_dd' => '1',
'approve_dd' => Auth::user()->id,
'approve_dd_at' => now(),
'keterangan_dd' => $request->message,
'keterangan_dd' => $request->keterangan,
]);
$permohonan->update([
@@ -893,25 +894,27 @@ class PenilaianController extends Controller
$permohonan = Permohonan::findOrFail($id);
$userRole = Auth::user()->roles[0]->name;
if ($permohonan->status === 'proses-paparan' && in_array($userRole, ['EO Appraisal', 'DD Appraisal'])) {
Authorization::delete([
'permohonan_id' => $permohonan->id,
'jenis' => 'paparan',
'request' => 'paparan',
]);
$authorization = Authorization::where('permohonan_id', $permohonan->id)
->where('jenis', 'paparan')->first();
if ($permohonan->status === 'proses-paparan') {
if ($authorization) {
$authorization->delete();
}
$status = 'revisi-paparan';
} elseif ($permohonan->status === 'proses-laporan' && $userRole === 'EO Appraisal') {
$permohonan->update([
'approve_so' => null,
'approve_so_at' => null,
'approval_so' => 0,
'approval_so_at' => null,
]);
$status = 'revisi-laporan';
} elseif ($permohonan->status === 'proses-laporan' && $userRole === 'DD Appraisal') {
$permohonan->update([
'approve_so' => null,
'approve_so_at' => null,
'approve_eo' => null,
'approve_eo_at' => null,
'approval_so' => 0,
'approval_so_at' => null,
'approval_eo' => 0,
'approval_eo_at' => null,
]);
$status = 'revisi-laporan';
@@ -925,7 +928,7 @@ class PenilaianController extends Controller
// Perbarui status dan informasi lainnya
$permohonan->update([
'status' => $status,
'keterangan' => $request->message,
'keterangan' => $request->keterangan,
'submitted_at' => now(),
]);