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

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

Browse Source 
Reviewed-on: #32
This commit is contained in:
putrakuningan
2024-11-06 03:29:53 +00:00
parent a2e099e9fe 93e57dc8f0
commit 1794f623db
12 changed files with 57 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/RegistrasiController.php
View File

@@ -167,6 +167,8 @@
$dataku['jenis_penilaian_id'] =$request->jenis_penilaian;
$dataku['region_id'] =$request->region;
$dataku['status'] = 'registered';
if($request->catatan2)
$dataku['registrasi_catatan'] =$request->catatan2;
}
else
{

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

@@ -27,6 +27,7 @@ use Exception;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Storage;
use Modules\Lpj\Models\PenawaranTender;
@@ -135,6 +136,13 @@ use Modules\Lpj\Models\PenawaranTender;
public function show($id)
{
$permohonan = Permohonan::find($id);
if($permohonan->dokumen)
{
$pdfSPK_path = Storage::url($permohonan->dokumen);
$permohonan->dokumen = $pdfSPK_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>';
}
return view('lpj::registrasifinal.show', compact('id','permohonan'));
}
@@ -164,6 +172,12 @@ use Modules\Lpj\Models\PenawaranTender;
$penawaranString = convertSlug($penawaran->status);
$penawaran->status = $penawaranString;
}
if($datas->dokumen)
{
$pdfSPK_path = Storage::url($datas->dokumen);
$datas->dokumen = $pdfSPK_path;
}
$data['status'] = 'success';
$data['regions'] = $regions;

8
app/Http/Controllers/SpkController.php
View File

@@ -4,7 +4,7 @@ namespace Modules\Lpj\Http\Controllers;
use Carbon\Carbon;
use App\Http\Controllers\Controller;
use Barryvdh\DomPDF\Facade\Pdf;
use Barryvdh\DomPDF\Facade\Pdf; // https://github.com/barryvdh/laravel-dompdf
use Exception;
use Illuminate\Http\Request;
use Maatwebsite\Excel\Facades\Excel;
@@ -235,4 +235,10 @@ use Illuminate\Support\Facades\Auth;
return view('lpj::spk.dokumennya', compact('data', 'penawaran'));
}
public function download($id) {
$document = Permohonan::find($id);
return response()->download(storage_path('app/public/' .$document->dokumen));
}
}

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

@@ -81,6 +81,15 @@
<option></option>
</select>
<em id="{{$route[0]}}_region_msg" class="alert text-danger text-sm"></em>
</div>
</div>
<div id="{{ $route[0] }}_div_catatan2" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Catatan
</label>
<div class="flex flex-wrap items-baseline w-full">
<textarea class="inputku textarea" name="{{$route[0]}}_catatan2" id="{{$route[0]}}_catatan2" placeholder="Catatan..." rows="6"></textarea>
<em id="{{$route[0]}}_catatan2_msg" class="alert text-danger text-sm"></em>
</div>
</div>
<div class="flex justify-end">

5
resources/views/registrasi/js/editjs.blade.php
View File

