From 009a3e913e78e6f009677bf5a27aba4728ce7201 Mon Sep 17 00:00:00 2001 From: Pusdatin BPKD Jkt Date: Wed, 3 Aug 2022 15:25:50 +0700 Subject: [PATCH] Data Kontrak --- app/Http/Controllers/ItemSearchController.php | 8 +-- .../RealisasiBelanjaController.php | 43 +++++++----- app/helpers.php | 8 +++ database/seeders/UsersTableSeeder.php | 34 +++++----- public/css/app.css | 5 ++ .../jadwal_salurdana/index_cht.blade.php | 67 +------------------ resources/views/partials/menu.blade.php | 50 +++++++------- .../views/realisasi_belanja/index.blade.php | 14 ++-- .../views/realisasi_belanja/submit.blade.php | 2 +- .../views/realisasi_pendapatan/show.blade.php | 20 +++--- 10 files changed, 107 insertions(+), 144 deletions(-) diff --git a/app/Http/Controllers/ItemSearchController.php b/app/Http/Controllers/ItemSearchController.php index 5c1d543..49ffb7d 100644 --- a/app/Http/Controllers/ItemSearchController.php +++ b/app/Http/Controllers/ItemSearchController.php @@ -126,10 +126,10 @@ class ItemSearchController extends Controller ->join("TRBAS","SI_ESET_PEMBAYARAN.KODE_BAS","=","TRBAS.C_AKUN") ->where("NO_SKPRD", $no_skprd) ->first(); - - $sts["tgl_validasi"] = date("Y-m-d",strtotime($sts["tgl_validasi"])); - $sts["nilai_bayar"] = separateNumberIndo($sts["nilai_bayar"]); - + if ($sts){ + $sts["tgl_validasi"] = date("Y-m-d",strtotime($sts["tgl_validasi"])); + $sts["nilai_bayar"] = separateNumberIndo($sts["nilai_bayar"]); + } return response()->json($sts); } diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index aaf0a11..9163134 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -83,35 +83,42 @@ class RealisasiBelanjaController extends Controller $post = $request->all(); $offset = $post["start"]; $limit = $post["length"]; - $src = isset($post["search"])?$post["search"]["value"]:""; + $src = $post["src"]; + $ta = $post["ta"]; + $JenisDana = $post["jenis_dana"]; + $SubJenisDana = $post["sub_jenis_dana"]; - $dataFilter=0; - $data = DB::select(DB::raw('SELECT x.*,y.JML_REALISASI_SP2D FROM BELANJA_REALISASI x + $sqlStr = "SELECT x.*,y.JML_REALISASI_SP2D + FROM BELANJA_REALISASI x LEFT JOIN ( SELECT I_IDRSK,SUM(y.V_SPP) AS JML_REALISASI_SP2D FROM NEWSIPKD.TMSP2D x LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y ON x.I_IDSPP = y.I_IDSPP GROUP BY I_IDRSK - ) y ON x.KODE_RSK = y.I_IDRSK')); - - if (!empty($src)){ - $data->whereRaw("(LOWER(jenis_belanja) LIKE '%".strtolower($src)."%' - OR LOWER(sub_jenis_belanja) LIKE '%".strtolower($src)."%' - OR LOWER(nama_program) LIKE '%".strtolower($src)."%' - OR LOWER(nama_skpd) LIKE '%".strtolower($src)."%' - OR LOWER(nama_kegiatan) LIKE '%".strtolower($src)."%' - OR LOWER(nama_sub_kegiatan) LIKE '%".strtolower($src)."%' - OR LOWER(nama_rsk) LIKE '%".strtolower($src)."%' - OR LOWER(nama_rekening) LIKE '%".strtolower($src)."%')"); + ) y ON x.KODE_RSK = y.I_IDRSK + WHERE x.tahun_anggaran='$ta'"; + + if (getRole()=="skpd"){ + $sqlStr.=" AND KODE_SKPD='".Auth::user()->nrk."'"; } - $dataFilter = count($data); - $dataTotal = BelanjaRealisasi::count(); + $filter=""; + if (!empty($JenisDana)){ + $filter.= " AND x.JENIS_DANA = '".$JenisDana."'"; + } + + if (!empty($SubJenisDana)){ + $filter.= " AND x.SUB_JENIS_DANA = '".$SubJenisDana."'"; + } + + $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')); return response()->json([ - "recordsTotal" => $dataTotal, - "recordsFiltered" => $dataFilter, + "recordsTotal" => $dataTotal[0]->jml, + "recordsFiltered" => $dataFilter[0]->jml, "data"=> $data ]); } diff --git a/app/helpers.php b/app/helpers.php index 423cb37..bed2572 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -108,4 +108,12 @@ function reportProceed($source, $reportName, $params = []){ )->execute(); return $output."/$reportName.pdf"; +} + +function getRole() +{ + $role = Auth::user()->getRoleNames(); + $role = $role[0]; + + return $role; } \ No newline at end of file diff --git a/database/seeders/UsersTableSeeder.php b/database/seeders/UsersTableSeeder.php index 8fe190e..a1823b9 100644 --- a/database/seeders/UsersTableSeeder.php +++ b/database/seeders/UsersTableSeeder.php @@ -52,23 +52,25 @@ class UsersTableSeeder extends Seeder // $user->save(); // $user->assignRole('bendahara'); - $user = new User; - $user->name = "skpd"; - $user->nrk = "skpd"; - $user->password = Hash::make('skpd321'); - $user->role_name = "skpd"; - $user->save(); - $user->assignRole('skpd'); + // $user = new User; + // $user->name = "skpd1"; + // $user->nrk = "skpd1"; + // $user->password = Hash::make('skpd3211'); + // $user->role_name = "skpd"; + // $user->save(); + // $user->assignRole('skpd'); - // $SKPD = Tropd::orderBy('I_ID','ASC')->get(); - // foreach($SKPD as $rowSKPD){ - // $user->name = $rowSKPD["N_OPD"]; - // $user->nrk = $rowSKPD["C_OPD"]; - // $user->password = Hash::make($rowSKPD["C_OPD"]); - // $user->role_name = "skpd"; - // $user->save(); + $SKPD = Tropd::orderBy('I_ID','ASC')->get(); + foreach($SKPD as $rowSKPD){ + // var_dump($rowSKPD); exit; + $user = new User; + $user->name = $rowSKPD["n_opd"]; + $user->nrk = $rowSKPD["c_opd"]; + $user->password = Hash::make($rowSKPD["c_opd"]); + $user->role_name = "skpd"; + $user->save(); - // $user->assignRole('skpd'); - // } + $user->assignRole('skpd'); + } } } diff --git a/public/css/app.css b/public/css/app.css index a451feb..caa9557 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -311,4 +311,9 @@ hr{ .width-200{ width:400px; +} + +.card-title{ + font-weight: bold; + text-transform: uppercase; } \ 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 fdf4fc3..998b0c1 100644 --- a/resources/views/jadwal_salurdana/index_cht.blade.php +++ b/resources/views/jadwal_salurdana/index_cht.blade.php @@ -214,7 +214,7 @@ "columnDefs": [ //{ className: "td-nowrap", "targets": [ 1 ] } ], - "dom": "<\"top\" <\"row\"<\"col-md-6\"><\"col-md-6 text-right\">>>rt<\"bottom\" <\"row\"<\"col-md-6\"i><\"col-md-6\"p>> ><\"clear\">", + "dom": "<\"top\" <\"row\"<\"col-md-6\"><\"col-md-6 text-right\">>>rt<\"bottom\" <\"row\"<\"col-md-6\"><\"col-md-6\">> ><\"clear\">", "lengthMenu": [ [ 50, 75, 100 ], [ "50", "75", "100" ] @@ -292,71 +292,6 @@ fixedColumns: { left: 2, }, - rowGroup: { - endRender: function ( rows, group, index ) { - let sum = []; - let sumReal = []; - let total = 0; - let totalReal = 0; - for(let x=0;x<12;x++){ - xx = x+1; - sum[x] = rows.data().pluck("spsbulan"+xx).reduce( function (a, b) { - return a + b * 1; - }, 0); - total += sum[x]; - - sumReal[x] = rows.data().pluck("real"+xx).reduce( function (a, b) { - return a + b * 1; - }, 0); - totalReal += sumReal[x]; - } - let textmuted = index == 1 ? "text-muted":""; - let labelGroup = index == 1 ?"JUMLAH | " + group : "TOTAL"; - return $("") - .append( "") - .append( ""+labelGroup+"") - .append( ""+ separateNumberIndo(sum[0]) +"" ) - .append( ""+ separateNumberIndo(sumReal[0]) +"" ) - .append( ""+ separateNumberIndo(sum[1]) +"" ) - .append( ""+ separateNumberIndo(sumReal[1]) +"" ) - .append( ""+ separateNumberIndo(sum[2]) +"" ) - .append( ""+ separateNumberIndo(sumReal[2]) +"" ) - .append( ""+ separateNumberIndo(sum[3]) +"" ) - .append( ""+ separateNumberIndo(sumReal[3]) +"" ) - .append( ""+ separateNumberIndo(sum[4]) +"" ) - .append( ""+ separateNumberIndo(sumReal[4]) +"" ) - .append( ""+ separateNumberIndo(sum[5]) +"" ) - .append( ""+ separateNumberIndo(sumReal[5]) +"" ) - .append( ""+ separateNumberIndo(sum[6]) +"" ) - .append( ""+ separateNumberIndo(sumReal[6]) +"" ) - .append( ""+ separateNumberIndo(sum[7]) +"" ) - .append( ""+ separateNumberIndo(sumReal[7]) +"" ) - .append( ""+ separateNumberIndo(sum[8]) +"" ) - .append( ""+ separateNumberIndo(sumReal[8]) +"" ) - .append( ""+ separateNumberIndo(sum[9]) +"" ) - .append( ""+ separateNumberIndo(sumReal[9]) +"" ) - .append( ""+ separateNumberIndo(sum[10]) +"" ) - .append( ""+ separateNumberIndo(sumReal[10]) +"" ) - .append( ""+ separateNumberIndo(sum[11]) +"" ) - .append( ""+ separateNumberIndo(sumReal[11]) +"" ) - .append( ""+ separateNumberIndo(total) +"" ) - .append( ""+ separateNumberIndo(totalReal) +"" ) - }, - startRender: function ( rows, group, index ) { - // let group1 = rows.data().pluck("GROUP1"); - // let group2 = rows.data().pluck("GROUP2"); - - // let groupNumber = index == 0 ? group1[0] : group2[0]; - // if (index == 0){ - // return $("") - // .append("" + groupNumber + ". " + group + "") - // }else{ - // return $("") - // .append("  " + groupNumber + ". " + group + "") - // } - }, - dataSrc: ["groupall", "kodegrup"] - }, scrollX:true, }); diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php index 759fcf5..c68b2d1 100644 --- a/resources/views/partials/menu.blade.php +++ b/resources/views/partials/menu.blade.php @@ -46,30 +46,32 @@ -
  • - - -

    Upload Rencana Belanja

    -     - -
    • + +
  • + + +

    Upload Rencana Belanja

    +     + +
    • + can("Read DBH Realisasi Pendapatan") || $role == "superadmin"){ ?>
  • diff --git a/resources/views/realisasi_belanja/index.blade.php b/resources/views/realisasi_belanja/index.blade.php index 6112b42..01c2c4d 100644 --- a/resources/views/realisasi_belanja/index.blade.php +++ b/resources/views/realisasi_belanja/index.blade.php @@ -40,6 +40,7 @@
    - @php - $listSubDana = ["All","CHT"]; - foreach($listSubDana as $Subdana){ - echo ""; - } - @endphp
    @@ -122,13 +117,17 @@ $.each(["All","CHT"],function(i,x){ $('#srcSubJenisDana').append($('