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

memperbaiki conflicts --> add feature Data Proses Penawaran

Browse Source
This commit is contained in:
Andy Chaerudin
2024-10-09 20:36:30 +07:00
parent 2f25496a39 b53db4141f
commit cdd5321df1
43 changed files with 3990 additions and 1275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Http/Requests/TenderPenawaranRequest.php
View File

@@ -12,21 +12,21 @@ class TenderPenawaranRequest extends FormRequest
public function rules(): array
{
$rules = [
'nama_kjpp_sebelumnya' => 'required|array',
'nama_kjpp_sebelumnya.*' => 'exists:kjpp,name',
'biaya_kjpp_sebelumnya' => 'required|numeric',
'tanggal_penilaian_sebelumnya' => 'required',
'nama_kjpp_sebelumnya' => 'nullable',
'biaya_kjpp_sebelumnya' => 'nullable|numeric',
'tanggal_penilaian_sebelumnya' => 'nullable',
'nomor_registrasi' => 'required',
'kjpp.*' => 'exists:kjpp,id',
'tujuan_penilaian_kjpp_id' => 'required',
'jenis_laporan_id' => 'required',
'start_date' => 'required',
'end_date' => 'required',
'catatan' => 'nullable',
'status' => 'required'
'status' => 'nullable'
];
if ($this->method() == 'PUT') {
$rules['code'] = 'required|max:50|unique:penawaran,code,' . $this->id;
$rules['code'] = 'required|max:50';
} else {
$rules['code'] = 'required|max:50|unique:penawaran,code';
}
@@ -48,16 +48,11 @@ class TenderPenawaranRequest extends FormRequest
'code.required' => 'Kode Penawaran Wajib diisi!',
'code.max' => 'Kode Penawaran maksimal 255 huruf!',
'code.unique' => 'Kode Penawaran tidak boleh sama!',
'nama_kjpp_sebelumnya.required' => 'Nama KJPP Sebelumnya Wajib diisi!',
'biaya_kjpp_sebelumnya.required' => 'Biaya KJPP Sebelumnya Wajib diisi!',
'biaya_kjpp_sebelumnya.numeric' => 'Biaya KJPP Sebelumnya harus berupa angka!',
'tanggal_penilaian_sebelumnya.required' => 'Tanggal Penilaian Sebelumnya Wajib diisi!',
'nomor_registrasi.required' => 'Nomor Registrasi Wajib diisi!',
'tujuan_penilaian_kjpp_id.required' => 'Tujuan Penilaian KJPP Wajib diisi!',
'jenis_laporan_id.required' => 'Jenis Laporan Wajib diisi!',
'start_date.required' => 'Tanggal Awal Wajib diisi!',
'end_date.required' => 'Tanggal Akhir Wajib diisi!',
'status.required' => 'Status Wajib diisi!'
];
}
@@ -66,10 +61,27 @@ class TenderPenawaranRequest extends FormRequest
$validator->after(function ($validator) {
$startDate = strtotime($this->input('start_date'));
$endDate = strtotime($this->input('end_date'));
$today = strtotime(date('Y-m-d'));
if ($endDate < $startDate) {
$validator->errors()->add('end_date', 'Tanggal Akhir tidak boleh lebih awal dari Tanggal Awal.');
}
if ($startDate < $today) {
$validator->errors()->add('start_date', 'Tanggal Awal tidak boleh sebelum hari ini.');
}
// Validasi minimal 3 pilihan pada nama_kjpp
$namaKjpp = $this->input('kjpp', []);
// jika nama KJPP itu kosong
if (empty($namaKjpp)) {
$validator->errors()->add('kjpp', 'Nama KJPP wajib diisi.');
}
// jika terisi kurang dari 3 item
elseif (is_array($namaKjpp) && count($namaKjpp) < 3) {
$validator->errors()->add('kjpp', 'Nama KJPP Sebelumnya harus memiliki minimal 3 pilihan jika diisi.');
}
});
}
}