Susulan : sinkronsisai bantuan dan sinkronisasi program (#422)

* perbaikan detail bantuan * Fix styling Co-authored-by: apidong <[email protected]>
OpenSID · May 31, 2022 · ec302f7 · ec302f7
1 parent 0c96bea
commit ec302f7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 36 deletions.
diff --git a/app/Http/Controllers/Api/PembangunanController.php b/app/Http/Controllers/Api/PembangunanController.php
@@ -70,7 +70,10 @@ public function store(PembangunanRequest $request)
                 ->queue($extract . $filecsv = Str::replaceLast('zip', 'csv', $name));
         } catch (\Exception $e) {
             report($e);
-            return back()->with('error', 'Import data gagal.');
+            return response()->json([
+                "message" => "Proses Sinkronisasi Data gagal. Error : " . $e->getMessage(),
+                "status"  => "danger"
+           ]);
         }
 
         // Hapus folder temp ketika sudah selesai

diff --git a/app/Http/Controllers/Data/DataPembangunanController.php b/app/Http/Controllers/Data/DataPembangunanController.php
@@ -68,11 +68,6 @@ public function getPembangunan(Request $request)
         }
     }
 
-    public function show($id)
-    {
-        # code...
-    }
-
     public function rincian($id, $kode_desa)
     {
         $page_title       = 'Pembangunan';

diff --git a/app/Http/Controllers/Data/ProgramBantuanController.php b/app/Http/Controllers/Data/ProgramBantuanController.php
@@ -56,7 +56,7 @@ public function getaProgramBantuan(Request $request)
     {
         return DataTables::of(Program::when(!empty($request->input('desa')), fn ($q) => $q->where('desa_id', $request->desa))->with('desa'))
             ->addColumn('aksi', function ($row) {
-                $data['detail_url'] = route('data.program-bantuan.show', $row->id);
+                $data['detail_url'] = route('data.program-bantuan.show', [$row->id, $row->desa_id]);
 
                 return view('forms.aksi', $data);
             })
@@ -97,13 +97,13 @@ public function store(Request $request)
         return redirect()->route('data.program-bantuan.index')->with('success', 'Data berhasil disimpan!');
     }
 
-    public function show($id)
+    public function show($id, $desa_id)
     {
-        $program          = Program::findOrFail($id);
+        $program          = Program::with('desa')->findOrFail($id);
         $page_title       = 'Detail Program';
         $page_description = 'Program Bantuan ' . $program->nama;
         $sasaran          = [1 => 'Penduduk/Perorangan', 2 => 'Keluarga-KK'];
-        $peserta          = PesertaProgram::where('program_id', $id)->get();
+        $peserta          = PesertaProgram::where('program_id', $id)->where('desa_id', $desa_id)->get();
 
         return view('data.program_bantuan.show', compact('page_title', 'page_description', 'program', 'sasaran', 'peserta'));
     }

diff --git a/resources/views/data/program_bantuan/show.blade.php b/resources/views/data/program_bantuan/show.blade.php
@@ -26,6 +26,10 @@
                             <th class="col-md-2">Nama</th>
                             <td>: {{ $program->nama }}</td>
                         </tr>
+                        <tr>
+                            <th>Desa</th>
+                            <td>: {{ $program->desa->nama }}</td>
+                        </tr>
                         <tr>
                             <th>Sasaran</th>
                             <td>: {{ $sasaran[$program->sasaran] }}</td>
@@ -42,30 +46,6 @@
                 </div>
                 <hr>
                 <legend>Daftar Peserta Program</legend>
-                <div class="table-responsive">
-                    <table class="table table-bordered table-hover dataTable no-footer" id="program-table">
-                        @if ($program->sasaran == 1)
-                            <thead>
-                                <tr>
-                                    <th class="col-md-2">Nama</th>
-                                    <td>: {{ $program->nama }}</td>
-                                </tr>
-                                <tr>
-                                    <th>Sasaran</th>
-                                    <td>: {{ $sasaran[$program->sasaran] }}</td>
-                                </tr>
-                                <tr>
-                                    <th>Periode Program</th>
-                                    <td>: {{ $program->start_date }} - {{ $program->end_date }}</td>
-                                </tr>
-                                <tr>
-                                    <th>Keterangan</th>
-                                    <td>: {{ $program->description }}</td>
-                                </tr>
-                    </table>
-                </div>
-                <hr>
-                <legend>Daftar Peserta Program</legend>
                 <div class="table-responsive">
                     <table class="table table-bordered table-hover dataTable no-footer" id="program-table">
                         @if ($program->sasaran == 1)

diff --git a/routes/web.php b/routes/web.php
@@ -409,7 +409,7 @@
                     Route::post('store', ['as' => 'data.program-bantuan.store', 'uses' => 'ProgramBantuanController@store']);
                     Route::post('add_peserta', ['as' => 'data.program-bantuan.add_peserta', 'uses' => 'ProgramBantuanController@add_peserta']);
                     Route::get('edit/{id}', ['as' => 'data.program-bantuan.edit', 'uses' => 'ProgramBantuanController@edit']);
-                    Route::get('show/{id}', ['as' => 'data.program-bantuan.show', 'uses' => 'ProgramBantuanController@show']);
+                    Route::get('show/{id}/{id_desa}', ['as' => 'data.program-bantuan.show', 'uses' => 'ProgramBantuanController@show']);
                     Route::get('create-peserta/{id}', ['as' => 'data.program-bantuan.create-peserta', 'uses' => 'ProgramBantuanController@createPeserta']);
                     Route::put('update/{id}', ['as' => 'data.program-bantuan.update', 'uses' => 'ProgramBantuanController@update']);
                     Route::delete('destroy/{id}', ['as' => 'data.program-bantuan.destroy', 'uses' => 'ProgramBantuanController@destroy']);
@@ -452,7 +452,6 @@
                 Route::group(['prefix' => 'pembangunan', 'middleware' => ['role:super-admin|administrator-website|admin-desa']], function () {
                     Route::get('/', ['as' => 'data.pembangunan.index', 'uses' => 'DataPembangunanController@index']);
                     Route::get('getdata', ['as' => 'data.pembangunan.getdata', 'uses' => 'DataPembangunanController@getPembangunan']);
-                    Route::get('show/{id}', ['as' => 'data.pembangunan.show', 'uses' => 'DataPembangunanController@show']);
                     Route::get('rincian/{id}/{kode_desa}', ['as' => 'data.pembangunan.rincian', 'uses' => 'DataPembangunanController@rincian']);
                     Route::get('getrinciandata/{id}/{kode_desa}', ['as' => 'data.pembangunan.getrinciandata', 'uses' => 'DataPembangunanController@getrinciandata']);
                 });