diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index 195a93c..b93a607 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -12,6 +12,7 @@ use App\Models\DbhBelanjaRealisasiDetail; use App\Models\TempRealisasiBelanja; use App\Models\VwAkbSpdRealRsk; use App\Models\UnitSatuan; +use App\Models\Sp2d; use App\Imports\RealisasiBelanjaImport; class RealisasiBelanjaController extends Controller @@ -49,22 +50,33 @@ class RealisasiBelanjaController extends Controller // var_dump($DbhBelanjaRealisasi->kode_rsk,$DbhBelanjaRealisasi->kode_sub_kegiatan); exit; $vwAKB = VwAkbSpdRealRsk::where("I_IDRSK",$DbhBelanjaRealisasi->kode_rsk)->firstorNew(); $vwSPD = DB::select(DB::raw( - 'SELECT x.I_SPDNO_DOK,x.D_SPDNO,sum(y.V_SPD) 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 = \''.$DbhBelanjaRealisasi->kode_sub_kegiatan.'\' - AND a.C_OPD = \''.$DbhBelanjaRealisasi->kode_skpd.'\' - AND x.C_ANGG_TAHUN = \''.$DbhBelanjaRealisasi->tahun_anggaran.'\' - GROUP BY x.I_SPDNO_DOK,x.D_SPDNO - ORDER BY x.D_SPDNO ' - )); - //var_dump($vwSPD); exit; - return view('realisasi_belanja.submit', compact("DbhBelanjaRealisasi","vwAKB","vwSPD")); + 'SELECT x.I_SPDNO_DOK,x.D_SPDNO,sum(y.V_SPD) 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 = \''.$DbhBelanjaRealisasi->kode_sub_kegiatan.'\' + AND a.C_OPD = \''.$DbhBelanjaRealisasi->kode_skpd.'\' + AND x.C_ANGG_TAHUN = \''.$DbhBelanjaRealisasi->tahun_anggaran.'\' + GROUP BY x.I_SPDNO_DOK,x.D_SPDNO + ORDER BY x.D_SPDNO ' + )); + $vwSP2D = DB::select(DB::raw('SELECT x.I_ID as IDSP2D, x.I_IDOPD,x.I_SP2DNO_DOK, + TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH,x.V_SPP + FROM NEWSIPKD.TMSP2D x + LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y + ON x.I_IDSPP = y.I_IDSPP + WHERE y.I_IDRSK='.$DbhBelanjaRealisasi->kode_rsk.' ORDER BY x.D_SP2D_SAH ' ) + ); + + // foreach($vwSP2D as $key=>$sp2d){ + // var_dump($sp2d->i_sp2dno_dok); + // } + // exit; + return view('realisasi_belanja.submit', compact("DbhBelanjaRealisasi","vwAKB","vwSPD","vwSP2D")); } public function datatable(Request $request) @@ -75,13 +87,14 @@ class RealisasiBelanjaController extends Controller $src = isset($post["search"])?$post["search"]["value"]:""; $dataFilter=0; - $data = DB::select(DB::raw('SELECT * FROM DBH_BELANJA_REALISASI x + $data = DB::select(DB::raw('SELECT x.*,y.JML_REALISASI_SP2D FROM DBH_BELANJA_REALISASI x LEFT JOIN ( - SELECT DBH_BELANJA_REALISASI_ID,SUM(JUMLAH_REALISASI) AS jml_realisasi, - sum(VOLUME_SATUAN_REALISASI) AS vol_realisasi, unit_satuan_realisasi - FROM SAMASA.DBH_BELANJA_REALISASI_DETAIL - GROUP BY DBH_BELANJA_REALISASI_ID,UNIT_SATUAN_REALISASI - ) y ON x.ID = y.DBH_BELANJA_REALISASI_ID')); + SELECT I_IDRSK,SUM(y.V_SPP) AS JML_REALISASI_SP2D + FROM NEWSIPKD.TMSP2D x + LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y + ON x.I_IDSPP = y.I_IDSPP + GROUP BY I_IDRSK + ) y ON x.KODE_RSK = y.I_IDRSK')); if (!empty($src)){ $data->whereRaw("(LOWER(jenis_belanja) LIKE '%".strtolower($src)."%' @@ -243,29 +256,67 @@ class RealisasiBelanjaController extends Controller return view('realisasi_belanja.upload'); } + // public function inputRealisasi(Request $request, $id) + // { + // $DbhBelanjaRealisasi = DbhBelanjaRealisasi::where("id", $id)->firstOrNew(); + // $req = $request->all(); + // $redirect = isset($req["redirect_link"])?$req["redirect_link"]:"/dbh/realisasi-belanja"; + // if ($request->isMethod('post')) { + // try{ + // DB::beginTransaction(); + + // $DbhBelanjaRealisasiDetail = DbhBelanjaRealisasiDetail::where(["dbh_belanja_realisasi_id"=>$id,"no_sp2d"=>$req["no_sp2d"]]); + // $data["dbh_belanja_realisasi_id"] = $id; + // $data["volume_satuan_realisasi"] = $req["vol_realisasi"]; + // $data["unit_satuan_realisasi"] = $req["unit_realisasi"]; + // $data["jumlah_realisasi"] = replaceMoney($req["jml_realisasi"]); + // $data["no_sp2d"] = $req["no_sp2d"]; + // $data["created_by"] = Auth::user()->id; + // // var_dump($DbhBelanjaRealisasiDetail->count()); exit; + // if ($DbhBelanjaRealisasiDetail->count()==0){ + // DbhBelanjaRealisasiDetail::create($data); + // }else{ + // $DbhBelanjaRealisasiDetail->firstorNew()->update($data); + // } + + // DB::commit(); + + // return redirect($redirect)->with('success','Data Realisasi berhasil di input!'); + // }catch(\Exception $e){ + // throw new \Exception($e->getMessage()); + // DB::rollBack(); + // return redirect($redirect)->with('error',$e->getMessage()); + // } + // } + + // $DbhBelanjaRealisasiDetail = DB::select( + // DB::raw('SELECT x.I_ID as IDSP2D, x.I_IDOPD,x.I_SP2DNO_DOK,TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH,x.V_SPP, + // a.no_sp2d,a.jumlah_realisasi,a.VOLUME_SATUAN_REALISASI,a.UNIT_SATUAN_REALISASI,a.ID + // FROM NEWSIPKD.TMSP2D x + // LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y + // ON x.I_IDSPP = y.I_IDSPP + // LEFT JOIN SAMASA.DBH_BELANJA_REALISASI_DETAIL a + // ON x.I_SP2DNO_DOK = a.NO_SP2D + // WHERE x.I_ID='.$request->id_sp2d.' ORDER BY x.D_SP2D_SAH ' ) + // ); + // $DbhBelanjaRealisasiDetail = $DbhBelanjaRealisasiDetail == null ? null : $DbhBelanjaRealisasiDetail[0]; + // $unitSatuan = UnitSatuan::orderBy("id")->get(); + + // return view('realisasi_belanja.form_input_realisasi',compact("DbhBelanjaRealisasi", "DbhBelanjaRealisasiDetail", "unitSatuan","redirect")); + // } + public function inputRealisasi(Request $request, $id) { $DbhBelanjaRealisasi = DbhBelanjaRealisasi::where("id", $id)->firstOrNew(); $req = $request->all(); - $redirect = isset($req["redirect_link"])?$req["redirect_link"]:"/dbh/realisasi-belanja"; + $redirect = isset($req["redirect_link"])?$req["redirect_link"]:"realisasi-belanja"; if ($request->isMethod('post')) { try{ DB::beginTransaction(); - - $DbhBelanjaRealisasiDetail = DbhBelanjaRealisasiDetail::where(["dbh_belanja_realisasi_id"=>$id,"no_sp2d"=>$req["no_sp2d"]]); - $data["dbh_belanja_realisasi_id"] = $id; $data["volume_satuan_realisasi"] = $req["vol_realisasi"]; $data["unit_satuan_realisasi"] = $req["unit_realisasi"]; - $data["jumlah_realisasi"] = replaceMoney($req["jml_realisasi"]); - $data["no_sp2d"] = $req["no_sp2d"]; - $data["created_by"] = Auth::user()->id; - // var_dump($DbhBelanjaRealisasiDetail->count()); exit; - if ($DbhBelanjaRealisasiDetail->count()==0){ - DbhBelanjaRealisasiDetail::create($data); - }else{ - $DbhBelanjaRealisasiDetail->firstorNew()->update($data); - } - + $data["realisasi_by"] = Auth::user()->id; + $DbhBelanjaRealisasi->update($data); DB::commit(); return redirect($redirect)->with('success','Data Realisasi berhasil di input!'); @@ -276,20 +327,8 @@ class RealisasiBelanjaController extends Controller } } - $DbhBelanjaRealisasiDetail = DB::select( - DB::raw('SELECT x.I_ID as IDSP2D, x.I_IDOPD,x.I_SP2DNO_DOK,TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH,x.V_SPP, - a.no_sp2d,a.jumlah_realisasi,a.VOLUME_SATUAN_REALISASI,a.UNIT_SATUAN_REALISASI,a.ID - FROM NEWSIPKD.TMSP2D x - LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y - ON x.I_IDSPP = y.I_IDSPP - LEFT JOIN SAMASA.DBH_BELANJA_REALISASI_DETAIL a - ON x.I_SP2DNO_DOK = a.NO_SP2D - WHERE x.I_ID='.$request->id_sp2d.' ORDER BY x.D_SP2D_SAH ' ) - ); - $DbhBelanjaRealisasiDetail = $DbhBelanjaRealisasiDetail == null ? null : $DbhBelanjaRealisasiDetail[0]; $unitSatuan = UnitSatuan::orderBy("id")->get(); - - return view('realisasi_belanja.form_input_realisasi',compact("DbhBelanjaRealisasi", "DbhBelanjaRealisasiDetail", "unitSatuan","redirect")); + return view('realisasi_belanja.form_input_realisasi',compact("DbhBelanjaRealisasi", "unitSatuan","redirect")); } public function datatableInputRealisasi(Request $request) diff --git a/app/Http/Controllers/RealisasiPendapatanController.php b/app/Http/Controllers/RealisasiPendapatanController.php index 1d34b24..c5fc55d 100644 --- a/app/Http/Controllers/RealisasiPendapatanController.php +++ b/app/Http/Controllers/RealisasiPendapatanController.php @@ -33,6 +33,23 @@ class RealisasiPendapatanController extends Controller return view('realisasi_pendapatan.create'); } + protected function dataPendapatan($req= []) + { + $data["tahun"] = $req["txt_ta"]; + $data["id_sps"] = $req["txt_id_sps"]; + $txt_rek_sps = explode("|",$req["txt_rek_sps"]); + $data["kode_rekening_sps"] = $txt_rek_sps[0]; + $data["nama_rekening_sps"] = $txt_rek_sps[1]; + $data["simtrad4_uraian"] = $req["txt_simtrad4_uraian"]; + $data["simtrad4_kotor"] = replaceMoney($req["txt_simtrad4_kotor"]); + $data["simtrad4_potongan"] = replaceMoney($req["txt_simtrad4_potongan"]); + $data["simtrad4_bersih"] = replaceMoney($req["txt_simtrad4_bersih"]); + $data["simtrad4_tgl_sp2d_bun"] = ConvertIndoDate($req["txt_simtrad4_tgl_sp2d_bun"]); + $data["simtrad4_sp2d_bun"] = $req["txt_simtrad4_sp2d_bun"]; + + return $data; + } + public function store(Request $request) { try{ @@ -40,16 +57,7 @@ class RealisasiPendapatanController extends Controller DB::beginTransaction(); $req = $request->all(); - $data["tahun"] = $req["txt_ta"]; - $data["id_sps"] = $req["txt_id_sps"]; - $txt_rek_sps = explode("|",$req["txt_rek_sps"]); - $data["kode_rekening_sps"] = $txt_rek_sps[0]; - $data["nama_rekening_sps"] = $txt_rek_sps[1]; - $data["simtrad4_uraian"] = $req["txt_simtrad4_uraian"]; - $data["simtrad4_kotor"] = replaceMoney($req["txt_simtrad4_kotor"]); - $data["simtrad4_potongan"] = replaceMoney($req["txt_simtrad4_potongan"]); - $data["simtrad4_bersih"] = replaceMoney($req["txt_simtrad4_bersih"]); - $data["simtrad4_sp2d_bun"] = $req["txt_simtrad4_sp2d_bun"]; + $data = $this->dataPendapatan($req); $data["created_by"] = Auth::user()->id; $DbhPendapatanRealisasi = DbhPendapatanRealisasi::create($data); @@ -84,16 +92,7 @@ class RealisasiPendapatanController extends Controller DB::beginTransaction(); $req = $request->all(); - $data["tahun"] = $req["txt_ta"]; - $data["id_sps"] = $req["txt_id_sps"]; - $txt_rek_sps = explode("|",$req["txt_rek_sps"]); - $data["kode_rekening_sps"] = $txt_rek_sps[0]; - $data["nama_rekening_sps"] = $txt_rek_sps[1]; - $data["simtrad4_uraian"] = $req["txt_simtrad4_uraian"]; - $data["simtrad4_kotor"] = replaceMoney($req["txt_simtrad4_kotor"]); - $data["simtrad4_potongan"] = replaceMoney($req["txt_simtrad4_potongan"]); - $data["simtrad4_bersih"] = replaceMoney($req["txt_simtrad4_bersih"]); - $data["simtrad4_sp2d_bun"] = $req["txt_simtrad4_sp2d_bun"]; + $data = $this->dataPendapatan($req); $data["updated_by"] = Auth::user()->id; $realisasi_pendapatan->update($data); @@ -184,6 +183,10 @@ class RealisasiPendapatanController extends Controller DB::beginTransaction(); $data = DbhPendapatanRealisasi::firstOrNew(array('id' => $realisasiId)); + + if ($data["simtrad4_bersih"]<>replaceMoney($req["rkud_jumlah"])){ + return redirect(url("/dbh/realisasi-pendapatan/".$realisasiId))->with('error', "Jumlah STS harus sama dengan Rencana !"); + } $data["rkud_tgl"] = $req["rkud_tgl"]; $data["rkud_no_sts"] = $req["rkud_no_sts"]; $data["rkud_kode_akun"] = $req["rkud_kode_akun"]; diff --git a/app/Models/DbhPendapatanRealisasi.php b/app/Models/DbhPendapatanRealisasi.php index 73454e1..5480412 100644 --- a/app/Models/DbhPendapatanRealisasi.php +++ b/app/Models/DbhPendapatanRealisasi.php @@ -13,7 +13,7 @@ class DbhPendapatanRealisasi extends Eloquent protected $connection = 'Samasa'; protected $table = 'SAMASA.dbh_pendapatan_realisasi'; protected $fillable = [ - 'tahun','simtrad4_uraian','simtrad4_kotor','simtrad4_potongan','simtrad4_bersih','simtrad4_sp2d_bun', + 'tahun','simtrad4_uraian','simtrad4_kotor','simtrad4_potongan','simtrad4_bersih','simtrad4_tgl_sp2d_bun','simtrad4_sp2d_bun', 'rkud_tgl','rkud_no_sts','rkud_kode_akun','rkud_nama_akun','rkud_jumlah','id_sps','kode_rekening_sps','nama_rekening_sps' ]; diff --git a/database/migrations/2022_07_11_093130_create_dbh_pendapatan_realisasi_table.php b/database/migrations/2022_07_11_093130_create_dbh_pendapatan_realisasi_table.php index 5065a83..dc9da0b 100644 --- a/database/migrations/2022_07_11_093130_create_dbh_pendapatan_realisasi_table.php +++ b/database/migrations/2022_07_11_093130_create_dbh_pendapatan_realisasi_table.php @@ -23,6 +23,7 @@ class CreateDbhPendapatanRealisasiTable extends Migration $table->decimal('simtrad4_kotor', 19, 2); $table->decimal('simtrad4_potongan', 19, 2); $table->decimal('simtrad4_bersih', 19, 2); + $table->date('simtrad4_tgl_sp2d_bun')->nullable(); $table->string('simtrad4_sp2d_bun',50); $table->date('rkud_tgl')->nullable(); $table->string('rkud_no_sts',20)->nullable(); diff --git a/public/js/app.js b/public/js/app.js index aa7b030..b45bab7 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -29,6 +29,16 @@ function setIndoDate(n){ } } +function setIndoDateOracle(n){ + if (n){ + arrDateSpace = n.split(" "); + arrDate = arrDateSpace[0].split("-"); + return arrDate[2] + "/" + arrDate[1] + "/" + arrDate[0]; + }else{ + return "-"; + } +} + // Set Currency Separator to input fields $(document).on('keypress , paste', '.number-separator', function (e) { if (/^-?\d*[,.]?(\d{0,3},)*(\d{3},)?\d{0,3}$/.test(e.key)) { diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php index 0f21974..f60a820 100644 --- a/resources/views/partials/menu.blade.php +++ b/resources/views/partials/menu.blade.php @@ -28,30 +28,54 @@

