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

perbaikan back halaman di otorisator so dan penambahan nilai likuidasi di resume

Browse Source
This commit is contained in:
majid
2025-02-14 16:16:41 +07:00
parent d2805bdb2f
commit 2cb2b7981c
11 changed files with 700 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Helpers/Lpj.php
View File

@@ -2,8 +2,8 @@
use Carbon\Carbon;
use Illuminate\Support\Facades\DB;
use Modules\Lpj\Models\CustomField;
use Modules\Lpj\Models\HolidayCalendar;
use Modules\Lpj\Models\CustomField;
use Modules\Lpj\Models\HolidayCalendar;
use Modules\Lpj\Models\PenawaranDetailTender;
use Modules\Lpj\Models\PenawaranTender;
use Modules\Lpj\Models\Penilaian;
@@ -30,7 +30,7 @@ function formatTanggalIndonesia($date, $time = false)
function formatRupiah($number)
{
$number = (float) $number;
return 'Rp ' . number_format($number, 2, ',', '.');
return 'Rp ' . number_format($number, 0, ',', '.');
}
@@ -357,7 +357,8 @@ function checkRegionUserName($userId)
}
}
function getNomorLaporan($permohonanId, $documentId){
function getNomorLaporan($permohonanId, $documentId)
{
$laporan = Laporan::where([
'permohonan_id' => $permohonanId,
'dokumen_jaminan_id' => $documentId,
@@ -365,13 +366,14 @@ function getNomorLaporan($permohonanId, $documentId){
return $laporan->nomor_laporan ?? null;
}
function getCustomField($param){
if(is_numeric($param)){
function getCustomField($param)
{
if (is_numeric($param)) {
$field = CustomField::find($param);
} else {
$field = CustomField::where(['name' => $param])->first();
}
if($field){
if ($field) {
return $field;
} else {
return null;

3
app/Http/Controllers/PenilaiController.php
View File

@@ -55,6 +55,7 @@ class PenilaiController extends Controller
$basicData = $this->surveyorController->getCommonData();
$permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
$inpeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
$penilai = Penilai::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
$formFoto = null;
if ($inpeksi) {
@@ -62,7 +63,7 @@ class PenilaiController extends Controller
$forminspeksi = json_decode($inpeksi->data_form, true);
}
return view('lpj::penilai.lampiran', compact('permohonan', 'formFoto', 'forminspeksi','basicData'));
return view('lpj::penilai.lampiran', compact('permohonan', 'formFoto', 'forminspeksi','basicData', 'penilai'));
}
public function create()

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

@@ -724,6 +724,7 @@ class PenilaianController extends Controller
->where('dokument_id', $documentId)
->where('inspeksi_id', $inspeksi->id)
->first();
$penilai = $lpj;
$forminspeksi = null;
$lpjData = null;
@@ -765,7 +766,7 @@ class PenilaianController extends Controller
return redirect()->back()->with('error', 'Laporan belum dibuat');
}
return view('lpj::' . $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'resumeData', 'rap', 'memo', 'cities', 'districts', 'villages','formFoto', 'formPeta','nomorLaporan'));
return view('lpj::' . $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'resumeData', 'rap', 'memo', 'cities', 'districts', 'villages','formFoto', 'formPeta','nomorLaporan', 'penilai'));
}
private function getViewLaporan($tipe)