Skip to content

tambahkan filter tahun pada statistik Aktivitas Keagamaan, ketenagakerjaan dan adat data presisi #970

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

Open
pandigresik wants to merge 1 commit into
base: rilis-dev
Choose a base branch
from
Open

tambahkan filter tahun pada statistik Aktivitas Keagamaan, ketenagakerjaan dan adat data presisi #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 10 additions & 13 deletions resources/views/presisi/statistik/adat.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,8 +187,7 @@ function exportToExcel() {
// Get current active category
var activeCategory = $('#daftar-statistik .active');
var categoryName = activeCategory.data('nama') || 'Statistik';
var tahun = $("#tahun").val();
var bulan = $("#bulan").val();
var tahun = $("#filter-tahun").val();

// Generate dynamic filename
var filename = `Statistik_${categoryName}_${nama_desa}`;
Expand Down Expand Up @@ -345,6 +338,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 +355,9 @@ function exportToExcel() {
})
})

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

return json.data;
}
Expand Down Expand Up @@ -397,6 +393,7 @@ className: 'dt-body-right',
urlDetail.searchParams.set('nama', nilai);
urlDetail.searchParams.set('tipe', $('.pilih-kategori > a.active')
.text().trim());
urlDetail.searchParams.set('tahun', $('#filter-tahun').val());
urlDetail.searchParams.set('chart-view', true);

return `<a target="_blank" href="${urlDetail.href}">${nilai}</a>`
Expand Down Expand Up @@ -438,10 +435,10 @@ className: 'dt-body-right',
});
});

$('#filter').on('click', function (e) {
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
23 changes: 10 additions & 13 deletions resources/views/presisi/statistik/aktivitas-keagamaan.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,8 +187,7 @@ function exportToExcel() {
// Get current active category
var activeCategory = $('#daftar-statistik .active');
var categoryName = activeCategory.data('nama') || 'Statistik';
var tahun = $("#tahun").val();
var bulan = $("#bulan").val();
var tahun = $("#filter-tahun").val();

// Generate dynamic filename
var filename = `Statistik_${categoryName}_${nama_desa}`;
Expand Down Expand Up @@ -345,6 +338,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 +355,9 @@ function exportToExcel() {
})
})

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

return json.data;
}
Expand Down Expand Up @@ -397,6 +393,7 @@ className: 'dt-body-right',
urlDetail.searchParams.set('nama', nilai);
urlDetail.searchParams.set('tipe', $('.pilih-kategori > a.active')
.text().trim());
urlDetail.searchParams.set('tahun', $('#filter-tahun').val());
urlDetail.searchParams.set('chart-view', true);

return `<a target="_blank" href="${urlDetail.href}">${nilai}</a>`
Expand Down Expand Up @@ -438,10 +435,10 @@ className: 'dt-body-right',
});
});

$('#filter').on('click', function (e) {
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
23 changes: 10 additions & 13 deletions resources/views/presisi/statistik/ketenagakerjaan.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,8 +187,7 @@ function exportToExcel() {
// Get current active category
var activeCategory = $('#daftar-statistik .active');
var categoryName = activeCategory.data('nama') || 'Statistik';
var tahun = $("#tahun").val();
var bulan = $("#bulan").val();
var tahun = $("#filter-tahun").val();

// Generate dynamic filename
var filename = `Statistik_${categoryName}_${nama_desa}`;
Expand Down Expand Up @@ -345,6 +338,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 +355,9 @@ function exportToExcel() {
})
})

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

return json.data;
}
Expand Down Expand Up @@ -397,6 +393,7 @@ className: 'dt-body-right',
urlDetail.searchParams.set('nama', nilai);
urlDetail.searchParams.set('tipe', $('.pilih-kategori > a.active')
.text().trim());
urlDetail.searchParams.set('tahun', $('#filter-tahun').val());
urlDetail.searchParams.set('chart-view', true);

return `<a target="_blank" href="${urlDetail.href}">${nilai}</a>`
Expand Down Expand Up @@ -438,10 +435,10 @@ className: 'dt-body-right',
});
});

$('#filter').on('click', function (e) {
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