Dana Bagi Hasil

{{--
  • diff --git a/resources/views/realisasi_belanja/form_input_realisasi.blade.php b/resources/views/realisasi_belanja/form_input_realisasi.blade.php index 80e8072..958bb08 100644 --- a/resources/views/realisasi_belanja/form_input_realisasi.blade.php +++ b/resources/views/realisasi_belanja/form_input_realisasi.blade.php @@ -9,21 +9,9 @@ -
    -
    - - -
    -
    -
    -
    - - -
    -
    - volume_satuan_realisasi) ? 0: $DbhBelanjaRealisasiDetail->volume_satuan_realisasi; ?> + volume_satuan_realisasi) ? $DbhBelanjaRealisasi->volume_satuan: $DbhBelanjaRealisasi->volume_satuan_realisasi; ?>
    @@ -32,8 +20,7 @@
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + volume_satuan_realisasi) ? 0: $DbhBelanjaRealisasiDetail->volume_satuan_realisasi; ?> + + +
    +
    +
    +
    + + +
    +
    +
    + +
    + + + \ No newline at end of file diff --git a/resources/views/realisasi_belanja/index.blade.php b/resources/views/realisasi_belanja/index.blade.php index b5df202..4dd52db 100644 --- a/resources/views/realisasi_belanja/index.blade.php +++ b/resources/views/realisasi_belanja/index.blade.php @@ -53,16 +53,17 @@ // "Jenis", // "Sub Jenis", // "Kode Program", - // "Nama Program", + // "Kode SKPD", - // "Nama SKPD", // "Kode Kegiatan", // "Nama Kegiatan", // "Kode Sub Kegiatan", - // "Nama Sub Kegiatan", // "Kode RSK", - "Nama RSK", // "Kode Rek", "Nama Rek", + "Nama SKPD", + "Nama Program", + "Nama Sub Kegiatan", + "Nama RSK", "Anggaran", "Volume", "Unit", @@ -144,22 +145,22 @@ // { "data": "jenis_belanja", "className":"text-left","defaultContent":"-" }, // { "data": "sub_jenis_belanja", "className":"text-left", "defaultContent":"-" }, // { "data": "kode_program", "className":"text-center", "defaultContent":"-" }, - // { "data": "nama_program", "className":"text-left", "defaultContent":"-" }, // { "data": "kode_skpd", "className":"text-center", "defaultContent":"-" }, - // { "data": "nama_skpd", "className":"text-left", "defaultContent":"-" }, // { "data": "kode_kegiatan", "className":"text-center", "defaultContent":"-" }, // { "data": "nama_kegiatan", "className":"text-left", "defaultContent":"-" }, // { "data": "kode_sub_kegiatan", "className":"text-center", "defaultContent":"-" }, - // { "data": "nama_sub_kegiatan", "className":"text-left", "defaultContent":"-" }, // { "data": "kode_rsk", "className":"text-center", "defaultContent":"-" }, - { "data": "nama_rsk", "className":"text-left", "defaultContent":"-", "width":"50%" }, // { "data": "kode_rekening", "className":"text-center", "defaultContent":"-" }, // { "data": "nama_rekening", "className":"text-left", "defaultContent":"-" }, + { "data": "nama_skpd", "className":"text-left", "defaultContent":"-" }, + { "data": "nama_program", "className":"text-left", "defaultContent":"-" }, + { "data": "nama_sub_kegiatan", "className":"text-left", "defaultContent":"20%" }, + { "data": "nama_rsk", "className":"text-left", "defaultContent":"-", "width":"20%" }, { "data": "jumlah_anggaran", "className":"text-right", "defaultContent":"0" }, { "data": "volume_satuan", "className":"text-center", "defaultContent":"0", "width":50 }, { "data": "unit_satuan", "className":"text-center", "defaultContent":"-", "width":50 }, { "data": null}, - { "data": "vol_realisasi", "className":"text-center", "defaultContent":"0", "width":50 }, + { "data": "volume_satuan_realisasi", "className":"text-center", "defaultContent":"0", "width":50 }, { "data": "unit_satuan_realisasi", "className":"text-center", "defaultContent":"-", "width":50 }, { "data": null} ], @@ -170,9 +171,9 @@ //let btnInput = {{ empty(Auth::user()->can("Input Realisasi DBH Realisasi Belanja"))?"false":Auth::user()->can("Input Realisasi DBH Realisasi Belanja") }}?' Input Realisasi':''; let btnInput = ""; $("td:eq(0)", nRow).html(index); - $("td:eq(2)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"])); - $("td:eq(5)", nRow).html(separateNumberIndo(aData["jml_realisasi"])); - $("td:eq(8)", nRow).html(''+btnInput); + $("td:eq(5)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"])); + $("td:eq(8)", nRow).html(separateNumberIndo(aData["jml_realisasi_sp2d"])); + $("td:eq(11)", nRow).html(''+btnInput); return nRow; }, diff --git a/resources/views/realisasi_belanja/submit.blade.php b/resources/views/realisasi_belanja/submit.blade.php index bc28ea1..7464a81 100644 --- a/resources/views/realisasi_belanja/submit.blade.php +++ b/resources/views/realisasi_belanja/submit.blade.php @@ -36,27 +36,36 @@
    - AKB
    + AKB vs Realisasi
    - $bulan){ ?> - ":"" ?> -
    - -
    - -
    -
    - ":"" ?> - -
    -
    -
    -
    TOTAL AKB
    -
    {{ separateNumberIndo($totalAKB) }}
    +
    + + + + + + + + $bulan){ ?> + + + + + + + + + + + + +
    BulanAKBRealisasi
    {{ $bulan }}{{ separateNumberIndo($vwAKB["v_akb_".substr("00".($key+1),-2)]) }} {{ separateNumberIndo($vwAKB["v_bku_".substr("00".($key+1),-2)]) }}
    TOTAL{{ separateNumberIndo($totalAKB) }}{{ separateNumberIndo($totalBKU) }}
    +
    @@ -64,8 +73,8 @@ - - + + $spd){ ?> - + jml); } ?> @@ -83,47 +92,51 @@
    NomorTanggalJumlahTanggalJumlah
    {{ $spd->i_spdno_dok }}{{ date("d-m-Y",strtotime($spd->d_spdno)) }}{{ date("d-m-Y",strtotime($spd->d_spdno)) }} {{ separateNumberIndo($spd->jml) }}
    + SP2D
    + + + + + + + + $sp2d){ ?> + + + + + + v_spp); } ?> + + + + + +
    NomorTanggalJumlah
    {{ $sp2d->i_sp2dno_dok }}{{ date("d-m-Y",strtotime($sp2d->d_sp2d_sah)) }}{{ separateNumberIndo($sp2d->v_spp) }}
    TOTAL SP2D{{ separateNumberIndo($totalSP2D) }}
    - {{--
    -

    Realisasi

    -
    - can("Input Realisasi DBH Realisasi Belanja")){ ?> - Input Realisasi - -
    -
    --}}
    REALISASI
    - - - - - can("Input Realisasi DBH Realisasi Belanja")){ - unset($arrCol[5]); - } - - foreach($arrCol as $rowCol){ - echo ""; - } - ?> - - - -
    No$rowCol
    +
    + + +
    +
    + + +
    +
    + + +
    + can("Input Realisasi DBH Realisasi Belanja")){ ?> + Input Realisasi +
    @endsection @@ -186,93 +199,6 @@ $("input[name=vol_realisasi]").val("{{ isset($DbhBelanjaRealisasi->volume_satuan_realisasi)?$DbhBelanjaRealisasi->volume_satuan_realisasi:0 }}"); $("input[name=unit_realisasi]").val("{{ isset($DbhBelanjaRealisasi->unit_satuan_realisasi)?$DbhBelanjaRealisasi->unit_satuan_realisasi:0 }}"); - var dtTable = $('#tblInputRealisasi').DataTable( { - "processing": true, - "serverSide": true, - "ordering": false, - "autoWidth": false, - "ajax": { - url: "/dbh/realisasi-belanja/{{ $DbhBelanjaRealisasi->kode_rsk }}/inputrealisasi-datatable", - type: "POST", - headers: { - 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') - }, - data: function (d) { - } - }, - "columnDefs": [ - //{ className: "td-nowrap", "targets": [ 1 ] } - ], - "dom": "<\"top\" <\"row\"<\"col-md-6\"><\"col-md-6 text-right\">>>rt<\"bottom\" <\"row\"<\"col-md-6\"><\"col-md-6\">> ><\"clear\">", - "lengthMenu": [ - [ 10, 25, 50 ], - [ "10", "25", "50" ] - ], - "paging": true, // Table pagination - "columns": [ - { "data": null}, - { "data": "i_sp2dno_dok", "className":"text-center", "defaultContent":"-"}, - { "data": "d_sp2d_sah", "className":"text-center", "defaultContent":"-"}, - { "data": "v_spp", "className":"text-right", "defaultContent":"0" }, - { "data": "volume_satuan_realisasi", "className":"text-center", "defaultContent":"0" }, - { "data": "unit_satuan_realisasi", "className":"text-center", "defaultContent":"-" }, - { "data": null} - ], - "rowCallback": function(nRow, aData, iDisplayIndex, iDisplayIndexFull, oSettings) { - let info = dtTable.page.info(); - let numStart = info.page; - let index = (numStart * dtTable.page.len()) + iDisplayIndex + 1; - let btnInput = {{ empty(Auth::user()->can("Input Realisasi DBH Realisasi Belanja"))?"false":Auth::user()->can("Input Realisasi DBH Realisasi Belanja") }}?'id }}/submit">':''; - //let btnDelete = {{ empty(Auth::user()->can("Input Realisasi DBH Realisasi Belanja"))?"false":Auth::user()->can("Input Realisasi DBH Realisasi Belanja") }}?'':''; - //let btnDelete = {{ !empty(auth()->user()->can('Input Realisasi DBH Realisasi Belanja'))?auth()->user()->can('Input Realisasi DBH Realisasi Belanja'):"false" }} ?"":""; - - $("td:eq(0)", nRow).html(index); - $("td:eq(3)", nRow).html(separateNumberIndo(aData["v_spp"])); - $("td:eq(6)", nRow).html(btnInput); - - return nRow; - }, - "language": { - "lengthMenu": "Tampil _MENU_ data per Halaman", - "zeroRecords": "Data tidak ditemukan!", - "info": "Halaman _PAGE_ dari _PAGES_ Halaman", - "infoEmpty": "Data tidak tersedia", - "infoFiltered": "(Disaring dari _MAX_ Data)", - "paginate": { - "previous": "", - "next": "", - }, - "processing": "
    ", - }, - scrollX:true, - rowGroup: { - endRender: function ( rows, group, index ) { - let sumRealisasi = rows.data().pluck("jumlah_realisasi").reduce( function (a, b) { - return a + b * 1; - }, 0); - - let sumVolume = rows.data().pluck("volume_satuan_realisasi").reduce( function (a, b) { - return a + b * 1; - }, 0); - - let satuan = rows.data().pluck("unit_satuan_realisasi").reduce( function (a) { - return a; - }); - - let textmuted = index == 1 ? "text-muted":""; - let labelGroup = index == 1 ?"JUMLAH | " + group : "TOTAL"; - return $("") - .append( "TOTAL") - .append( ""+ separateNumberIndo(sumRealisasi) +"") - .append( ""+ separateNumberIndo(sumVolume) +"" ) - .append( ""+satuan+"") - }, - startRender: function ( rows, group, index ) { - }, - dataSrc: ["i_idopd"] - }, - }); - }); @endsection \ No newline at end of file diff --git a/resources/views/realisasi_pendapatan/form.blade.php b/resources/views/realisasi_pendapatan/form.blade.php index f0c6e6d..975899f 100644 --- a/resources/views/realisasi_pendapatan/form.blade.php +++ b/resources/views/realisasi_pendapatan/form.blade.php @@ -107,6 +107,10 @@ +
    + + +
    diff --git a/resources/views/realisasi_pendapatan/index.blade.php b/resources/views/realisasi_pendapatan/index.blade.php index 5da3373..ed2cd91 100644 --- a/resources/views/realisasi_pendapatan/index.blade.php +++ b/resources/views/realisasi_pendapatan/index.blade.php @@ -56,7 +56,9 @@ Potongan Bersih SP2D BUN + TGL SP2D BUN NO. STS + TGL STS Aksi @@ -124,8 +126,10 @@ { "data": "simtrad4_kotor", "className":"text-right" }, { "data": "simtrad4_potongan", "className":"text-right" }, { "data": "simtrad4_bersih", "className":"text-right", "defaultContent":"0" }, - { "data": "simtrad4_sp2d_bun", "className":"text-left", "defaultContent":"-" }, + { "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":"-"}, + { "data": "rkud_tgl", "className":"text-center", "defaultContent":"-"}, { "data": null}, ], "rowCallback": function(nRow, aData, iDisplayIndex, iDisplayIndexFull, oSettings) { @@ -138,7 +142,9 @@ $("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(7)", nRow).html( + $("td:eq(6)", nRow).html(setIndoDateOracle(aData["simtrad4_tgl_sp2d_bun"])); + $("td:eq(8)", nRow).html(setIndoDateOracle(aData["rkud_tgl"])); + $("td:eq(9)", nRow).html( "
    "+ ""+ ""+ diff --git a/resources/views/realisasi_pendapatan/show.blade.php b/resources/views/realisasi_pendapatan/show.blade.php index e546e82..6d0c0ca 100644 --- a/resources/views/realisasi_pendapatan/show.blade.php +++ b/resources/views/realisasi_pendapatan/show.blade.php @@ -66,6 +66,7 @@
    + @stop @section('scripts2')