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

Merge remote-tracking branch 'composer/feature/senior-officer' into staging

Browse Source
This commit is contained in:
Daeng Deni Mardaeni
2025-04-17 19:30:26 +07:00
parent 23aa158cc2 55036bf581
commit e28da750c7
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -603,8 +603,15 @@ class PenilaianController extends Controller
break;
case 'paparan':
if (Auth::user()->roles[0]->name === 'senior-officer' || Auth::user()->roles[0]->name === 'administrator' && $authorization->approve_so === null) {
$status = '3';
if (in_array($permohonan->nilai_plafond_id, [3])) {
$status = '1';
$permohonan->update([
'status' => $authorization->request
]);
}
$authorization->update([
'status' => '3',
'status' => $status,
'status_so' => '1',
'approve_so' => Auth::user()->id,
'approve_so_at' => now(),
@@ -615,9 +622,10 @@ class PenilaianController extends Controller
'tanggal_paparan' => $request->tanggalPaparan,
'keterangan' => $request->keterangan
]);
} elseif (Auth::user()->roles[0]->name === 'EO Appraisal') {
$status = '2';
if (in_array($permohonan->nilai_plafond_id, [1,2])) {
if (in_array($permohonan->nilai_plafond_id, [1,2, 3])) {
$status = '1';
$permohonan->update([
'status' => $authorization->request

6
resources/views/penilaian/otorisator/show.blade.php
View File

@@ -172,7 +172,7 @@
@if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) &&
$permohonan->approval_so &&
$permohonan->approval_eo == 0 &&
in_array($permohonan->nilai_plafond_id, [1, 2, 4]))
in_array($permohonan->nilai_plafond_id, [1, 2,3, 4]))
<button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
<i class="ki-filled ki-double-check"></i>
Otorisator {{ $header ?? '' }}
@@ -216,7 +216,7 @@
</button>
@endif
@if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2,4]))
@if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2,3,4]) && $permohonan->status === 'proses-paparan')
<button onclick="otorisatorData({{ $authorization->id }},'EO')" type="button"
class="btn btn-primary">
<i class="ki-filled ki-double-check"></i>
@@ -224,7 +224,7 @@
</button>
@endif
@if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [4]))
@if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [4]) &&$permohonan->status === 'proses-paparan')
<button onclick="otorisatorData({{ $authorization->id }},'DD')" type="button"
class="btn btn-primary">
<i class="ki-filled ki-double-check"></i>

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

@@ -364,6 +364,8 @@
param_name: paramName
};
// Add file to existing files set to prevent duplicates
existingFiles.add(file.name);
@@ -830,6 +832,9 @@
const filePreviewElement = file.previewElement;
console.log(file.originalPath);
if (!filePreviewElement) {
console.error('File preview element not found for:', file);
return;
@@ -874,7 +879,7 @@
url: "{{ route('surveyor.hapusFoto') }}",
method: 'DELETE',
data: {
path: file.originalPath,
path: response.path,
permohonan_id: {{ $permohonan->id ?? 0 }},
dokument_id: '{{ request('dokument') ?? '' }}',
param_name: response.param_name