Penambahan unduh dan lihat pada halaman unduhan dokumen website (#948)

OpenSID · Jun 14, 2024 · f1379ba · f1379ba
1 parent 05b9360
commit f1379ba
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/app/Http/Controllers/FrontEnd/DownloadController.php b/app/Http/Controllers/FrontEnd/DownloadController.php
@@ -35,8 +35,10 @@
 use App\Http\Controllers\FrontEndController;
 use App\Models\Prosedur;
 use App\Models\Regulasi;
-use Illuminate\Support\Facades\DB;
+use App\Models\FormDokumen;
 use Yajra\DataTables\DataTables;
+use Illuminate\Support\Facades\DB;
+use App\Http\Controllers\Controller;
 
 class DownloadController extends FrontEndController
 {
@@ -118,28 +120,17 @@ public function indexFormDokumen()
 
     public function getDataDokumen()
     {
-        $query = DB::table('das_form_dokumen')->selectRaw('id, nama_dokumen, file_dokumen');
-
-        return DataTables::of($query->get())
+        return DataTables::of(FormDokumen::query())
             ->addColumn('aksi', function ($row) {
-                $data['download_url'] = asset($row->file_dokumen);
+                $data['show_url'] = asset($row->file_dokumen);
+                $data['download_url'] = route('unduhan.form-dokumen.download', $row->id);
 
                 return view('forms.aksi', $data);
             })->make();
     }
 
-    public function showDokumen($nama_dokumen)
-    {
-        $dokumen = dokumen::where('judul', str_replace('-', ' ', $nama_regulasi))->first();
-        $page_title = 'Detail Dokumen :'.$dokumen->judul;
-
-        return view('pages.unduhan.dokumen_show', compact('page_title', 'dokumen'));
-    }
-
-    public function downloadDokumen($file)
+    public function downloadDokumen(FormDokumen $file)
     {
-        $getFile = Dokumen::where('judul', str_replace('-', ' ', $file))->firstOrFail();
-
-        return response()->download($getFile->file_dokumen);
+        return response()->download($file->file_dokumen);
     }
 }
diff --git a/catatan_rilis.md b/catatan_rilis.md
@@ -5,6 +5,7 @@ Di rilis versi v2406.1.0 di versi ini terdapat [untuk diisi] dan perbaikan lain
 
 1. [#262](https://github.com/OpenSID/OpenDK/issues/262) Penambahan modul themes.
 2. [#960](https://github.com/OpenSID/OpenDK/issues/960) Penambahan filter berdasarkan desa pada modul berkaitan dengan data desa.
+3. [#962](https://github.com/OpenSID/OpenDK/issues/962) Penambahan unduh dan lihat pada halaman unduhan dokumen website.
 
 
 #### BUG

diff --git a/resources/views/forms/aksi.blade.php b/resources/views/forms/aksi.blade.php
@@ -15,7 +15,7 @@
         </a>
     @endif
     @if (isset($show_url))
-        <a href="{!! empty($show_url) ? 'javascript:void(0)' : $show_url !!}" class="{!! empty($show_url) ? 'disabled' : '' !!}" title="Lihat" data-button="show">
+        <a href="{!! empty($show_url) ? 'javascript:void(0)' : $show_url !!}" class="{!! empty($show_url) ? 'disabled' : '' !!}" title="Lihat" data-button="show" target="_blank">
             <button type="button" class="btn btn-warning btn-sm" style="width: 40px;"><i class="fa fa-eye fa-fw"></i></button>
         </a>
     @endif

diff --git a/routes/web.php b/routes/web.php
@@ -166,6 +166,7 @@
                     Route::permanentRedirect('/', '/');
                     Route::get('/', 'DownloadController@indexFormDokumen')->name('unduhan.form-dokumen');
                     Route::get('getdata', 'DownloadController@getDataDokumen')->name('unduhan.form-dokumen.getdata');
+                    Route::get('unduh/{file}', 'DownloadController@downloadDokumen')->name('unduhan.form-dokumen.download');
                 });
             });