diff --git a/app/Http/Controllers/JadwalSalurdanaController.php b/app/Http/Controllers/JadwalSalurdanaController.php index 438b54e..446e2ef 100644 --- a/app/Http/Controllers/JadwalSalurdanaController.php +++ b/app/Http/Controllers/JadwalSalurdanaController.php @@ -24,42 +24,6 @@ class JadwalSalurdanaController extends Controller return view('jadwal_salurdana.index'); } - protected function queryJadwalSalurDana($ta) - { - $sqlstr = 'SELECT x.kode_rekening,x.nama_rekening,spsbulan1,spsbulan2,spsbulan3,spsbulan4, - spsbulan5,spsbulan6,spsbulan7,spsbulan8,spsbulan9,spsbulan10,spsbulan11,spsbulan12, - SUBSTR(x.KODE_REKENING,1,12) AS kodegrup,SUBSTR(x.KODE_REKENING,1,9) AS groupall, - NVL("1",0) AS "REAL1",NVL("2",0) AS "REAL2",NVL("3",0) AS "REAL3", - NVL("4",0) AS "REAL4",NVL("5",0) AS "REAL5",NVL("6",0) AS "REAL6", - NVL("7",0) AS "REAL7",NVL("8",0) AS "REAL8",NVL("9",0) AS "REAL9", - NVL("10",0) AS "REAL10",NVL("11",0) AS "REAL11",NVL("12",0) AS "REAL12" - FROM PROKSI.SPS_PENDAPATAN x - LEFT JOIN - ( - SELECT * FROM ( - SELECT ID_SPS,extract(month from RKUD_TGL) AS BULAN,RKUD_JUMLAH - FROM SAMASA.PENDAPATAN_REALISASI - WHERE TAHUN=\''.$ta.'\' - ) - PIVOT - ( - SUM(RKUD_JUMLAH) - FOR BULAN IN(1,2,3,4,5,6,7,8,9,10,11,12) - ) - )y ON x.ID = y.ID_SPS '; - - - if (getRole()=="skpd"){ - $sqlstr .= ' LEFT JOIN SAMASA.MAPPING_DBH_SKPD z ON x.id=z.id_sps WHERE z.KODE_SKPD=\''.Auth::user()->nrk.'\''; - }else{ - $sqlstr .= " WHERE 1=1 "; - } - - $sqlstr .= ' AND x.TAHUN = '.$ta.' AND x.SKPD_ID=980 AND SUBSTR(x.KODE_REKENING,1,3)=\'4.2\''; - - return $sqlstr; - } - public function datatable(Request $request) { $post = $request->all(); @@ -70,7 +34,7 @@ class JadwalSalurdanaController extends Controller $dataFilter = 0; $typeDana = isset($post["type_dana"])?$post["type_dana"]:""; $idSPS = isset($post["id_sps"])?$post["id_sps"]:""; - $sqlstr = $this->queryJadwalSalurDana($ta); + $sqlstr = Sps_pendapatan::queryJadwalSalurDana($ta); if (!empty($idSPS)){ $sqlstr.=" AND x.ID=$idSPS"; @@ -140,7 +104,7 @@ class JadwalSalurdanaController extends Controller $typeDana = isset($post["type_dana"])?$post["type_dana"]:""; $idSPS = isset($post["id_sps"])?$post["id_sps"]:""; $ta = $post["ta"]; - $sqlstr = $this->queryJadwalSalurDana($ta); + $sqlstr = Sps_pendapatan::queryJadwalSalurDana($ta); if (!empty($idSPS)){ $sqlstr.=" AND x.ID=$idSPS"; diff --git a/app/Models/Sps_pendapatan.php b/app/Models/Sps_pendapatan.php index 9bdf2bc..60b14ec 100644 --- a/app/Models/Sps_pendapatan.php +++ b/app/Models/Sps_pendapatan.php @@ -11,4 +11,19 @@ class Sps_pendapatan extends Eloquent use HasFactory; protected $connection = 'oracle'; protected $table = 'PROKSI.SPS_PENDAPATAN'; + + public function queryJadwalSalurDana($ta) + { + $sqlstr = 'SELECT * FROM VW_JADWAL_SALUR x '; + + if (getRole()=="skpd"){ + $sqlstr .= ' WHERE x.id IN (SELECT id_sps FROM SAMASA.MAPPING_DBH_SKPD WHERE KODE_SKPD=\''.Auth::user()->nrk.'\') '; + }else{ + $sqlstr .= " WHERE 1=1 "; + } + + $sqlstr .= ' AND x.TAHUN = '.$ta.' AND x.SKPD_ID=980 AND SUBSTR(x.KODE_REKENING,1,3)=\'4.2\''; + + return $sqlstr; + } } diff --git a/public/css/app.css b/public/css/app.css index 90e12a8..2b43083 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -346,4 +346,8 @@ hr{ .select2-container--default .select2-selection--multiple .select2-selection__choice__remove{ color:#333; +} + +.card-header{ + background: whitesmoke; } \ No newline at end of file diff --git a/resources/views/jadwal_salurdana/index_cht.blade.php b/resources/views/jadwal_salurdana/index_cht.blade.php index d1fce29..922b4d7 100644 --- a/resources/views/jadwal_salurdana/index_cht.blade.php +++ b/resources/views/jadwal_salurdana/index_cht.blade.php @@ -16,7 +16,7 @@ @section('content')
-
+

Filter Pencarian

-
+