From fd281d9c719fcb754e6b8464a151d56aa95b7da2 Mon Sep 17 00:00:00 2001 From: Pusdatin BPKD Jkt Date: Wed, 20 Jul 2022 11:35:22 +0700 Subject: [PATCH] Update master data , login style --- .../Controllers/Admin/RolessController.php | 1 + .../Controllers/JadwalSalurdanaController.php | 38 +++++++-- .../2014_10_12_000000_create_users_table.php | 1 + ..._07_07_104858_create_permission_tables.php | 2 + database/seeders/UsersTableSeeder.php | 9 ++- public/css/app.css | 2 +- .../views/admin/mst_pengguna/create.blade.php | 2 +- .../views/admin/mst_pengguna/edit.blade.php | 2 +- .../views/admin/mst_pengguna/index.blade.php | 2 +- .../views/admin/mst_pengguna/show.blade.php | 2 +- .../admin/mst_permission/create.blade.php | 2 +- .../views/admin/mst_permission/edit.blade.php | 2 +- .../admin/mst_permission/index.blade.php | 2 +- .../views/admin/mst_permission/show.blade.php | 2 +- .../views/admin/mst_role/create.blade.php | 2 +- resources/views/admin/mst_role/edit.blade.php | 2 +- .../views/admin/mst_role/index.blade.php | 2 +- resources/views/admin/mst_role/show.blade.php | 2 +- .../views/jadwal_salurdana/index.blade.php | 77 +++++++++++-------- resources/views/login.blade.php | 28 +++---- resources/views/partials/menu.blade.php | 8 +- .../views/realisasi_belanja/index.blade.php | 10 +-- 22 files changed, 118 insertions(+), 82 deletions(-) diff --git a/app/Http/Controllers/Admin/RolessController.php b/app/Http/Controllers/Admin/RolessController.php index aef6947..8e79460 100644 --- a/app/Http/Controllers/Admin/RolessController.php +++ b/app/Http/Controllers/Admin/RolessController.php @@ -79,6 +79,7 @@ class RolessController extends Controller $requestAll = $request->all(); RolePermission::where("role_id", $roleId)->delete(); $role_permission = $requestAll["role_permission"]; + // var_dump($roleId);exit; foreach($role_permission as $row_permission){ RolePermission::create([ "permission_id"=>$row_permission, diff --git a/app/Http/Controllers/JadwalSalurdanaController.php b/app/Http/Controllers/JadwalSalurdanaController.php index f149d6f..e4eebf3 100644 --- a/app/Http/Controllers/JadwalSalurdanaController.php +++ b/app/Http/Controllers/JadwalSalurdanaController.php @@ -31,16 +31,38 @@ class JadwalSalurdanaController extends Controller $ta = $post["ta"]; $dataFilter=0; - $data = Sps_pendapatan::selectRaw("kode_rekening,nama_rekening,spsbulan1,spsbulan2,spsbulan3,spsbulan4, - spsbulan5,spsbulan6,spsbulan7,spsbulan8,spsbulan9,spsbulan10,spsbulan11,spsbulan12, - SUBSTR(KODE_REKENING,1,12) AS kodegrup,SUBSTR(KODE_REKENING,1,9) AS groupall") - ->where("SKPD_ID",980) - ->where("TAHUN",$ta) - ->whereRaw("SUBSTR(KODE_REKENING,1,3)='4.2'"); + $data = DB::select(DB::raw('SELECT + kode_rekening,nama_rekening,spsbulan1,spsbulan2,spsbulan3,spsbulan4, + spsbulan5,spsbulan6,spsbulan7,spsbulan8,spsbulan9,spsbulan10,spsbulan11,spsbulan12, + SUBSTR(KODE_REKENING,1,12) AS kodegrup,SUBSTR(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.DBH_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 + WHERE x.TAHUN = '.$ta.' AND x.SKPD_ID=980 AND SUBSTR(x.KODE_REKENING,1,3)=\'4.2\' + ORDER BY kode_rekening')); + // var_dump($data); exit; + // ->where("SKPD_ID",980) + // ->where("TAHUN",$ta) + // ->whereRaw("SUBSTR(KODE_REKENING,1,3)='4.2'"); if (!empty($src)){ $data->whereRaw("(LOWER(NAMA_REKENING) LIKE '%".strtolower($src)."%' OR LOWER(KODE_REKENING) LIKE '%".strtolower($src)."%')"); } - $dataFilter = $data->count(); + $dataFilter = count($data); $dataTotal = Sps_pendapatan::where("SKPD_ID",980) ->where("TAHUN",$ta) @@ -50,7 +72,7 @@ class JadwalSalurdanaController extends Controller return response()->json([ "recordsTotal" => $dataTotal, "recordsFiltered" => $dataFilter, - "data"=> $data->orderBy("KODE_REKENING","ASC")->skip($offset)->take($limit)->get() + "data"=> $data ]); } diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index ab7a08f..849b614 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -17,6 +17,7 @@ class CreateUsersTable extends Migration $table->uuid('id')->primary(); $table->string('name'); $table->string('nrk')->unique(); + $table->string('role_name', 30); // $table->timestamp('email_verified_at')->nullable(); $table->string('password'); $table->rememberToken(); diff --git a/database/migrations/2022_07_07_104858_create_permission_tables.php b/database/migrations/2022_07_07_104858_create_permission_tables.php index 7624b61..dbcba33 100644 --- a/database/migrations/2022_07_07_104858_create_permission_tables.php +++ b/database/migrations/2022_07_07_104858_create_permission_tables.php @@ -75,6 +75,7 @@ class CreatePermissionTables extends Migration }); Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames, $teams) { + $table->bigIncrements('id'); $table->unsignedBigInteger(PermissionRegistrar::$pivotRole); $table->string('model_type'); @@ -98,6 +99,7 @@ class CreatePermissionTables extends Migration }); Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames) { + $table->bigIncrements('id'); $table->unsignedBigInteger(PermissionRegistrar::$pivotPermission); $table->unsignedBigInteger(PermissionRegistrar::$pivotRole); diff --git a/database/seeders/UsersTableSeeder.php b/database/seeders/UsersTableSeeder.php index 935d136..f782341 100644 --- a/database/seeders/UsersTableSeeder.php +++ b/database/seeders/UsersTableSeeder.php @@ -22,7 +22,8 @@ class UsersTableSeeder extends Seeder $user = new User; $user->name = "Superadmin"; $user->nrk = "superadmin"; - $user->password = Hash::make('superadmin123!'); + $user->password = Hash::make('superadmin123!'); + $user->role_name = "superadmin"; $user->save(); $user->assignRole('superadmin'); @@ -30,7 +31,8 @@ class UsersTableSeeder extends Seeder $user = new User; $user->name = "admin"; $user->nrk = "admin"; - $user->password = Hash::make('admin321!'); + $user->password = Hash::make('admin321!'); + $user->role_name = "admin"; $user->save(); $user->assignRole('admin'); @@ -39,6 +41,7 @@ class UsersTableSeeder extends Seeder $user->name = "anggaran"; $user->nrk = "anggaran"; $user->password = Hash::make('anggaran321'); + $user->role_name = "anggaran"; $user->save(); $user->assignRole('anggaran'); @@ -47,6 +50,7 @@ class UsersTableSeeder extends Seeder $user->name = "skpd"; $user->nrk = "skpd"; $user->password = Hash::make('skpd321'); + $user->role_name = "skpd"; $user->save(); $user->assignRole('skpd'); @@ -55,6 +59,7 @@ class UsersTableSeeder extends Seeder $user->name = "bendahara"; $user->nrk = "bendahara"; $user->password = Hash::make('bendahara321'); + $user->role_name = "bendahara"; $user->save(); $user->assignRole('bendahara'); diff --git a/public/css/app.css b/public/css/app.css index 461aef6..63f61b4 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -159,7 +159,7 @@ hr{ white-space: nowrap; } -#tblRealisasi td,#tempUploadRealisasi td,#dtTableJadwalPendapatan td{ +#tempUploadRealisasi td,#dtTableJadwalPendapatan td{ white-space: nowrap; } diff --git a/resources/views/admin/mst_pengguna/create.blade.php b/resources/views/admin/mst_pengguna/create.blade.php index 46b2507..c4c1b57 100644 --- a/resources/views/admin/mst_pengguna/create.blade.php +++ b/resources/views/admin/mst_pengguna/create.blade.php @@ -11,7 +11,7 @@
-

