diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php
index 8957172..2db4e54 100644
--- a/app/Http/Controllers/RealisasiBelanjaController.php
+++ b/app/Http/Controllers/RealisasiBelanjaController.php
@@ -1045,10 +1045,10 @@ class RealisasiBelanjaController extends Controller
'Alokasi Anggaran'=>'alokasi_anggaran',
'Volume'=>'volume_satuan',
'Unit'=>'unit_satuan',
+ 'Realisasi SIPD'=>'jml',
'Realisasi'=>'jumlah_realisasi',
'Volume Realisasi'=>'volume_satuan_realisasi',
'Unit Realisasi'=>'unit_satuan_realisasi',
- 'Total Realisasi'=>'jml',
'Jenis Belanja'=>'nama_jenis_belanja',
'Sub Jenis Belanja'=>'nama_sub_jenis_belanja',
'Semester 1'=>["semester1","satuan_sms1"],
diff --git a/public/css/app.css b/public/css/app.css
index 72b8240..45abbff 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -380,4 +380,8 @@ table.dataTable th,table.dataTable thead td
.swal2-container.swal2-bottom, .swal2-container.swal2-center, .swal2-container.swal2-top
{
z-index: 99999;
+}
+
+.table-bordered td, .table-bordered th{
+ border: 1px solid #c1c1c1;
}
\ No newline at end of file
diff --git a/resources/views/realisasi_pendapatan/index.blade.php b/resources/views/realisasi_pendapatan/index.blade.php
index e841d18..4a1fca5 100644
--- a/resources/views/realisasi_pendapatan/index.blade.php
+++ b/resources/views/realisasi_pendapatan/index.blade.php
@@ -51,7 +51,9 @@
Uraian |
Kotor |
Potongan |
- Bersih |
+ Bersih Simtrad4 |
+ Retur |
+ Jumlah Bersih |
SP2D BUN |
TGL SP2D BUN |
NO. STS |
@@ -153,6 +155,8 @@
{ "data": "simtrad4_kotor", "className":"text-right" },
{ "data": "simtrad4_potongan", "className":"text-right" },
{ "data": "simtrad4_bersih", "className":"text-right", "defaultContent":"0" },
+ { "data": "retur", "className":"text-right", "defaultContent":"0" },
+ { "data": "bersih", "className":"text-right", "defaultContent":"0" },
{ "data": "simtrad4_sp2d_bun", "className":"text-left", "defaultContent":"-" },
{ "data": "simtrad4_tgl_sp2d_bun", "className":"text-center", "defaultContent":"-" },
{ "data": "rkud_no_sts", "className":"text-center", "defaultContent":"-"},
@@ -173,10 +177,12 @@
$("td:eq(2)", nRow).html(separateNumberIndo(aData["simtrad4_kotor"]));
$("td:eq(3)", nRow).html(separateNumberIndo(aData["simtrad4_potongan"]));
$("td:eq(4)", nRow).html(separateNumberIndo(aData["simtrad4_bersih"]));
- $("td:eq(6)", nRow).html(setIndoDateOracle(aData["simtrad4_tgl_sp2d_bun"]));
- $("td:eq(7)", nRow).html(aData["rkud_no_sts"] == null?"-":""+aData["rkud_no_sts"]+"");
- $("td:eq(8)", nRow).html(aData["rkud_tgl"] == null?"-":""+setIndoDateOracle(aData["rkud_tgl"])+"");
- $("td:eq(9)", nRow).html(
+ $("td:eq(5)", nRow).html(separateNumberIndo(aData["retur"]));
+ $("td:eq(6)", nRow).html(separateNumberIndo(aData["bersih"]));
+ $("td:eq(8)", nRow).html(setIndoDateOracle(aData["simtrad4_tgl_sp2d_bun"]));
+ $("td:eq(9)", nRow).html(aData["rkud_no_sts"] == null?"-":""+aData["rkud_no_sts"]+"");
+ $("td:eq(10)", nRow).html(aData["rkud_tgl"] == null?"-":""+setIndoDateOracle(aData["rkud_tgl"])+"");
+ $("td:eq(11)", nRow).html(
"