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

Merge remote-tracking branch 'composer/staging' into staging

Browse Source
This commit is contained in:
Daeng Deni Mardaeni
2025-11-10 20:48:05 +07:00
parent c153990c52 2db123a386
commit db0b1f6cfc
3 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/NocController.php
View File

@@ -229,7 +229,10 @@ use Modules\Lpj\Models\Noc;
$search = $request->get('search'); $search = $request->get('search');
$query->where(function ($q) use ($search) { $query->where(function ($q) use ($search) {
$q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%') $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%'); ->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
->orWhereRelation('permohonan.debiture','name', 'LIKE', '%' . $search . '%')
->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%')
->orWhere('nomor_tiket', 'LIKE', '%' . $search . '%');
}); });
} }
@@ -327,7 +330,14 @@ use Modules\Lpj\Models\Noc;
$search = $request->get('search'); $search = $request->get('search');
$query->where(function ($q) use ($search) { $query->where(function ($q) use ($search) {
$q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%') $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%'); ->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
->orWhereRelation('permohonan.debiture','name', 'LIKE', '%' . $search . '%')
->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%')
->orWhere('nomor_tiket', 'LIKE', '%' . $search . '%'); $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
->orWhereRelation('permohonan.debiture','name', 'LIKE', '%' . $search . '%')
->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%')
->orWhere('nomor_tiket', 'LIKE', '%' . $search . '%');
}); });
} }

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

