diff --git a/app/Http/Controllers/ItemSearchController.php b/app/Http/Controllers/ItemSearchController.php index 8df819f..b34f3bd 100644 --- a/app/Http/Controllers/ItemSearchController.php +++ b/app/Http/Controllers/ItemSearchController.php @@ -34,26 +34,33 @@ class ItemSearchController extends Controller public function skpd(Request $request) { $tropd = []; - if($request->has('q')){ - $ta = $request->ta; - $search = strtoupper($request->q); - if($request->has('realisasi-belanja')){ - $sqlStr = "SELECT DISTINCT x.KODE_SKPD AS ID,x.KODE_SKPD||' | '||x.NAMA_SKPD as name - FROM SAMASA.BELANJA_REALISASI x - LEFT JOIN NEWSIPKD.TROPD y ON x.KODE_SKPD = y.C_OPD - WHERE TAHUN_ANGGARAN = $ta AND - NAMA_SKPD LIKE '%$search%' "; + $ta = $request->ta; + $search = strtoupper($request->q); + if($request->has('realisasi-belanja')){ + $sqlStr = "SELECT DISTINCT x.KODE_SKPD AS ID,x.KODE_SKPD||' | '||x.NAMA_SKPD as name + FROM SAMASA.BELANJA_REALISASI x + LEFT JOIN NEWSIPKD.TROPD y ON x.KODE_SKPD = y.C_OPD + WHERE TAHUN_ANGGARAN = $ta "; - if (getRole()=="sbpk"){ - $sqlStr.= " AND y.C_WIL_SP2DPROSES=".Auth::user()->wilayah; - } - $tropd = DB::select(DB::raw($sqlStr." ORDER BY x.KODE_SKPD ")); - }else{ - $select = DB::raw("C_OPD AS ID,C_OPD||' | '||N_OPD as name"); - $tropd = Tropd::select($select) - ->where('N_OPD', 'LIKE', "%$search%") - ->get(); + if (getRole()=="sbpk"){ + $sqlStr.= " AND y.C_WIL_SP2DPROSES=".Auth::user()->wilayah; + } + + if($request->has('q')){ + $search = strtolower($request->q); + $sqlStr.= " AND LOWER(x.NAMA_SKPD) LIKE '%$search%' "; + } + + $tropd = DB::select(DB::raw($sqlStr." ORDER BY x.KODE_SKPD ")); + }else{ + $select = DB::raw("C_OPD AS ID,C_OPD||' | '||N_OPD as name"); + $tropd = Tropd::select($select); + if($request->has('q')){ + $search = strtolower($request->q); + $tropd->whereRaw("LOWER(x.NAMA_SKPD) LIKE '%$search%'"); } + $tropd->orderBy("C_OPD"); + $tropd->get(); } return response()->json($tropd); } diff --git a/app/Http/Controllers/JadwalSalurdanaController.php b/app/Http/Controllers/JadwalSalurdanaController.php index 39dcf16..f645f50 100644 --- a/app/Http/Controllers/JadwalSalurdanaController.php +++ b/app/Http/Controllers/JadwalSalurdanaController.php @@ -67,6 +67,15 @@ class JadwalSalurdanaController extends Controller if (getRole()=="skpd"){ $filter.=" AND x.kode_skpd='".Auth::user()->nrk."'"; } + $idSPS = 0; + if ($request->has("id_sps")) + { + if ($request->id_sps > 0) + { + $filter.=" AND x.id_sps=".$request->id_sps; + $idSPS = $request->id_sps; + } + } $dataAkbRealisasi = DB::select(DB::raw("SELECT x.kode_skpd, x.nama_skpd, x.kode_rsk, x.nama_rsk, x.jumlah_anggaran, y.* FROM SAMASA.BELANJA_REALISASI x @@ -79,7 +88,7 @@ class JadwalSalurdanaController extends Controller return (array)$value; }, $dataAkbRealisasi); - return view("jadwal_salurdana.index_".$typeDana, compact("dataAkbRealisasi")); + return view("jadwal_salurdana.index_".$typeDana, compact("dataAkbRealisasi","idSPS")); } public function datatable_cht_dak(Request $request, $typeDana) diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index 19f48f2..a6ec8bc 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -48,7 +48,7 @@ class RealisasiBelanjaController extends Controller return redirect(URL::to("/realisasi-belanja")) ->with('error','Data dengan RSK yand dipilih sudah ada!'); } - $VwDpaRsk = VwDpaRsk::where("I_ID",$get["rsk"])->firstorCreate(); + $VwDpaRsk = VwDpaRsk::where("I_ID",$get["rsk"])->first(); $unitSatuan = UnitSatuan::orderBy("id")->get(); return view('realisasi_belanja.create', compact("unitSatuan","VwDpaRsk")); } @@ -111,7 +111,7 @@ class RealisasiBelanjaController extends Controller ]); $req = $request->all(); - $VwDpaRsk = VwDpaRsk::where("I_ID",$req["rsk"])->firstorCreate(); + $VwDpaRsk = VwDpaRsk::where("I_ID",$req["rsk"])->first(); try{ DB::beginTransaction(); @@ -155,9 +155,9 @@ class RealisasiBelanjaController extends Controller public function edit(VwBelanjaRealisasi $realisasi_belanja) { - $VwDpaRsk = VwDpaRsk::where("I_ID",$realisasi_belanja->kode_rsk)->firstorCreate(); + $VwDpaRsk = VwDpaRsk::where("I_ID",$realisasi_belanja->kode_rsk)->first(); $unitSatuan = UnitSatuan::orderBy("id")->get(); - $sps = Sps_pendapatan::select(DB::raw("ID,KODE_REKENING||' | '||NAMA_REKENING as name"))->where("ID", $realisasi_belanja->id_sps)->firstorCreate(); + $sps = Sps_pendapatan::select(DB::raw("ID,KODE_REKENING||' | '||NAMA_REKENING as name"))->where("ID", $realisasi_belanja->id_sps)->first(); return view('realisasi_belanja.edit', compact("realisasi_belanja","sps","unitSatuan","VwDpaRsk")); } @@ -176,7 +176,7 @@ class RealisasiBelanjaController extends Controller ]); $req = $request->all(); - $VwDpaRsk = VwDpaRsk::where("I_ID",$req["rsk"])->firstorCreate(); + $VwDpaRsk = VwDpaRsk::where("I_ID",$req["rsk"])->first(); try{ DB::beginTransaction(); @@ -223,12 +223,19 @@ class RealisasiBelanjaController extends Controller "SELECT * FROM SAMASA.VW_BELANJA_REALISASI WHERE id='$id' " )); $BelanjaRealisasi = $BelanjaRealisasi[0]; + + if (getRole()=="sbpk"){ + $sbpkUpdate = BelanjaRealisasi::where("id", $id)->firstOrNew(); + $sbpkUpdate->update(["f_view_sbpk"=>date("Y-m-d H:i")]); + } + if (getRole()=="skpd"){ if ($BelanjaRealisasi->kode_skpd != Auth::user()->nrk) { abort(403, 'Tidak diperbolehkan mengunjungi halaman ini!'); } } + $BelanjaRealisasiDetail = BelanjaRealisasiDetail::where("belanja_realisasi_id",$BelanjaRealisasi->id)->get(); // var_dump($BelanjaRealisasi->kode_rsk,$BelanjaRealisasi->kode_sub_kegiatan); exit; $this->setTitle("Realisasi Belanja"); @@ -261,7 +268,7 @@ class RealisasiBelanjaController extends Controller $unitSatuan = UnitSatuan::orderBy("id")->get(); $jmlRealisasi1 = $this->getRealisasi($BelanjaRealisasi->kode_rsk, 1); $jmlRealisasi2 = $this->getRealisasi($BelanjaRealisasi->kode_rsk, 2); - $sps = Sps_pendapatan::select(DB::raw("ID,KODE_REKENING||' | '||NAMA_REKENING as name"))->where("ID", $BelanjaRealisasi->id_sps)->firstorCreate(); + $sps = Sps_pendapatan::select(DB::raw("ID,KODE_REKENING||' | '||NAMA_REKENING as name"))->where("ID", $BelanjaRealisasi->id_sps)->first(); return view('realisasi_belanja.submit', compact("BelanjaRealisasi","BelanjaRealisasiDetail","BelanjaRealisasiKontrak","vwAKB","vwSPD","vwSP2D","unitSatuan","jmlRealisasi1","jmlRealisasi2","sps")); } @@ -276,6 +283,7 @@ class RealisasiBelanjaController extends Controller $SubJenisDana = isset($post["sub_jenis_dana"])?$post["sub_jenis_dana"]:""; $skpd = isset($post["skpd"])?$post["skpd"]:""; $subkeg = isset($post["subkeg"])?$post["subkeg"]:""; + $idSPS = isset($post["id_sps"])?$post["id_sps"]:""; $sqlStr = "SELECT x.* FROM BELANJA_REALISASI x LEFT JOIN NEWSIPKD.TROPD z ON x.KODE_SKPD = z.C_OPD WHERE x.tahun_anggaran='$ta'"; @@ -284,10 +292,10 @@ class RealisasiBelanjaController extends Controller $sqlStr.=" AND KODE_SKPD='".Auth::user()->nrk."'"; }elseif (getRole()=="sbpk"){ $sqlStr.=" AND z.C_WIL_SP2DPROSES=".Auth::user()->wilayah; - }else{ - if (!empty($skpd)){ - $sqlStr.=" AND KODE_SKPD='".$skpd."'"; - } + } + + if (!empty($skpd)){ + $sqlStr.=" AND KODE_SKPD='".$skpd."'"; } $filter=""; @@ -303,6 +311,10 @@ class RealisasiBelanjaController extends Controller $filter.= " AND x.KODE_SUB_KEGIATAN = '".$subkeg."'"; } + if (!empty($idSPS)){ + $filter.= " AND x.id_sps = ".$idSPS; + } + $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("SELECT a.*,b.jml FROM (".$sqlStr.$filter.") a diff --git a/app/Models/BelanjaRealisasi.php b/app/Models/BelanjaRealisasi.php index aab8bc9..95ee10c 100644 --- a/app/Models/BelanjaRealisasi.php +++ b/app/Models/BelanjaRealisasi.php @@ -40,6 +40,7 @@ class BelanjaRealisasi extends Eloquent "created_by", "jenis_dana", "sub_jenis_dana", - "id_sps" + "id_sps", + "f_view_sbpk" ]; } diff --git a/database/migrations/2022_07_18_090432_create_belanja_realisasi_table.php b/database/migrations/2022_07_18_090432_create_belanja_realisasi_table.php index 79ffb6e..791e5d6 100644 --- a/database/migrations/2022_07_18_090432_create_belanja_realisasi_table.php +++ b/database/migrations/2022_07_18_090432_create_belanja_realisasi_table.php @@ -43,6 +43,7 @@ class CreateBelanjaRealisasiTable extends Migration $table->uuid('realisasi_by')->nullable(); $table->uuid('created_by')->nullable(); $table->integer('id_sps')->nullable(); + $table->tinyInteger('f_view_sbpk')->default(0); $table->timestamps(); }); } diff --git a/public/js/app.js b/public/js/app.js index 2f2341d..93f163b 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -361,6 +361,7 @@ let subJenisDana = (idGrup)=>{ $('.sps_search').select2({ placeholder: 'Pilih DBH / DAK', + allowClear: true, ajax: { url: Url+'/item-search-sps?ta='+ta, dataType: 'json', @@ -375,7 +376,7 @@ $('.sps_search').select2({ }) }; }, - cache: true + cache: true, } }); diff --git a/resources/views/jadwal_salurdana/index_dak.blade.php b/resources/views/jadwal_salurdana/index_dak.blade.php index ab8ebfb..ff8460f 100644 --- a/resources/views/jadwal_salurdana/index_dak.blade.php +++ b/resources/views/jadwal_salurdana/index_dak.blade.php @@ -171,38 +171,6 @@ AKB Realisasi - { + $.ajax({ + url: '{{ $baseUrl }}/item-search-sps?ta='+$("#srcTA").val()+'&jenis=dak', + dataType: 'json', + async: false, + success: function (data) { + $('#txt_id_sps').empty(); + $('#txt_id_sps').append($('' ) - // } ); - // }); - // } initComplete: function () { this.api().columns([1]).every( function () { var column = this; @@ -522,28 +490,12 @@ ], }); - optionDAK = () =>{ - $.ajax({ - url: '{{ $baseUrl }}/item-search-sps?ta='+$("#srcTA").val()+'&jenis=dak', - dataType: 'json', - success: function (data) { - $('#txt_id_sps').empty(); - $('#txt_id_sps').append($('