From 95c469c4a3e6cb95534521adbbbfcdeaa91666a9 Mon Sep 17 00:00:00 2001
From: Ilham Wara Nugroho <ilhamwara@gmail.com>
Date: Mon, 2 Mar 2026 13:35:17 +0700
Subject: [PATCH] update

---
 app/Http/Controllers/FrontController.php            |  4 ++--
 app/Http/Controllers/HomeController.php             |  8 ++++----
 app/Http/Controllers/Opendata/DatasetController.php |  2 +-
 resources/views/layouts/appNew.blade.php            |  4 ++--
 resources/views/layouts/master.blade.php            | 13 +++++++++++++
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/FrontController.php b/app/Http/Controllers/FrontController.php
index c3b138d..9d7667e 100644
--- a/app/Http/Controllers/FrontController.php
+++ b/app/Http/Controllers/FrontController.php
@@ -105,7 +105,7 @@ class FrontController extends Controller
         $instansi_id    = decode_id(@request()->instansi_id);
         $resource_id    = decode_id(@request()->resource_id);
 
-        $dataset = Dataset::orderBy('DatasetId','DESC');
+        $dataset = Dataset::where('status',1)->orderBy('DatasetId','DESC');
         if(@$key){
             $dataset->where('name','ilike','%'.@$key.'%');
         }
@@ -135,7 +135,7 @@ class FrontController extends Controller
         $instansi_id    = decode_id(@request()->instansi_id);
         $resource_id    = decode_id(@request()->resource_id);
 
-        $dataset = DatasetTambahan::orderBy('DatasetTambahanId','DESC');
+        $dataset = DatasetTambahan::where('status',1)->orderBy('DatasetTambahanId','DESC');
         if(@$key){
             $dataset->where('name','ilike','%'.@$key.'%');
         }
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index bc67b47..f18f94f 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -33,8 +33,8 @@ class HomeController extends Controller
         $data['title']   = 'Dashboard';
         $data['route']   = $this->route;
         if((session('group_id') == 1) || (session('group_alias') == 'admin')){
-            $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->where('tahun',date('Y'))->count();
-            $data['datasetTambahan'] = DatasetTambahan::orderBy('DatasetId','DESC')->where('tahun',date('Y'))->count();
+            $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("
                                             SUM(
                                                 CASE
@@ -57,8 +57,8 @@ class HomeController extends Controller
                                     ->count('ms_instansi.MsInstansiId');
 
         }else{
-            $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->whereIn('instansi_id',[session('instansi_id')])->where('tahun',date('Y'))->count();
-            $data['datasetTambahan'] = DatasetTambahan::whereIn('instansi_id',[session('instansi_id')])->where('tahun',date('Y'))->count();
+            $data['dataset'] = Dataset::where('status',1)->orderBy('DatasetId','DESC')->whereIn('instansi_id',[session('instansi_id')])->where('tahun',date('Y'))->count();
+            $data['datasetTambahan'] = DatasetTambahan::where('status',1)->whereIn('instansi_id',[session('instansi_id')])->where('tahun',date('Y'))->count();
             $data['datasetInstansi'] = Instansi::where('MsInstansiId',session('instansi_id'))->selectRaw("
                                             SUM(
                                                 CASE
diff --git a/app/Http/Controllers/Opendata/DatasetController.php b/app/Http/Controllers/Opendata/DatasetController.php
index ae08f0a..20bd5fb 100644
--- a/app/Http/Controllers/Opendata/DatasetController.php
+++ b/app/Http/Controllers/Opendata/DatasetController.php
@@ -238,7 +238,7 @@ class DatasetController extends Controller
                     'type'    => 'success',
                 ]);
 
-        } catch (Exception $e) {
+        } catch (\Throwable $e) {
             DB::rollback();
             return redirect()->back()->with([
                      'message' => $e->getMessage(),
diff --git a/resources/views/layouts/appNew.blade.php b/resources/views/layouts/appNew.blade.php
index a9ea18c..b4511ba 100644
--- a/resources/views/layouts/appNew.blade.php
+++ b/resources/views/layouts/appNew.blade.php
@@ -53,7 +53,7 @@
                 <a href="{{ url('/') }}" class="font-medium text-slate-700 hover:text-blue-600 transition-colors">Beranda</a>
                 <a href="{{ url('dataset') }}" class="font-medium text-slate-700 hover:text-blue-600 transition-colors">Dataset Utama</a>
                 <a href="{{ url('dataset-tambahan') }}" class="font-medium text-slate-700 hover:text-blue-600 transition-colors">Dataset Tambahan</a>
-                <a href="{{ url('kontak') }}" class="font-medium text-slate-700 hover:text-blue-600 transition-colors">Kontak</a>
+                {{-- <a href="{{ url('kontak') }}" class="font-medium text-slate-700 hover:text-blue-600 transition-colors">Kontak</a> --}}
                 {{-- <a href="#" class="font-medium text-slate-700 hover:text-blue-600 transition-colors">Informasi</a> --}}
                 <a href="{{ url('login') }}" class="flex items-center space-x-2 bg-blue-600 text-white px-5 py-2 rounded-xl font-semibold hover:bg-blue-700 transition-all shadow-lg shadow-blue-200">
                     <span>Login</span>
@@ -74,7 +74,7 @@
             <a href="{{ url('/') }}" class="block font-medium py-2">Beranda</a>
             <a href="{{ url('dataset') }}" class="block font-medium py-2">Dataset Utama</a>
             <a href="{{ url('dataset-tambahan') }}" class="block font-medium py-2">Dataset Tambahan</a>
-            <a href="{{ url('kontak') }}" class="block font-medium py-2">Kontak</a>
+            {{-- <a href="{{ url('kontak') }}" class="block font-medium py-2">Kontak</a> --}}
             <a href="{{ url('/login') }}" class="w-full bg-blue-600 text-white px-5 py-3 rounded-xl font-bold">Login</a>
         </div>
     </nav>
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index 164b7ea..b9b5216 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -239,6 +239,19 @@
                 $('.numberInput').on('input', function() {
                     this.value = this.value.replace(/[^0-9]/g, ''); // Hanya angka 0-9
                 });
+            
+            @if (Session::get('type')=='error')
+                  toastr.error("{{ Session::get('message') }}", 'Error!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'});
+              @endif
+              @if (Session::get('type')=='success')
+                  toastr.success("{{ Session::get('message') }}", 'Berhasil!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'});
+              @endif
+              @if (Session::get('type')=='warning')
+                  toastr.warning("{{ Session::get('message') }}", 'Whoopss!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'});
+              @endif
+              @if (Session::get('type')=='info')
+                  toastr.info("{{ Session::get('message') }}", 'Info!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'});
+              @endif
 
             // 1. Sidebar Collapse Logic
             $('#toggle-sidebar').click(function() {