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

Merge pull request 'andydev' (#54) from andydev into staging

Browse Source 
Reviewed-on: #54
This commit is contained in:
putrakuningan
2024-12-09 07:33:38 +00:00
parent d6d2799485 2a36bce0a1
commit 96f99306dc
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/RegistrasiFinalController.php
View File

@@ -134,10 +134,10 @@
public function show($id) public function show($id)
{ {
$permohonan = Permohonan::find($id); $permohonan = Permohonan::find($id);
if ($permohonan->dokumen) { $document = PenawaranTender::where('nomor_registrasi','=',$permohonan->nomor_registrasi)->first();
$pdfSPK_path = Storage::url($permohonan->dokumen); if ($document) {
$permohonan->dokumen = $pdfSPK_path; $pdfSPK_path = Storage::url($document->spk_dokumen_path);
$permohonan->dokumen = '| <a download href="' . $pdfSPK_path . '" class="badge badge-sm badge-outline" target="_blank">Dokumen SPK.pdf &nbsp;&nbsp;<i class="ki-filled ki-cloud-download"></i></a>'; $permohonan->pdfSPK_path = '| <a download href="' . $pdfSPK_path . '" class="badge badge-sm badge-outline" target="_blank">Dokumen SPK.pdf &nbsp;&nbsp;<i class="ki-filled ki-cloud-download"></i></a>';
} }
return view('lpj::registrasifinal.show', compact('id', 'permohonan')); return view('lpj::registrasifinal.show', compact('id', 'permohonan'));
@@ -145,7 +145,15 @@
public function edit($id) public function edit($id)
{ {
return view('lpj::registrasifinal.edit', compact('id')); $doc_pdf='';
$permohonan = Permohonan::find($id);
$document = PenawaranTender::where('nomor_registrasi','=',$permohonan->nomor_registrasi)->first();
if ($document) {
$pdfSPK_path = Storage::url($document->spk_dokumen_path);
$doc_pdf = '<a download href="' . $pdfSPK_path . '" class="badge badge-sm badge-outline" target="_blank">Dokumen SPK.pdf &nbsp;&nbsp;<i class="ki-filled ki-cloud-download"></i></a>';
}
return view('lpj::registrasifinal.edit', compact('id','doc_pdf'));
} }
public function setData(Request $request) public function setData(Request $request)

2
resources/views/registrasifinal/edit.blade.php
View File

@@ -70,7 +70,7 @@
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<em id="" class="alert text-danger text-sm"></em> <em id="" class="alert text-danger text-sm"></em>
<div class="flex items-center justify-between flex-wrap my-2.5 gap-2"><a download id="pdfSPK" class="badge badge-sm badge-outline" target="_blank">Dokumen SPK.pdf &nbsp;&nbsp;<i class="ki-filled ki-cloud-download"></i></a></div> <div class="flex items-center justify-between flex-wrap my-2.5 gap-2">{!! $doc_pdf !!}</div>
</div> </div>
</div> </div>
<div id="{{ $route[0] }}_div_region" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div id="{{ $route[0] }}_div_region" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">

2
resources/views/registrasifinal/index.blade.php
View File

@@ -139,7 +139,7 @@
<a onclick="showRegistrasiFinal(${data.permohonan.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail"> <a onclick="showRegistrasiFinal(${data.permohonan.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
<i class="ki-outline ki-eye"></i> <i class="ki-outline ki-eye"></i>
</a> </a>
<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" href="registrasifinal/${data.permohonan.id}/edit"> <a class="btn btn-sm btn-icon btn-clear btn-info" title="Registrasi Final" href="registrasifinal/${data.permohonan.id}/edit">
<i class="ki-outline ki-notepad-edit"></i> <i class="ki-outline ki-notepad-edit"></i>
</a> </a>
</div>`; </div>`;

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

@@ -45,7 +45,7 @@
Tujan Permohonan: Tujan Permohonan:
</h3> </h3>
<span class="text-2sm text-gray-700"> <span class="text-2sm text-gray-700">
{{ $permohonan->tujuanPenilaian->name }} {!! $permohonan->dokumen !!} {{ $permohonan->tujuanPenilaian->name }} {!! $permohonan->pdfSPK_path !!}
</span> </span>
</div> </div>