From a74f5bff5fcb1b9f339e5f386928132c6c133b20 Mon Sep 17 00:00:00 2001 From: majid Date: Thu, 9 Jan 2025 10:18:52 +0700 Subject: [PATCH] perbaikan laporan penilai dan print out --- app/Http/Controllers/PenilaiController.php | 2 +- .../views/component/form-penilai.blade.php | 2 +- .../lpj-sederhana-standard.blade.php | 11 +- .../views/penilai/components/memo.blade.php | 15 +- .../components/print-out-rap.blade.php | 337 +++++++++--------- .../components/print-out-standard.blade.php | 2 +- .../penilai/components/rap-penilai.blade.php | 289 ++++++++++++++- .../views/penilai/components/resume.blade.php | 232 ++++++------ resources/views/penilai/show.blade.php | 36 -- .../views/penilaian/laporan-so.blade.php | 7 +- .../views/penilaian/otorisator/show.blade.php | 2 +- .../surveyor/components/inspeksi.blade.php | 3 +- .../views/surveyor/components/rap.blade.php | 6 +- resources/views/surveyor/js/utils.blade.php | 36 ++ routes/breadcrumbs.php | 4 + 15 files changed, 656 insertions(+), 328 deletions(-) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 75863a0..33f7912 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -802,7 +802,7 @@ class PenilaiController extends Controller 'standard' => 'penilai.components.print-out-standard', 'resume' => 'penilai.components.print-resume', 'memo' => 'penilai.components.print-memo', - 'rap' => 'penilai.components.print-rap' + 'rap' => 'penilai.components.print-out-rap' ]; return $viewMap[$tipe] ?? 'penilai.components.print-resume'; } diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php index 5acbae4..7635835 100644 --- a/resources/views/component/form-penilai.blade.php +++ b/resources/views/component/form-penilai.blade.php @@ -995,7 +995,7 @@ confirmButtonText: 'OK' }).then((response) => { if (response.isConfirmed) { - window.location.reload(); + // window.location.reload(); } }); } else { diff --git a/resources/views/penilai/components/lpj-sederhana-standard.blade.php b/resources/views/penilai/components/lpj-sederhana-standard.blade.php index f240e5a..0c4f3b5 100644 --- a/resources/views/penilai/components/lpj-sederhana-standard.blade.php +++ b/resources/views/penilai/components/lpj-sederhana-standard.blade.php @@ -1,7 +1,7 @@ @extends('layouts.main') @section('breadcrumbs') - {{ Breadcrumbs::render(request()->route()->getName()) }} + {{ Breadcrumbs::render(request()->route()->getName()) }} @endsection @section('content') @@ -15,6 +15,15 @@ + @if (Auth::user()->hasAnyRole(['senior-officer'])) + + Revisi + + + Print + + @endif @endsection diff --git a/resources/views/penilai/components/memo.blade.php b/resources/views/penilai/components/memo.blade.php index 3a0338e..57501fd 100644 --- a/resources/views/penilai/components/memo.blade.php +++ b/resources/views/penilai/components/memo.blade.php @@ -266,11 +266,21 @@ @include('lpj::penilai.components.foto-lampiran') -
+ +
@endsection @@ -333,8 +343,7 @@ confirmButtonText: 'OK' }).then((response) => { if (response.isConfirmed) { - window.location.href = - '{{ route('penilai.show', ['id' => $permohonan->id]) }}'; + window.location.reload(); } }); } else { diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php index dc44a8d..a264493 100644 --- a/resources/views/penilai/components/print-out-rap.blade.php +++ b/resources/views/penilai/components/print-out-rap.blade.php @@ -10,16 +10,17 @@