diff --git a/app/Http/Controllers/ItemSearchController.php b/app/Http/Controllers/ItemSearchController.php index 4fb8c7f..bfed47e 100644 --- a/app/Http/Controllers/ItemSearchController.php +++ b/app/Http/Controllers/ItemSearchController.php @@ -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,13 +31,21 @@ class ItemSearchController extends Controller public function skpd(Request $request) { $tropd = []; - if($request->has('q')){ $search = strtoupper($request->q); - $select = DB::raw("C_OPD AS ID,C_OPD||' | '||N_OPD as name"); - $tropd = Tropd::select($select) - ->where('N_OPD', 'LIKE', "%$search%") - ->get(); + 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')){ - $search = strtoupper($request->q); - $select = DB::raw("C_SUBGIAT AS ID,C_SUBGIAT||' | '||N_SUBGIAT as name"); - $tropd = SubKegiatan::select($select) - ->where('N_SUBGIAT', 'LIKE', "%$search%") - ->get(); + 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"); + $sk = SubKegiatan::select($select) + ->where('N_SUBGIAT', 'LIKE', "%$search%") + ->get(); + } } - return response()->json($tropd); + return response()->json($sk); } public function rsk(Request $request) diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index 8d202f7..fc96480 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -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')); diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 6354cd9..63a6261 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -2,9 +2,9 @@ @section('content')
-

E-SAMASA

+

S I D A T A

-

Selamat Datang di aplikasi E-SAMASA

+

Selamat Datang di aplikasi SIDATA

@stop \ No newline at end of file diff --git a/resources/views/layouts/auth.blade.php b/resources/views/layouts/auth.blade.php index 563b844..7c4aa4f 100644 --- a/resources/views/layouts/auth.blade.php +++ b/resources/views/layouts/auth.blade.php @@ -3,7 +3,7 @@ - E-SAMASA | LOG IN + SIDATA | LOG IN diff --git a/resources/views/login.blade.php b/resources/views/login.blade.php index a5797fa..b488a26 100644 --- a/resources/views/login.blade.php +++ b/resources/views/login.blade.php @@ -11,7 +11,8 @@

-

E-SAMASA

+

S I D A T A

+

Sistem Informasi Dana Transfer
Provinsi DKI Jakarta

@if(session('errors')) -
+
-
+
+
+
+ + +
+
+
+
+ + +
+
{{--
@@ -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": [ diff --git a/resources/views/realisasi_pendapatan/form.blade.php b/resources/views/realisasi_pendapatan/form.blade.php index 55520a0..a5dbe17 100644 --- a/resources/views/realisasi_pendapatan/form.blade.php +++ b/resources/views/realisasi_pendapatan/form.blade.php @@ -17,7 +17,7 @@
-
RINCIAN
+
RINCIAN JADWAL SALUR