diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php
index 46a8175..c357f9d 100644
--- a/app/Http/Controllers/RealisasiBelanjaController.php
+++ b/app/Http/Controllers/RealisasiBelanjaController.php
@@ -1000,21 +1000,38 @@ class RealisasiBelanjaController extends Controller
];
foreach(GetBulan() as $key=>$namaBulan){
- $arrCol+=[$namaBulan=>"jumlah_realisasi_".($key+1)];
+ $arrCol+=[$namaBulan=>["jumlah_realisasi_".($key+1),"volume_satuan_realisasi_".($key+1)]];
}
-
+
$i=0;
foreach($arrCol as $key=>$fieldVal){
- $sheet->setCellValue(getAlphabetCell($i).'1', $key);
- $i++;
+ if (is_array($fieldVal)){
+ foreach($fieldVal as $rowfieldVal){
+ $sheet->setCellValue(getAlphabetCell($i).'1', $key);
+ $i++;
+ }
+ $sheet->mergeCells(getAlphabetCell($i-2).'1:'.getAlphabetCell($i-1).'1');
+ }else{
+ $sheet->setCellValue(getAlphabetCell($i).'1', $key);
+ $i++;
+ }
}
$rows = 2;
foreach ($data as $val){
$i=0;
foreach($arrCol as $key=>$fieldVal){
- $sheet->setCellValue(getAlphabetCell($i) . $rows, $val[$fieldVal]);
- $i++;
+ if (is_array($fieldVal)){
+ foreach($fieldVal as $rowfieldVal){
+ $valNotNull = $val[$rowfieldVal]?$val[$rowfieldVal]:0;
+ $contentVal = str_contains($rowfieldVal,"volume_satuan_realisasi")? $valNotNull." ".$val["unit_satuan"]:$valNotNull;
+ $sheet->setCellValue(getAlphabetCell($i) . $rows, $contentVal);
+ $i++;
+ }
+ }else{
+ $sheet->setCellValue(getAlphabetCell($i) . $rows, $val[$fieldVal]);
+ $i++;
+ }
}
$rows++;
}
diff --git a/app/Models/BelanjaRealisasi.php b/app/Models/BelanjaRealisasi.php
index 5610e24..1c0a488 100644
--- a/app/Models/BelanjaRealisasi.php
+++ b/app/Models/BelanjaRealisasi.php
@@ -71,6 +71,8 @@ class BelanjaRealisasi extends Eloquent
$sqlstr = "SELECT a.*,NVL(b.jml,0) as jml,
CASE WHEN a.jenis_dana = 'DBH' AND a.nama_subjenis_dana<>'CHT'
THEN NVL(d.jml_spd, 0) ELSE NVL(c.jml_spd, 0) END AS jml_spd,
+ volume_satuan_realisasi_1,volume_satuan_realisasi_2,volume_satuan_realisasi_3,volume_satuan_realisasi_4,volume_satuan_realisasi_5,volume_satuan_realisasi_6,volume_satuan_realisasi_7,
+ volume_satuan_realisasi_8,volume_satuan_realisasi_9,volume_satuan_realisasi_10,volume_satuan_realisasi_11,volume_satuan_realisasi_12,
jumlah_realisasi_1,jumlah_realisasi_2,jumlah_realisasi_3,jumlah_realisasi_4,jumlah_realisasi_5,jumlah_realisasi_6,jumlah_realisasi_7,
jumlah_realisasi_8,jumlah_realisasi_9,jumlah_realisasi_10,jumlah_realisasi_11,jumlah_realisasi_12
FROM VW_BELANJA_REALISASI a
diff --git a/app/helpers.php b/app/helpers.php
index 246a597..3c73b8a 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -122,9 +122,8 @@ function getAlphabetCell($idx)
{
$alphabet = range("A","Z");
if ($idx > 25)
- {
- $idx -= 26;
- return $alphabet[round($idx/25)].= getAlphabetCell($idx);
+ {
+ return $alphabet[(int)($idx/25)-1].= getAlphabetCell($idx%25);
}else{
return $alphabet[$idx];
}
diff --git a/resources/views/realisasi_pendapatan/show.blade.php b/resources/views/realisasi_pendapatan/show.blade.php
index ef32916..f899ae8 100644
--- a/resources/views/realisasi_pendapatan/show.blade.php
+++ b/resources/views/realisasi_pendapatan/show.blade.php
@@ -80,7 +80,7 @@
$(document).ready(function(){
$("#btn_save_realisasi_pendapatan").remove();
- let $newOption = $("").val({{ $realisasi_pendapatan->id_sps }}).text("{{ $realisasi_pendapatan->kode_rekening_sps."|".$realisasi_pendapatan->nama_rekening_sps }}")
+ let $newOption = $("").val("{{ $realisasi_pendapatan->kode_rekening_sps }}").text("{{ $realisasi_pendapatan->kode_rekening_sps."|".$realisasi_pendapatan->nama_rekening_sps }}")
$("#txt_rek_sps").val("{{ $realisasi_pendapatan->kode_rekening_sps."|".$realisasi_pendapatan->nama_rekening_sps }}");
$("#txt_id_sps").append($newOption).trigger('change');
$("#txt_ta").val("{{ $realisasi_pendapatan->tahun }}");
@@ -92,7 +92,7 @@
$("#txt_simtrad4_bersih").val("{{ separateNumberIndo($realisasi_pendapatan->simtrad4_bersih) }}");
$("#txt_retur").val("{{ separateNumberIndo($realisasi_pendapatan->retur) }}");
$("#txt_bersih").val("{{ separateNumberIndo($realisasi_pendapatan->bersih) }}");
- showRinciDBH({{ $realisasi_pendapatan->id_sps }});
+ showRinciDBH("{{ $realisasi_pendapatan->kode_rekening_sps }}");
let validasi = ()=>{