@php echo $sitesubTitle; @endphp

+
@php echo $sitesubTitle; @endphp
Back diff --git a/resources/views/admin/mst_pengguna/edit.blade.php b/resources/views/admin/mst_pengguna/edit.blade.php index 6b940c3..97a0b13 100644 --- a/resources/views/admin/mst_pengguna/edit.blade.php +++ b/resources/views/admin/mst_pengguna/edit.blade.php @@ -11,7 +11,7 @@
-

@php echo $sitesubTitle; @endphp

+
@php echo $sitesubTitle; @endphp
Back diff --git a/resources/views/admin/mst_pengguna/index.blade.php b/resources/views/admin/mst_pengguna/index.blade.php index 7c4af4a..96dc1a8 100644 --- a/resources/views/admin/mst_pengguna/index.blade.php +++ b/resources/views/admin/mst_pengguna/index.blade.php @@ -11,7 +11,7 @@
-

@php echo $sitesubTitle; @endphp

+
@php echo $sitesubTitle; @endphp
Tambah Data diff --git a/resources/views/admin/mst_pengguna/show.blade.php b/resources/views/admin/mst_pengguna/show.blade.php index 0bc27cd..7799997 100644 --- a/resources/views/admin/mst_pengguna/show.blade.php +++ b/resources/views/admin/mst_pengguna/show.blade.php @@ -11,7 +11,7 @@
-

