gitea/sidata
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Maintenance

Browse Source
This commit is contained in:
Izuddin
2022-08-23 00:20:14 +07:00
parent 262a35326a
commit f4a830593b
9 changed files with 130 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ItemSearchController.php
+23 -4
View File
@@ -11,6 +11,7 @@ use App\Models\Rsk;
use App\Models\Sps_pendapatan;
use App\Models\Siesetpembayaran;
use App\Models\Sp2d;
use App\Models\BelanjaRealisasi;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Auth;
@@ -30,14 +31,22 @@ class ItemSearchController extends Controller
public function skpd(Request $request)
{
$tropd = [];
if($request->has('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");
$tropd = Tropd::select($select)
->where('N_OPD', 'LIKE', "%$search%")
->get();
}
}
return response()->json($tropd);
}
@@ -71,16 +80,26 @@ class ItemSearchController extends Controller
public function sk(Request $request)
{
$tropd = [];
$sk = [];
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);
$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%")
->get();
}
return response()->json($tropd);
}
return response()->json($sk);
}
public function rsk(Request $request)
app/Http/Controllers/RealisasiBelanjaController.php
+10
View File
@@ -102,6 +102,8 @@ class RealisasiBelanjaController extends Controller
$ta = $post["ta"];
$JenisDana = $post["jenis_dana"];
$SubJenisDana = $post["sub_jenis_dana"];
$skpd = $post["skpd"];
$subkeg = $post["subkeg"];
$sqlStr = "SELECT x.*,y.JML_REALISASI_SP2D
FROM BELANJA_REALISASI x
@@ -116,6 +118,10 @@ class RealisasiBelanjaController extends Controller
if (getRole()=="skpd"){
$sqlStr.=" AND KODE_SKPD='".Auth::user()->nrk."'";
}else{
if (!empty($skpd)){
$sqlStr.=" AND KODE_SKPD='".$skpd."'";
}
}
$filter="";
@@ -127,6 +133,10 @@ class RealisasiBelanjaController extends Controller
$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"));
$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'));
resources/views/home.blade.php
+2 -2
View File
@@ -2,9 +2,9 @@
@section('content')
<div class="content-header">
<h1>E-SAMASA</h1>
<h1>S I D A T A</h1>
</div>
<div class="content px-2">
<p>Selamat Datang di aplikasi E-SAMASA</p>
<p>Selamat Datang di aplikasi SIDATA</p>
</div>
@stop
resources/views/layouts/auth.blade.php
+1 -1
View File
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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="{{ $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">
resources/views/login.blade.php
+2 -1
View File
@@ -11,7 +11,8 @@
<p class="login-box-msg p-0">
<img src="/bg-login.png"></i>
</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'))
<div class="alert alert-danger alert-dismissible fade show" role="alert">
Something it's wrong:
resources/views/partials/header.blade.php
+4 -3
View File
@@ -1,11 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<html lang="en" translate="no">
<head>
<meta charset="utf-8">
<meta name="google" content="notranslate">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<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="{{ $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">
@@ -15,4 +16,4 @@
<link rel="stylesheet" href="{{ $baseUrl }}/css/app.css">
@yield('styles')
</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">
resources/views/partials/menu.blade.php
+4 -4
View File
@@ -5,7 +5,7 @@
<aside class="main-sidebar sidebar-dark-primary elevation-4 sidebar-dark-navy">
<a href="javascript:void(0)" class="brand-link">
<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>
<div class="sidebar">
@@ -28,7 +28,7 @@
</a>
</li>
<?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">
<a href="{{ $baseUrl }}/jadwal-salurdana/cht" class="nav-link">
<i class="nav-icon fa fa-minus"></i>
@@ -95,8 +95,8 @@
@endif
@if ($role == "superadmin")
<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/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/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><p>Roles</p></a></li>
@endif
</ul>
</nav>
resources/views/realisasi_belanja/index.blade.php
+75 -3
View File
@@ -38,7 +38,7 @@
</select>
</div>
</div>
<div class="col-3">
<div class="col-2">
<div class="form-group">
<label>Jenis Dana</label>
<select class="form-control form-control-sm" id="srcJenisDana" name="jenis_dana">
@@ -52,13 +52,25 @@
</select>
</div>
</div>
<div class="col-3">
<div class="col-2">
<div class="form-group">
<label>&nbsp;</label>
<select class="form-control form-control-sm" id="srcSubJenisDana" name="sub_jenis_dana">
</select>
</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="form-group">
<label>Berdasarkan Kata</label>
@@ -142,6 +154,64 @@
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( {
"processing": true,
"serverSide": true,
@@ -157,7 +227,9 @@
d.ta = $("#srcTA").val(),
//d.src = $("#src").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": [
resources/views/realisasi_pendapatan/form.blade.php
+1 -1
View File
@@ -17,7 +17,7 @@
<input id="txt_rek_sps" name="txt_rek_sps" type="hidden">
</div>
<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">
<div class="form-group row">