Maintenance
This commit is contained in:
@@ -11,6 +11,7 @@ use App\Models\Rsk;
|
|||||||
use App\Models\Sps_pendapatan;
|
use App\Models\Sps_pendapatan;
|
||||||
use App\Models\Siesetpembayaran;
|
use App\Models\Siesetpembayaran;
|
||||||
use App\Models\Sp2d;
|
use App\Models\Sp2d;
|
||||||
|
use App\Models\BelanjaRealisasi;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
@@ -30,14 +31,22 @@ class ItemSearchController extends Controller
|
|||||||
public function skpd(Request $request)
|
public function skpd(Request $request)
|
||||||
{
|
{
|
||||||
$tropd = [];
|
$tropd = [];
|
||||||
|
|
||||||
if($request->has('q')){
|
if($request->has('q')){
|
||||||
$search = strtoupper($request->q);
|
$search = strtoupper($request->q);
|
||||||
|
if($request->has('realisasi-belanja')){
|
||||||
|
$select = DB::raw("DISTINCT KODE_SKPD AS ID,KODE_SKPD||' | '||NAMA_SKPD as name");
|
||||||
|
$ta = $request->ta;
|
||||||
|
$tropd = BelanjaRealisasi::select($select)
|
||||||
|
->where("TAHUN_ANGGARAN", $ta)
|
||||||
|
->where('NAMA_SKPD', 'LIKE', "%$search%")
|
||||||
|
->get();
|
||||||
|
}else{
|
||||||
$select = DB::raw("C_OPD AS ID,C_OPD||' | '||N_OPD as name");
|
$select = DB::raw("C_OPD AS ID,C_OPD||' | '||N_OPD as name");
|
||||||
$tropd = Tropd::select($select)
|
$tropd = Tropd::select($select)
|
||||||
->where('N_OPD', 'LIKE', "%$search%")
|
->where('N_OPD', 'LIKE', "%$search%")
|
||||||
->get();
|
->get();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return response()->json($tropd);
|
return response()->json($tropd);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -71,16 +80,26 @@ class ItemSearchController extends Controller
|
|||||||
|
|
||||||
public function sk(Request $request)
|
public function sk(Request $request)
|
||||||
{
|
{
|
||||||
$tropd = [];
|
$sk = [];
|
||||||
|
|
||||||
if($request->has('q')){
|
if($request->has('q')){
|
||||||
|
if($request->has('realisasi-belanja')){
|
||||||
|
$search = $request->q;
|
||||||
|
$select = DB::raw("DISTINCT KODE_SUB_KEGIATAN AS ID,KODE_SUB_KEGIATAN||' | '||NAMA_SUB_KEGIATAN as name");
|
||||||
|
$ta = $request->ta;
|
||||||
|
$sk = BelanjaRealisasi::select($select)
|
||||||
|
->where("TAHUN_ANGGARAN", $ta)
|
||||||
|
->where('NAMA_SUB_KEGIATAN', 'LIKE', "%$search%")
|
||||||
|
->get();
|
||||||
|
}else{
|
||||||
$search = strtoupper($request->q);
|
$search = strtoupper($request->q);
|
||||||
$select = DB::raw("C_SUBGIAT AS ID,C_SUBGIAT||' | '||N_SUBGIAT as name");
|
$select = DB::raw("C_SUBGIAT AS ID,C_SUBGIAT||' | '||N_SUBGIAT as name");
|
||||||
$tropd = SubKegiatan::select($select)
|
$sk = SubKegiatan::select($select)
|
||||||
->where('N_SUBGIAT', 'LIKE', "%$search%")
|
->where('N_SUBGIAT', 'LIKE', "%$search%")
|
||||||
->get();
|
->get();
|
||||||
}
|
}
|
||||||
return response()->json($tropd);
|
}
|
||||||
|
return response()->json($sk);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function rsk(Request $request)
|
public function rsk(Request $request)
|
||||||
|
|||||||
@@ -102,6 +102,8 @@ class RealisasiBelanjaController extends Controller
|
|||||||
$ta = $post["ta"];
|
$ta = $post["ta"];
|
||||||
$JenisDana = $post["jenis_dana"];
|
$JenisDana = $post["jenis_dana"];
|
||||||
$SubJenisDana = $post["sub_jenis_dana"];
|
$SubJenisDana = $post["sub_jenis_dana"];
|
||||||
|
$skpd = $post["skpd"];
|
||||||
|
$subkeg = $post["subkeg"];
|
||||||
|
|
||||||
$sqlStr = "SELECT x.*,y.JML_REALISASI_SP2D
|
$sqlStr = "SELECT x.*,y.JML_REALISASI_SP2D
|
||||||
FROM BELANJA_REALISASI x
|
FROM BELANJA_REALISASI x
|
||||||
@@ -116,6 +118,10 @@ class RealisasiBelanjaController extends Controller
|
|||||||
|
|
||||||
if (getRole()=="skpd"){
|
if (getRole()=="skpd"){
|
||||||
$sqlStr.=" AND KODE_SKPD='".Auth::user()->nrk."'";
|
$sqlStr.=" AND KODE_SKPD='".Auth::user()->nrk."'";
|
||||||
|
}else{
|
||||||
|
if (!empty($skpd)){
|
||||||
|
$sqlStr.=" AND KODE_SKPD='".$skpd."'";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$filter="";
|
$filter="";
|
||||||
@@ -127,6 +133,10 @@ class RealisasiBelanjaController extends Controller
|
|||||||
$filter.= " AND x.SUB_JENIS_DANA = '".$SubJenisDana."'";
|
$filter.= " AND x.SUB_JENIS_DANA = '".$SubJenisDana."'";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!empty($subkeg)){
|
||||||
|
$filter.= " AND x.KODE_SUB_KEGIATAN = '".$subkeg."'";
|
||||||
|
}
|
||||||
|
|
||||||
$dataFilter = DB::select(DB::raw("SELECT COUNT(ID) as JML FROM ($sqlStr $filter) x"));
|
$dataFilter = DB::select(DB::raw("SELECT COUNT(ID) as JML FROM ($sqlStr $filter) x"));
|
||||||
$dataTotal = DB::select(DB::raw("SELECT COUNT(ID) as JML FROM ($sqlStr) x"));
|
$dataTotal = DB::select(DB::raw("SELECT COUNT(ID) as JML FROM ($sqlStr) x"));
|
||||||
$data = DB::select(DB::raw($sqlStr.$filter.' ORDER BY x.ID OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY'));
|
$data = DB::select(DB::raw($sqlStr.$filter.' ORDER BY x.ID OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY'));
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
<div class="content-header">
|
<div class="content-header">
|
||||||
<h1>E-SAMASA</h1>
|
<h1>S I D A T A</h1>
|
||||||
</div>
|
</div>
|
||||||
<div class="content px-2">
|
<div class="content px-2">
|
||||||
<p>Selamat Datang di aplikasi E-SAMASA</p>
|
<p>Selamat Datang di aplikasi SIDATA</p>
|
||||||
</div>
|
</div>
|
||||||
@stop
|
@stop
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<title>E-SAMASA | LOG IN</title>
|
<title>SIDATA | LOG IN</title>
|
||||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700&display=fallback">
|
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700&display=fallback">
|
||||||
<link rel="stylesheet" href="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/fontawesome-free/css/all.min.css">
|
<link rel="stylesheet" href="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/fontawesome-free/css/all.min.css">
|
||||||
<link rel="stylesheet" href="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/icheck-bootstrap/icheck-bootstrap.min.css">
|
<link rel="stylesheet" href="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/icheck-bootstrap/icheck-bootstrap.min.css">
|
||||||
|
|||||||
@@ -11,7 +11,8 @@
|
|||||||
<p class="login-box-msg p-0">
|
<p class="login-box-msg p-0">
|
||||||
<img src="/bg-login.png"></i>
|
<img src="/bg-login.png"></i>
|
||||||
</p>
|
</p>
|
||||||
<h2 class="text-center" style="color:#001f3f;">E-SAMASA</h2>
|
<h2 class="text-center" style="color:#001f3f">S I D A T A</h2>
|
||||||
|
<p class="text-center">Sistem Informasi Dana Transfer<br>Provinsi DKI Jakarta</p>
|
||||||
@if(session('errors'))
|
@if(session('errors'))
|
||||||
<div class="alert alert-danger alert-dismissible fade show" role="alert">
|
<div class="alert alert-danger alert-dismissible fade show" role="alert">
|
||||||
Something it's wrong:
|
Something it's wrong:
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en" translate="no">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
|
<meta name="google" content="notranslate">
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta name="csrf-token" content="{{ csrf_token() }}" />
|
<meta name="csrf-token" content="{{ csrf_token() }}" />
|
||||||
<title>{{ config('app.name','E-SAMASA') }} {{ isset($siteTitle)?" | ".$siteTitle:"" }}</title>
|
<title>{{ config('app.name','SIDATA') }} {{ isset($siteTitle)?" | ".$siteTitle:"" }}</title>
|
||||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700&display=fallback">
|
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700&display=fallback">
|
||||||
<link rel="stylesheet" href="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css">
|
<link rel="stylesheet" href="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css">
|
||||||
<link rel="stylesheet" href="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/fontawesome-free/css/all.min.css">
|
<link rel="stylesheet" href="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/fontawesome-free/css/all.min.css">
|
||||||
@@ -15,4 +16,4 @@
|
|||||||
<link rel="stylesheet" href="{{ $baseUrl }}/css/app.css">
|
<link rel="stylesheet" href="{{ $baseUrl }}/css/app.css">
|
||||||
@yield('styles')
|
@yield('styles')
|
||||||
</head>
|
</head>
|
||||||
<body class="hold-transition sidebar-mini text-sm layout-fixed layout-navbar-fixed">
|
<body class="hold-transition sidebar-mini text-sm layout-fixed layout-navbar-fixed sidebar-collapse">
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<aside class="main-sidebar sidebar-dark-primary elevation-4 sidebar-dark-navy">
|
<aside class="main-sidebar sidebar-dark-primary elevation-4 sidebar-dark-navy">
|
||||||
<a href="javascript:void(0)" class="brand-link">
|
<a href="javascript:void(0)" class="brand-link">
|
||||||
<img class='brand-image' src="/logo.png">
|
<img class='brand-image' src="/logo.png">
|
||||||
<span class="brand-text font-weight" style="line-height:1; letter-spacing:3px; font-weight:bold;">E-SAMASA</span>
|
<span class="brand-text font-weight" style="line-height:1; letter-spacing:3px; font-weight:bold;">S I D A T A</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<div class="sidebar">
|
<div class="sidebar">
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
<?php if (Auth::user()->can("Read DBH Jadwal") || $role == "superadmin"){ ?>
|
<?php if (Auth::user()->can("Read DBH CHT Jadwal") || $role == "superadmin"){ ?>
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a href="{{ $baseUrl }}/jadwal-salurdana/cht" class="nav-link">
|
<a href="{{ $baseUrl }}/jadwal-salurdana/cht" class="nav-link">
|
||||||
<i class="nav-icon fa fa-minus"></i>
|
<i class="nav-icon fa fa-minus"></i>
|
||||||
@@ -95,8 +95,8 @@
|
|||||||
@endif
|
@endif
|
||||||
@if ($role == "superadmin")
|
@if ($role == "superadmin")
|
||||||
<li class="nav-header">PENGATURAN</li>
|
<li class="nav-header">PENGATURAN</li>
|
||||||
<li class="nav-item"><a href="{{ $baseUrl }}/admin/permissions" class="nav-link"><i class="nav-icon fas fa-th-large nav-icon"></i>Permissions</a></li>
|
<li class="nav-item"><a href="{{ $baseUrl }}/admin/permissions" class="nav-link"><i class="nav-icon fas fa-th-large nav-icon"></i><p>Permissions</p></a></li>
|
||||||
<li class="nav-item"><a href="{{ $baseUrl }}/admin/roless" class="nav-link"><i class="nav-icon fas fa-th-large nav-icon"></i>Roles</a></li>
|
<li class="nav-item"><a href="{{ $baseUrl }}/admin/roless" class="nav-link"><i class="nav-icon fas fa-th-large nav-icon"></i><p>Roles</p></a></li>
|
||||||
@endif
|
@endif
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-3">
|
<div class="col-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label>Jenis Dana</label>
|
<label>Jenis Dana</label>
|
||||||
<select class="form-control form-control-sm" id="srcJenisDana" name="jenis_dana">
|
<select class="form-control form-control-sm" id="srcJenisDana" name="jenis_dana">
|
||||||
@@ -52,13 +52,25 @@
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-3">
|
<div class="col-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label> </label>
|
<label> </label>
|
||||||
<select class="form-control form-control-sm" id="srcSubJenisDana" name="sub_jenis_dana">
|
<select class="form-control form-control-sm" id="srcSubJenisDana" name="sub_jenis_dana">
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-3">
|
||||||
|
<div class="form-group">
|
||||||
|
<label>SKPD</label>
|
||||||
|
<select class="form-control" id="skpd" name="skpd"></select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-3">
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Sub Kegiatan</label>
|
||||||
|
<select class="form-control" id="subkeg" name="subkeg"></select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
{{-- <div class="col-5">
|
{{-- <div class="col-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label>Berdasarkan Kata</label>
|
<label>Berdasarkan Kata</label>
|
||||||
@@ -142,6 +154,64 @@
|
|||||||
dtTable.draw();
|
dtTable.draw();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('#skpd').select2({
|
||||||
|
placeholder: 'Pilih SKPD',
|
||||||
|
allowClear: true,
|
||||||
|
ajax: {
|
||||||
|
url: '{{ $baseUrl }}/skpd-search?realisasi-belanja=ya&ta='+$("#srcTA").val(),
|
||||||
|
dataType: 'json',
|
||||||
|
delay: 250,
|
||||||
|
processResults: function (data) {
|
||||||
|
return {
|
||||||
|
results: $.map(data, function (item) {
|
||||||
|
return {
|
||||||
|
text: item.name,
|
||||||
|
id: item.id
|
||||||
|
}
|
||||||
|
})
|
||||||
|
};
|
||||||
|
},
|
||||||
|
cache: true
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
$('#skpd').on('select2:select', function (e) {
|
||||||
|
dtTable.draw();
|
||||||
|
})
|
||||||
|
|
||||||
|
$('#skpd').on('select2:clear', function (e) {
|
||||||
|
dtTable.draw();
|
||||||
|
})
|
||||||
|
|
||||||
|
$('#subkeg').select2({
|
||||||
|
placeholder: 'Pilih Sub Kegiatan',
|
||||||
|
allowClear: true,
|
||||||
|
ajax: {
|
||||||
|
url: '{{ $baseUrl }}/item-search-sk?realisasi-belanja=ya&ta='+$("#srcTA").val(),
|
||||||
|
dataType: 'json',
|
||||||
|
delay: 250,
|
||||||
|
processResults: function (data) {
|
||||||
|
return {
|
||||||
|
results: $.map(data, function (item) {
|
||||||
|
return {
|
||||||
|
text: item.name,
|
||||||
|
id: item.id
|
||||||
|
}
|
||||||
|
})
|
||||||
|
};
|
||||||
|
},
|
||||||
|
cache: true
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
$('#subkeg').on('select2:select', function (e) {
|
||||||
|
dtTable.draw();
|
||||||
|
})
|
||||||
|
|
||||||
|
$('#subkeg').on('select2:clear', function (e) {
|
||||||
|
dtTable.draw();
|
||||||
|
})
|
||||||
|
|
||||||
var dtTable = $('#tblRealisasi').DataTable( {
|
var dtTable = $('#tblRealisasi').DataTable( {
|
||||||
"processing": true,
|
"processing": true,
|
||||||
"serverSide": true,
|
"serverSide": true,
|
||||||
@@ -157,7 +227,9 @@
|
|||||||
d.ta = $("#srcTA").val(),
|
d.ta = $("#srcTA").val(),
|
||||||
//d.src = $("#src").val(),
|
//d.src = $("#src").val(),
|
||||||
d.jenis_dana = $("#srcJenisDana").val(),
|
d.jenis_dana = $("#srcJenisDana").val(),
|
||||||
d.sub_jenis_dana = $("#srcSubJenisDana").val()
|
d.sub_jenis_dana = $("#srcSubJenisDana").val(),
|
||||||
|
d.skpd = $("#skpd").val(),
|
||||||
|
d.subkeg = $("#subkeg").val()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"columnDefs": [
|
"columnDefs": [
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
<input id="txt_rek_sps" name="txt_rek_sps" type="hidden">
|
<input id="txt_rek_sps" name="txt_rek_sps" type="hidden">
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="col-12"><strong>RINCIAN</strong><hr></div>
|
<div class="col-12"><strong>RINCIAN JADWAL SALUR</strong><hr></div>
|
||||||
<div class="col-12 row">
|
<div class="col-12 row">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
|
|||||||
Reference in New Issue
Block a user