@php echo $sitesubTitle; @endphp

+
@php echo $sitesubTitle; @endphp
Back diff --git a/resources/views/admin/mst_permission/create.blade.php b/resources/views/admin/mst_permission/create.blade.php index 03eb4fe..54344bc 100644 --- a/resources/views/admin/mst_permission/create.blade.php +++ b/resources/views/admin/mst_permission/create.blade.php @@ -11,7 +11,7 @@
-

@php echo $sitesubTitle; @endphp

+
@php echo $sitesubTitle; @endphp
Back diff --git a/resources/views/admin/mst_permission/edit.blade.php b/resources/views/admin/mst_permission/edit.blade.php index a62753f..8f3029d 100644 --- a/resources/views/admin/mst_permission/edit.blade.php +++ b/resources/views/admin/mst_permission/edit.blade.php @@ -11,7 +11,7 @@
-

@php echo $sitesubTitle; @endphp

+
@php echo $sitesubTitle; @endphp
Back diff --git a/resources/views/admin/mst_permission/index.blade.php b/resources/views/admin/mst_permission/index.blade.php index 961436f..2c5561f 100644 --- a/resources/views/admin/mst_permission/index.blade.php +++ b/resources/views/admin/mst_permission/index.blade.php @@ -11,7 +11,7 @@
-

@php echo $sitesubTitle; @endphp

+
@php echo $sitesubTitle; @endphp
Tambah Data diff --git a/resources/views/admin/mst_permission/show.blade.php b/resources/views/admin/mst_permission/show.blade.php index a8b04d8..bb088bb 100644 --- a/resources/views/admin/mst_permission/show.blade.php +++ b/resources/views/admin/mst_permission/show.blade.php @@ -11,7 +11,7 @@
-

@php echo $sitesubTitle; @endphp

+
@php echo $sitesubTitle; @endphp
Back diff --git a/resources/views/admin/mst_role/create.blade.php b/resources/views/admin/mst_role/create.blade.php index 4a355bd..0a6fdf9 100644 --- a/resources/views/admin/mst_role/create.blade.php +++ b/resources/views/admin/mst_role/create.blade.php @@ -11,7 +11,7 @@
-

@php echo $sitesubTitle; @endphp

