diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 904c721..24a60bf 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -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 diff --git a/resources/views/penilai/components/foto-jaminan.blade.php b/resources/views/penilai/components/foto-jaminan.blade.php index 002e072..d8ad12e 100644 --- a/resources/views/penilai/components/foto-jaminan.blade.php +++ b/resources/views/penilai/components/foto-jaminan.blade.php @@ -31,7 +31,8 @@ /* Image Styling */ .photo-item img { width: auto; - height: 400px; + max-width: 100%; + height: auto; max-height: 400px; object-fit: contain; background-color: #f0f0f0; @@ -59,7 +60,6 @@ } .photo-image { - width: 100; height: 400px; max-height: 400px; } diff --git a/resources/views/penilai/components/print-resume.blade.php b/resources/views/penilai/components/print-resume.blade.php index de2290a..d61d1c3 100644 --- a/resources/views/penilai/components/print-resume.blade.php +++ b/resources/views/penilai/components/print-resume.blade.php @@ -1,5 +1,36 @@ @include('lpj::penilai.components.header') +@php + $data = ''; + foreach ($permohonan->documents as $dokumen) { + $data .= $dokumen->jenisJaminan->name . ', '; + + $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first(); + $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first(); + $teams = $permohonan->region->teams; + + if ($teams) { + foreach ($teams as $team) { + $team_users = $team->teamsUsers; + // print_r($team_users); + if ($team_users) { + foreach ($team_users as $team_user) { + $user = $team_user->user; + + if ($user && $user->hasRole('senior-officer')) { + $senior_officer = $user; + break 3; + } + } + } + } + } + } + use Modules\Usermanagement\Models\User; + $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first(); + + $data = rtrim($data, ', '); +@endphp
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php index 38c23cc..cf027b1 100644 --- a/resources/views/penilaian/otorisator/show.blade.php +++ b/resources/views/penilaian/otorisator/show.blade.php @@ -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])) @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') @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')