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

Merge remote-tracking branch 'origin/tender' into staging

Browse Source
This commit is contained in:
Daeng Deni Mardaeni
2024-10-08 17:16:29 +07:00
parent 0ae0fe8c30 ed4a381c20
commit b24d0af1ce
10 changed files with 201 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/views/penawaran/create.blade.php
View File

@@ -29,7 +29,7 @@
</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="{{ $penawaran->nomor_registrasi ?? '-' }}">
name="nomor_registrasi" readonly value="{{ $permohonan->nomor_registrasi ?? '-' }}">
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -38,7 +38,7 @@
</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="{{ $penawaran->nama_kjpp_sebelumnya ?? '' }}">
name="nama_kjpp_sebelumnya" readonly value="">
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -47,15 +47,14 @@
</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="{{ $penawaran->biaya_kjpp_sebelumnya ?? '' }}">
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="{{ $penawaran->tanggal_penilaian_sebelumnya ?? '' }}">
name="tanggal_penilaian_sebelumnya" readonly value="">
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -207,5 +206,12 @@
outline: none;
box-shadow: none;
}
@media (prefers-color-scheme: dark) {
input.input-custom {
background: none;
color: var(--tw-gray-600);
}
}
</style>
@endpush

9
resources/views/penawaran/edit.blade.php
View File

@@ -31,7 +31,7 @@
</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="{{ $penawaran->nomor_registrasi ?? '-' }}">
name="nomor_registrasi" readonly value="{{ $permohonan->nomor_registrasi ?? '-' }}">
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -212,5 +212,12 @@
outline: none;
box-shadow: none;
}
@media (prefers-color-scheme: dark) {
input.input-custom {
background: none;
color: var(--tw-gray-600);
}
}
</style>
@endpush

47
resources/views/penawaran/index.blade.php
View File

@@ -107,6 +107,12 @@
return months[month -
1];
}
function capitalizeWords(str) {
return str.replace(/\b\w/g, function(char) {
return char.toUpperCase();
});
}
</script>
<script type="module">
const element = document.querySelector('#penawaran-table');
@@ -161,22 +167,43 @@
},
},
status: {
title: 'Status'
title: 'Status',
render: (item, data) => {
return capitalizeWords(data.status)
}
},
actions: {
title: 'Action',
render: (item, data) => {
return `<div class="flex flex-nowrap justify-center">
<a class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail" href="tender/penawaran/${data.nomor_registrasi}/show">
<i class="ki-outline ki-abstract-26"></i>
</a>
<a class="btn btn-sm btn-icon btn-clear btn-info" title="Penawaran" href="tender/penawaran/${data.nomor_registrasi}/create">
<i class="ki-outline ki-arrow-circle-right"></i>
</a>
</div>`;
// Display default links first
return `<div class="flex flex-nowrap justify-center" id="action-${data.nomor_registrasi}">
<a class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail" href="tender/penawaran/${data.nomor_registrasi}/show">
<i class="ki-outline ki-abstract-26"></i>
</a>
<a class="btn btn-sm btn-icon btn-clear btn-info" title="Penawaran" href="tender/penawaran/${data.nomor_registrasi}/create" id="penawaran-link-${data.nomor_registrasi}">
<i class="ki-outline ki-arrow-circle-right"></i>
</a>
</div>`;
},
createdRow: function(row, data, dataIndex) {
// Call checkPenawaranExistence after the row is rendered
checkPenawaranExistence(data.nomor_registrasi)
.then(penawaranExists => {
// Update link based on penawaranExists status
let penawaranUrl = penawaranExists ?
`tender/penawaran/${data.nomor_registrasi}/edit` :
`tender/penawaran/${data.nomor_registrasi}/create`;
// Update href of the Penawaran link
$(`#penawaran-link-${data.nomor_registrasi}`).attr('href', penawaranUrl);
})
.catch(error => {
console.error("Error fetching penawaran existence:", error);
});
}
}
},
};

30
resources/views/penawaran/show.blade.php
View File

@@ -44,10 +44,14 @@
Detail Penawaran
</h3>
<div class="flex items-center gap-2">
<a href="{{ route('tender.penawaran.ulang.index') }}" class="btn btn-xs btn-danger" title="Penawaran"><i
class="ki-filled ki-arrow-circle-left"></i> Penawaran Ulang</a>
<a href="{{ route('tender.penawaran.createPenawaran', $noreg) }}" class="btn btn-xs btn-primary"
title="Penawaran"><i class="ki-filled ki-arrow-circle-right"></i> Tambah Penawaran</a>
@if ($penawaranExists)
<a href="{{ route('tender.penawaran.editPenawaran', $noreg) }}" class="btn btn-xs btn-danger"
title="Penawaran"><i class="ki-filled ki-arrow-circle-left"></i> Penawaran Ulang</a>
@endif
@if (!$penawaranExists)
<a href="{{ route('tender.penawaran.createPenawaran', $noreg) }}" class="btn btn-xs btn-primary"
title="Penawaran"><i class="ki-filled ki-arrow-circle-right"></i> Tambah Penawaran</a>
@endif
<a href="{{ route('tender.penawaran.index') }}" class="btn btn-xs btn-info"><i
class="ki-filled ki-exit-left"></i> Back</a>
</div>
@@ -62,14 +66,16 @@
{{ $penawaran->nomor_registrasi ?? '' }}
</p>
</div>
<label class="form-label max-w-56">
No. Penawaran
</label>
<div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm">
{{ $penawaran->code ?? '' }}
</p>
</div>
@if ($penawaran->code)
<label class="form-label max-w-56">
No. Penawaran
</label>
<div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm">
{{ $penawaran->code }}
</p>
</div>
@endif
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">

11
resources/views/penawaran_ulang/index.blade.php
View File

@@ -107,6 +107,12 @@
return months[month -
1];
}
function capitalizeWords(str) {
return str.replace(/\b\w/g, function(char) {
return char.toUpperCase();
});
}
</script>
<script type="module">
const element = document.querySelector('#penawaran-table');
@@ -161,7 +167,10 @@
},
},
status: {
title: 'Status'
title: 'Status',
render: (item, data) => {
return capitalizeWords(data.status);
}
},
actions: {
title: 'Action',

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

@@ -67,7 +67,7 @@
</label>
<div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm">
{{ $penawaran->code ?? '' }}
{{ $penawaran->code ?? 'Tidak Ada' }}
</p>
</div>
</div>