@@ -517,12 +517,18 @@ class PenilaianController extends Controller
$role = Auth::user()->roles[0]->name; $role = Auth::user()->roles[0]->name;
$status = 'done'; $status = 'done';
$approvalField = null; $approvalField = null;
$lpj_ = optional(json_decode($permohonan->penilaian->lpj));
$npw = $lpj_->total_nilai_pasar_wajar ?? 0;
$npw = str_replace('.', '', $npw);
if ($role === 'senior-officer') { if ($role === 'senior-officer') {
$approvalField = 'approval_so'; $approvalField = 'approval_so';
$status = in_array($permohonan->nilai_plafond_id, [3]) ? 'done' : 'proses-laporan'; $status = $npw <=1000000000 ? 'done' : 'proses-laporan';
} elseif ($role === 'EO Appraisal') { } elseif ($role === 'EO Appraisal') {
$approvalField = 'approval_eo'; $approvalField = 'approval_eo';
$status = in_array($permohonan->nilai_plafond_id, [2, 1]) ? 'done' : 'proses-laporan'; $status = $npw <=5000000000 ? 'done' : 'proses-laporan';
} elseif ($role === 'DD Appraisal') { } elseif ($role === 'DD Appraisal') {
$approvalField = 'approval_dd'; $approvalField = 'approval_dd';
$status = 'done'; $status = 'done';

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

@@ -5,7 +5,7 @@
@endsection @endsection
@section('content') @section('content')
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto"> <div class="grid gap-5 mx-auto w-full lg:gap-7.5">
@php @php
$dataHeader = strtolower($header ?? ''); $dataHeader = strtolower($header ?? '');
@@ -14,15 +14,15 @@
@include('lpj::component.detail-jaminan', ['backLink' => 'otorisator.' . $dataHeader . '.index']) @include('lpj::component.detail-jaminan', ['backLink' => 'otorisator.' . $dataHeader . '.index'])
@foreach ($permohonan->documents as $dokumen) @foreach ($permohonan->documents as $dokumen)
<div class="card border border-agi-100 pb-2.5"> <div class="pb-2.5 border card border-agi-100">
<div class="card-header bg-agi-50" id="basic_settings"> <div class="card-header bg-agi-50" id="basic_settings">
<h3 class="card-title"> <h3 class="card-title">
Team Team
</h3> </h3>
</div> </div>
<div class="card-body grid gap-5"> <div class="grid gap-5 card-body">
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
@php @php
$surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first(); $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
$penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first(); $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
@@ -33,11 +33,11 @@
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm"> <p class="flex w-full text-sm font-medium text-gray-600">
{{ $surveyor->userPenilaiTeam->name }} {{ $surveyor->userPenilaiTeam->name }}
</p> </p>
<p class="flex w-full text-gray-600 font-medium text-sm"> <p class="flex w-full text-sm font-medium text-gray-600">
{{ checkRegionUserName($surveyor->userPenilaiTeam->id) }} {{ checkRegionUserName($surveyor->userPenilaiTeam->id) }}
</p> </p>
</div> </div>
@@ -46,11 +46,11 @@
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm"> <p class="flex w-full text-sm font-medium text-gray-600">
{{ $penilai->userPenilaiTeam->name }} {{ $penilai->userPenilaiTeam->name }}
</p> </p>
<p class="flex w-full text-gray-600 font-medium text-sm"> <p class="flex w-full text-sm font-medium text-gray-600">
{{ checkRegionUserName($penilai->userPenilaiTeam->id) }} {{ checkRegionUserName($penilai->userPenilaiTeam->id) }}
</p> </p>
</div> </div>
@@ -65,7 +65,7 @@
@if ($permohonan->approval_so) @if ($permohonan->approval_so)
<div class="card border border-agi-100 pb-2.5"> <div class="pb-2.5 border card border-agi-100">
<div class="card-header bg-agi-50" id="basic_settings"> <div class="card-header bg-agi-50" id="basic_settings">
<h3 class="card-title"> <h3 class="card-title">
Approval Approval
@@ -105,7 +105,7 @@
@if (isset($permohonan->authorization->approve_so) && $dataHeader == 'paparan' ) @if (isset($permohonan->authorization->approve_so) && $dataHeader == 'paparan' )
<div class="card border border-agi-100 pb-2.5"> <div class="pb-2.5 border card border-agi-100">
<div class="card-header bg-agi-50" id="basic_settings"> <div class="card-header bg-agi-50" id="basic_settings">
<h3 class="card-title"> <h3 class="card-title">
Approval Approval
@@ -158,6 +158,13 @@
@endphp @endphp
@if ($dataHeader == 'pelaporan') @if ($dataHeader == 'pelaporan')
@php
@php
$lpj_ = optional(json_decode($permohonan->penilaian->lpj));
$npw = $lpj_->total_nilai_pasar_wajar ?? 0;
$npw = str_replace('.', '', $npw);
@endphp
@endphp
<a class="btn btn-success" <a class="btn btn-success"
href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}&header={{ $header ?? '' }}"> href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}&header={{ $header ?? '' }}">
Lihat Laporan Lihat Laporan
@@ -172,7 +179,7 @@
@if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) &&
$permohonan->approval_so && $permohonan->approval_so &&
$permohonan->approval_eo == 0 && $permohonan->approval_eo == 0 &&
in_array($permohonan->nilai_plafond_id, [1, 2,3, 4])) $npw > 1000000000)
<button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary"> <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
<i class="ki-filled ki-double-check"></i> <i class="ki-filled ki-double-check"></i>
Otorisator {{ $header ?? '' }} Otorisator {{ $header ?? '' }}
@@ -182,7 +189,7 @@
@if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) &&
$permohonan->approval_eo && $permohonan->approval_eo &&
$permohonan->approval_dd == 0 && $permohonan->approval_dd == 0 &&
in_array($permohonan->nilai_plafond_id, [4])) $npw > 5000000000)
<button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary"> <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
<i class="ki-filled ki-double-check"></i> <i class="ki-filled ki-double-check"></i>
Otorisator {{ $header ?? '' }} Otorisator {{ $header ?? '' }}
@@ -192,13 +199,13 @@
@if ($permohonan->penilai->file_paparan) @if ($permohonan->penilai->file_paparan)
<span class="btn btn-success btn-outline" <span class="btn btn-success btn-outline"
onclick="viewPDF('{{ Storage::url($permohonan->penilai->file_paparan) }}')"><i onclick="viewPDF('{{ Storage::url($permohonan->penilai->file_paparan) }}')"><i
class="ki-filled ki-eye mr-2"></i>Lihat Data Paparan</span> class="mr-2 ki-filled ki-eye"></i>Lihat Data Paparan</span>
@endif @endif
@if ($permohonan->penilai->kertas_kerja) @if ($permohonan->penilai->kertas_kerja)
<span class="btn btn-warning btn-outline" <span class="btn btn-warning btn-outline"
onclick="viewPDF('{{ Storage::url($permohonan->penilai->kertas_kerja) }}')"><i onclick="viewPDF('{{ Storage::url($permohonan->penilai->kertas_kerja) }}')"><i
class="ki-filled ki-eye mr-2"></i>Lihat Kertas Kerja</span> class="mr-2 ki-filled ki-eye"></i>Lihat Kertas Kerja</span>
@endif @endif
@@ -320,14 +327,14 @@
const isPaparanSO = dataHeader === 'Paparan' && role === 'SO'; const isPaparanSO = dataHeader === 'Paparan' && role === 'SO';
const swalHtml = isPaparanSO ? ` const swalHtml = isPaparanSO ? `
<div class="text-left space-y-4"> <div class="space-y-4 text-left">
<p class="text-gray-700 text-center">Untuk melakukan otorisasi ${dataHeader}!</p> <p class="text-center text-gray-700">Untuk melakukan otorisasi ${dataHeader}!</p>
<div> <div>
<label for="swal-keterangan" class="block text-sm font-medium text-gray-700 mb-1">Keterangan</label> <label for="swal-keterangan" class="block mb-1 text-sm font-medium text-gray-700">Keterangan</label>
<input id="swal-keterangan" class="input" placeholder="Masukkan Keterangan"> <input id="swal-keterangan" class="input" placeholder="Masukkan Keterangan">
</div> </div>
<div> <div>
<label for="swal-tanggal-paparan" class="block text-sm font-medium text-gray-700 mb-1">Tanggal Paparan</label> <label for="swal-tanggal-paparan" class="block mb-1 text-sm font-medium text-gray-700">Tanggal Paparan</label>
<input id="swal-tanggal-paparan" class="input" type="date" placeholder="Tanggal paparan"> <input id="swal-tanggal-paparan" class="input" type="date" placeholder="Tanggal paparan">
</div> </div>
</div>` : ''; </div>` : '';