fix(prosespenawaran): perbaiki penanganan data dan tampilan
- Menambahkan pengambilan data Permohonan berdasarkan nomor registrasi pada metode show. - Memperbaiki tampilan dengan menggunakan komponen detail-jaminan untuk menampilkan data proses penawaran. - Menghapus kode yang tidak diperlukan untuk meningkatkan kebersihan kode.
This commit is contained in:
@@ -437,7 +437,11 @@ class ProsesPenawaranController extends Controller
|
|||||||
public function show($id)
|
public function show($id)
|
||||||
{
|
{
|
||||||
$prosespenawaran = PenawaranTender::find($id);
|
$prosespenawaran = PenawaranTender::find($id);
|
||||||
return view('lpj::prosespenawaran.show', compact('id', 'prosespenawaran'));
|
$permohonan = "";
|
||||||
|
if($prosespenawaran){
|
||||||
|
$permohonan = Permohonan::where('nomor_registrasi',$prosespenawaran->nomor_registrasi)->first();
|
||||||
|
}
|
||||||
|
return view('lpj::prosespenawaran.show', compact('id', 'prosespenawaran','permohonan'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function updateDraft(Request $request, $id): JsonResponse
|
public function updateDraft(Request $request, $id): JsonResponse
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
@if (!isset($status))
|
@if (!isset($status))
|
||||||
<div class="card border border-agi-100 {{ isset($hidePermohonan) ? 'hidden' : '' }}">
|
<div class="card border border-agi-100 {{ isset($hidePermohonan) ? 'hidden' : '' }}">
|
||||||
<div class="card-header light:bg-agi-50" id="advanced_settings_appearance">
|
<div class="card-header bg-agi-50" id="advanced_settings_appearance">
|
||||||
@php
|
@php
|
||||||
$title = $title ?? 'Data Permohonan';
|
$title = $title ?? 'Data Permohonan';
|
||||||
@endphp
|
@endphp
|
||||||
@@ -9,6 +9,7 @@
|
|||||||
</h3>
|
</h3>
|
||||||
|
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
|
{!! $customlink ?? "" !!}
|
||||||
@if (isset($id))
|
@if (isset($id))
|
||||||
@php
|
@php
|
||||||
$parameters = isset($id) ? ['id' => $id] : [];
|
$parameters = isset($id) ? ['id' => $id] : [];
|
||||||
|
|||||||
@@ -7,48 +7,24 @@
|
|||||||
$route = explode('.', Route::currentRouteName());
|
$route = explode('.', Route::currentRouteName());
|
||||||
@endphp
|
@endphp
|
||||||
@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">
|
||||||
<div class="card border border-agi-100 pb-2.5">
|
@php
|
||||||
<div class="card-header bg-agi-50" id="basic_settings">
|
$buttonProses='';
|
||||||
<h3 class="card-title">
|
if('tender'==$prosespenawaran->status)
|
||||||
Detail Data Proses Penawaran
|
{
|
||||||
</h3>
|
$buttonProses='<a href="'. route('tender.prosespenawaran.edit', $id) .'" class="btn btn-xs btn-primary" title="Proses Penawaran"><i class="ki-outline ki-notepad-edit"></i> Proses Penawaran</a>';
|
||||||
<div class="flex items-center gap-2">
|
}
|
||||||
@php
|
elseif ('proposal-tender'==$prosespenawaran->status)
|
||||||
$buttonProses='';
|
{
|
||||||
if('tender'==$prosespenawaran->status)
|
$buttonProses='<a href="'. route('tender.prosespenawaran.editulang', $id) .'" class="btn btn-xs btn-primary" title="Proses Penawaran Ulang"><i class="ki-filled ki-arrow-circle-right"></i> Proses Penawaran Ulang</a>';
|
||||||
{
|
}
|
||||||
$buttonProses='<a href="'. route('tender.prosespenawaran.edit', $id) .'" class="btn btn-xs btn-primary" title="Proses Penawaran"><i class="ki-outline ki-notepad-edit"></i> Proses Penawaran</a>';
|
@endphp
|
||||||
}
|
|
||||||
elseif ('proposal-tender'==$prosespenawaran->status)
|
@include('lpj::component.detail-jaminan', [
|
||||||
{
|
'customlink' => $buttonProses,
|
||||||
$buttonProses='<a href="'. route('tender.prosespenawaran.editulang', $id) .'" class="btn btn-xs btn-primary" title="Proses Penawaran Ulang"><i class="ki-filled ki-arrow-circle-right"></i> Proses Penawaran Ulang</a>';
|
'backLink' => 'tender.prosespenawaran.index',
|
||||||
}
|
'title' => 'Detail Data Proses Penawaran',
|
||||||
@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">
|
|
||||||
{{ $prosespenawaran->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">
|
|
||||||
{{ $prosespenawaran->code }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
@endsection
|
@endsection
|
||||||
|
|||||||
Reference in New Issue
Block a user