diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php index 8ee6169..57e31af 100644 --- a/app/Http/Controllers/AjaxController.php +++ b/app/Http/Controllers/AjaxController.php @@ -20,16 +20,14 @@ class AjaxController extends Controller $resource = json_decode($instansi->resource_data); // dd($resource); + $data = []; + if(@$resource){ $data = TabelData::whereIn('MsTabelDataId',$resource)->count(); if(@$data != 0){ $data = TabelData::whereIn('MsTabelDataId',$resource)->get(); - }else{ - $data = TabelData::all(); } - }else{ - $data = TabelData::all(); } // $data = TabelData::all(); diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 49e285d..bc67b47 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -105,9 +105,15 @@ class HomeController extends Controller foreach ($data as $key => $row) { //cek upload $status = ''; - $cek = Dataset::where('ms_tabel_data_id',$row->MsTabelDataId)->where('tahun',date('Y'))->count(); - if($cek > 0){ - $status = 'Sudah Unggah'; + $cek = Dataset::where('ms_tabel_data_id',$row->MsTabelDataId)->where('tahun',date('Y'))->first(); + if(@$cek){ + if(@$cek->status == 1){ + $status = ' Valid'; + }elseif(@$cek->status == 0){ + $status = 'Menunggu Verifikasi'; + }elseif(@$cek->status == 2){ + $status = 'Verifikasi Ditolak'; + } $action = ''; }else{ $status = 'Belum Unggah'; @@ -126,7 +132,7 @@ class HomeController extends Controller } function gridInstansiTambahan(Request $request){ - $data = DatasetTambahan::whereIn('ms_instansi_id',session('instansi_id'))->get(); + $data = DatasetTambahan::whereIn('instansi_id',[session('instansi_id')])->get(); $_data = []; foreach ($data as $key => $row) { diff --git a/app/Http/Controllers/Opendata/DatasetController.php b/app/Http/Controllers/Opendata/DatasetController.php index 3ef2475..ae08f0a 100644 --- a/app/Http/Controllers/Opendata/DatasetController.php +++ b/app/Http/Controllers/Opendata/DatasetController.php @@ -108,7 +108,7 @@ class DatasetController extends Controller if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){ $action .= '
'; - if(($row->created_by == auth()->user()->id) || ($row->status == 2)){ + if(($row->created_by == auth()->user()->id) && ($row->status == 2)){ $action .= 'Edit'; } $action .= 'Detail'; @@ -175,6 +175,7 @@ class DatasetController extends Controller $dataset->tahun_data = $request->tahun_data; $dataset->name = $request->name; $dataset->deskripsi = $request->deskripsi; + $dataset->status = 0; $dataset->save(); }else{ @@ -201,7 +202,9 @@ class DatasetController extends Controller } if(@$request->file){ - $tabelData = TabelData::find(decode_id($request->template_id)); + // dd($dataset); + $tabelData = TabelData::find($dataset->ms_tabel_data_id); + // dd($tabelData); $import = new Import; Excel::import($import, $request->file('file')); @@ -219,17 +222,17 @@ class DatasetController extends Controller 'ms_tabel_data_kolom_id' => $columnIndex, ],[ 'dataset_id' => $dataset->DatasetId, - 'ms_tabel_data_id' => decode_id($request->template_id), + 'ms_tabel_data_id' => $dataset->ms_tabel_data_id, 'row_id' => $rowIndex + 1, 'ms_tabel_data_kolom_id' => $columnIndex, 'value' => $value, ]); } } - - DB::commit(); } + DB::commit(); + return redirect()->back()->with([ 'message' => 'Berhasil update data', 'type' => 'success', @@ -301,7 +304,7 @@ class DatasetController extends Controller $data['item'] = Dataset::find($keyId); $template = TabelData::find($data['item']->ms_tabel_data_id); - $data['catatan'] = DatasetCatatan::where('dataset_id',$keyId)->orderBy('created_at','ASC')->get(); + $data['catatan'] = DatasetCatatan::where('dataset_id',$keyId)->orderBy('DatasetCatatanId','DESC')->first(); $data['tabel'] = TabelDataKolom::where('ms_tabel_data_id',$template->MsTabelDataId)->orderBy('order','ASC')->get(); // $filename = pathinfo($tabelData->template_url, PATHINFO_FILENAME); // $data['modelClass'] = "App\\Models\\Dataset\\Dataset" . ucfirst($filename); diff --git a/app/Http/Controllers/Opendata/DatasetTambahanController.php b/app/Http/Controllers/Opendata/DatasetTambahanController.php index 74f52db..8caaf3c 100644 --- a/app/Http/Controllers/Opendata/DatasetTambahanController.php +++ b/app/Http/Controllers/Opendata/DatasetTambahanController.php @@ -13,6 +13,7 @@ use App\Models\Master\Topik; use App\Models\Master\Template; use App\Models\Master\TabelData; use App\Models\DatasetTambahan; +use App\Models\DatasetCatatan; class DatasetTambahanController extends Controller { @@ -58,9 +59,9 @@ class DatasetTambahanController extends Controller public function grid(Request $request) { if((session('group_id') == 1) || (session('group_alias') == 'admin')){ - $data = DatasetTambahan::orderBy('DatasetTambahanId','DESC')->get(); + $data = DatasetTambahan::with(['tabelData'])->orderBy('DatasetTambahanId','DESC')->get(); }else{ - $data = DatasetTambahan::orderBy('DatasetTambahanId','DESC')->whereIn('instansi_id',[auth()->user()->ms_instansi_id])->get(); + $data = DatasetTambahan::with(['tabelData'])->orderBy('DatasetTambahanId','DESC')->whereIn('instansi_id',[session('instansi_id')])->get(); } // $data = User::with(['group'])->orderBy('id','DESC')->get(); $_data = []; @@ -73,16 +74,16 @@ class DatasetTambahanController extends Controller if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){ $action .= '
'; - if($row->created_by == auth()->user()->id){ - $action .= ''; + if(($row->created_by == auth()->user()->id) && ($row->status == 2)){ + $action .= 'Edit'; } - $action .= ''; + $action .= 'Detail'; if((session('group_id') == 1) || (session('group_alias') == 'admin')){ // $action .= ''; if($row->status == 1){ - $action .= ''; + // $action .= ''; }else{ - $action .= ''; + // $action .= ''; } } $action .= '
'; @@ -188,34 +189,15 @@ class DatasetTambahanController extends Controller if(@$keyId){ - Validator::make($request->all(), [ - 'name' => 'required', - 'instansi_id' => 'required', - 'template_id' => 'required', - // 'template_default' => 'required', - 'publik' => 'required', - // 'tags' => 'required', - // 'topik' => 'required', - ])->validate(); $insert = DatasetTambahan::find($keyId); - $insert->instansi_id = decode_id($request->instansi_id); - $insert->template_id = decode_id($request->template_id); - $insert->template_default = 0; $insert->name = $request->name; - $insert->publik = 1; - $insert->tags = json_encode($request->tags); if(@$request->hasFile('file')){ $insert->file = $filePath; } $insert->deskripsi = $request->deskripsi; - $insert->tahun = $request->tahun; $insert->tahun_data = $request->tahun_data; - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ - $insert->status = 1; - }else{ - $insert->status = 0; - } + $insert->status = 0; $insert->save(); }else{ // dd($request->all()); @@ -239,11 +221,16 @@ class DatasetTambahanController extends Controller $insert->publik = 1; $insert->tags = json_encode($request->tags); if(@$request->hasFile('file')){ - $insert->file = $filePath; + $insert->file = $filePath; + } + if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + $insert->status = 1; + }else{ + $insert->status = 0; } $insert->deskripsi = $request->deskripsi; $insert->tahun = $request->tahun; - $insert->tahun_data = $request->tahun_data; + $insert->tahun_data = $request->tahun_data; $insert->created_by = auth()->user()->id; $insert->save(); } @@ -317,6 +304,7 @@ class DatasetTambahanController extends Controller $data['instansi'] = Instansi::all(); $data['topik'] = Topik::all(); $data['template'] = Template::all(); + $data['catatan'] = DatasetCatatan::where('dataset_id',$keyId)->orderBy('created_at','ASC')->get(); return view($this->template.'.view',$data); } @@ -347,4 +335,26 @@ class DatasetTambahanController extends Controller return response()->json(['success' => true,'message' => 'Berhasil update data','type' => 'success']); } + + public function verifikasi(Request $request,$id) + { + $keyId = decode_id($id); + $dataset = DatasetTambahan::find($keyId); + $dataset->status = $request->verifikasi; + $dataset->save(); + + if($request->catatan){ + $cat = new DatasetCatatan; + $cat->dataset_id = $keyId; + $cat->type = 'dataset-tambahan'; + $cat->catatan = $request->catatan; + $cat->status = 1; + $cat->save(); + } + + return redirect()->back()->with([ + 'message' => 'Berhasil update data', + 'type' => 'success', + ]); + } } diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 593b4fe..26dabbc 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -36,7 +36,7 @@
-
+