Skip to content

Tambahkan filter tahun pada statistik seni budaya & pendidikan data presisi #949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vickyrolanda merged 3 commits into from
Mar 6, 2026
Merged

Tambahkan filter tahun pada statistik seni budaya & pendidikan data presisi #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
811e8d2
Tambahkan filter tahun pada statistik seni budaya & pendidikan data p…
pandigresik Mar 4, 2026
c2dbba0
Merge branch 'rilis-dev' into dev-948
vickyrolanda Mar 6, 2026
759500c
[ci skip] memutahirkan catatan rilis
vickyrolanda Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions catatan_rilis.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Di rilis ini, versi 2603.0.0 berisi penambahan dan perbaikan yang diminta penggu
#### Penambahan Fitur

1. [#946](https://github.com/OpenSID/OpenKab/issues/946) Penambahan filter tahun pada statistik papan & sandang data presisi.
2. [#948](https://github.com/OpenSID/OpenKab/issues/948) Penambahan filter tahun pada statistik seni budaya & pendidikan data presisi.


#### Perbaikan BUG
Expand Down
21 changes: 12 additions & 9 deletions resources/views/presisi/statistik/pendidikan.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,7 @@
<h3 id="title-block"></h3>
</div>
<div class="row">
<div class="col-auto">
<a class="btn btn-sm btn-secondary" data-toggle="collapse" href="#collapse-filter" role="button"
aria-expanded="true" aria-controls="collapse-filter">
<i class="fas fa-filter"></i>
</a>
</div>

<x-filter-tahun />
<div class="col-md-2">
<button type="button" id="export-excel" class="btn btn-info btn-block btn-sm">
<i class="fa fa-file-excel"></i>
Expand Down Expand Up @@ -193,7 +187,7 @@ function exportToExcel() {
// Get current active category
var activeCategory = $('#daftar-statistik .active');
var categoryName = activeCategory.data('nama') || 'Statistik';
var tahun = $("#tahun").val();
var tahun = $("#filter-tahun").val();
var bulan = $("#bulan").val();

// Generate dynamic filename
Expand Down Expand Up @@ -345,6 +339,7 @@ function exportToExcel() {
method: 'get',
data: function (row) {
return {
"tahun": $('#filter-tahun').val(),
"sort": (row.order[0]?.dir === "asc" ? "" : "-") + row.columns[row
.order[0]
?.column]
Expand All @@ -361,7 +356,9 @@ function exportToExcel() {
})
})

grafikPie()
if (data_grafik.length > 2) {
grafikPie()
}

return json.data;
}
Expand Down Expand Up @@ -394,6 +391,7 @@ className: 'dt-body-right',
let urlDetail = new URL(urlDetailLink);
urlDetail.searchParams.set('filter[nilai]', nilai);
urlDetail.searchParams.set('judul', judul);
urlDetail.searchParams.set('tahun', $('#filter-tahun').val());
urlDetail.searchParams.set('nama', nilai);
urlDetail.searchParams.set('tipe', $('.pilih-kategori > a.active')
.text().trim());
Expand Down Expand Up @@ -442,6 +440,11 @@ className: 'dt-body-right',
statistik.draw();
});

// Event listener for year filter change
$('#filter-tahun').on('change', function () {
statistik.ajax.reload();
});

$(document).on('click', '#reset', function (e) {
e.preventDefault();
statistik.ajax.reload();
Expand Down
21 changes: 12 additions & 9 deletions resources/views/presisi/statistik/senibudaya.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,7 @@
<h3 id="title-block"></h3>
</div>
<div class="row">
<div class="col-auto">
<a class="btn btn-sm btn-secondary" data-toggle="collapse" href="#collapse-filter" role="button"
aria-expanded="true" aria-controls="collapse-filter">
<i class="fas fa-filter"></i>
</a>
</div>

<x-filter-tahun />
<div class="col-md-2">
<button type="button" id="export-excel" class="btn btn-info btn-block btn-sm">
<i class="fa fa-file-excel"></i>
Expand Down Expand Up @@ -193,7 +187,7 @@ function exportToExcel() {
// Get current active category
var activeCategory = $('#daftar-statistik .active');
var categoryName = activeCategory.data('nama') || 'Statistik';
var tahun = $("#tahun").val();
var tahun = $("#filter-tahun").val();
var bulan = $("#bulan").val();

// Generate dynamic filename
Expand Down Expand Up @@ -345,6 +339,7 @@ function exportToExcel() {
method: 'get',
data: function (row) {
return {
"tahun": $('#filter-tahun').val(),
"sort": (row.order[0]?.dir === "asc" ? "" : "-") + row.columns[row
.order[0]
?.column]
Expand All @@ -361,7 +356,9 @@ function exportToExcel() {
})
})

grafikPie()
if (data_grafik.length > 2) {
grafikPie()
}

return json.data;
}
Expand Down Expand Up @@ -393,6 +390,7 @@ className: 'dt-body-right',
let urlDetail = new URL(urlDetailLink);
urlDetail.searchParams.set('filter[nilai]', nilai);
urlDetail.searchParams.set('judul', judul);
urlDetail.searchParams.set('tahun', $('#filter-tahun').val());
urlDetail.searchParams.set('nama', nilai);
urlDetail.searchParams.set('tipe', $('.pilih-kategori > a.active').text().trim());
urlDetail.searchParams.set('chart-view', true);
Expand Down Expand Up @@ -439,6 +437,11 @@ className: 'dt-body-right',
statistik.draw();
});

// Event listener for year filter change
$('#filter-tahun').on('change', function () {
statistik.ajax.reload();
});

$(document).on('click', '#reset', function (e) {
e.preventDefault();
statistik.ajax.reload();
Expand Down