diff --git a/app/Http/Controllers/ItemSearchController.php b/app/Http/Controllers/ItemSearchController.php index e7f2470..6dc888c 100644 --- a/app/Http/Controllers/ItemSearchController.php +++ b/app/Http/Controllers/ItemSearchController.php @@ -140,11 +140,18 @@ class ItemSearchController extends Controller $ta = $request->ta; $jenis = $request->jenis; - if (getRole()=="skpd"){ + if (getRole()=="skpd"){ + $filter = ""; + if (isset($jenis)){ + $typeDana = strtoupper($jenis); + $kodeRekening = "'".implode("','",getKodeRekInduk($typeDana))."'"; + $filter = " AND SUBSTR(x.KODE_REKENING,1,12) IN ($kodeRekening) "; + } + $sps = DB::select(DB::raw("SELECT x.KODE_REKENING as IDX,x.KODE_REKENING||' | '||z.NAMA_REKENING as name FROM SAMASA.MAPPING_DBH_SKPD x LEFT JOIN SAMASA.VW_REKENING_PENDAPATAN z ON x.ID_REKENING = z.ID - WHERE x.kode_skpd='".Auth::user()->nrk."'")); + WHERE x.kode_skpd='".Auth::user()->nrk."' $filter")); }else{ $select = DB::raw("KODE_REKENING AS IDX,KODE_REKENING||' | '||NAMA_REKENING as name"); $sps = VwRekeningPendapatan::select($select); @@ -153,12 +160,10 @@ class ItemSearchController extends Controller $sps->whereRaw(" (LOWER(KODE_REKENING) LIKE '%$search%' OR LOWER(NAMA_REKENING) LIKE '%$search%') "); } - if ($jenis == "dbh"){ - $sps->whereRaw(" (SUBSTR(KODE_REKENING,1,12)='4.2.01.01.01') "); - }else if($jenis == "dak"){ - $sps->whereRaw(" (SUBSTR(KODE_REKENING,1,12)='4.2.01.01.03' OR SUBSTR(KODE_REKENING,1,12)='4.2.01.01.04') "); - }else{ - $sps->whereRaw(" (SUBSTR(KODE_REKENING,1,3)='4.2') "); + if (isset($jenis)){ + $typeDana = strtoupper($jenis); + $kodeRekening = "'".implode("','",getKodeRekInduk($typeDana))."'"; + $sps->whereRaw(" SUBSTR(KODE_REKENING,1,12) IN ($kodeRekening)"); } $sps->orderby("KODE_REKENING"); diff --git a/app/Http/Controllers/JadwalSalurdanaController.php b/app/Http/Controllers/JadwalSalurdanaController.php index b0cb3a3..d8faef6 100644 --- a/app/Http/Controllers/JadwalSalurdanaController.php +++ b/app/Http/Controllers/JadwalSalurdanaController.php @@ -20,17 +20,19 @@ class JadwalSalurdanaController extends Controller $this->setIconTitle("fa fa-calendar-alt"); } + /* public function index() { return view('jadwal_salurdana.index'); } + */ protected function filterJadwalSalur($request) { $ta = getTA(); $post = $request->all(); - $typeDana = isset($post["type_dana"])?$post["type_dana"]:""; + $typeDana = isset($post["jenis_dana"])?strtoupper($post["jenis_dana"]):""; $idSPS = isset($post["id_sps"])?$post["id_sps"]:""; $sqlstr = Sps_pendapatan::queryJadwalSalurDana($ta); @@ -39,11 +41,8 @@ class JadwalSalurdanaController extends Controller } if (!empty($typeDana)){ - if ($typeDana == "cht"){ - $sqlstr.=" AND x.kode_rekening='4.2.01.01.01.0004'"; - }else{ - $sqlstr.=" AND SUBSTR(x.kode_rekening,1,12) IN ('4.2.01.01.03','4.2.01.01.04')"; - } + $kodeRekening = "'".implode("','",getKodeRekInduk($typeDana))."'"; + $sqlstr.=" AND SUBSTR(x.kode_rekening,1,12) IN ($kodeRekening)"; } return $sqlstr; @@ -55,15 +54,20 @@ class JadwalSalurdanaController extends Controller $post = $request->all(); $src = isset($post["src"]) ? $post["src"]:""; - $typeDanaFilter = $typeDana == "cht" ? " AND x.jenis_dana = 'DBH' AND lower(x.NAMA_SUBJENIS_DANA) = 'cht' ": " AND x.jenis_dana = 'DAK'"; $idSPS = isset($post["id_sps"])?$post["id_sps"]:""; $skpd = isset($post["skpd"])?$post["skpd"]:""; + $where = ""; + if (!empty($typeDana)){ + $where = $typeDana == "cht" ? " AND x.jenis_dana = 'DBH' AND lower(x.NAMA_SUBJENIS_DANA) = 'cht' ": " AND x.jenis_dana = '$typeDana'"; + } + $where.= !empty($idSPS) ? " AND x.kode_rekening='$idSPS' ":""; + $sqlstr = 'SELECT x.kode_skpd, x.nama_skpd, x.kode_rsk, x.nama_rsk, x.jumlah_anggaran, y.* FROM SAMASA.VW_BELANJA_REALISASI x LEFT JOIN SAMASA.MV_ASYNC_AKB_REALISASI y ON x.KODE_RSK = y.I_IDRSK AND x.TAHUN_ANGGARAN = y.C_ANGG_TAHUN - WHERE x.TAHUN_ANGGARAN = \''.$ta.'\''.$typeDanaFilter; + WHERE x.TAHUN_ANGGARAN = \''.$ta.'\''.$where; if (getRole()=="skpd"){ $sqlstr.=" AND KODE_SKPD='".Auth::user()->nrk."'"; @@ -76,7 +80,7 @@ class JadwalSalurdanaController extends Controller return $sqlstr; } - public function datatable(Request $request) + public function datatableSalur(Request $request) { $post = $request->all(); $offset = $post["start"]; @@ -96,16 +100,17 @@ class JadwalSalurdanaController extends Controller ]); } - public function index_cht_dak(Request $request, $typeDana) + public function index() { - return view("jadwal_salurdana.index_cht_dak", compact("typeDana")); + return view("jadwal_salurdana.index"); } - public function datatable_cht_dak(Request $request, $typeDana) + public function datatableBelanja(Request $request) { $post = $request->all(); $offset = $post["start"]; $limit = $post["length"]; + $typeDana = $post["jenis_dana"]; $sqlstr = $this->filterBelanja($request, $typeDana); @@ -246,7 +251,7 @@ class JadwalSalurdanaController extends Controller } - $sqlstr = $this->filterBelanja($request, $post["type_dana"]); + $sqlstr = $this->filterBelanja($request, $post["jenis_dana"]); $data = DB::select(DB::raw($sqlstr)); $data = json_decode(json_encode($data),true); diff --git a/app/helpers.php b/app/helpers.php index 354d9a0..246a597 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -138,4 +138,17 @@ function getTA() function getJenisDana() { return ["DBH","DAK","DID","DAU"]; +} + +function getKodeRekInduk($val) +{ + $kodeRek = [ + "DBH"=>["4.2.01.01.01"], + // "DBH-CHT"=>"4.2.01.01.01.0004", + "DAU"=>["4.2.01.01.02"], + "DAK"=>["4.2.01.01.03","4.2.01.01.04"], + "DID"=>["4.2.01.02.01"] + ]; + + return $kodeRek[$val]; } \ No newline at end of file diff --git a/public/5655510.jpg b/public/5655510.jpg new file mode 100644 index 0000000..e2636ab Binary files /dev/null and b/public/5655510.jpg differ diff --git a/public/css/app.css b/public/css/app.css index 0e1d0fd..72b8240 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -2,6 +2,7 @@ body{ background: url("../bg.jpg") no-repeat; + /* background: #f2f6fc; */ background-size: cover; /* background: #d5dee7 !important; */ color:#333; diff --git a/resources/views/admin/mapping_dbh_skpd/index.blade.php b/resources/views/admin/mapping_dbh_skpd/index.blade.php index 06939b9..c6c34e9 100644 --- a/resources/views/admin/mapping_dbh_skpd/index.blade.php +++ b/resources/views/admin/mapping_dbh_skpd/index.blade.php @@ -16,7 +16,7 @@ @endsection @section('content') -