diff --git a/app/Http/Controllers/JadwalSalurdanaController.php b/app/Http/Controllers/JadwalSalurdanaController.php index 9eb4a17..f149d6f 100644 --- a/app/Http/Controllers/JadwalSalurdanaController.php +++ b/app/Http/Controllers/JadwalSalurdanaController.php @@ -31,7 +31,9 @@ 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") + $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'"); diff --git a/resources/views/jadwal_salurdana/index.blade.php b/resources/views/jadwal_salurdana/index.blade.php index b11220c..87cbca2 100644 --- a/resources/views/jadwal_salurdana/index.blade.php +++ b/resources/views/jadwal_salurdana/index.blade.php @@ -50,21 +50,49 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -131,18 +159,31 @@ { "data": null}, { "data": "kode_rekening", "width": "400px" }, { "data": "spsbulan1", "className":"text-right" }, + { "data": null, "className":"text-right" }, { "data": "spsbulan2", "className":"text-right" }, - { "data": "spsbulan3", "className":"text-right" }, - { "data": "spsbulan4", "className":"text-right" }, - { "data": "spsbulan5", "className":"text-right" }, - { "data": "spsbulan6", "className":"text-right" }, - { "data": "spsbulan7", "className":"text-right" }, - { "data": "spsbulan8", "className":"text-right" }, - { "data": "spsbulan9", "className":"text-right" }, - { "data": "spsbulan10", "className":"text-right" }, + { "data": null, "className":"text-right" }, + { "data": "spsbulan3", "className":"text-right" }, + { "data": null, "className":"text-right" }, + { "data": "spsbulan4", "className":"text-right" }, + { "data": null, "className":"text-right" }, + { "data": "spsbulan5", "className":"text-right" }, + { "data": null, "className":"text-right" }, + { "data": "spsbulan6", "className":"text-right" }, + { "data": null, "className":"text-right" }, + { "data": "spsbulan7", "className":"text-right" }, + { "data": null, "className":"text-right" }, + { "data": "spsbulan8", "className":"text-right" }, + { "data": null, "className":"text-right" }, + { "data": "spsbulan9", "className":"text-right" }, + { "data": null, "className":"text-right" }, + { "data": "spsbulan10", "className":"text-right" }, + { "data": null, "className":"text-right" }, { "data": "spsbulan11", "className":"text-right" }, - { "data": "spsbulan12", "className":"text-right" }, - { "data": "kode_rekening", "className":"text-right" }, + { "data": null, "className":"text-right" }, + { "data": "spsbulan12", "className":"text-right" }, + { "data": null, "className":"text-right" }, + { "data": null, "className":"text-right" }, + { "data": null, "className":"text-right" }, //{ "data": null }, ], "rowCallback": function(nRow, aData, iDisplayIndex, iDisplayIndexFull, oSettings) { @@ -154,9 +195,12 @@ let total = 0; $("td:eq(0)", nRow).html(index); - $("td:eq(1)", nRow).html(aData["kode_rekening"]+" | "+aData["nama_rekening"]); + $("td:eq(1)", nRow).html(aData["kode_rekening"] + " | " + aData["nama_rekening"]); + let Jadwalcol=0; $.each(sps, function(i,x){ - $("td:eq("+(i+2)+")", nRow).html(separateNumberIndo(sps[i])); + Jadwalcol+=2; + $("td:eq("+Jadwalcol+")", nRow).html(separateNumberIndo(sps[i])); + $("td:eq("+(Jadwalcol+1)+")", nRow).html(0); total+=parseFloat(sps[i]); }) $("td:eq(14)", nRow).html(separateNumberIndo(total)); @@ -195,18 +239,31 @@ 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( "" ); }, 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 91817a5..976f31a 100644 --- a/resources/views/login.blade.php +++ b/resources/views/login.blade.php @@ -34,37 +34,43 @@ @endif @csrf -
- -
-
- +
+ +
+ +
+
+ +
+
-
-
- -
-
- +
+ +
+ +
+
+ +
+
-
-
-
-
- {{-- - --}} +
+
+
+ {{-- + --}} +
+ +
+ +
+
- -
- -
- -
{{--

NoRekeningJanFebMarAprMeiJuniJuliAguSepOktNovDesJumlahNoNama RekeningJanFebMarAprMeiJuniJuliAguSepOktNovDesJumlah
JadwalRealisasiJadwalRealisasiJadwalRealisasiJadwalRealisasiJadwalRealisasiJadwalRealisasiJadwalRealisasiJadwalRealisasiJadwalRealisasiJadwalRealisasiJadwalRealisasiJadwalRealisasiJadwalRealisasi
"+labelGroup+""+ separateNumberIndo(sum[0]) +"0"+ separateNumberIndo(sum[1]) +"0"+ separateNumberIndo(sum[2]) +"0"+ separateNumberIndo(sum[3]) +"0"+ separateNumberIndo(sum[4]) +"0"+ separateNumberIndo(sum[5]) +"0"+ separateNumberIndo(sum[6]) +"0"+ separateNumberIndo(sum[7]) +"0"+ separateNumberIndo(sum[8]) +"0"+ separateNumberIndo(sum[9]) +"0"+ separateNumberIndo(sum[10]) +"0"+ separateNumberIndo(sum[11]) +""+ separateNumberIndo(total) +"0"+ separateNumberIndo(total) +"0