From 92c24df0f6f8a85c6666cfc4120e5821fa5d1ef0 Mon Sep 17 00:00:00 2001 From: Pusdatin BPKD Jkt Date: Tue, 23 Aug 2022 11:51:38 +0700 Subject: [PATCH] Update --- .../Controllers/Admin/RolessController.php | 2 +- app/Http/Controllers/ItemSearchController.php | 17 ++-- .../Controllers/JadwalSalurdanaController.php | 80 ++----------------- .../RealisasiBelanjaController.php | 23 +++--- app/Models/User.php | 3 +- database/seeders/DatabaseSeeder.php | 6 +- database/seeders/PermissionSeeder.php | 1 + database/seeders/RolesTableSeeder.php | 47 ++++++----- database/seeders/UsersTableSeeder.php | 15 ++++ .../jadwal_salurdana/index_dak.blade.php | 74 ----------------- resources/views/partials/menu.blade.php | 2 +- resources/views/partials/top_menu.blade.php | 2 +- .../views/realisasi_belanja/submit.blade.php | 4 +- .../views/realisasi_pendapatan/form.blade.php | 4 +- 14 files changed, 80 insertions(+), 200 deletions(-) diff --git a/app/Http/Controllers/Admin/RolessController.php b/app/Http/Controllers/Admin/RolessController.php index 8e79460..01f4ee9 100644 --- a/app/Http/Controllers/Admin/RolessController.php +++ b/app/Http/Controllers/Admin/RolessController.php @@ -46,7 +46,7 @@ class RolessController extends Controller { $this->setSubtitle("Detail Data"); $permissions = Permission::get(); - $rolePermissions = RolePermission::where("role_id",$roless->id)->get()->toArray(); + $rolePermissions = RolePermission::where("role_id",$roless->id)->orderBy("permission_id")->get()->toArray(); $rolePermissions = array_column($rolePermissions, 'permission_id'); return view('admin.mst_role.show',compact('roless','permissions','rolePermissions')); } diff --git a/app/Http/Controllers/ItemSearchController.php b/app/Http/Controllers/ItemSearchController.php index bfed47e..067ae56 100644 --- a/app/Http/Controllers/ItemSearchController.php +++ b/app/Http/Controllers/ItemSearchController.php @@ -32,14 +32,19 @@ class ItemSearchController extends Controller { $tropd = []; if($request->has('q')){ + $ta = $request->ta; $search = strtoupper($request->q); 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(); + $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%' "; + + 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) diff --git a/app/Http/Controllers/JadwalSalurdanaController.php b/app/Http/Controllers/JadwalSalurdanaController.php index 2cb638c..438b54e 100644 --- a/app/Http/Controllers/JadwalSalurdanaController.php +++ b/app/Http/Controllers/JadwalSalurdanaController.php @@ -113,89 +113,19 @@ class JadwalSalurdanaController extends Controller $dataFilter=0; $sqlstr = 'SELECT x.kode_skpd, x.nama_skpd, x.kode_rsk, x.nama_rsk, x.jumlah_anggaran, y.* FROM SAMASA.BELANJA_REALISASI x - LEFT JOIN - ( - SELECT * FROM ( - SELECT - IDRSK, - NVL(V_BKU_01,0) AS V_BKU_01, - NVL(V_BKU_02,0) AS V_BKU_02, - NVL(V_BKU_03,0) AS V_BKU_03, - NVL(V_BKU_04,0) AS V_BKU_04, - NVL(V_BKU_05,0) AS V_BKU_05, - NVL(V_BKU_06,0) AS V_BKU_06, - NVL(V_BKU_07,0) AS V_BKU_07, - NVL(V_BKU_08,0) AS V_BKU_08, - NVL(V_BKU_09,0) AS V_BKU_09, - NVL(V_BKU_10,0) AS V_BKU_10, - NVL(V_BKU_11,0) AS V_BKU_11, - NVL(V_BKU_12,0) AS V_BKU_12, - TOTAL AS TOTAL_REALISASI - FROM ( - SELECT x.*,SUM (V_REALISASI) OVER ( PARTITION BY IDRSK ) AS Total - FROM - ( - SELECT IDRSK, - extract(month FROM TO_DATE(D_POSTING, \'YYYYMMDD\')) AS BULAN, - SUM (REALISASI) AS V_REALISASI - FROM NEWSIPKD.VW_BKU_REALISASI_RSK - WHERE TAHUN_ANGGARAN = \''.$ta.'\' - GROUP BY IDRSK,D_POSTING - ) x - ) - PIVOT - ( - SUM(V_REALISASI) - FOR BULAN IN( - 1 AS V_BKU_01, - 2 AS V_BKU_02, - 3 AS V_BKU_03, - 4 AS V_BKU_04, - 5 AS V_BKU_05, - 6 AS V_BKU_06, - 7 AS V_BKU_07, - 8 AS V_BKU_08, - 9 AS V_BKU_09, - 10 AS V_BKU_10, - 11 AS V_BKU_11, - 12 AS V_BKU_12 - ) - ) - ) xx - LEFT JOIN - ( - SELECT - RSK_BELANJARINCI_ID, - sum(BULAN1) AS V_AKB_01, - sum(BULAN2) AS V_AKB_02, - sum(BULAN3) AS V_AKB_03, - sum(BULAN4) AS V_AKB_04, - sum(BULAN5) AS V_AKB_05, - sum(BULAN6) AS V_AKB_06, - sum(BULAN7) AS V_AKB_07, - sum(BULAN8) AS V_AKB_08, - sum(BULAN9) AS V_AKB_09, - sum(BULAN10) AS V_AKB_10, - sum(BULAN11) AS V_AKB_11, - sum(BULAN12) AS V_AKB_12 - FROM BAPEDA_BUDGETING.P_SPB_BELANJARINCIAKB@EBUDGETING - WHERE TAHUN = \''.$ta.'\' - GROUP BY RSK_BELANJARINCI_ID - ) yy - ON xx.IDRSK = yy.RSK_BELANJARINCI_ID - ) y - ON x.KODE_RSK = y.IDRSK + LEFT JOIN SAMASA.VW_AKB_REALISASI y + ON x.KODE_RSK = y.IDRSK AND x.TAHUN_ANGGARAN = y.TAHUN_ANGGARAN WHERE x.TAHUN_ANGGARAN = \''.$ta.'\''.$typeDanaFilter; if (getRole()=="skpd"){ $sqlstr.=" AND KODE_SKPD='".Auth::user()->nrk."'"; } - $data = DB::connection('oracle')->select(DB::raw($sqlstr.' ORDER BY x.kode_skpd,x.kode_rsk OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY')); - $dataTotal = count(DB::connection('oracle')->select(DB::raw($sqlstr))); + $data = DB::select(DB::raw($sqlstr.' ORDER BY x.kode_skpd,x.kode_rsk OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY')); + $dataTotal = count(DB::select(DB::raw($sqlstr))); // if (!empty($src)){ //$data->whereRaw("(LOWER(NAMA_REKENING) LIKE '%".strtolower($src)."%' OR LOWER(KODE_REKENING) LIKE '%".strtolower($src)."%')"); // } - $dataFilter = count(DB::connection('oracle')->select(DB::raw($sqlstr))); + $dataFilter = count(DB::select(DB::raw($sqlstr))); return response()->json([ "recordsTotal" => $dataTotal, diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index fc96480..84f4131 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -67,19 +67,11 @@ class RealisasiBelanjaController extends Controller $vwAKB = VwAkbSpdRealRsk::where("I_IDRSK",$BelanjaRealisasi->kode_rsk)->firstorNew(); $BelanjaRealisasiKontrak = BelanjaRealisasiKontrak::where("belanja_realisasi_id",$id)->get(); $vwSPD = DB::select(DB::raw( - 'SELECT x.I_SPDNO_DOK,x.D_SPDNO,sum(y.V_SPD) AS JML - FROM NEWSIPKD.TMSPD x - LEFT JOIN NEWSIPKD.TMSPDRINCIBLJ y - ON x.I_ID = y.I_IDSPD - LEFT JOIN NEWSIPKD.TMDPASUBGIAT z - ON y.I_IDSUBGIAT = z.I_ID - LEFT JOIN NEWSIPKD.TROPD a - ON x.I_IDOPD = a.I_ID - WHERE z.C_SUBGIAT = \''.$BelanjaRealisasi->kode_sub_kegiatan.'\' - AND a.C_OPD = \''.$BelanjaRealisasi->kode_skpd.'\' - AND x.C_ANGG_TAHUN = \''.$BelanjaRealisasi->tahun_anggaran.'\' - GROUP BY x.I_SPDNO_DOK,x.D_SPDNO - ORDER BY x.D_SPDNO ' + "SELECT x.I_SPDNO_DOK, x.D_SPDNO, z.V_SPP AS JML + FROM NEWSIPKD.TMSPD x + LEFT JOIN NEWSIPKD.TMSPPRINCIBLJ y ON x.I_ID = y.I_IDSPD + LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK z ON y.I_IDSPP = z.I_IDSPP + WHERE z.I_IDRSK=".$BelanjaRealisasi->kode_rsk )); $vwSP2D = DB::select(DB::raw('SELECT x.I_ID as IDSP2D, x.I_IDOPD,x.I_SP2DNO_DOK, @@ -114,10 +106,13 @@ class RealisasiBelanjaController extends Controller ON x.I_IDSPP = y.I_IDSPP GROUP BY I_IDRSK ) y ON x.KODE_RSK = y.I_IDRSK + LEFT JOIN NEWSIPKD.TROPD z ON x.KODE_SKPD = z.C_OPD WHERE x.tahun_anggaran='$ta'"; if (getRole()=="skpd"){ $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."'"; @@ -139,7 +134,7 @@ class RealisasiBelanjaController extends Controller $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')); + $data = DB::select(DB::raw($sqlStr.$filter.' ORDER BY x.KODE_SKPD, x.KODE_RSK OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY')); return response()->json([ "recordsTotal" => $dataTotal[0]->jml, diff --git a/app/Models/User.php b/app/Models/User.php index 893bdb3..6c444d3 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -27,7 +27,8 @@ class User extends Authenticatable 'role_name', 'is_lock_upload', 'lock_upload_time', - 'lock_upload_by' + 'lock_upload_by', + 'wilayah' ]; /** diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index b78785a..7673854 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -14,9 +14,9 @@ class DatabaseSeeder extends Seeder public function run() { // \App\Models\User::factory(10)->create(); - // $this->call(PermissionSeeder::class); - // $this->call(RolesTableSeeder::class); - $this->call(UsersTableSeeder::class); + //$this->call(PermissionSeeder::class); + //$this->call(RolesTableSeeder::class); + //$this->call(UsersTableSeeder::class); // $this->call(SatuanTableSeeder::class); } } diff --git a/database/seeders/PermissionSeeder.php b/database/seeders/PermissionSeeder.php index d44605f..0a5410f 100644 --- a/database/seeders/PermissionSeeder.php +++ b/database/seeders/PermissionSeeder.php @@ -22,6 +22,7 @@ class PermissionSeeder extends Seeder Role::create(['name' => 'anggaran']); Role::create(['name' => 'skpd']); Role::create(['name' => 'bendahara']); + Role::create(['name' => 'sbpk']); // $Permission0 = Permission::create(['name' => 'Lihat SKPP']); // $Permission1 = Permission::create(['name' => 'Tambah SKPP']); diff --git a/database/seeders/RolesTableSeeder.php b/database/seeders/RolesTableSeeder.php index 06c1003..1142235 100644 --- a/database/seeders/RolesTableSeeder.php +++ b/database/seeders/RolesTableSeeder.php @@ -14,31 +14,36 @@ class RolesTableSeeder extends Seeder */ public function run() { - Role::truncate(); + // Role::truncate(); - $role = new Role; - $role->name = "superadmin"; - $role->description = "Super Administrator"; - $role->save(); + // $role = new Role; + // $role->name = "superadmin"; + // $role->description = "Super Administrator"; + // $role->save(); - $role = new Role; - $role->name = "admin"; - $role->description = "Administrator"; - $role->save(); + // $role = new Role; + // $role->name = "admin"; + // $role->description = "Administrator"; + // $role->save(); - $role = new Role; - $role->name = "anggaran"; - $role->description = "Anggaran"; - $role->save(); + // $role = new Role; + // $role->name = "anggaran"; + // $role->description = "Anggaran"; + // $role->save(); - $role = new Role; - $role->name = "skpd"; - $role->description = "SKPD"; - $role->save(); + // $role = new Role; + // $role->name = "skpd"; + // $role->description = "SKPD"; + // $role->save(); - $role = new Role; - $role->name = "bendahara"; - $role->description = "Bendahara"; - $role->save(); + // $role = new Role; + // $role->name = "bendahara"; + // $role->description = "Bendahara"; + // $role->save(); + + // $role = new Role; + // $role->name = "sbpk"; + // $role->description = "SBPK"; + // $role->save(); } } diff --git a/database/seeders/UsersTableSeeder.php b/database/seeders/UsersTableSeeder.php index a1823b9..4e62056 100644 --- a/database/seeders/UsersTableSeeder.php +++ b/database/seeders/UsersTableSeeder.php @@ -60,6 +60,7 @@ class UsersTableSeeder extends Seeder // $user->save(); // $user->assignRole('skpd'); + /* $SKPD = Tropd::orderBy('I_ID','ASC')->get(); foreach($SKPD as $rowSKPD){ // var_dump($rowSKPD); exit; @@ -72,5 +73,19 @@ class UsersTableSeeder extends Seeder $user->assignRole('skpd'); } + */ + + // $arrRegion = ["pusat","utara","barat","selatan","timur"]; + // foreach($arrRegion as $key=>$userRegion){ + // $user = new User; + // $user->name = "SBPK ".$userRegion; + // $user->nrk = "sbpk".$userRegion; + // $user->password = Hash::make('sbpk'.$userRegion); + // $user->role_name = "sbpk"; + // $user->wilayah = ($key+1); + // $user->save(); + // $user->assignRole('sbpk'); + // } + } } diff --git a/resources/views/jadwal_salurdana/index_dak.blade.php b/resources/views/jadwal_salurdana/index_dak.blade.php index 01023cd..d539e28 100644 --- a/resources/views/jadwal_salurdana/index_dak.blade.php +++ b/resources/views/jadwal_salurdana/index_dak.blade.php @@ -363,17 +363,6 @@ .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"] }, @@ -391,14 +380,6 @@ extype: "excel" } }, - // { - // text: " Pdf", - // className: "export-data link-pdf", - // attr: { - // formid: "frm_proses_spm_sp2d", - // extype: "pdf" - // } - // } ], } ], @@ -529,61 +510,6 @@ fixedColumns: { left: 3, }, - // rowGroup: { - // endRender: function ( rows, group, index ) { - // let sum = []; - // let sumReal = []; - // let total = 0; - // let totalReal = 0; - // for(let x=0;x<12;x++){ - // xx = ("00"+(x+1)); - // xx = xx.substring(xx.length - 2); - // sum[x] = rows.data().pluck("v_akb_"+xx).reduce( function (a, b) { - // return a + b * 1; - // }, 0); - // total += sum[x]; - - // sumReal[x] = rows.data().pluck("v_bku_"+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 ) { - // }, - // dataSrc: ["kode_skpd"] - // }, scrollX: true, scrollY: "350px", }); diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php index 6fae714..657bbdd 100644 --- a/resources/views/partials/menu.blade.php +++ b/resources/views/partials/menu.blade.php @@ -46,7 +46,7 @@ - + can("Upload DBH Rencana Belanja") || Auth::user()->can("Upload DAK Rencana Belanja") || $role == "superadmin"){ ?>
  • diff --git a/resources/views/partials/top_menu.blade.php b/resources/views/partials/top_menu.blade.php index ba7843d..baebe1b 100644 --- a/resources/views/partials/top_menu.blade.php +++ b/resources/views/partials/top_menu.blade.php @@ -23,7 +23,7 @@
  • - {{ Auth::user()->name." | Role : ".strtoupper($role) }} + {{ strtoupper(Auth::user()->name)." | ROLE : ".strtoupper($role) }}
    id) }}" > Ganti Kata Sandi diff --git a/resources/views/realisasi_belanja/submit.blade.php b/resources/views/realisasi_belanja/submit.blade.php index f8d292a..8416e4b 100644 --- a/resources/views/realisasi_belanja/submit.blade.php +++ b/resources/views/realisasi_belanja/submit.blade.php @@ -32,7 +32,9 @@
    @csrf @include('realisasi_belanja.form') - + @if(auth()->user()->can('Update Detail Realisasi Belanja')) + + @endif
    diff --git a/resources/views/realisasi_pendapatan/form.blade.php b/resources/views/realisasi_pendapatan/form.blade.php index a5dbe17..eeb87f2 100644 --- a/resources/views/realisasi_pendapatan/form.blade.php +++ b/resources/views/realisasi_pendapatan/form.blade.php @@ -104,11 +104,11 @@
    - +
    - +