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

Membuat Sub Menu Data Penawaran dari Menu Tender part 2

Browse Source
This commit is contained in:
rahmatrafli1
2024-10-02 00:15:59 +07:00
parent e889350453
commit 1c92ce9dea
4 changed files with 72 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/TenderController.php
View File

@@ -37,19 +37,35 @@ class TenderController extends Controller
$tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all(); $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all();
$jenis_laporan = JenisLaporan::all(); $jenis_laporan = JenisLaporan::all();
$kjpp = KJPP::all(); $kjpp = KJPP::all();
// $penawaran = Permohonan::where('nomor_registrasi', $id)->get(); $permohonan = Permohonan::find($id);
$permohonanId = $permohonan->id;
$permohonanNomorRegistrasi = $permohonan->nomor_registrasi;
return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'id')); return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'permohonanId', 'permohonanNomorRegistrasi'));
} }
/** /**
* Store a newly created resource in storage. * Store a newly created resource in storage.
*/ */
public function penawaran_store(TenderPenawaranRequest $request) public function penawaran_store(TenderPenawaranRequest $request, $id)
{ {
$validated = $request->validated(); $validated = $request->validated();
dd($validated); if ($validated) {
$validated['nomor_registrasi'] = $request->nomor_registrasi;
$validated['nama_kjpp_sebelumnya'] = json_encode($request->input('nama_kjpp_sebelumnya'));
PenawaranTender::create($validated);
return redirect()
->route('tender.penawaran.index')
->with('success', 'Data Penawaran created successfully');
} else {
return redirect()
->route('tender.penawaran.createPenawaran', $id)
->with('error', 'Validation failed');
}
} }
/** /**

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

@@ -50,6 +50,7 @@ class TenderPenawaranRequest extends FormRequest
'code.unique' => 'Kode Penawaran tidak boleh sama!', 'code.unique' => 'Kode Penawaran tidak boleh sama!',
'nama_kjpp_sebelumnya.required' => 'Nama KJPP Sebelumnya Wajib diisi!', 'nama_kjpp_sebelumnya.required' => 'Nama KJPP Sebelumnya Wajib diisi!',
'biaya_kjpp_sebelumnya.required' => 'Biaya 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!', 'tanggal_penilaian_sebelumnya.required' => 'Tanggal Penilaian Sebelumnya Wajib diisi!',
'nomor_registrasi.required' => 'Nomor Registrasi Wajib diisi!', 'nomor_registrasi.required' => 'Nomor Registrasi Wajib diisi!',
'tujuan_penilaian_kjpp_id.required' => 'Tujuan Penilaian KJPP Wajib diisi!', 'tujuan_penilaian_kjpp_id.required' => 'Tujuan Penilaian KJPP Wajib diisi!',
@@ -67,7 +68,7 @@ class TenderPenawaranRequest extends FormRequest
$endDate = strtotime($this->input('end_date')); $endDate = strtotime($this->input('end_date'));
if ($endDate < $startDate) { if ($endDate < $startDate) {
$validator->errors()->add('end_date', 'End date tidak boleh lebih awal dari start date.'); $validator->errors()->add('end_date', 'Tanggal Akhir tidak boleh lebih awal dari Tanggal Awal.');
} }
}); });
} }

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

@@ -6,19 +6,13 @@
@section('content') @section('content')
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto"> <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
<form <form action="{{ route('tender.penawaran.storePenawaran', $permohonanId) }}" method="POST">
action="{{ isset($id) ? route('tender.penawaran.updatePenawaran', $id) : route('tender.penawaran.storePenawaran', $id) }}"
method="POST">
@if (isset($id))
<input type="hidden" name="id" value="{{ $id }}">
@method('PUT')
@endif
@csrf @csrf
<div class="card pb-2.5"> <div class="card pb-2.5">
<div class="card-header" id="basic_settings"> <div class="card-header" id="basic_settings">
<h3 class="card-title"> <h3 class="card-title">
{{ isset($id) ? 'Edit' : 'Tambah' }} Data Penawaran Tambah Data Penawaran
</h3> </h3>
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<a href="{{ route('tender.penawaran.index') }}" class="btn btn-xs btn-info"><i <a href="{{ route('tender.penawaran.index') }}" class="btn btn-xs btn-info"><i
@@ -32,9 +26,12 @@
Nomor Registrasi Nomor Registrasi
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm"> <input
{{ $id }} class="input bg-gray-200 text-gray-700 cursor-not-allowed @error('nomor_registrasi') border-danger @enderror"
</p> type="text" name="nomor_registrasi" value="{{ $permohonanNomorRegistrasi }}" readonly>
@error('nomor_registrasi')
<em class="alert text-danger text-sm">{{ $message }}</em>
@enderror
</div> </div>
</div> </div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -43,7 +40,7 @@
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<input class="input @error('code') border-danger @enderror" type="text" name="code" <input class="input @error('code') border-danger @enderror" type="text" name="code"
value="{{ isset($penawaran->id) ? $penawaran->code : old('code') }}"> value="{{ old('code') }}">
@error('code') @error('code')
<em class="alert text-danger text-sm">{{ $message }}</em> <em class="alert text-danger text-sm">{{ $message }}</em>
@enderror @enderror
@@ -60,11 +57,14 @@
<option value="">Pilih Nama KJPP Sebelumnya</option> <option value="">Pilih Nama KJPP Sebelumnya</option>
@foreach ($kjpp as $row) @foreach ($kjpp as $row)
<option value="{{ $row->name }}" <option value="{{ $row->name }}"
{{ isset($penawaran->nama_kjpp_sebelumnya) ? (in_array($row->name, old('nama_kjpp_sebelumnya', json_decode($penawaran->nama_kjpp_sebelumnya, true))) ? 'selected' : '') : (in_array($row->name, old('nama_kjpp_sebelumnya', [])) ? 'selected' : '') }}> {{ in_array($row->name, old('nama_kjpp_sebelumnya', [])) ? 'selected' : '' }}>
{{ $row->name }} {{ $row->name }}
</option> </option>
@endforeach @endforeach
</select> </select>
@error('nama_kjpp_sebelumnya')
<em class="alert text-danger text-sm">{{ $message }}</em>
@enderror
</div> </div>
</div> </div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -72,7 +72,8 @@
Biaya KJPP Sebelumnya Biaya KJPP Sebelumnya
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<input class="input @error('biaya_kjpp_sebelumnya') border-danger @enderror" type="text"
name="biaya_kjpp_sebelumnya" value="{{ old('biaya_kjpp_sebelumnya') }}">
@error('biaya_kjpp_sebelumnya') @error('biaya_kjpp_sebelumnya')
<em class="alert text-danger text-sm">{{ $message }}</em> <em class="alert text-danger text-sm">{{ $message }}</em>
@enderror @enderror
@@ -83,7 +84,7 @@
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<input class="input @error('tanggal_penilaian_sebelumnya') border-danger @enderror" <input class="input @error('tanggal_penilaian_sebelumnya') border-danger @enderror"
type="date" name="tanggal_penilaian_sebelumnya" type="date" name="tanggal_penilaian_sebelumnya"
value="{{ $penawaran->tanggal_penilaian_sebelumnya ?? old('tanggal_penilaian_sebelumnya') }}"> value="{{ old('tanggal_penilaian_sebelumnya') }}">
@error('tanggal_penilaian_sebelumnya') @error('tanggal_penilaian_sebelumnya')
<em class="alert text-danger text-sm">{{ $message }}</em> <em class="alert text-danger text-sm">{{ $message }}</em>
@enderror @enderror
@@ -99,14 +100,6 @@
name="tujuan_penilaian_kjpp_id"> name="tujuan_penilaian_kjpp_id">
<option value="">Pilih Tujuan Penilaian KJPP</option> <option value="">Pilih Tujuan Penilaian KJPP</option>
@if (isset($tujuan_penilaian_kjpp)) @if (isset($tujuan_penilaian_kjpp))
@if (isset($penawaran))
@foreach ($tujuan_penilaian_kjpp as $tp)
<option value="{{ $tp->id }}"
{{ old('tujuan_penilaian_kjpp_id', $penawaran->tujuan_penilaian_kjpp_id) == $tp->id ? 'selected' : '' }}>
{{ $tp->name }}
</option>
@endforeach
@else
@foreach ($tujuan_penilaian_kjpp as $tp) @foreach ($tujuan_penilaian_kjpp as $tp)
<option value="{{ $tp->id }}" <option value="{{ $tp->id }}"
{{ old('tujuan_penilaian_kjpp_id') == $tp->id ? 'selected' : '' }}> {{ old('tujuan_penilaian_kjpp_id') == $tp->id ? 'selected' : '' }}>
@@ -114,8 +107,10 @@
</option> </option>
@endforeach @endforeach
@endif @endif
@endif
</select> </select>
@error('tujuan_penilaian_kjpp_id')
<em class="alert text-danger text-sm">{{ $message }}</em>
@enderror
</div> </div>
<label class="form-label max-w-56"> <label class="form-label max-w-56">
Jenis Laporan Jenis Laporan
@@ -126,23 +121,17 @@
name="jenis_laporan_id"> name="jenis_laporan_id">
<option value="">Pilih Jenis Laporan</option> <option value="">Pilih Jenis Laporan</option>
@if (isset($jenis_laporan)) @if (isset($jenis_laporan))
@if (isset($penawaran))
@foreach ($jenis_laporan as $jl) @foreach ($jenis_laporan as $jl)
<option value="{{ $jl->id }}" <option value="{{ $jl->id }}"
{{ old('jenis_laporan_id', $penawaran->jenis_laporan_id) == $jl->name ? 'selected' : '' }}> {{ old('jenis_laporan_id') == $jl->id ? 'selected' : '' }}>
{{ $jl->name }} {{ $jl->name }}
</option> </option>
@endforeach @endforeach
@else
@foreach ($jenis_laporan as $jl)
<option value="{{ $jl->id }}"
{{ old('jenis_laporan_id') == $jl->name ? 'selected' : '' }}>
{{ $jl->name }}
</option>
@endforeach
@endif
@endif @endif
</select> </select>
@error('jenis_laporan_id')
<em class="alert text-danger text-sm">{{ $message }}</em>
@enderror
</div> </div>
</div> </div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -151,7 +140,7 @@
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<input class="input @error('start_date') border-danger @enderror" type="date" <input class="input @error('start_date') border-danger @enderror" type="date"
name="start_date" value="{{ $penawaran->start_date ?? old('start_date') }}"> name="start_date" value="{{ old('start_date') }}">
@error('start_date') @error('start_date')
<em class="alert text-danger text-sm">{{ $message }}</em> <em class="alert text-danger text-sm">{{ $message }}</em>
@enderror @enderror
@@ -160,9 +149,9 @@
Tanggal Akhir Tanggal Akhir
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<input class="input @error('tanggal_akhir') border-danger @enderror" type="date" <input class="input @error('end_date') border-danger @enderror" type="date" name="end_date"
name="tanggal_akhir" value="{{ $penawaran->tanggal_akhir ?? old('tanggal_akhir') }}"> value="{{ old('end_date') }}">
@error('tanggal_akhir') @error('end_date')
<em class="alert text-danger text-sm">{{ $message }}</em> <em class="alert text-danger text-sm">{{ $message }}</em>
@enderror @enderror
</div> </div>
@@ -172,7 +161,7 @@
Catatan Catatan
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<textarea class="textarea @error('catatan') border-danger @enderror" name="catatan" rows="3" id="address">{{ $penawaran->catatan ?? old('catatan') }}</textarea> <textarea class="textarea @error('catatan') border-danger @enderror" name="catatan" rows="3" id="address">{{ old('catatan') }}</textarea>
@error('catatan') @error('catatan')
<em class="alert text-danger text-sm">{{ $message }}</em> <em class="alert text-danger text-sm">{{ $message }}</em>
@enderror @enderror
@@ -184,21 +173,11 @@
name="status"> name="status">
<option value="">Pilih Status</option> <option value="">Pilih Status</option>
@if (isset($status)) @if (isset($status))
@if (isset($penawaran))
@foreach ($status as $s) @foreach ($status as $s)
<option value="{{ $s->name }}" <option value="{{ $s->name }}" {{ old('status') == $s->name ? 'selected' : '' }}>
{{ old('status', $penawaran->status) == $s->name ? 'selected' : '' }}>
{{ $s->name }} {{ $s->name }}
</option> </option>
@endforeach @endforeach
@else
@foreach ($status as $s)
<option value="{{ $s->name }}"
{{ old('status') == $s->name ? 'selected' : '' }}>
{{ $s->name }}
</option>
@endforeach
@endif
@endif @endif
</select> </select>
</div> </div>

13
resources/views/permohonan/index.blade.php
View File

@@ -175,15 +175,14 @@
title: 'Status', title: 'Status',
render: (item, data) => { render: (item, data) => {
return ` return `
<div class="flex flex-nowrap justify-center"> <div class="flex flex-nowrap justify-center gap-1.5">
<a class="btn btn-sm btn-icon btn-clear btn-success" href="tender/penawaran/${data.nomor_registrasi}/create"> <a class="btn btn-sm btn-outline btn-success" href="tender/penawaran/${data.id}/create">
<i class="ki-filled ki-plus-circle"></i> Penawaran
</a>
<a class="btn btn-sm btn-outline btn-info" href="permohonan/${data.id}/edit">
<i class="ki-outline ki-notepad-edit"></i> <i class="ki-outline ki-notepad-edit"></i>
</a> </a>
<div class="flex flex-nowrap justify-center"> <a onclick="deleteData(${data.id})" class="delete btn btn-sm btn-outline btn-danger">
<a class="btn btn-sm btn-icon btn-clear btn-info" href="permohonan/${data.id}/edit">
<i class="ki-outline ki-notepad-edit"></i>
</a>
<a onclick="deleteData(${data.id})" class="delete btn btn-sm btn-icon btn-clear btn-danger">
<i class="ki-outline ki-trash"></i> <i class="ki-outline ki-trash"></i>
</a> </a>
</div>`; </div>`;