diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 25c79fb..dc1ff7f 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use Session; class HomeController extends Controller { @@ -12,6 +13,12 @@ class HomeController extends Controller return view('home'); } + public function ta($ta) + { + Session::put('Tahun_Anggaran', $ta); + return redirect()->route('home'); + } + public function uploadThis(Request $request) { $this->validate($request, [ diff --git a/app/Http/Controllers/JadwalSalurdanaController.php b/app/Http/Controllers/JadwalSalurdanaController.php index 446e2ef..081f4e1 100644 --- a/app/Http/Controllers/JadwalSalurdanaController.php +++ b/app/Http/Controllers/JadwalSalurdanaController.php @@ -63,6 +63,11 @@ class JadwalSalurdanaController extends Controller { $judul = strtoupper($typeDana); $this->setTitle("Jadwal Salur Dana $judul"); + $data = DB::select(DB::raw("SELECT x.kode_skpd, x.nama_skpd, x.kode_rsk, x.nama_rsk, x.jumlah_anggaran, y.* + FROM SAMASA.BELANJA_REALISASI x + LEFT JOIN SAMASA.VW_AKB_REALISASI y + ON x.KODE_RSK = y.IDRSK AND x.TAHUN_ANGGARAN = y.TAHUN_ANGGARAN + WHERE x.TAHUN_ANGGARAN = ".getTa()." ORDER BY x.kode_skpd,x.kode_rsk ")); return view("jadwal_salurdana.index_".$typeDana); } diff --git a/app/Http/Controllers/RealisasiPendapatanController.php b/app/Http/Controllers/RealisasiPendapatanController.php index 2b6852d..e26dac7 100644 --- a/app/Http/Controllers/RealisasiPendapatanController.php +++ b/app/Http/Controllers/RealisasiPendapatanController.php @@ -125,12 +125,12 @@ class RealisasiPendapatanController extends Controller $ta = $post["ta"]; $dataFilter=0; - $data = PendapatanRealisasi::orderBy("created_at","ASC"); + $data = PendapatanRealisasi::where("tahun",$ta)->orderBy("created_at","ASC"); if (!empty($sps)){ $data->where("id_sps",$sps); } $dataFilter = $data->count(); - $dataTotal = PendapatanRealisasi::count(); + $dataTotal = PendapatanRealisasi::where("tahun",$ta)->count(); return response()->json([ "recordsTotal" => $dataTotal, diff --git a/app/helpers.php b/app/helpers.php index 6aea921..4308423 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -128,4 +128,9 @@ function getAlphabetCell($idx) }else{ return $alphabet[$idx]; } +} + +function getTA() +{ + return Session::get('Tahun_Anggaran'); } \ No newline at end of file diff --git a/public/css/app.css b/public/css/app.css index 2b43083..ccf54f3 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -350,4 +350,16 @@ hr{ .card-header{ background: whitesmoke; -} \ No newline at end of file +} + +table.dataTable th,table.dataTable thead td +{ + background: #dcdcdc; +} + +.btn-info +{ + background: rgba(52,73,94,0.94) !important; + border: rgba(52,73,94,0.94) !important; + color: white !important; +} diff --git a/resources/views/admin/mapping_dbh_skpd/index.blade.php b/resources/views/admin/mapping_dbh_skpd/index.blade.php index 7c259a9..08ed4e8 100644 --- a/resources/views/admin/mapping_dbh_skpd/index.blade.php +++ b/resources/views/admin/mapping_dbh_skpd/index.blade.php @@ -24,15 +24,8 @@
- - + +
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 5d8049e..641ca65 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -6,7 +6,7 @@

S I D A T A

Sistem Informasi Dana Transfer

-
Badan Pengelola Keuangan Daerah
Provinsi DKI Jakarta
+
Tahun Anggaran {{ !empty(Session::get('Tahun_Anggaran'))?Session::get('Tahun_Anggaran'):date("Y") }}
Badan Pengelola Keuangan Daerah
Provinsi DKI Jakarta
@stop \ No newline at end of file diff --git a/resources/views/jadwal_salurdana/index.blade.php b/resources/views/jadwal_salurdana/index.blade.php index f75472b..f172b8c 100644 --- a/resources/views/jadwal_salurdana/index.blade.php +++ b/resources/views/jadwal_salurdana/index.blade.php @@ -31,15 +31,8 @@
- - + +
{{--
diff --git a/resources/views/jadwal_salurdana/index_cht.blade.php b/resources/views/jadwal_salurdana/index_cht.blade.php index 922b4d7..e6becdd 100644 --- a/resources/views/jadwal_salurdana/index_cht.blade.php +++ b/resources/views/jadwal_salurdana/index_cht.blade.php @@ -27,14 +27,7 @@
- +
diff --git a/resources/views/jadwal_salurdana/index_dak.blade.php b/resources/views/jadwal_salurdana/index_dak.blade.php index c9c9e8d..6b108bc 100644 --- a/resources/views/jadwal_salurdana/index_dak.blade.php +++ b/resources/views/jadwal_salurdana/index_dak.blade.php @@ -30,15 +30,8 @@
- - + +
diff --git a/resources/views/notifikasi/index.blade.php b/resources/views/notifikasi/index.blade.php index 32adb2f..7962b24 100644 --- a/resources/views/notifikasi/index.blade.php +++ b/resources/views/notifikasi/index.blade.php @@ -73,10 +73,6 @@ } }); - $("#srcTA").on("change",function(){ - dtTable.draw(); - }); - var dtTable = $('#dtTableSKPP').DataTable( { "processing": true, "serverSide": true, diff --git a/resources/views/partials/top_menu.blade.php b/resources/views/partials/top_menu.blade.php index baebe1b..afcec14 100644 --- a/resources/views/partials/top_menu.blade.php +++ b/resources/views/partials/top_menu.blade.php @@ -21,6 +21,20 @@ +
  • + + TA: {{ !empty(Session::get('Tahun_Anggaran'))?Session::get('Tahun_Anggaran'):date("Y") }} + +
    + 2021 + @php + $listTA = Session::get('listTA'); + foreach($listTA as $rowTA){ + echo "$rowTA"; + } + @endphp +
    +
  • {{ strtoupper(Auth::user()->name)." | ROLE : ".strtoupper($role) }} diff --git a/resources/views/realisasi_belanja/index.blade.php b/resources/views/realisasi_belanja/index.blade.php index 988dd4e..e2f190d 100644 --- a/resources/views/realisasi_belanja/index.blade.php +++ b/resources/views/realisasi_belanja/index.blade.php @@ -27,15 +27,8 @@
    - - + +
    @@ -273,7 +266,7 @@ $("td:eq(6)", nRow).html(separateNumberIndo(aData["volume_satuan"])); $("td:eq(8)", nRow).html(separateNumberIndo(aData["jumlah_realisasi"])); $("td:eq(9)", nRow).html(separateNumberIndo(aData["volume_satuan_realisasi"])); - $("td:eq(11)", nRow).html(''+btnInput); + $("td:eq(11)", nRow).html(''+btnInput); return nRow; }, diff --git a/resources/views/realisasi_belanja/upload.blade.php b/resources/views/realisasi_belanja/upload.blade.php index 00637c1..c585ff9 100644 --- a/resources/views/realisasi_belanja/upload.blade.php +++ b/resources/views/realisasi_belanja/upload.blade.php @@ -30,15 +30,8 @@
    @csrf
    - - + +
    diff --git a/resources/views/realisasi_belanja/upload_dak.blade.php b/resources/views/realisasi_belanja/upload_dak.blade.php index c72c4d2..e041dfc 100644 --- a/resources/views/realisasi_belanja/upload_dak.blade.php +++ b/resources/views/realisasi_belanja/upload_dak.blade.php @@ -31,15 +31,8 @@ @csrf
    - - + +
    diff --git a/resources/views/realisasi_pendapatan/form.blade.php b/resources/views/realisasi_pendapatan/form.blade.php index eeb87f2..46880cd 100644 --- a/resources/views/realisasi_pendapatan/form.blade.php +++ b/resources/views/realisasi_pendapatan/form.blade.php @@ -2,14 +2,7 @@
    - +
    diff --git a/resources/views/realisasi_pendapatan/index.blade.php b/resources/views/realisasi_pendapatan/index.blade.php index bdace51..7e216a0 100644 --- a/resources/views/realisasi_pendapatan/index.blade.php +++ b/resources/views/realisasi_pendapatan/index.blade.php @@ -32,14 +32,7 @@
    - +
    @@ -168,9 +161,9 @@ let info = dtTable.page.info(); let numStart = info.page; let index = (numStart * dtTable.page.len()) + iDisplayIndex + 1; - let btnEdit = {{ !empty(auth()->user()->can('Update DBH Realisasi Pendapatan'))?auth()->user()->can('Update DBH Realisasi Pendapatan'):"false" }} ?"":""; + let btnEdit = {{ !empty(auth()->user()->can('Update DBH Realisasi Pendapatan'))?auth()->user()->can('Update DBH Realisasi Pendapatan'):"false" }} ?"":""; btnEdit = aData["rkud_no_sts"] ==""?btnEdit:""; - let btnDelete = {{ !empty(auth()->user()->can('Delete DBH Realisasi Pendapatan'))?auth()->user()->can('Delete DBH Realisasi Pendapatan'):"false" }} ?"":""; + let btnDelete = {{ !empty(auth()->user()->can('Delete DBH Realisasi Pendapatan'))?auth()->user()->can('Delete DBH Realisasi Pendapatan'):"false" }} ?"":""; btnDelete = aData["rkud_no_sts"] ==""?btnDelete:""; $("td:eq(0)", nRow).html(index); @@ -182,7 +175,7 @@ $("td:eq(9)", nRow).html( ""+ ""+ - ""+ + ""+ btnEdit + btnDelete + ""); return nRow; diff --git a/routes/web.php b/routes/web.php index 6d9886f..0e325eb 100644 --- a/routes/web.php +++ b/routes/web.php @@ -117,4 +117,5 @@ Route::group(['middleware' => 'auth'], function () { Route::post('/get-notif', [NotifikasiController::class, 'getNotif']); }); Route::resource('notif', NotifikasiController::class); + Route::get('tahun-anggaran/{ta}', [HomeController::class, 'ta']); }); \ No newline at end of file