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

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

Browse Source
This commit is contained in:
Daeng Deni Mardaeni
2024-11-20 15:36:38 +07:00
parent c7411ec240 b81357ed87
commit 212d6b3ae9
17 changed files with 726 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
resources/views/otorisasipenawaran/edit.blade.php
View File

@@ -36,11 +36,11 @@
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Kode Penawaran:
Nomor Penawaran:
</h3>
<span class="text-2sm text-gray-700">
<label class="card-title" id="textCodePenawaran">
Kode Penawaran
Nomor Penawaran
</label>
</span>
</div>
@@ -69,7 +69,9 @@
<thead>
<tr>
<th class="w-14 text-center">No</th>
<th class="min-w-[250px]">KJPP</th>
<th class="min-w-[80px]">KJPP</th>
<th>No Proposal</th>
<th>Tanggal Proposal</th>
<th>Biaya Penawaran</th>
<th>Dokumen Penawaran</th>
<th class="min-w-[50px] text-center">Action</th>
@@ -98,7 +100,9 @@
<thead>
<tr>
<th class="w-14 text-center">No</th>
<th class="min-w-[250px]">KJPP</th>
<th class="min-w-[80px]">KJPP</th>
<th>No Proposal</th>
<th>Tanggal Proposal</th>
<th>Biaya Penawaran</th>
<th>Dokumen Penawaran</th>
<th>created_at</th>

62
resources/views/otorisasipenawaran/index.blade.php
View File

