diff --git a/app/Http/Controllers/RegistrasiController.php b/app/Http/Controllers/RegistrasiController.php
index adc0f3e..99e5f4f 100644
--- a/app/Http/Controllers/RegistrasiController.php
+++ b/app/Http/Controllers/RegistrasiController.php
@@ -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
{
diff --git a/app/Http/Controllers/RegistrasiFinalController.php b/app/Http/Controllers/RegistrasiFinalController.php
index 2561079..deb2781 100644
--- a/app/Http/Controllers/RegistrasiFinalController.php
+++ b/app/Http/Controllers/RegistrasiFinalController.php
@@ -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 = '| Dokumen SPK.pdf ';
+ }
+
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;
diff --git a/app/Http/Controllers/SpkController.php b/app/Http/Controllers/SpkController.php
index ec96a62..8496397 100644
--- a/app/Http/Controllers/SpkController.php
+++ b/app/Http/Controllers/SpkController.php
@@ -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));
+ }
}
diff --git a/resources/views/registrasi/edit.blade.php b/resources/views/registrasi/edit.blade.php
index 167fa25..c606451 100644
--- a/resources/views/registrasi/edit.blade.php
+++ b/resources/views/registrasi/edit.blade.php
@@ -81,6 +81,15 @@
+
+
+
diff --git a/resources/views/registrasi/js/editjs.blade.php b/resources/views/registrasi/js/editjs.blade.php
index 1863f78..80bc38d 100644
--- a/resources/views/registrasi/js/editjs.blade.php
+++ b/resources/views/registrasi/js/editjs.blade.php
@@ -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({
diff --git a/resources/views/registrasi/show.blade.php b/resources/views/registrasi/show.blade.php
index 9ff7791..22cc87f 100644
--- a/resources/views/registrasi/show.blade.php
+++ b/resources/views/registrasi/show.blade.php
@@ -199,7 +199,7 @@
-
+
@@ -208,6 +208,15 @@
+
+
+
diff --git a/resources/views/registrasifinal/edit.blade.php b/resources/views/registrasifinal/edit.blade.php
index ddaead8..a2e15e7 100644
--- a/resources/views/registrasifinal/edit.blade.php
+++ b/resources/views/registrasifinal/edit.blade.php
@@ -69,7 +69,7 @@
diff --git a/resources/views/registrasifinal/js/editjs.blade.php b/resources/views/registrasifinal/js/editjs.blade.php
index 9464649..c46596d 100644
--- a/resources/views/registrasifinal/js/editjs.blade.php
+++ b/resources/views/registrasifinal/js/editjs.blade.php
@@ -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;
diff --git a/resources/views/registrasifinal/show.blade.php b/resources/views/registrasifinal/show.blade.php
index 7592d0d..b9471ad 100644
--- a/resources/views/registrasifinal/show.blade.php
+++ b/resources/views/registrasifinal/show.blade.php
@@ -45,10 +45,9 @@
Tujan Permohonan:
- {{ $permohonan->tujuanPenilaian->name }}
+ {{ $permohonan->tujuanPenilaian->name }} {!! $permohonan->dokumen !!}
-
diff --git a/resources/views/spk/documentSPK.blade.php b/resources/views/spk/documentSPK.blade.php
index 8bf42c3..a262e02 100644
--- a/resources/views/spk/documentSPK.blade.php
+++ b/resources/views/spk/documentSPK.blade.php
@@ -1,12 +1,5 @@
-
-
-
-
+
-
-