@@ -13,6 +13,7 @@
$("#{{ $route[0] }}_div_jenis_pilihan").show();
$("#{{ $route[0] }}_div_catatan").hide();
$("#{{ $route[0] }}_div_region").hide();
$("#{{ $route[0] }}_div_catatan2").show();
// prepare data
setData();
}
@@ -94,12 +95,14 @@
$("#{{ $route[0] }}_div_jenis_pilihan").show();
$("#{{ $route[0] }}_catatan").val('');
$("#{{ $route[0] }}_div_catatan").hide();
$("#{{ $route[0] }}_div_catatan2").show();
}
else
{
$("#{{$route[0]}}_jenis_penilaian option[value=0]").prop('selected', true);
$("#{{ $route[0] }}_div_jenis_pilihan").hide();
$("#{{ $route[0] }}_div_catatan").show();
$("#{{ $route[0] }}_div_catatan2").hide();
}
});
@@ -115,6 +118,7 @@
let jenis_penilaian = $("#{{$route[0]}}_jenis_penilaian").val();
let region = $("#{{$route[0]}}_region").val();
let catatan = $("#{{$route[0]}}_catatan").val();
let catatan2 = $("#{{$route[0]}}_catatan2").val();
if(jenis_penilaian==0)
jenis_penilaian='';
@@ -129,6 +133,7 @@
input_data.jenis_penilaian= jenis_penilaian;
input_data.region= region;
input_data.catatan = catatan;
input_data.catatan2 = catatan2;
let useURL= '{{ route($route[0].'.update', $id) }}';
$.ajax({

11
resources/views/registrasi/show.blade.php
View File

@@ -199,7 +199,7 @@
<em id="{{$route[0]}}_catatan_msg" class="alert text-danger text-sm"></em>
</div>
</div>
<div id="{{ $route[0] }}_div_region" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 mt-5">
<div id="{{ $route[0] }}_div_region" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Region
</label>
@@ -208,6 +208,15 @@
<option></option>
</select>
<em id="{{$route[0]}}_region_msg" class="alert text-danger text-sm"></em>
</div>
</div><br />
<div id="{{ $route[0] }}_div_catatan2" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Catatan
</label>
<div class="flex flex-wrap items-baseline w-full">
<textarea class="inputku textarea" name="{{$route[0]}}_catatan2" id="{{$route[0]}}_catatan2" placeholder="Catatan..." rows="6"></textarea>
<em id="{{$route[0]}}_catatan2_msg" class="alert text-danger text-sm"></em>
</div>
</div>
<div class="flex justify-end mt-5">

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

@@ -69,7 +69,7 @@
</label>
<div class="flex flex-wrap items-baseline w-full">
<em id="" class="alert text-danger text-sm"></em>
<div class="flex items-center justify-between flex-wrap my-2.5 gap-2"><a href="javascript:void(0)" class="badge badge-sm badge-outline">SPK_Dokumen.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"><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>
</div>
<div id="{{ $route[0] }}_div_region" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">

2
resources/views/registrasifinal/js/editjs.blade.php
View File

@@ -43,6 +43,8 @@
$("#textCodePenawaran").text(response.penawaran.code);
$("#textStatusPenawaran").text(response.penawaran.status);
setRegionList(response.regions,0);
// alert(response.datas.dokumen);
$("#pdfSPK").attr("href", response.datas.dokumen);
// success
// var message = response.message;

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

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

9
resources/views/spk/documentSPK.blade.php
View File

File diff suppressed because one or more lines are too long

4
resources/views/spk/index.blade.php
View File

@@ -150,8 +150,8 @@
else
{
spkShow =`<div class="flex flex-nowrap justify-center">
<a onclick="spkShow(${data.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Lihat SPK">
<i class="ki-outline ki-eye"></i>
<a href="/spk/${data.id}/download" class="btn btn-sm btn-icon btn-clear btn-primary" title="Download SPK">
<i class="ki-filled ki-cloud-download"></i>
</a> `;
spkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Buat SPK" onclick="spkCreate(${data.id})" >
<i class="ki-outline ki-notepad-edit"></i>

3
routes/registrasi.php
View File

@@ -88,11 +88,14 @@ Route::middleware(['auth'])->group(function () {
Route::controller(SpkController::class)->group(function(){
Route::get('/spk/dokumennya', 'dokumennya')->name('spk.dokumennya');
Route::get('/spk', 'index')->name('spk.index');
Route::get('/spk/datatables', 'dataForDatatables')->name('spk.datatables');
Route::get('/spk/{spk}', 'show')->name('spk.show');
Route::get('/spk/{spk}/edit', 'edit')->name('spk.edit');
Route::put('/spk/{spk}', 'update')->name('spk.update');
Route::get('spk/{spk}/download', 'download')->name('spk.download');
});
Route::controller(RegistrasiFinalController::class)->group(function(){