@@ -36,17 +36,37 @@
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="code">
<span class="sort"> <span class="sort-label"> Kode Penawaran </span>
<span class="sort"> <span class="sort-label"> Nomor Penawaran</span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="start_date">
<th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
<span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="user_pemohon">
<span class="sort"> <span class="sort-label"> User Pemohon </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="branches_name">
<span class="sort"> <span class="sort-label"> Cabang Pemohon </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="debiture">
<span class="sort"> <span class="sort-label"> Nama Debitur </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="date_range">
<span class="sort"> <span class="sort-label"> Tanggal Penawaran </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_kjpp_id">
<th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_name">
<span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_kjpp_id">
<span class="sort"> <span class="sort-label"> Tujuan Penilaian KJPP </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="penawarandetails_count">
<span class="sort"> <span class="sort-label"> Total KJPP </span>
<span class="sort-icon"> </span> </span>
@@ -107,13 +127,40 @@
title: 'Nomor Registrasi',
},
code: {
title: 'Kode Penawaran',
title: 'Nomor Penawaran',
},
tanggal_permohonan: {
title: 'Tanggal Permohonan',
},
user_pemohon: {
title: 'User Pemohon',
},
branches_name: {
title: 'Cabang Pemohon',
},
debiture: {
title: 'Nama Debitur',
render: (item, data) => {
if(data.debitures_name) {
return `${data.debitures_name}`;
}
return "-";
}
},
date_range: {
title: 'Tanggal Penawaran',
},
tujuan_penilaian_kjpp_name: {
tujuan_penilaian_name: {
title: 'Tujuan Penilaian',
render: (item, data) => {
return data.tujuan_penilaian_name
}
},
tujuan_penilaian_kjpp: {
title: 'Tujuan Penilaian KJPP',
render: (item, data) => {
return data.tujuan_penilaian_kjpp_name
}
},
penawarandetails_count: {
title: 'Total KJPP',
@@ -122,7 +169,10 @@
},
},
status: {
title: 'Status'
title: 'Status',
render: (item, data) => {
return data.status.toUpperCase()
}
},
actions: {
title: 'Status',

8
resources/views/otorisasipenawaran/js/editjs.blade.php
View File

@@ -63,6 +63,8 @@
$.each(datas, function(key, value){
var kjppName = value.kjpp_code+' - '+value.kjpp_name;
var no_proposal = (value.no_proposal)??'';// alert(no_proposal);
var tgl_proposal = (value.tgl_proposal)??'';// alert(tgl_proposal);
var biaya_penawaran = value.biaya_penawaran;// alert(biaya_penawaran);
var htmlDokumenPersetujuanDownload='';
var dokumenPersetujuanDownload = value.dokumen_persetujuan;
@@ -79,6 +81,8 @@
var markup = '<tr>';
markup +='<td valign="top">'+i+'</td>';
markup +='<td valign="top"><label id="{{$route[1]}}_kjppName_'+value.id+'">'+kjppName+'</label></td>';
markup +='<td valign="top">'+no_proposal+'</td>';
markup +='<td valign="top">'+tgl_proposal+'</td>';
markup +='<td valign="top" align="right">Rp.'+biaya_penawaran_format+'</td>';
markup +='<td><em id="{{$route[1]}}_dokumenPersetujuan_msg_'+value.id+'" class="alert text-danger text-sm"></em>'+htmlDokumenPersetujuanDownload+'</td>';
markup +='<td><div class="flex flex-nowrap justify-center">';
@@ -113,6 +117,8 @@
$.each(datas, function(key, value){
var kjppName = value.kjpp_code+' - '+value.kjpp_name;
var no_proposal = (value.no_proposal)??'';// alert(no_proposal);
var tgl_proposal = (value.tgl_proposal)??'';// alert(tgl_proposal);
var biaya_penawaran = value.biaya_penawaran;// alert(biaya_penawaran);
var htmlDokumenPersetujuanDownload='';
var dokumenPersetujuanDownload = value.dokumen_persetujuan;
@@ -129,6 +135,8 @@
var markup = '<tr>';
markup +='<td valign="top">'+i+'</td>';
markup +='<td valign="top"><label id="{{$route[1]}}_kjppName_'+value.id+'">'+kjppName+'</label></td>';
markup +='<td valign="top">'+no_proposal+'</td>';
markup +='<td valign="top">'+tgl_proposal+'</td>';
markup +='<td valign="top" align="right">Rp.'+biaya_penawaran_format+'</td>';
markup +='<td><em id="{{$route[1]}}_dokumenPersetujuan_msg_'+value.id+'" class="alert text-danger text-sm"></em>'+htmlDokumenPersetujuanDownload+'</td>';
markup +='<td valign="top"><label id="{{$route[1]}}_kjppName_'+value.id+'">'+value.created_at2+'</label></td>';

2
resources/views/otorisasipenawaran/show.blade.php
View File

@@ -29,7 +29,7 @@
</div>
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Kode Penawaran:
Nomor Penawaran:
</h3>
<span class="text-2sm text-gray-700">
{{ $prosespenawaran->code }}

222
resources/views/prosespenawaran/createPenawaran.blade.php Normal file
View File

@@ -0,0 +1,222 @@
@extends('layouts.main')
@section('breadcrumbs')
{{ Breadcrumbs::render(request()->route()->getName()) }}
@endsection
@php
// $route = Route::currentRouteName();
// dd($route); tender.prosespenawaran.create
$route = explode('.', Route::currentRouteName());
@endphp
@section('content')
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
<div class="card pb-2.5">
<div class="card-header" id="basic_settings">
<h3 class="card-title">
Tambah Data Penawaran
</h3>
<div class="flex items-center gap-2">
<a href="{{ route('tender.prosespenawaran.showPermohonan', $id) }}" class="btn btn-xs btn-primary" title="Detail"><i class="ki-filled ki-abstract-26"></i> Detail</a>
<a href="{{ route('tender.prosespenawaran.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
</div>
</div><!-- $id = permohonan.id -->
<form action="{{ route('tender.prosespenawaran.storePenawaran', $id) }}" method="POST">
@csrf
<div class="card-body grid gap-5">
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Nomor Registrasi
</label>
<div class="flex flex-wrap items-baseline w-full">
<input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
name="nomor_registrasi" readonly value="{{ $permohonan->nomor_registrasi ?? '-' }}">
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Nama KJPP Sebelumnya
</label>
<div class="flex flex-wrap items-baseline w-full">
<input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
name="nama_kjpp_sebelumnya" readonly value="">
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Biaya KJPP Sebelumnya
</label>
<div class="flex flex-wrap items-baseline w-full">
<input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
name="biaya_kjpp_sebelumnya" readonly value="">
</div>
<label class="form-label max-w-56">
Tanggal Penilaian Sebelumnya
</label>
<div class="flex flex-wrap items-baseline w-full">
<input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
name="tanggal_penilaian_sebelumnya" readonly value="">
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Nomor Penawaran
</label>
<div class="flex flex-wrap items-baseline w-full">
-
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Data KJPP
</label>
<div class="flex flex-wrap items-baseline w-full">
<select name="kjpp[]" multiple="multiple"
class="input tomselect w-full @error('kjpp') border-danger @enderror" id="kjpp_select">
<option value=""> - Pilih KJPP - </option>
@foreach ($kjpp as $row)
@if (isset($kjpp))
<option value="{{ $row->id }}"
{{ in_array($row->id, old('kjpp', [])) ? 'selected' : '' }}>
{{ $row->name }}
</option>
@endif
@endforeach
</select>
@error('kjpp')
<em class="alert text-danger text-sm">{{ $message }}</em>
@enderror
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Tujuan Penilaian KJPP
</label>
<div class="flex flex-wrap items-baseline w-full">
<select id="tujuan_penilaian_kjpp_id"
class="select w-full @error('tujuan_penilaian_kjpp_id') border-danger @enderror"
name="tujuan_penilaian_kjpp_id">
<option value=""> - Pilih Tujuan Penilaian KJPP - </option>
@if (isset($tujuan_penilaian_kjpp))
@foreach ($tujuan_penilaian_kjpp as $tp)
<option value="{{ $tp->id }}"
{{ old('tujuan_penilaian_kjpp_id') == $tp->id ? 'selected' : '' }}>
{{ $tp->name }}
</option>
@endforeach
@endif
</select>
@error('tujuan_penilaian_kjpp_id')
<em class="alert text-danger text-sm">{{ $message }}</em>
@enderror
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Tanggal Batas Waktu
</label>
<div class="flex flex-wrap items-baseline w-full">
<input class="input @error('start_date') border-danger @enderror" type="date"
name="start_date" value="{{ old('start_date') }}">
@error('start_date')
<em class="alert text-danger text-sm">{{ $message }}</em>
@enderror
</div>
-
<div class="flex flex-wrap items-baseline w-full">
<input class="input @error('end_date') border-danger @enderror" name="end_date"
value="{{ old('end_date') }}" type="date">
@error('end_date')
<em class="alert text-danger text-sm">{{ $message }}</em>
@enderror
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Catatan
</label>
<div class="flex flex-wrap items-baseline w-full">
<textarea class="textarea @error('catatan') border-danger @enderror" name="catatan" rows="3" id="address">{{ old('catatan') }}</textarea>
@error('catatan')
<em class="alert text-danger text-sm">{{ $message }}</em>
@enderror
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Jenis Laporan
</label>
<div class="flex flex-wrap items-baseline w-full">
<select id="jenis_laporan_id"
class="select w-full @error('jenis_laporan_id') border-danger @enderror"
name="jenis_laporan_id">
<option value=""> - Pilih Jenis Laporan - </option>
@if (isset($jenis_laporan))
@foreach ($jenis_laporan as $jl)
<option value="{{ $jl->id }}"
{{ old('jenis_laporan_id') == $jl->id ? 'selected' : '' }}>
{{ $jl->name }}
</option>
@endforeach
@endif
</select>
@error('jenis_laporan_id')
<em class="alert text-danger text-sm">{{ $message }}</em>
@enderror
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 status-custom">
<label class="form-label max-w-56">
Status
</label>
<div class="flex flex-wrap items-baseline w-full">
<select class="select w-full @error('status') border-danger @enderror" name="status">
<option value="">Pilih Status</option>
@if (isset($status))
@foreach ($status as $s)
<option value="{{ $s->name }}"
{{ old('status') == $s->name ? 'selected' : '' }}>
{{ $s->name }}
</option>
@endforeach
@endif
</select>
@error('status')
<em class="alert text-danger text-sm">{{ $message }}</em>
@enderror
</div>
</div>
<div class="flex justify-end gap-1.5">
@if (isset($penawaran->nomor_registrasi))
<a href="{{ route('tender.penawaran.showSuratTender', $noreg) }}" class="btn btn-primary">
Surat Tender
</a>
@endif
<button type="submit" class="btn btn-primary">
Save
</button>
</div>
</div>
</form>
</div>
</div>
@endsection
@push('styles')
<style>
input.input-custom:focus {
outline: none;
box-shadow: none;
}
@media (prefers-color-scheme: dark) {
input.input-custom {
background: none;
color: var(--tw-gray-600);
}
}
.status-custom {
display: none
}
</style>
@endpush

4
resources/views/prosespenawaran/edit.blade.php
View File

@@ -38,11 +38,11 @@
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Kode Penawaran
Nomor Penawaran
</label>
<div class="flex flex-wrap items-baseline w-full">
<label class="card-title" id="textCodePenawaran">
Kode Penawaran
Nomor Penawaran
</label>
</div>
</div>

4
resources/views/prosespenawaran/editulang.blade.php
View File

@@ -37,11 +37,11 @@
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Kode Penawaran:
Nomor Penawaran:
</h3>
<span class="text-2sm text-gray-700">
<label class="card-title" id="textCodePenawaran">
Kode Penawaran
Nomor Penawaran
</label>
</span>
</div>

103
resources/views/prosespenawaran/index.blade.php
View File

@@ -38,6 +38,23 @@
<span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="penawaran_code">
<span class="sort"> <span class="sort-label"> Nomor Penawaran</span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
<span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="user_pemohon">
<span class="sort"> <span class="sort-label"> User Pemohon </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="branches_name">
<span class="sort"> <span class="sort-label"> Cabang Pemohon </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="debiture">
<span class="sort"> <span class="sort-label"> Nama Debitur </span>
<span class="sort-icon"> </span> </span>
@@ -46,6 +63,10 @@
<span class="sort"> <span class="sort-label"> Tanggal Penawaran </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_name">
<span class="sort"> <span class="sort-label"> Tujuan Penilaian</span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_kjpp_id">
<span class="sort"> <span class="sort-label"> Tujuan Penilaian KJPP </span>
<span class="sort-icon"> </span> </span>
@@ -82,29 +103,11 @@
@push('scripts')
<script type="text/javascript">
function formatDate(date) {
const day = date.getDate().toString().padStart(2, '0');
const month = (date.getMonth() + 1).toString().padStart(2, '0');
// Months are 0-indexed
const year = date.getFullYear();
return `${day} ${getIndonesianMonth(month)} ${year}`;
function showPermohonanData(regId) {
var url = "{{ url('tender/prosespenawaran') }}/" + regId + "/showPermohonan";
$(location).attr('href', url);
}
function getIndonesianMonth(month) {
const months = ['Januari', 'Februari', 'Maret', 'April', 'Mei', 'Juni',
'Juli', 'Agustus', 'September', 'Oktober', 'November', 'Desember'
];
return months[month -
1];
}
function capitalizeWords(str) {
return str.replace(/\b\w/g, function(char) {
return char.toUpperCase();
});
}
function showPenawaranData(regId) {
var url = "{{ url('tender/prosespenawaran') }}/" + regId;
$(location).attr('href', url);
@@ -132,27 +135,40 @@
'nomor_registrasi': {
title: 'Nomor Registrasi',
},
'penawaran_code': {
title: 'Kode Penawaran',
},
tanggal_permohonan: {
title: 'Tanggal Permohonan',
},
user_pemohon: {
title: 'User Pemohon',
},
branches_name: {
title: 'Cabang Pemohon',
},
debiture: {
title: 'Nama Debitur',
render: (item, data) => {
if(data.permohonan) {
return `${data.permohonan.debiture.name}`;
if(data.debitures_name) {
return `${data.debitures_name}`;
}
return "-";
}
},
start_date: {
date_range: {
title: 'Tanggal Penawaran',
},
tujuan_penilaian_name: {
title: 'Tujuan Penilaian',
render: (item, data) => {
return `${formatDate(new Date(data.start_date))} - ${formatDate(new Date(data.end_date))}`
return data.tujuan_penilaian_name
}
},
tujuan_penilaian_kjpp: {
title: 'Tujuan Penilaian KJPP',
render: (item, data) => {
return data.tujuan_penilaian_kjpp.name
return data.tujuan_penilaian_kjpp_name
}
},
penawarandetails_count: {
@@ -164,32 +180,43 @@
status: {
title: 'Status',
render: (item, data) => {
return capitalizeWords(data.status)
return data.statusnya.toUpperCase()
}
},
actions: {
title: 'Status',
render: (item, data) => {
// data.id ==> penawaran.id
var iconProses ='';
if('tender'==data.status)
var iconDetail =`<a onclick="showPenawaranData(${data.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
<i class="ki-outline ki-eye"></i>
</a>`;
if('registered'==data.statusnya)
{
// data.id ==> permohonan.id
iconProses=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Penawaran" href="tender/prosespenawaran/${data.id}/createPenawaran">
<i class="ki-outline ki-feather"></i>
</a>`;
iconDetail=`<a onclick="showPermohonanData(${data.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
<i class="ki-outline ki-eye"></i>
</a>`;
}
else if('tender'==data.statusnya)
{
// data.id ==> penawaran.id
iconProses=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" href="tender/prosespenawaran/${data.id}/edit">
<i class="ki-outline ki-notepad-edit"></i>
</a>`;
}
else if('proposal-tender'==data.status)
else if('proposal-tender'==data.statusnya)
{
// data.id ==> penawaran.id
iconProses=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran Ulang" href="tender/prosespenawaran/${data.id}/editulang">
<i class="ki-outline ki-arrow-circle-right"></i>
</a>`;
}
return `<div class="flex flex-nowrap justify-center">
<a onclick="showPenawaranData(${data.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
<i class="ki-outline ki-eye"></i>
</a>`+iconProses+`
</div>`;
return `<div class="flex flex-nowrap justify-center">`+iconDetail+iconProses+`</div>`;
},
}
},

2
resources/views/prosespenawaran/show.blade.php
View File

@@ -40,7 +40,7 @@
</div>
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Kode Penawaran:
Nomor Penawaran:
</h3>
<span class="text-2sm text-gray-700">
{{ $prosespenawaran->code }}

50
resources/views/prosespenawaran/showPermohonan.blade.php Normal file
View File

@@ -0,0 +1,50 @@
@extends('layouts.main')
@section('breadcrumbs')
{{ Breadcrumbs::render(request()->route()->getName()) }}
@endsection
@php
$route = explode('.', Route::currentRouteName());
@endphp
@section('content')
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
<div class="card pb-2.5">
<div class="card-header" id="basic_settings">
<h3 class="card-title">
Detail Data Proses Penawaran
</h3>
<div class="flex items-center gap-2">
@php
$buttonProses='';
if('registered'==$permohonan->status)
{
$buttonProses='<a href="'. route('tender.prosespenawaran.createPenawaran', $id) .'" class="btn btn-xs btn-primary" title="Penawaran"><i class="ki-outline ki-notepad-edit"></i>Penawaran</a>';
}
@endphp
{!! $buttonProses !!}
<a href="{{ route('tender.prosespenawaran.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
</div>
</div>
<div class="card-body lg:py-7.5 grid grid-cols-3">
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Nomor Register Permohonan:
</h3>
<span class="text-2sm text-gray-700">
{{ $permohonan->nomor_registrasi }}
</span>
</div>
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Nomor Penawaran:
</h3>
<span class="text-2sm text-gray-700">
-
</span>
</div>
</div>
</div>
</div>
@endsection