gitea/sidata
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Pusdatin BPKD Jkt
2022-08-23 11:51:38 +07:00
parent f4a830593b
commit 92c24df0f6
14 changed files with 80 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/RolessController.php
+1 -1
View File
@@ -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'));
}
app/Http/Controllers/ItemSearchController.php
+11 -6
View File
@@ -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)
app/Http/Controllers/JadwalSalurdanaController.php
+5 -75
View File
@@ -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,
app/Http/Controllers/RealisasiBelanjaController.php
+8 -13
View File
@@ -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
"SELECT x.I_SPDNO_DOK, x.D_SPDNO, z.V_SPP 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 '
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,
app/Models/User.php
+2 -1
View File
@@ -27,7 +27,8 @@ class User extends Authenticatable
'role_name',
'is_lock_upload',
'lock_upload_time',
'lock_upload_by'
'lock_upload_by',
'wilayah'
];
/**
database/seeders/DatabaseSeeder.php
+3 -3
View File
@@ -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);
}
}
database/seeders/PermissionSeeder.php
+1
View File
@@ -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']);
database/seeders/RolesTableSeeder.php
+26 -21
View File
@@ -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();
}
}
database/seeders/UsersTableSeeder.php
+15
View File
@@ -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');
// }
}
}
resources/views/jadwal_salurdana/index_dak.blade.php
-74
View File
@@ -363,17 +363,6 @@
.append( "<td class='text-success text-right'><strong>"+ separateNumberIndo(totalReal) +"</strong></td>" )
},
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 $("<tr/>")
// .append("<td colspan=5><a href=\'/akun/index/detail/?acc="+groupNumber.split(".").join("_")+"\'>" + groupNumber + ". " + group + "</a></td>")
// }else{
// return $("<tr/>")
// .append("<td colspan=5>&nbsp;&nbsp;<a href=\'/akun/index/detail/?acc="+groupNumber.split(".").join("_")+"\'><strong>" + groupNumber + ". " + group + "</strong></a></td>")
// }
},
dataSrc: ["groupall"]
},
@@ -391,14 +380,6 @@
extype: "excel"
}
},
// {
// text: "<i class=\'fas fa-file-pdf\'></i> 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 $("<tr/>")
// .append( "<td></td>")
// .append( "<td colspan='2' class=\'text-left " + textmuted +"\'><strong>"+labelGroup+"</strong></td>")
// .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[0]) +"</strong></td>" )
// .append( "<td class='text-success text-right'><strong>"+ separateNumberIndo(sumReal[0]) +"</strong></td>" )
// .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[1]) +"</strong></td>" )
// .append( "<td class='text-success text-right'><strong>"+ separateNumberIndo(sumReal[1]) +"</strong></td>" )
// .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[2]) +"</strong></td>" )
// .append( "<td class='text-success text-right'><strong>"+ separateNumberIndo(sumReal[2]) +"</strong></td>" )
// .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[3]) +"</strong></td>" )
// .append( "<td class='text-success text-right'><strong>"+ separateNumberIndo(sumReal[3]) +"</strong></td>" )
// .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[4]) +"</strong></td>" )
// .append( "<td class='text-success text-right'><strong>"+ separateNumberIndo(sumReal[4]) +"</strong></td>" )
// .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[5]) +"</strong></td>" )
// .append( "<td class='text-success text-right'><strong>"+ separateNumberIndo(sumReal[5]) +"</strong></td>" )
// .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[6]) +"</strong></td>" )
// .append( "<td class='text-success text-right'><strong>"+ separateNumberIndo(sumReal[6]) +"</strong></td>" )
// .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[7]) +"</strong></td>" )
// .append( "<td class='text-success text-right'><strong>"+ separateNumberIndo(sumReal[7]) +"</strong></td>" )
// .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[8]) +"</strong></td>" )
// .append( "<td class='text-success text-right'><strong>"+ separateNumberIndo(sumReal[8]) +"</strong></td>" )
// .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[9]) +"</strong></td>" )
// .append( "<td class='text-success text-right'><strong>"+ separateNumberIndo(sumReal[9]) +"</strong></td>" )
// .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[10]) +"</strong></td>" )
// .append( "<td class='text-success text-right'><strong>"+ separateNumberIndo(sumReal[10]) +"</strong></td>" )
// .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[11]) +"</strong></td>" )
// .append( "<td class='text-success text-right'><strong>"+ separateNumberIndo(sumReal[11]) +"</strong></td>" )
// .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(total) +"</strong></td>" )
// .append( "<td class='text-success text-right'><strong>"+ separateNumberIndo(totalReal) +"</strong></td>" )
// },
// startRender: function ( rows, group, index ) {
// },
// dataSrc: ["kode_skpd"]
// },
scrollX: true,
scrollY: "350px",
});
resources/views/partials/menu.blade.php
+1 -1
View File
@@ -46,7 +46,7 @@
<?php } ?>
</ul>
</li>
<?php if ($role != "bendahara"){ ?>
<?php if (Auth::user()->can("Upload DBH Rencana Belanja") || Auth::user()->can("Upload DAK Rencana Belanja") || $role == "superadmin"){ ?>
<li class="nav-item">
<a href="#" class="nav-link">
<i class="fas fa-upload nav-icon"></i>
resources/views/partials/top_menu.blade.php
+1 -1
View File
@@ -23,7 +23,7 @@
</li>
<li class="nav-item dropdown">
<a class="nav-link" data-toggle="dropdown" href="#">
<i class="fa fa-user mr-2"></i>{{ Auth::user()->name." | Role : ".strtoupper($role) }}</span>
<i class="fa fa-user mr-2"></i>{{ strtoupper(Auth::user()->name)." | ROLE : ".strtoupper($role) }}</span>
</a>
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
<a class="dropdown-item modalButton" title="Ganti Kata Sandi" href="{{ route("users.changepass", Auth::user()->id) }}" ><i class="fa fa-key mr-2"></i> Ganti Kata Sandi</a>
resources/views/realisasi_belanja/submit.blade.php
+2
View File
@@ -32,7 +32,9 @@
<form id="frmRealBelanja" action="{{ url('/realisasi-belanja/'.$BelanjaRealisasi->id.'/submit') }}" method="POST" autocomplete="off">
@csrf
@include('realisasi_belanja.form')
@if(auth()->user()->can('Update Detail Realisasi Belanja'))
<button id="btnUbah" class="btn btn-sm btn-warning">Ubah</button>
@endif
<input id="btnSubmit" class="btn btn-sm btn-success" type="submit" value="Simpan" style="display: none;">
<button type="button" id="btnCancel" class="btn btn-sm btn-danger" style="display: none;">Batal</button>
</form>
resources/views/realisasi_pendapatan/form.blade.php
+2 -2
View File
@@ -104,11 +104,11 @@
<textarea id="txt_simtrad4_uraian" name="txt_simtrad4_uraian" class="form-control" required></textarea>
</div>
<div class="form-group">
<label class="col-form-label label-align" for="txt_simtrad4_sp2d_bun">SP2D BUN</label>
<label class="col-form-label label-align" for="txt_simtrad4_sp2d_bun">SP2D Bendahara Umum Negara</label>
<input id="txt_simtrad4_sp2d_bun" name="txt_simtrad4_sp2d_bun" class="form-control" required value="">
</div>
<div class="form-group">
<label class="col-form-label label-align" for="txt_simtrad4_sp2d_bun">TGL SP2D BUN</label>
<label class="col-form-label label-align" for="txt_simtrad4_sp2d_bun">TGL SP2D Bendahara Umum Negara</label>
<input id="txt_simtrad4_tgl_sp2d_bun" name="txt_simtrad4_tgl_sp2d_bun" class="form-control indo_date" required value="">
</div>
<div class="form-group">