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

prbaikan output foto di laporan dan penilai dan surveyor by region

Browse Source
This commit is contained in:
majid
2024-12-30 09:28:06 +07:00
parent fa0a864a10
commit f60a4c558e
6 changed files with 343 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

203
app/Helpers/Lpj.php
View File

@@ -1,40 +1,41 @@
<?php <?php
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Modules\Lpj\Models\HolidayCalendar; use Modules\Lpj\Models\HolidayCalendar;
use Modules\Lpj\Models\PenawaranDetailTender; use Modules\Lpj\Models\PenawaranDetailTender;
use Modules\Lpj\Models\PenawaranTender; use Modules\Lpj\Models\PenawaranTender;
use Modules\Lpj\Models\Penilaian; use Modules\Lpj\Models\Penilaian;
use Modules\Lpj\Models\JenisDokumen; use Modules\Lpj\Models\JenisDokumen;
use Modules\Usermanagement\Models\User; use Modules\Lpj\Models\TeamsUsers;
use Modules\Usermanagement\Models\User;
function formatTanggalIndonesia($date, $time = false) function formatTanggalIndonesia($date, $time = false)
{ {
Carbon::setLocale('id'); Carbon::setLocale('id');
$waktu = Carbon::parse($date); $waktu = Carbon::parse($date);
if (!$time) { if (!$time) {
return $waktu->translatedFormat('d F Y'); return $waktu->translatedFormat('d F Y');
} }
return $waktu->translatedFormat('d F Y') . ' pukul ' . $waktu->format('H.i') . ' WIB'; return $waktu->translatedFormat('d F Y') . ' pukul ' . $waktu->format('H.i') . ' WIB';
} }
function formatRupiah($number) function formatRupiah($number)
{ {
$number = (float) $number; $number = (float) $number;
return 'Rp ' . number_format($number, 2, ',', '.'); return 'Rp ' . number_format($number, 2, ',', '.');
} }
function formatAlamat($alamat) function formatAlamat($alamat)
{ {
return ($alamat->address ? $alamat->address . ', ' : '') . (isset($alamat->village) ? $alamat->village->name . ', ' : '') . (isset($alamat->city) ? $alamat->city->name . ', ' : '') . (isset($alamat->province) ? $alamat->province->name . ', ' : '') . ($alamat->postal_code ?? ''); return ($alamat->address ? $alamat->address . ', ' : '') . (isset($alamat->village) ? $alamat->village->name . ', ' : '') . (isset($alamat->city) ? $alamat->city->name . ', ' : '') . (isset($alamat->province) ? $alamat->province->name . ', ' : '') . ($alamat->postal_code ?? '');
} }
// andy add // andy add
function checkActiveDateRangePenawaran($id) function checkActiveDateRangePenawaran($id)
{ {
$penawaran = PenawaranTender::find($id); $penawaran = PenawaranTender::find($id);
$start_date = strtotime($penawaran->start_date); $start_date = strtotime($penawaran->start_date);
@@ -57,10 +58,10 @@
} }
return $allow; return $allow;
} }
function checkKelengkapanDetailKJPP($id) function checkKelengkapanDetailKJPP($id)
{ {
$allow = true; $allow = true;
// DB::enableQueryLog(); // DB::enableQueryLog();
// detail_penawaran apakah isian biaya_penawaran, attachment, dokumen_persetujuan sudah lengkap? // detail_penawaran apakah isian biaya_penawaran, attachment, dokumen_persetujuan sudah lengkap?
@@ -92,11 +93,11 @@
} }
return $allow; return $allow;
} }
// convert // convert
function convertSlug($slug) function convertSlug($slug)
{ {
$words = explode('-', $slug); $words = explode('-', $slug);
foreach ($words as $index => $word) { foreach ($words as $index => $word) {
@@ -104,28 +105,25 @@
} }
return implode(' ', $words); return implode(' ', $words);
} }
// generate last penawaran.code // generate last penawaran.code
function onLastnumberCodePenawaran() function onLastnumberCodePenawaran(): string
: string {
{
// ambil code terakhir // ambil code terakhir
$maxCode = PenawaranTender::max('code'); $maxCode = PenawaranTender::max('code');
// chek data penawaran terakhir --> mengurutkan data berdasarkan kolom `created_at` secara DESC // chek data penawaran terakhir --> mengurutkan data berdasarkan kolom `created_at` secara DESC
// $penawaran = PenawaranTender::latest()->first(); // $penawaran = PenawaranTender::latest()->first();
$penawaran = PenawaranTender::where('code','=',$maxCode)->first(); $penawaran = PenawaranTender::where('code', '=', $maxCode)->first();
$code_penawaran_last=''; $code_penawaran_last = '';
// nomor di set 0001 // nomor di set 0001
$noUrutAkhirString = sprintf("%04s", 1); $noUrutAkhirString = sprintf("%04s", 1);
if($penawaran) if ($penawaran) {
{
$isNum = substr($maxCode, 2); // memastikan string ke 3 s/d 8 adalan numiric $isNum = substr($maxCode, 2); // memastikan string ke 3 s/d 8 adalan numiric
$isNP = substr($maxCode, 0, 2); $isNP = substr($maxCode, 0, 2);
if((8 == strlen($maxCode)) && ("NP"==$isNP) && (isNumeric($isNum))) if ((8 == strlen($maxCode)) && ("NP" == $isNP) && (isNumeric($isNum))) {
{ $code_penawaran_last = substr($maxCode, -4);
$code_penawaran_last = substr ($maxCode, -4);
$year_penawaran_last = Carbon::parse($penawaran->created_at)->year; $year_penawaran_last = Carbon::parse($penawaran->created_at)->year;
$year_now = Carbon::now()->year; $year_now = Carbon::now()->year;
if ($year_now == $year_penawaran_last) { if ($year_now == $year_penawaran_last) {
@@ -137,34 +135,32 @@
} }
return 'NP' . Carbon::now()->format('y') . $noUrutAkhirString; return 'NP' . Carbon::now()->format('y') . $noUrutAkhirString;
} }
function isNumeric($str) function isNumeric($str)
{ {
return ctype_digit($str); return ctype_digit($str);
} }
// generate last penawaran.no_spk // generate last penawaran.no_spk
function onLastnumberCodePenawaranSPK($jenis_laporan_code): string function onLastnumberCodePenawaranSPK($jenis_laporan_code): string
{ {
// 20241124_001 ==> spk_no_core // 20241124_001 ==> spk_no_core
// XXX / PJ / JKT / MONTH-ROM / FR|SR / 2024 // XXX / PJ / JKT / MONTH-ROM / FR|SR / 2024
// 001 / PJ / JKT / XI / FR / 2024 // 001 / PJ / JKT / XI / FR / 2024
$maxCode = PenawaranTender::max('spk_no_core'); $maxCode = PenawaranTender::max('spk_no_core');
$penawaran = PenawaranTender::where('spk_no_core','=',$maxCode)->first(); $penawaran = PenawaranTender::where('spk_no_core', '=', $maxCode)->first();
$no_spk_penawaran_last=''; $no_spk_penawaran_last = '';
$year_penawaran_last=''; $year_penawaran_last = '';
$year_now = Carbon::now()->year; $year_now = Carbon::now()->year;
// nomor di set 001 // nomor di set 001
$noUrutAkhirString = sprintf("%03s", 1); $noUrutAkhirString = sprintf("%03s", 1);
if($penawaran) if ($penawaran) {
{ $no_spk_penawaran_last = substr($maxCode, -3);
$no_spk_penawaran_last = substr ($maxCode, -3); $year_penawaran_last = substr($maxCode, 0, 4);
$year_penawaran_last = substr ($maxCode, 0, 4);
if($year_now == $year_penawaran_last) if ($year_now == $year_penawaran_last) {
{
$noUrutAkhirString = sprintf("%03s", abs($no_spk_penawaran_last + 1)); $noUrutAkhirString = sprintf("%03s", abs($no_spk_penawaran_last + 1));
} }
// jika ternyata tahun tdk sama (kurang dari tahun sekarang), maka nomor di set 001 // jika ternyata tahun tdk sama (kurang dari tahun sekarang), maka nomor di set 001
@@ -174,11 +170,11 @@
$lastSPK = $noUrutAkhirString.' / PJ / JKT / '. $month .' / ' .$jenis_laporan_code.' / '.$year_now; $lastSPK = $noUrutAkhirString.' / PJ / JKT / '. $month .' / ' .$jenis_laporan_code.' / '.$year_now;
return $lastSPK; return $lastSPK;
} }
function onRomawi(int $bln): string function onRomawi(int $bln): string
{ {
switch ($bln){ switch ($bln) {
case 1: case 1:
return "I"; return "I";
break; break;
@@ -218,49 +214,51 @@
} }
} }
function penyebut($nilai) { function penyebut($nilai)
{
$nilai = abs($nilai); $nilai = abs($nilai);
$huruf = array("", "satu", "dua", "tiga", "empat", "lima", "enam", "tujuh", "delapan", "sembilan", "sepuluh", "sebelas"); $huruf = array("", "satu", "dua", "tiga", "empat", "lima", "enam", "tujuh", "delapan", "sembilan", "sepuluh", "sebelas");
$temp = ""; $temp = "";
if ($nilai < 12) { if ($nilai < 12) {
$temp = " ". $huruf[$nilai]; $temp = " ". $huruf[$nilai];
} else if ($nilai <20) { } elseif ($nilai < 20) {
$temp = penyebut($nilai - 10). " belas"; $temp = penyebut($nilai - 10). " belas";
} else if ($nilai < 100) { } elseif ($nilai < 100) {
$temp = penyebut($nilai/10)." puluh". penyebut($nilai % 10); $temp = penyebut($nilai / 10)." puluh". penyebut($nilai % 10);
} else if ($nilai < 200) { } elseif ($nilai < 200) {
$temp = " seratus" . penyebut($nilai - 100); $temp = " seratus" . penyebut($nilai - 100);
} else if ($nilai < 1000) { } elseif ($nilai < 1000) {
$temp = penyebut($nilai/100) . " ratus" . penyebut($nilai % 100); $temp = penyebut($nilai / 100) . " ratus" . penyebut($nilai % 100);
} else if ($nilai < 2000) { } elseif ($nilai < 2000) {
$temp = " seribu" . penyebut($nilai - 1000); $temp = " seribu" . penyebut($nilai - 1000);
} else if ($nilai < 1000000) { } elseif ($nilai < 1000000) {
$temp = penyebut($nilai/1000) . " ribu" . penyebut($nilai % 1000); $temp = penyebut($nilai / 1000) . " ribu" . penyebut($nilai % 1000);
} else if ($nilai < 1000000000) { } elseif ($nilai < 1000000000) {
$temp = penyebut($nilai/1000000) . " juta" . penyebut($nilai % 1000000); $temp = penyebut($nilai / 1000000) . " juta" . penyebut($nilai % 1000000);
} else if ($nilai < 1000000000000) { } elseif ($nilai < 1000000000000) {
$temp = penyebut($nilai/1000000000) . " milyar" . penyebut(fmod($nilai,1000000000)); $temp = penyebut($nilai / 1000000000) . " milyar" . penyebut(fmod($nilai, 1000000000));
} else if ($nilai < 1000000000000000) { } elseif ($nilai < 1000000000000000) {
$temp = penyebut($nilai/1000000000000) . " trilyun" . penyebut(fmod($nilai,1000000000000)); $temp = penyebut($nilai / 1000000000000) . " trilyun" . penyebut(fmod($nilai, 1000000000000));
} }
return $temp; return $temp;
} }
function terbilang($nilai) { function terbilang($nilai)
if($nilai<0) { {
if ($nilai < 0) {
$hasil = "minus ". trim(penyebut($nilai)); $hasil = "minus ". trim(penyebut($nilai));
} else { } else {
$hasil = trim(penyebut($nilai)); $hasil = trim(penyebut($nilai));
} }
return $hasil; return $hasil;
} }
// andy add // andy add
function hitungHariKerja($tanggalMulai, $tanggalSelesai) function hitungHariKerja($tanggalMulai, $tanggalSelesai)
{ {
$tanggalMulai = Carbon::parse($tanggalMulai)->startOfDay(); $tanggalMulai = Carbon::parse($tanggalMulai)->startOfDay();
$tanggalSelesai = Carbon::parse($tanggalSelesai)->endOfDay(); $tanggalSelesai = Carbon::parse($tanggalSelesai)->endOfDay();
@@ -276,19 +274,19 @@
} }
return $hariKerja; return $hariKerja;
} }
function holidays() function holidays()
{ {
return HolidayCalendar::pluck('date')->map( return HolidayCalendar::pluck('date')->map(
function ($item) { function ($item) {
return Carbon::parse($item)->format('Y-m-d'); return Carbon::parse($item)->format('Y-m-d');
}, },
)->toArray(); )->toArray();
} }
function countPermohonanForUser($userId) function countPermohonanForUser($userId)
{ {
return Penilaian::whereHas('userPenilai', function ($query) use ($userId) { return Penilaian::whereHas('userPenilai', function ($query) use ($userId) {
$query->where('user_id', $userId); $query->where('user_id', $userId);
}) })
@@ -297,11 +295,11 @@
}) })
->count(); ->count();
} }
function getMaxFileSize($jenis) function getMaxFileSize($jenis)
{ {
$jenisDokumen = JenisDokumen::where('name', $jenis)->first(); $jenisDokumen = JenisDokumen::where('name', $jenis)->first();
if (!$jenisDokumen) { if (!$jenisDokumen) {
return 2048; return 2048;
@@ -310,14 +308,15 @@
$maxSizeInKB = (int) $jenisDokumen->max_size * 1024; $maxSizeInKB = (int) $jenisDokumen->max_size * 1024;
return $maxSizeInKB; return $maxSizeInKB;
} }
function getUser($userId){ function getUser($userId)
{
return User::find($userId); return User::find($userId);
} }
function generateLpjUniqueCode($randomLength = 6) function generateLpjUniqueCode($randomLength = 6)
{ {
$year = date('y'); $year = date('y');
$month = str_pad(date('m'), 2, '0', STR_PAD_LEFT); $month = str_pad(date('m'), 2, '0', STR_PAD_LEFT);
@@ -328,4 +327,14 @@
// Concatenate components to create the custom code // Concatenate components to create the custom code
return $year . $month . $day . $randomNumber; return $year . $month . $day . $randomNumber;
}
function checkRegionUserName($userId)
{
$region = TeamsUsers::where('user_id', $userId)->first();
if ($region) {
return $region->team->regions->name;
} else {
return null;
} }
}

4
resources/views/penilai/components/foto-jaminan.blade.php
View File

@@ -75,7 +75,7 @@
@endforeach @endforeach
@endif @endif
@if (isset($formFoto['foto_lingkungan']['foto_lingkungan'])) {{-- @if (isset($formFoto['foto_lingkungan']['foto_lingkungan']))
@foreach ($formFoto['foto_lingkungan']['foto_lingkungan'][0] as $index => $item) @foreach ($formFoto['foto_lingkungan']['foto_lingkungan'][0] as $index => $item)
<div class="border photo-item"> <div class="border photo-item">
<h2 class="text-gray-600 font-semibold text-xl"> <h2 class="text-gray-600 font-semibold text-xl">
@@ -91,7 +91,7 @@
@endif @endif
</div> </div>
@endforeach @endforeach
@endif @endif --}}
@if (isset($formFoto['foto_basement'])) @if (isset($formFoto['foto_basement']))
<div class="border photo-item"> <div class="border photo-item">

2
resources/views/penilai/components/foto-lampiran.blade.php
View File

@@ -263,7 +263,7 @@
@endphp @endphp
@if ($imagePath && file_exists(storage_path('app/public/' . $imagePath))) @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
<img src="{{ asset('storage/' . $imagePath) }}" alt="{{ $type }}" <img src="{{ Storage::url($imagePath) }}" alt="{{ $type }}"
class="photo-image"> class="photo-image">
@endif @endif
<p class="mt-2 text-sm">{{ Str::title(str_replace('_', ' ', $type)) }}</p> <p class="mt-2 text-sm">{{ Str::title(str_replace('_', ' ', $type)) }}</p>

2
resources/views/penilai/components/print-out-sederhana.blade.php
View File

@@ -1067,7 +1067,7 @@
@endphp @endphp
@if ($imagePath && file_exists(storage_path('app/public/' . $imagePath))) @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
<img src="{{ asset('storage/' . $imagePath) }}" alt="{{ $type }}" <img src="{{ storage_path('app/public/' . $imagePath) }}" alt="{{ $type }}"
class="photo-image"> class="photo-image">
@endif @endif
<p class="mt-2 text-sm">{{ Str::title(str_replace('_', ' ', $type)) }}</p> <p class="mt-2 text-sm">{{ Str::title(str_replace('_', ' ', $type)) }}</p>

36
resources/views/penilai/components/print-out-standard.blade.php
View File

@@ -1422,6 +1422,42 @@
<div class="page-break"></div> <div class="page-break"></div>
<div class="section">
<div class="judul">
<h6 class="border">
PETA
</h6>
</div>
<div>
@php
$fotoTypes = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat'];
if (($key = array_search('foto_tempat', $fotoTypes)) !== false) {
unset($fotoTypes[$key]);
array_unshift($fotoTypes, 'foto_tempat');
}
@endphp
@if (isset($forminspeksi))
@forelse ($fotoTypes as $type)
<div class="border photo-item">
@php
$imagePath = $forminspeksi[$type] ?? null;
@endphp
@if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
<img src="{{ storage_path('app/public/' . $imagePath) }}" alt="{{ $type }}"
class="photo-image">
@endif
<p class="mt-2 text-sm">{{ Str::title(str_replace('_', ' ', $type)) }}</p>
</div>
@empty
<p>Tidak ada tipe foto yang tersedia</p>
@endforelse
@endif
</div>
</div>
<div class="section"> <div class="section">
<div class="judul"> <div class="judul">
<h6 class="border"> <h6 class="border">

4
resources/views/penilai/show.blade.php
View File

@@ -116,7 +116,7 @@
{{ $surveyor->userPenilaiTeam->name }} {{ $surveyor->userPenilaiTeam->name }}
</p> </p>
<p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->region->name }} <p class="flex w-full text-gray-600 font-medium text-sm">{{ checkRegionUserName($surveyor->userPenilaiTeam->id) }}
</p> </p>
</div> </div>
<label class="form-label max-w-56"> <label class="form-label max-w-56">
@@ -129,7 +129,7 @@
</p> </p>
<p class="flex w-full text-gray-600 font-medium text-sm"> <p class="flex w-full text-gray-600 font-medium text-sm">
{{ $permohonan->region->name }} {{ checkRegionUserName($penilai->userPenilaiTeam->id) }}
</p> </p>
</div> </div>
</div> </div>