+
@php echo $sitesubTitle; @endphp
Back diff --git a/resources/views/admin/mst_role/edit.blade.php b/resources/views/admin/mst_role/edit.blade.php index eab8743..31cc718 100644 --- a/resources/views/admin/mst_role/edit.blade.php +++ b/resources/views/admin/mst_role/edit.blade.php @@ -11,7 +11,7 @@
-

@php echo $sitesubTitle; @endphp

+
@php echo $sitesubTitle; @endphp
Back diff --git a/resources/views/admin/mst_role/index.blade.php b/resources/views/admin/mst_role/index.blade.php index 588ee86..6d2b04b 100644 --- a/resources/views/admin/mst_role/index.blade.php +++ b/resources/views/admin/mst_role/index.blade.php @@ -11,7 +11,7 @@
-

@php echo $sitesubTitle; @endphp

+
@php echo $sitesubTitle; @endphp
Tambah Data diff --git a/resources/views/admin/mst_role/show.blade.php b/resources/views/admin/mst_role/show.blade.php index 66c9acc..772cdce 100644 --- a/resources/views/admin/mst_role/show.blade.php +++ b/resources/views/admin/mst_role/show.blade.php @@ -11,7 +11,7 @@
-

@php echo $sitesubTitle; @endphp

+
@php echo $sitesubTitle; @endphp
Back diff --git a/resources/views/jadwal_salurdana/index.blade.php b/resources/views/jadwal_salurdana/index.blade.php index 87cbca2..d3d9b33 100644 --- a/resources/views/jadwal_salurdana/index.blade.php +++ b/resources/views/jadwal_salurdana/index.blade.php @@ -10,8 +10,8 @@ - + @endsection @section('card_header') @@ -47,7 +47,7 @@
- +
@@ -159,31 +159,31 @@ { "data": null}, { "data": "kode_rekening", "width": "400px" }, { "data": "spsbulan1", "className":"text-right" }, - { "data": null, "className":"text-right" }, + { "data": null, "className":"text-right text-success" }, { "data": "spsbulan2", "className":"text-right" }, - { "data": null, "className":"text-right" }, + { "data": null, "className":"text-right text-success" }, { "data": "spsbulan3", "className":"text-right" }, - { "data": null, "className":"text-right" }, + { "data": null, "className":"text-right text-success" }, { "data": "spsbulan4", "className":"text-right" }, - { "data": null, "className":"text-right" }, + { "data": null, "className":"text-right text-success" }, { "data": "spsbulan5", "className":"text-right" }, - { "data": null, "className":"text-right" }, + { "data": null, "className":"text-right text-success" }, { "data": "spsbulan6", "className":"text-right" }, - { "data": null, "className":"text-right" }, + { "data": null, "className":"text-right text-success" }, { "data": "spsbulan7", "className":"text-right" }, - { "data": null, "className":"text-right" }, + { "data": null, "className":"text-right text-success" }, { "data": "spsbulan8", "className":"text-right" }, - { "data": null, "className":"text-right" }, + { "data": null, "className":"text-right text-success" }, { "data": "spsbulan9", "className":"text-right" }, - { "data": null, "className":"text-right" }, + { "data": null, "className":"text-right text-success" }, { "data": "spsbulan10", "className":"text-right" }, - { "data": null, "className":"text-right" }, + { "data": null, "className":"text-right text-success" }, { "data": "spsbulan11", "className":"text-right" }, - { "data": null, "className":"text-right" }, + { "data": null, "className":"text-right text-success" }, { "data": "spsbulan12", "className":"text-right" }, - { "data": null, "className":"text-right" }, - { "data": null, "className":"text-right" }, - { "data": null, "className":"text-right" }, + { "data": null, "className":"text-right text-success" }, + { "data": null, "className":"text-right " }, + { "data": null, "className":"text-right text-success" }, //{ "data": null }, ], "rowCallback": function(nRow, aData, iDisplayIndex, iDisplayIndexFull, oSettings) { @@ -192,18 +192,24 @@ let index = (numStart * dtTable.page.len()) + iDisplayIndex + 1; let sps = [aData["spsbulan1"],aData["spsbulan2"],aData["spsbulan3"],aData["spsbulan4"],aData["spsbulan5"],aData["spsbulan6"] ,aData["spsbulan7"],aData["spsbulan8"],aData["spsbulan9"],aData["spsbulan10"],aData["spsbulan11"],aData["spsbulan12"]]; + let real = [aData["real1"],aData["real2"],aData["real3"],aData["real4"],aData["real5"],aData["real6"] + ,aData["real7"],aData["real8"],aData["real9"],aData["real10"],aData["real11"],aData["real12"]]; let total = 0; + let totalReal = 0; + let Jadwalcol=0; $("td:eq(0)", nRow).html(index); $("td:eq(1)", nRow).html(aData["kode_rekening"] + " | " + aData["nama_rekening"]); - let Jadwalcol=0; $.each(sps, function(i,x){ Jadwalcol+=2; $("td:eq("+Jadwalcol+")", nRow).html(separateNumberIndo(sps[i])); - $("td:eq("+(Jadwalcol+1)+")", nRow).html(0); + $("td:eq("+(Jadwalcol+1)+")", nRow).html(separateNumberIndo(real[i])); total+=parseFloat(sps[i]); + totalReal+=parseFloat(real[i]); + console.log(real[i]); }) - $("td:eq(14)", nRow).html(separateNumberIndo(total)); + $("td:eq(26)", nRow).html(separateNumberIndo(total)); + $("td:eq(27)", nRow).html(separateNumberIndo(totalReal)); return nRow; }, @@ -226,44 +232,51 @@ 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( "" ) - .append( "" ) + .append( "" ) .append( "" ) - .append( "" ) + .append( "" ) .append( "" ) - .append( "" ) + .append( "" ) .append( "" ) - .append( "" ) + .append( "" ) .append( "" ) - .append( "" ) + .append( "" ) .append( "" ) - .append( "" ) + .append( "" ) .append( "" ) - .append( "" ) + .append( "" ) .append( "" ) - .append( "" ) + .append( "" ) .append( "" ) - .append( "" ) + .append( "" ) .append( "" ) - .append( "" ) + .append( "" ) .append( "" ) - .append( "" ) + .append( "" ) .append( "" ) - .append( "" ) + .append( "" ) .append( "" ) - .append( "" ); + .append( "" ) }, startRender: function ( rows, group, index ) { // let group1 = rows.data().pluck("GROUP1"); diff --git a/resources/views/login.blade.php b/resources/views/login.blade.php index 976f31a..a5797fa 100644 --- a/resources/views/login.blade.php +++ b/resources/views/login.blade.php @@ -6,8 +6,8 @@ E-SAMASA --}} -
-
No
"+labelGroup+""+ separateNumberIndo(sum[0]) +"0"+ separateNumberIndo(sumReal[0]) +""+ separateNumberIndo(sum[1]) +"0"+ separateNumberIndo(sumReal[1]) +""+ separateNumberIndo(sum[2]) +"0"+ separateNumberIndo(sumReal[2]) +""+ separateNumberIndo(sum[3]) +"0"+ separateNumberIndo(sumReal[3]) +""+ separateNumberIndo(sum[4]) +"0"+ separateNumberIndo(sumReal[4]) +""+ separateNumberIndo(sum[5]) +"0"+ separateNumberIndo(sumReal[5]) +""+ separateNumberIndo(sum[6]) +"0"+ separateNumberIndo(sumReal[6]) +""+ separateNumberIndo(sum[7]) +"0"+ separateNumberIndo(sumReal[7]) +""+ separateNumberIndo(sum[8]) +"0"+ separateNumberIndo(sumReal[8]) +""+ separateNumberIndo(sum[9]) +"0"+ separateNumberIndo(sumReal[9]) +""+ separateNumberIndo(sum[10]) +"0"+ separateNumberIndo(sumReal[10]) +""+ separateNumberIndo(sum[11]) +"0"+ separateNumberIndo(sumReal[11]) +""+ separateNumberIndo(total) +"0"+ separateNumberIndo(totalReal) +"