From 4dfd6f1afb0c532411e380292810e64cad2c1410 Mon Sep 17 00:00:00 2001 From: Ilham Wara Nugroho Date: Tue, 3 Mar 2026 11:32:26 +0700 Subject: [PATCH] update --- app/Http/Controllers/HomeController.php | 12 ++++----- .../Controllers/Management/UserController.php | 2 +- .../Controllers/Master/InstansiController.php | 2 +- .../Master/TabelDataController.php | 2 +- .../Master/TabelDataKolomController.php | 2 +- .../Opendata/DatasetController.php | 9 ++++--- .../Opendata/DatasetTambahanController.php | 26 ++++++++++--------- resources/views/auth/login.blade.php | 24 +++++++++++++---- resources/views/layouts/appNew.blade.php | 14 ++++++++++ resources/views/layouts/master.blade.php | 1 + .../modules/dashboard/dashboard.blade.php | 2 +- .../opendata/dataset-tambahan/index.blade.php | 10 +++---- .../modules/opendata/dataset/index.blade.php | 10 +++---- 13 files changed, 75 insertions(+), 41 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 7e38dff..f7063c4 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -32,7 +32,7 @@ class HomeController extends Controller { $data['title'] = 'Dashboard'; $data['route'] = $this->route; - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->where('tahun',date('Y'))->where('status',1)->count(); $data['datasetTambahan'] = DatasetTambahan::where('status',1)->orderBy('DatasetId','DESC')->where('tahun',date('Y'))->count(); $data['datasetInstansi'] = Instansi::selectRaw(" @@ -148,7 +148,7 @@ class HomeController extends Controller public function gridTabel(Request $request) { - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ $data = Instansi::all(); }else{ $data = Instansi::where('MsInstansiId',session('instansi_id'))->get(); @@ -191,7 +191,7 @@ class HomeController extends Controller public function grid(Request $request) { - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ $data = Dataset::orderBy('DatasetId','DESC')->limit(10)->get(); }else{ $data = Dataset::orderBy('DatasetId','DESC')->limit(10)->whereIn('created_by',[auth()->user()->id,1])->get(); @@ -234,7 +234,7 @@ class HomeController extends Controller public function gridResource(Request $request) { - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ $data = TabelData::with(['dataset'])->where('show_dashboard',1)->get(); }else{ $data = TabelData::with(['dataset'])->whereHas('dataset',function($query){ @@ -247,7 +247,7 @@ class HomeController extends Controller foreach ($data as $key => $row) { $action = ''; - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ $action .= 'Lihat Data'; }else{ $action .= 'Lihat Data'; @@ -270,7 +270,7 @@ class HomeController extends Controller public function datasetGrid($alias,Request $request) { - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ $data = Dataset::whereHas('instansi',function($query) use ($alias){ $query->where('parent','ilike','%'.$alias.'%'); })->orderBy('DatasetId','DESC')->get(); diff --git a/app/Http/Controllers/Management/UserController.php b/app/Http/Controllers/Management/UserController.php index ab9eaf2..e39ac00 100644 --- a/app/Http/Controllers/Management/UserController.php +++ b/app/Http/Controllers/Management/UserController.php @@ -53,7 +53,7 @@ class UserController extends Controller if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){ $action .= '
'; $action .= ''; - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ $action .= ''; $action .= ''; } diff --git a/app/Http/Controllers/Master/InstansiController.php b/app/Http/Controllers/Master/InstansiController.php index 864328b..e7a3ff4 100644 --- a/app/Http/Controllers/Master/InstansiController.php +++ b/app/Http/Controllers/Master/InstansiController.php @@ -54,7 +54,7 @@ class InstansiController extends Controller if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){ $action .= '
'; $action .= 'Edit'; - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ $action .= 'Hapus'; } $action .= '
'; diff --git a/app/Http/Controllers/Master/TabelDataController.php b/app/Http/Controllers/Master/TabelDataController.php index 4b662cf..59d0886 100644 --- a/app/Http/Controllers/Master/TabelDataController.php +++ b/app/Http/Controllers/Master/TabelDataController.php @@ -48,7 +48,7 @@ class TabelDataController extends Controller $action .= '
'; $action .= 'Edit'; $action .= 'Detail'; - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ // $action .= ''; } $action .= '
'; diff --git a/app/Http/Controllers/Master/TabelDataKolomController.php b/app/Http/Controllers/Master/TabelDataKolomController.php index 1b84370..fb743c0 100644 --- a/app/Http/Controllers/Master/TabelDataKolomController.php +++ b/app/Http/Controllers/Master/TabelDataKolomController.php @@ -48,7 +48,7 @@ class TabelDataKolomController extends Controller if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){ $action .= '
'; $action .= ''; - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ // $action .= ''; } $action .= '
'; diff --git a/app/Http/Controllers/Opendata/DatasetController.php b/app/Http/Controllers/Opendata/DatasetController.php index 6ea7d0c..7e974d9 100644 --- a/app/Http/Controllers/Opendata/DatasetController.php +++ b/app/Http/Controllers/Opendata/DatasetController.php @@ -106,10 +106,13 @@ class DatasetController extends Controller $action = ''; - if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){ + if(access('is_read', $this->route.'.*','module',false)){ $action .= '
'; - if(($row->created_by == auth()->user()->id) && ($row->status == 2)){ - $action .= 'Edit'; + + if((access('is_update', $this->route.'.*','module',false))){ + if(($row->created_by == auth()->user()->id) && ($row->status == 2)){ + $action .= 'Edit'; + } } $action .= 'Detail'; if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ diff --git a/app/Http/Controllers/Opendata/DatasetTambahanController.php b/app/Http/Controllers/Opendata/DatasetTambahanController.php index 8caaf3c..a5372c2 100644 --- a/app/Http/Controllers/Opendata/DatasetTambahanController.php +++ b/app/Http/Controllers/Opendata/DatasetTambahanController.php @@ -58,7 +58,7 @@ class DatasetTambahanController extends Controller public function grid(Request $request) { - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ $data = DatasetTambahan::with(['tabelData'])->orderBy('DatasetTambahanId','DESC')->get(); }else{ $data = DatasetTambahan::with(['tabelData'])->orderBy('DatasetTambahanId','DESC')->whereIn('instansi_id',[session('instansi_id')])->get(); @@ -72,13 +72,15 @@ class DatasetTambahanController extends Controller $action = ''; - if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){ + if((access('is_read', $this->route.'.*','module',false))){ $action .= '
'; - if(($row->created_by == auth()->user()->id) && ($row->status == 2)){ - $action .= 'Edit'; + if((access('is_update', $this->route.'.*','module',false))){ + if(($row->created_by == auth()->user()->id) && ($row->status == 2)){ + $action .= 'Edit'; + } } - $action .= 'Detail'; - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + $action .= 'Detail'; + if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ // $action .= ''; if($row->status == 1){ // $action .= ''; @@ -90,11 +92,11 @@ class DatasetTambahanController extends Controller } $status = ''; if($row->status == 1){ - $status = 'Valid'; + $status = 'Valid'; }elseif($row->status == 0){ - $status = 'Menunggu Verifikasi'; + $status = 'Menunggu Verifikasi'; }elseif($row->status == 2){ - $status = 'Verifikasi Ditolak'; + $status = 'Verifikasi Ditolak'; } $_data[] = [ @@ -223,7 +225,7 @@ class DatasetTambahanController extends Controller if(@$request->hasFile('file')){ $insert->file = $filePath; } - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ $insert->status = 1; }else{ $insert->status = 0; @@ -278,7 +280,7 @@ class DatasetTambahanController extends Controller $data['route'] = $this->route; $data['keyId'] = $id; $data['item'] = DatasetTambahan::find($keyId); - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ $data['instansi'] = Instansi::all(); }else{ $data['instansi'] = Instansi::where('MsInstansiId',session('instansi_id'))->get(); @@ -304,7 +306,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(); + $data['catatan'] = DatasetCatatan::where('dataset_id',$keyId)->orderBy('created_at','DESC')->first(); return view($this->template.'.view',$data); } diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 0954c38..c926ff1 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -8,11 +8,11 @@ - + - + - +