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 @@
Beranda
Dataset Utama
Dataset Tambahan
- Kontak
+ {{-- Kontak --}}
{{-- Informasi --}}
Login
@@ -74,7 +74,7 @@
Beranda
Dataset Utama
Dataset Tambahan
- Kontak
+ {{-- Kontak --}}
Login
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() {