update
parent
c1ab5d3138
commit
95c469c4a3
|
|
@ -105,7 +105,7 @@ class FrontController extends Controller
|
||||||
$instansi_id = decode_id(@request()->instansi_id);
|
$instansi_id = decode_id(@request()->instansi_id);
|
||||||
$resource_id = decode_id(@request()->resource_id);
|
$resource_id = decode_id(@request()->resource_id);
|
||||||
|
|
||||||
$dataset = Dataset::orderBy('DatasetId','DESC');
|
$dataset = Dataset::where('status',1)->orderBy('DatasetId','DESC');
|
||||||
if(@$key){
|
if(@$key){
|
||||||
$dataset->where('name','ilike','%'.@$key.'%');
|
$dataset->where('name','ilike','%'.@$key.'%');
|
||||||
}
|
}
|
||||||
|
|
@ -135,7 +135,7 @@ class FrontController extends Controller
|
||||||
$instansi_id = decode_id(@request()->instansi_id);
|
$instansi_id = decode_id(@request()->instansi_id);
|
||||||
$resource_id = decode_id(@request()->resource_id);
|
$resource_id = decode_id(@request()->resource_id);
|
||||||
|
|
||||||
$dataset = DatasetTambahan::orderBy('DatasetTambahanId','DESC');
|
$dataset = DatasetTambahan::where('status',1)->orderBy('DatasetTambahanId','DESC');
|
||||||
if(@$key){
|
if(@$key){
|
||||||
$dataset->where('name','ilike','%'.@$key.'%');
|
$dataset->where('name','ilike','%'.@$key.'%');
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,8 +33,8 @@ class HomeController extends Controller
|
||||||
$data['title'] = 'Dashboard';
|
$data['title'] = 'Dashboard';
|
||||||
$data['route'] = $this->route;
|
$data['route'] = $this->route;
|
||||||
if((session('group_id') == 1) || (session('group_alias') == 'admin')){
|
if((session('group_id') == 1) || (session('group_alias') == 'admin')){
|
||||||
$data['dataset'] = Dataset::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::orderBy('DatasetId','DESC')->where('tahun',date('Y'))->count();
|
$data['datasetTambahan'] = DatasetTambahan::where('status',1)->orderBy('DatasetId','DESC')->where('tahun',date('Y'))->count();
|
||||||
$data['datasetInstansi'] = Instansi::selectRaw("
|
$data['datasetInstansi'] = Instansi::selectRaw("
|
||||||
SUM(
|
SUM(
|
||||||
CASE
|
CASE
|
||||||
|
|
@ -57,8 +57,8 @@ class HomeController extends Controller
|
||||||
->count('ms_instansi.MsInstansiId');
|
->count('ms_instansi.MsInstansiId');
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
$data['dataset'] = Dataset::orderBy('DatasetId','DESC')->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::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("
|
$data['datasetInstansi'] = Instansi::where('MsInstansiId',session('instansi_id'))->selectRaw("
|
||||||
SUM(
|
SUM(
|
||||||
CASE
|
CASE
|
||||||
|
|
|
||||||
|
|
@ -238,7 +238,7 @@ class DatasetController extends Controller
|
||||||
'type' => 'success',
|
'type' => 'success',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
} catch (Exception $e) {
|
} catch (\Throwable $e) {
|
||||||
DB::rollback();
|
DB::rollback();
|
||||||
return redirect()->back()->with([
|
return redirect()->back()->with([
|
||||||
'message' => $e->getMessage(),
|
'message' => $e->getMessage(),
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
<a href="{{ url('/') }}" class="font-medium text-slate-700 hover:text-blue-600 transition-colors">Beranda</a>
|
<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') }}" 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('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="#" 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">
|
<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>
|
<span>Login</span>
|
||||||
|
|
@ -74,7 +74,7 @@
|
||||||
<a href="{{ url('/') }}" class="block font-medium py-2">Beranda</a>
|
<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') }}" 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('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>
|
<a href="{{ url('/login') }}" class="w-full bg-blue-600 text-white px-5 py-3 rounded-xl font-bold">Login</a>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
|
||||||
|
|
@ -239,6 +239,19 @@
|
||||||
$('.numberInput').on('input', function() {
|
$('.numberInput').on('input', function() {
|
||||||
this.value = this.value.replace(/[^0-9]/g, ''); // Hanya angka 0-9
|
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
|
// 1. Sidebar Collapse Logic
|
||||||
$('#toggle-sidebar').click(function() {
|
$('#toggle-sidebar').click(function() {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue