gitea/sidata
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Pusdatin BPKD Jkt
2022-08-10 14:59:14 +07:00
parent e0ac0bb8db
commit 3bc423dbb4
12 changed files with 65 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/JadwalSalurdanaController.php
+13 -1
View File
@@ -26,7 +26,7 @@ class JadwalSalurdanaController extends Controller
protected function queryJadwalSalurDana($ta) protected function queryJadwalSalurDana($ta)
{ {
return 'SELECT kode_rekening,nama_rekening,spsbulan1,spsbulan2,spsbulan3,spsbulan4, $sqlstr = 'SELECT kode_rekening,nama_rekening,spsbulan1,spsbulan2,spsbulan3,spsbulan4,
spsbulan5,spsbulan6,spsbulan7,spsbulan8,spsbulan9,spsbulan10,spsbulan11,spsbulan12, spsbulan5,spsbulan6,spsbulan7,spsbulan8,spsbulan9,spsbulan10,spsbulan11,spsbulan12,
SUBSTR(KODE_REKENING,1,12) AS kodegrup,SUBSTR(KODE_REKENING,1,9) AS groupall, 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("1",0) AS "REAL1",NVL("2",0) AS "REAL2",NVL("3",0) AS "REAL3",
@@ -47,7 +47,15 @@ class JadwalSalurdanaController extends Controller
FOR BULAN IN(1,2,3,4,5,6,7,8,9,10,11,12) FOR BULAN IN(1,2,3,4,5,6,7,8,9,10,11,12)
) )
)y ON x.ID = y.ID_SPS )y ON x.ID = y.ID_SPS
LEFT JOIN
NEWSIPKD.TROPD z ON x.SKPD_ID = z.I_ID
WHERE x.TAHUN = '.$ta.' AND x.SKPD_ID=980 AND SUBSTR(x.KODE_REKENING,1,3)=\'4.2\''; WHERE x.TAHUN = '.$ta.' AND x.SKPD_ID=980 AND SUBSTR(x.KODE_REKENING,1,3)=\'4.2\'';
// if (getRole()=="skpd"){
// $sqlstr.=" AND z.C_OPD='".Auth::user()->nrk."'";
// }
return $sqlstr;
} }
public function datatable(Request $request) public function datatable(Request $request)
@@ -175,6 +183,10 @@ class JadwalSalurdanaController extends Controller
) y ) y
ON x.KODE_RSK = y.IDRSK ON x.KODE_RSK = y.IDRSK
WHERE x.TAHUN_ANGGARAN = \''.$ta.'\''.$typeDanaFilter; WHERE x.TAHUN_ANGGARAN = \''.$ta.'\''.$typeDanaFilter;
// if (getRole()=="skpd"){
// $sqlstr.=" AND KODE_SKPD='".Auth::user()->nrk."'";
// }
$data = DB::connection('oracle')->select(DB::raw($sqlstr.' ORDER BY x.id OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY')); $data = DB::connection('oracle')->select(DB::raw($sqlstr.' ORDER BY x.id OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY'));
$dataTotal = count(DB::connection('oracle')->select(DB::raw($sqlstr))); $dataTotal = count(DB::connection('oracle')->select(DB::raw($sqlstr)));
// if (!empty($src)){ // if (!empty($src)){
database/migrations/2022_07_15_094519_create_temp_realisasi_belanja_table.php
+11 -9
View File
@@ -16,22 +16,23 @@ class CreateTempRealisasiBelanjaTable extends Migration
Schema::create('temp_realisasi_belanja', function (Blueprint $table) { Schema::create('temp_realisasi_belanja', function (Blueprint $table) {
$table->id(); $table->id();
$table->string("tahun_anggaran",4); $table->string("tahun_anggaran",4);
$table->string("jenis_belanja",50); $table->string("jenis_belanja",400);
$table->string("sub_jenis_belanja",50); $table->string("sub_jenis_belanja",400);
$table->string("kode_program",50); $table->string("kode_program",50);
$table->string("nama_program",150); $table->string("nama_program",400);
$table->string("kode_skpd",50); $table->string("kode_skpd",50);
$table->string("nama_skpd",150); $table->string("nama_skpd",400);
$table->string("kode_kegiatan",50); $table->string("kode_kegiatan",50);
$table->string("nama_kegiatan",150); $table->string("nama_kegiatan",400);
$table->string("kode_sub_kegiatan",50); $table->string("kode_sub_kegiatan",50);
$table->string("nama_sub_kegiatan",150); $table->string("nama_sub_kegiatan",400);
$table->string("kode_rsk",50); $table->string("kode_rsk",50);
$table->text("nama_rsk"); $table->string("nama_rsk",400);
$table->string("kode_rekening",50)->nullable(); $table->string("kode_rekening",50)->nullable();
$table->string("nama_rekening",150)->nullable(); $table->string("nama_rekening",400)->nullable();
$table->decimal('jumlah_anggaran', 19, 2); $table->decimal('jumlah_anggaran', 19, 2);
$table->tinyInteger('volume_satuan'); $table->integer('volume_satuan')->nullable();
$table->string('unit_satuan',30)->nullable();
$table->enum('jenis_dana',["DBH","DAK"]); $table->enum('jenis_dana',["DBH","DAK"]);
$table->enum('sub_jenis_dana',["All","CHT","Fisik","Non-Fisik"]); $table->enum('sub_jenis_dana',["All","CHT","Fisik","Non-Fisik"]);
$table->uuid('userid'); $table->uuid('userid');
@@ -49,3 +50,4 @@ class CreateTempRealisasiBelanjaTable extends Migration
Schema::dropIfExists('temp_realisasi_belanja'); Schema::dropIfExists('temp_realisasi_belanja');
} }
} }
database/migrations/2022_07_18_090432_create_belanja_realisasi_table.php
+15 -13
View File
@@ -16,27 +16,29 @@ class CreateBelanjaRealisasiTable extends Migration
Schema::create('belanja_realisasi', function (Blueprint $table) { Schema::create('belanja_realisasi', function (Blueprint $table) {
$table->uuid('id')->primary(); $table->uuid('id')->primary();
$table->string("tahun_anggaran",4); $table->string("tahun_anggaran",4);
$table->string("jenis_belanja",50); $table->string("jenis_belanja",400);
$table->string("sub_jenis_belanja",50); $table->string("sub_jenis_belanja",400);
$table->string("kode_program",50); $table->string("kode_program",50);
$table->string("nama_program",150); $table->string("nama_program",400);
$table->string("kode_skpd",50); $table->string("kode_skpd",50);
$table->string("nama_skpd",150); $table->string("nama_skpd",400);
$table->string("kode_kegiatan",50); $table->string("kode_kegiatan",50);
$table->string("nama_kegiatan",150); $table->string("nama_kegiatan",400);
$table->string("kode_sub_kegiatan",50); $table->string("kode_sub_kegiatan",50);
$table->string("nama_sub_kegiatan",150); $table->string("nama_sub_kegiatan",400);
$table->string("kode_rsk",50); $table->string("kode_rsk",50);
$table->text("nama_rsk"); $table->string("nama_rsk",400);
$table->string("kode_rekening",50)->nullable(); $table->string("kode_rekening",50)->nullable();
$table->string("nama_rekening",150)->nullable(); $table->string("nama_rekening",400)->nullable();
$table->decimal('jumlah_anggaran', 19, 2); $table->decimal('jumlah_anggaran', 19, 2);
$table->tinyInteger('volume_satuan'); $table->integer('volume_satuan')->nullable();
$table->string('unit_satuan',30); $table->string('unit_satuan',30)->nullable();
$table->decimal('jumlah_realisasi', 19, 2); $table->decimal('jumlah_realisasi', 19, 2)->nullable();
$table->tinyInteger('volume_satuan_realisasi')->nullable(); $table->integer('volume_satuan_realisasi')->nullable();
$table->string('unit_satuan_realisasi',30)->nullable(); $table->string('unit_satuan_realisasi',30)->nullable();
$table->string("no_sp2d",30); $table->string("no_sp2d",30)->nullable();
$table->string("jenis_dana",50);
$table->string("sub_jenis_dana",50);
$table->uuid('realisasi_by')->nullable(); $table->uuid('realisasi_by')->nullable();
$table->uuid('created_by')->nullable(); $table->uuid('created_by')->nullable();
$table->timestamps(); $table->timestamps();
resources/views/jadwal_salurdana/index_cht.blade.php
+6 -4
View File
@@ -371,12 +371,14 @@
$("td:eq(1)", nRow).html("<div class='text-wrap width-200'>" + aData["kode_rsk"] + " | " + aData["nama_rsk"] + "</div>"); $("td:eq(1)", nRow).html("<div class='text-wrap width-200'>" + aData["kode_rsk"] + " | " + aData["nama_rsk"] + "</div>");
$("td:eq(2)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"])); $("td:eq(2)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"]));
$.each(akb, function(i,x){ $.each(akb, function(i,x){
$("td:eq("+Jadwalcol+")", nRow).html(separateNumberIndo(parseFloat(akb[i]))); let nAKB = akb[i] == null ? 0 : parseFloat(akb[i]);
let nReal = real[i] == null ? 0 : parseFloat(real[i]);
$("td:eq("+Jadwalcol+")", nRow).html(separateNumberIndo(nAKB));
Jadwalcol++; Jadwalcol++;
$("td:eq("+(Jadwalcol)+")", nRow).html(separateNumberIndo(parseFloat(real[i]))); $("td:eq("+(Jadwalcol)+")", nRow).html(separateNumberIndo(nReal));
total+=parseFloat(akb[i]);
totalReal+=parseFloat(real[i]);
Jadwalcol++; Jadwalcol++;
total+=parseFloat(nAKB);
totalReal+=parseFloat(nReal);
}) })
$("td:eq(27)", nRow).html(separateNumberIndo(total)); $("td:eq(27)", nRow).html(separateNumberIndo(total));
$("td:eq(28)", nRow).html(separateNumberIndo(totalReal)); $("td:eq(28)", nRow).html(separateNumberIndo(totalReal));
resources/views/jadwal_salurdana/index_dak.blade.php
+8 -6
View File
@@ -19,7 +19,7 @@
<div class="card-header border-0"> <div class="card-header border-0">
<h2 class="card-title"><i class="fa fa-search mr-2"></i> Filter Pencarian</h2> <h2 class="card-title"><i class="fa fa-search mr-2"></i> Filter Pencarian</h2>
<div class="card-tools"> <div class="card-tools">
<button type="button" class="btn btn-secondary btn-sm" data-card-widget="collapse" title="Collapse"> <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
<i class="fas fa-minus"></i> <i class="fas fa-minus"></i>
</button> </button>
</div> </div>
@@ -56,7 +56,7 @@
<div class="card-header"> <div class="card-header">
<h2 class="card-title"><i class="fa fa-th-list mr-2"></i> Jadwal Salur</h2> <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> Jadwal Salur</h2>
<div class="card-tools"> <div class="card-tools">
<button type="button" class="btn btn-secondary btn-sm" data-card-widget="collapse" title="Collapse"> <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
<i class="fas fa-minus"></i> <i class="fas fa-minus"></i>
</button> </button>
</div> </div>
@@ -497,12 +497,14 @@
$("td:eq(1)", nRow).html("<div class='text-wrap width-200'>" + aData["kode_rsk"] + " | " + aData["nama_rsk"] + "</div>"); $("td:eq(1)", nRow).html("<div class='text-wrap width-200'>" + aData["kode_rsk"] + " | " + aData["nama_rsk"] + "</div>");
$("td:eq(2)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"])); $("td:eq(2)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"]));
$.each(akb, function(i,x){ $.each(akb, function(i,x){
$("td:eq("+Jadwalcol+")", nRow).html(separateNumberIndo(parseFloat(akb[i]))); let nAKB = akb[i] == null ? 0 : parseFloat(akb[i]);
let nReal = real[i] == null ? 0 : parseFloat(real[i]);
$("td:eq("+Jadwalcol+")", nRow).html(separateNumberIndo(nAKB));
Jadwalcol++; Jadwalcol++;
$("td:eq("+(Jadwalcol)+")", nRow).html(separateNumberIndo(parseFloat(real[i]))); $("td:eq("+(Jadwalcol)+")", nRow).html(separateNumberIndo(nReal));
total+=parseFloat(akb[i]);
totalReal+=parseFloat(real[i]);
Jadwalcol++; Jadwalcol++;
total+=parseFloat(nAKB);
totalReal+=parseFloat(nReal);
}) })
$("td:eq(27)", nRow).html(separateNumberIndo(total)); $("td:eq(27)", nRow).html(separateNumberIndo(total));
$("td:eq(28)", nRow).html(separateNumberIndo(totalReal)); $("td:eq(28)", nRow).html(separateNumberIndo(totalReal));
resources/views/layouts/app.blade.php
+1 -1
View File
@@ -21,7 +21,7 @@
</div> </div>
</section> </section>
<section class="content"> <section class="content pt-1">
@if ($errors->any()) @if ($errors->any())
<div class="alert alert-danger"> <div class="alert alert-danger">
<strong>Whoops!</strong> There were some problems with your input.<br><br> <strong>Whoops!</strong> There were some problems with your input.<br><br>
resources/views/layouts/empty.blade.php
+1 -1
View File
@@ -21,7 +21,7 @@
</div> </div>
</section> </section>
<section class="content"> <section class="content pt-1">
@if ($errors->any()) @if ($errors->any())
<div class="alert alert-danger"> <div class="alert alert-danger">
<strong>Whoops!</strong> There were some problems with your input.<br><br> <strong>Whoops!</strong> There were some problems with your input.<br><br>
resources/views/realisasi_belanja/index.blade.php
+3 -1
View File
@@ -178,7 +178,7 @@
{ "data": "jumlah_anggaran", "className":"text-right", "defaultContent":"0" }, { "data": "jumlah_anggaran", "className":"text-right", "defaultContent":"0" },
{ "data": "volume_satuan", "className":"text-center", "defaultContent":"0", "width":50 }, { "data": "volume_satuan", "className":"text-center", "defaultContent":"0", "width":50 },
{ "data": "unit_satuan", "className":"text-center", "defaultContent":"-", "width":50 }, { "data": "unit_satuan", "className":"text-center", "defaultContent":"-", "width":50 },
{ "data": null}, { "data": null, "className":"text-right"},
{ "data": "volume_satuan_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": "unit_satuan_realisasi", "className":"text-center", "defaultContent":"-", "width":50 },
{ "data": null} { "data": null}
@@ -191,7 +191,9 @@
let btnInput = ""; let btnInput = "";
$("td:eq(0)", nRow).html(index); $("td:eq(0)", nRow).html(index);
$("td:eq(5)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"])); $("td:eq(5)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"]));
$("td:eq(6)", nRow).html(separateNumberIndo(aData["volume_satuan"]));
$("td:eq(8)", nRow).html(separateNumberIndo(aData["jml_realisasi_sp2d"])); $("td:eq(8)", nRow).html(separateNumberIndo(aData["jml_realisasi_sp2d"]));
$("td:eq(9)", nRow).html(separateNumberIndo(aData["volume_satuan_realisasi"]));
$("td:eq(11)", nRow).html('<a href="{{ $baseUrl }}/realisasi-belanja/' + aData["id"] +'/submit" class="btn btn-sm btn-default mr-2"><i class="fa fa-eye"></i></a>'+btnInput); $("td:eq(11)", nRow).html('<a href="{{ $baseUrl }}/realisasi-belanja/' + aData["id"] +'/submit" class="btn btn-sm btn-default mr-2"><i class="fa fa-eye"></i></a>'+btnInput);
return nRow; return nRow;
resources/views/realisasi_belanja/submit.blade.php
+3 -3
View File
@@ -21,8 +21,8 @@
<h2 class="card-title"><i class="fa fa-th-list mr-2"></i> DETAIL {{ strtoupper($sitesubTitle) }}</h2> <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> DETAIL {{ strtoupper($sitesubTitle) }}</h2>
<div class="card-tools"> <div class="card-tools">
{{-- @if(auth()->user()->can('Tambah SKPP')) --}} {{-- @if(auth()->user()->can('Tambah SKPP')) --}}
<button class="btn btn-sm btn-default" onclick="location.href='{{ url('/realisasi-belanja') }}'"><i class="fa fa-arrow-left"></i> Kembali</button> <button class="btn btn-tool" onclick="location.href='{{ url('/realisasi-belanja') }}'"><i class="fa fa-arrow-left"></i> Kembali</button>
<button type="button" class="btn btn-secondary btn-sm" data-card-widget="collapse" title="Collapse"> <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
<i class="fas fa-minus"></i> <i class="fas fa-minus"></i>
</button> </button>
{{-- @endif --}} {{-- @endif --}}
@@ -246,7 +246,7 @@
$("input[name=anggaran]").val("{{ separateNumberIndo($BelanjaRealisasi->jumlah_anggaran) }}"); $("input[name=anggaran]").val("{{ separateNumberIndo($BelanjaRealisasi->jumlah_anggaran) }}");
$("input[name=anggaran]").attr("readonly", true); $("input[name=anggaran]").attr("readonly", true);
$("input[name=vol]").val("{{ isset($BelanjaRealisasi->volume_satuan)?$BelanjaRealisasi->volume_satuan:0 }}"); $("input[name=vol]").val("{{ isset($BelanjaRealisasi->volume_satuan)?separateNumberIndo($BelanjaRealisasi->volume_satuan):0 }}");
$("input[name=vol]").attr("readonly", true); $("input[name=vol]").attr("readonly", true);
$("input[name=unit]").val("{{ $BelanjaRealisasi->unit_satuan }}"); $("input[name=unit]").val("{{ $BelanjaRealisasi->unit_satuan }}");
$("input[name=unit]").attr("readonly", true); $("input[name=unit]").attr("readonly", true);
resources/views/realisasi_belanja/upload.blade.php
+1 -1
View File
@@ -81,7 +81,7 @@
<h2 class="card-title"><i class="fa fa-check mr-2"></i> Validasi Data Rencana Belanja</h2> <h2 class="card-title"><i class="fa fa-check mr-2"></i> Validasi Data Rencana Belanja</h2>
<div class="card-tools"> <div class="card-tools">
{{-- @if(auth()->user()->can('Tambah SKPP')) --}} {{-- @if(auth()->user()->can('Tambah SKPP')) --}}
<button id="upload_validated" class="btn btn-sm btn-warning"><i class="fa fa-save"></i> Upload Data</button> <button id="upload_validated" class="btn btn-tool btn-warning"><i class="fa fa-save"></i> Upload Data</button>
{{-- @endif --}} {{-- @endif --}}
</div> </div>
</div> </div>
resources/views/realisasi_pendapatan/index.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@
<h2 class="card-title"><i class="fa fa-th-list mr-2"></i> {{ $sitesubTitle }}</h2> <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> {{ $sitesubTitle }}</h2>
<div class="card-tools"> <div class="card-tools">
@if(auth()->user()->can('Create DBH Realisasi Pendapatan')) @if(auth()->user()->can('Create DBH Realisasi Pendapatan'))
<button class="btn btn-sm btn-success" onclick="location.href='{{ route('realisasi-pendapatan.create') }}'"><i class="fa fa-edit"></i> Tambah Data</button> <button class="btn btn-tool" onclick="location.href='{{ route('realisasi-pendapatan.create') }}'"><i class="fa fa-edit"></i> Tambah Data</button>
@endif @endif
</div> </div>
</div> </div>
resources/views/realisasi_pendapatan/show.blade.php
+1 -1
View File
@@ -14,7 +14,7 @@
<div class="card-header"> <div class="card-header">
<h2 class="card-title"><i class="fa fa-th-list mr-2"></i> {{ $sitesubTitle }}</h2> <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> {{ $sitesubTitle }}</h2>
<div class="card-tools"> <div class="card-tools">
<button class="btn btn-sm btn-default" onclick="location.href='{{ url('/realisasi-pendapatan') }}'"><i class="fa fa-arrow-left"></i> Kembali</button> <button class="btn btn-tool" onclick="location.href='{{ url('/realisasi-pendapatan') }}'"><i class="fa fa-arrow-left"></i> Kembali</button>
</div> </div>
</div> </div>
<div id="detail_realisasi_pendapatan" class="card-body"> <div id="detail_realisasi_pendapatan" class="card-body">