diff --git a/app/Http/Controllers/Data/UmkmController.php b/app/Http/Controllers/Data/UmkmController.php index 27f2cf3..3a81360 100644 --- a/app/Http/Controllers/Data/UmkmController.php +++ b/app/Http/Controllers/Data/UmkmController.php @@ -15,41 +15,30 @@ class UmkmController extends Controller */ public function index(Request $request) { - $menuId = $request->query('menu_id'); - $user = Auth::user(); - $userId = $user->id; + $menuId = $request->query('menu_id', 0); + $permissions = $this->permissions[$menuId] ?? []; // Avoid undefined index error - // Ambil role_id yang dimiliki user - $roleIds = DB::table('user_role') - ->where('user_id', $userId) - ->pluck('role_id'); - - // Ambil data akses berdasarkan role_id dan menu_id - $roleAccess = DB::table('role_menu') - ->whereIn('role_id', $roleIds) - ->where('menu_id', $menuId) - ->first(); - - // Pastikan roleAccess tidak null sebelum mengakses properti - $creator = $roleAccess->allow_create ?? 0; - $updater = $roleAccess->allow_update ?? 0; - $destroyer = $roleAccess->allow_destroy ?? 0; - return view('data.umkm.index', compact('creator', 'updater', 'destroyer')); + $creator = $permissions['allow_create'] ?? 0; + $updater = $permissions['allow_update'] ?? 0; + $destroyer = $permissions['allow_destroy'] ?? 0; + return view('data.umkm.index', compact('creator', 'updater', 'destroyer', 'menuId')); } /** * Show the form for creating a new resource. */ - public function bulkCreate() + public function bulkCreate(Request $request) { - return view('data.umkm.form-upload'); + $menuId = $request->query('menu_id', 0); + return view('data.umkm.form-upload', compact('menuId')); } /** * Show the form for creating a new resource. */ - public function create() + public function create(Request $request) { + $menuId = $request->query('menu_id', 0); $title = 'UMKM'; $subtitle = 'Create Data'; @@ -67,14 +56,15 @@ class UmkmController extends Controller $apiUrl = url('/api/umkm'); - return view('data.umkm.form', compact('title', 'subtitle', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions')); + return view('data.umkm.form', compact('title', 'subtitle', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions','menuId')); } /** * Show the form for editing the specified resource. */ - public function edit($id) + public function edit(Request $request,$id) { + $menuId = $request->query('menu_id', 0); $title = 'UMKM'; $subtitle = 'Update Data'; $modelInstance = Umkm::find($id); @@ -116,7 +106,7 @@ class UmkmController extends Controller $apiUrl = url('/api/umkm'); // dd($modelInstance->business_form_id, $dropdownOptions['business_form']); - return view('data.umkm.form', compact('title', 'subtitle', 'modelInstance', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions')); + return view('data.umkm.form', compact('title', 'subtitle', 'modelInstance', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions','menuId')); } private function getFields() diff --git a/resources/js/data/umkm/data-umkm.js b/resources/js/data/umkm/data-umkm.js index b087b0d..83238aa 100644 --- a/resources/js/data/umkm/data-umkm.js +++ b/resources/js/data/umkm/data-umkm.js @@ -7,6 +7,7 @@ import GeneralTable from "../../table-generator.js"; const tableElement = document.getElementById("umkm-data-table"); const canUpdate = tableElement.getAttribute("data-updater") === "1"; const canDelete = tableElement.getAttribute("data-destroyer") === "1"; +let menuId = document.getElementById("menuId").value; const dataUMKMColumns = [ "No", @@ -31,24 +32,25 @@ const dataUMKMColumns = [ { name: "Actions", widht: "120px", - formatter: function(cell, row) { + formatter: function (cell, row) { const id = row.cells[19].data; - const model = "data/umkm"; + const model = "data/web-umkm"; let actionButtons = '