diff --git a/app/Http/Controllers/Data/SpatialPlanningController.php b/app/Http/Controllers/Data/SpatialPlanningController.php index 09c8b9b..8f62ac4 100644 --- a/app/Http/Controllers/Data/SpatialPlanningController.php +++ b/app/Http/Controllers/Data/SpatialPlanningController.php @@ -5,8 +5,6 @@ namespace App\Http\Controllers\Data; use App\Http\Controllers\Controller; use App\Models\SpatialPlanning; use Illuminate\Http\Request; -use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Auth; class SpatialPlanningController extends Controller { @@ -15,42 +13,31 @@ class SpatialPlanningController 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'); + $creator = $permissions['allow_create'] ?? 0; + $updater = $permissions['allow_update'] ?? 0; + $destroyer = $permissions['allow_destroy'] ?? 0; - // 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.spatialPlannings.index', compact('creator', 'updater', 'destroyer')); + return view('data.spatialPlannings.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.spatialPlannings.form-upload'); + $menuId = $request->query('menu_id', 0); + return view('data.spatialPlannings.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 = 'Rencana Tata Ruang'; $subtitle = "Create Data"; @@ -61,30 +48,15 @@ class SpatialPlanningController extends Controller $fieldTypes = $this->getFieldTypes(); $apiUrl = url('/api/spatial-plannings'); - return view('data.spatialPlannings.form', compact('title', 'subtitle', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions')); - } - - /** - * Store a newly created resource in storage. - */ - public function store(Request $request) - { - // - } - - /** - * Display the specified resource. - */ - public function show(string $id) - { - // + return view('data.spatialPlannings.form', compact('title', 'subtitle', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions','menuId')); } /** * Show the form for editing the specified resource. */ - public function edit(string $id) + public function edit(Request $request,string $id) { + $menuId = $request->query('menu_id', 0); $title = 'Rencana Tata Ruang'; $subtitle = 'Update Data'; @@ -100,23 +72,7 @@ class SpatialPlanningController extends Controller $fieldTypes = $this->getFieldTypes(); $apiUrl = url('/api/spatial-plannings'); - return view('data.spatialPlannings.form', compact('title', 'subtitle', 'modelInstance', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions')); - } - - /** - * Update the specified resource in storage. - */ - public function update(Request $request, string $id) - { - // - } - - /** - * Remove the specified resource from storage. - */ - public function destroy(string $id) - { - // + return view('data.spatialPlannings.form', compact('title', 'subtitle', 'modelInstance', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions','menuId')); } private function getFields() diff --git a/resources/js/data/spatialPlannings/data-spatialPlannings.js b/resources/js/data/spatialPlannings/data-spatialPlannings.js index cba1aa2..b56bae4 100644 --- a/resources/js/data/spatialPlannings/data-spatialPlannings.js +++ b/resources/js/data/spatialPlannings/data-spatialPlannings.js @@ -8,6 +8,7 @@ import GeneralTable from "../../table-generator.js"; const tableElement = document.getElementById("spatial-planning-data-table"); const canUpdate = tableElement.getAttribute("data-updater") === "1"; const canDelete = tableElement.getAttribute("data-destroyer") === "1"; +let menuId = document.getElementById("menuId").value; const dataSpatialPlanningColumns = [ "No", @@ -23,7 +24,7 @@ const dataSpatialPlanningColumns = [ widht: "120px", formatter: function (cell, row) { const id = row.cells[8].data; - const model = "data/spatial-plannings"; + const model = "data/web-spatial-plannings"; let actionButtons = '
'; let hasPrivilege = false; @@ -34,7 +35,8 @@ const dataSpatialPlanningColumns = [ actionButtons += ` `; } @@ -49,10 +51,14 @@ const dataSpatialPlanningColumns = [ `; } - actionButtons += '
'; + actionButtons += ""; // Jika tidak memiliki akses, tampilkan teks "No Privilege" - return gridjs.html(hasPrivilege ? actionButtons : 'No Privilege'); + return gridjs.html( + hasPrivilege + ? actionButtons + : 'No Privilege' + ); }, }, ]; diff --git a/resources/js/data/spatialPlannings/form-create-update.js b/resources/js/data/spatialPlannings/form-create-update.js index 5ff395e..b66d5c7 100644 --- a/resources/js/data/spatialPlannings/form-create-update.js +++ b/resources/js/data/spatialPlannings/form-create-update.js @@ -5,6 +5,7 @@ document.addEventListener("DOMContentLoaded", function () { const modalButton = document.querySelector(".btn-modal"); const form = document.querySelector("form#create-update-form"); var authLogo = document.querySelector(".auth-logo"); + let menuId = document.getElementById("menuId").value; if (!saveButton || !form) return; @@ -73,7 +74,7 @@ document.addEventListener("DOMContentLoaded", function () { }, 3000); setTimeout(() => { - window.location.href = "/data/web-spatial-plannings"; + window.location.href = `/data/web-spatial-plannings?menu_id=${menuId}`; }, 3000); } else { if (authLogo) { diff --git a/resources/js/data/spatialPlannings/form-upload.js b/resources/js/data/spatialPlannings/form-upload.js index 10bb5bc..47ca5d6 100644 --- a/resources/js/data/spatialPlannings/form-upload.js +++ b/resources/js/data/spatialPlannings/form-upload.js @@ -28,6 +28,7 @@ console.log(dropzonePreviewNode); .getAttribute("content")}`, }, init: function () { + let menuId = document.getElementById("menuId").value; // Listen for the success event this.on("success", function (file, response) { console.log("File successfully uploaded:", file); @@ -39,7 +40,7 @@ console.log(dropzonePreviewNode); "Upload Files"; // Tunggu sebentar lalu reload halaman setTimeout(() => { - window.location.href = "/data/web-spatial-plannings"; + window.location.href = `/data/web-spatial-plannings?menu_id=${menuId}`; }, 2000); }); // Listen for the error event diff --git a/resources/views/data/spatialPlannings/form-upload.blade.php b/resources/views/data/spatialPlannings/form-upload.blade.php index 4f86296..7682215 100644 --- a/resources/views/data/spatialPlannings/form-upload.blade.php +++ b/resources/views/data/spatialPlannings/form-upload.blade.php @@ -3,7 +3,7 @@ @section('content') @include('layouts.partials/page-title', ['title' => 'Form', 'subtitle' => 'File Uploads']) - +
diff --git a/resources/views/data/spatialPlannings/form.blade.php b/resources/views/data/spatialPlannings/form.blade.php index 969bcbe..0bf5008 100644 --- a/resources/views/data/spatialPlannings/form.blade.php +++ b/resources/views/data/spatialPlannings/form.blade.php @@ -3,7 +3,7 @@ @section('content') @include('layouts.partials/page-title', ['title' => $title, 'subtitle' => $subtitle]) - +
@if (session('error'))
diff --git a/resources/views/data/spatialPlannings/index.blade.php b/resources/views/data/spatialPlannings/index.blade.php index b7a18b3..17bf04e 100644 --- a/resources/views/data/spatialPlannings/index.blade.php +++ b/resources/views/data/spatialPlannings/index.blade.php @@ -6,7 +6,7 @@ @section('content') @include('layouts.partials/page-title', ['title' => 'Data', 'subtitle' => 'Rencana Tata Ruang']) - +
Daftar Rencana Tata Ruang
@@ -15,10 +15,10 @@
@if ($creator) - -