Skip to content

Commit 4656e2b

Browse files
vickyrolandavickyrolanda
authored
Merge pull request #970 from OpenSID/dev-952
tambahkan filter tahun pada statistik Aktivitas Keagamaan, ketenagakerjaan dan adat data presisi
2 parents 0323c88 + 8c557b9 commit 4656e2b

3 files changed

Lines changed: 30 additions & 39 deletions

File tree

‎resources/views/presisi/statistik/adat.blade.php‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,7 @@
3434
<h3 id="title-block"></h3>
3535
</div>
3636
<div class="row">
37-
<div class="col-auto">
38-
<a class="btn btn-sm btn-secondary" data-toggle="collapse" href="#collapse-filter" role="button"
39-
aria-expanded="true" aria-controls="collapse-filter">
40-
<i class="fas fa-filter"></i>
41-
</a>
42-
</div>
43-
37+
<x-filter-tahun />
4438
<div class="col-md-2">
4539
<button type="button" id="export-excel" class="btn btn-info btn-block btn-sm">
4640
<i class="fa fa-file-excel"></i>
@@ -193,8 +187,7 @@ function exportToExcel() {
193187
// Get current active category
194188
var activeCategory = $('#daftar-statistik .active');
195189
var categoryName = activeCategory.data('nama') || 'Statistik';
196-
var tahun = $("#tahun").val();
197-
var bulan = $("#bulan").val();
190+
var tahun = $("#filter-tahun").val();
198191
199192
// Generate dynamic filename
200193
var filename = `Statistik_${categoryName}_${nama_desa}`;
@@ -345,6 +338,7 @@ function exportToExcel() {
345338
method: 'get',
346339
data: function (row) {
347340
return {
341+
"tahun": $('#filter-tahun').val(),
348342
"sort": (row.order[0]?.dir === "asc" ? "" : "-") + row.columns[row
349343
.order[0]
350344
?.column]
@@ -361,7 +355,9 @@ function exportToExcel() {
361355
})
362356
})
363357
364-
grafikPie()
358+
if(data_grafik.length > 2){
359+
grafikPie()
360+
}
365361
366362
return json.data;
367363
}
@@ -397,6 +393,7 @@ className: 'dt-body-right',
397393
urlDetail.searchParams.set('nama', nilai);
398394
urlDetail.searchParams.set('tipe', $('.pilih-kategori > a.active')
399395
.text().trim());
396+
urlDetail.searchParams.set('tahun', $('#filter-tahun').val());
400397
urlDetail.searchParams.set('chart-view', true);
401398
402399
return `<a target="_blank" href="${urlDetail.href}">${nilai}</a>`
@@ -438,10 +435,10 @@ className: 'dt-body-right',
438435
});
439436
});
440437
441-
$('#filter').on('click', function (e) {
442-
statistik.draw();
438+
// Event listener for year filter change
439+
$('#filter-tahun').on('change', function () {
440+
statistik.ajax.reload();
443441
});
444-
445442
$(document).on('click', '#reset', function (e) {
446443
e.preventDefault();
447444
statistik.ajax.reload();

‎resources/views/presisi/statistik/aktivitas-keagamaan.blade.php‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,7 @@
3434
<h3 id="title-block"></h3>
3535
</div>
3636
<div class="row">
37-
<div class="col-auto">
38-
<a class="btn btn-sm btn-secondary" data-toggle="collapse" href="#collapse-filter" role="button"
39-
aria-expanded="true" aria-controls="collapse-filter">
40-
<i class="fas fa-filter"></i>
41-
</a>
42-
</div>
43-
37+
<x-filter-tahun />
4438
<div class="col-md-2">
4539
<button type="button" id="export-excel" class="btn btn-info btn-block btn-sm">
4640
<i class="fa fa-file-excel"></i>
@@ -193,8 +187,7 @@ function exportToExcel() {
193187
// Get current active category
194188
var activeCategory = $('#daftar-statistik .active');
195189
var categoryName = activeCategory.data('nama') || 'Statistik';
196-
var tahun = $("#tahun").val();
197-
var bulan = $("#bulan").val();
190+
var tahun = $("#filter-tahun").val();
198191
199192
// Generate dynamic filename
200193
var filename = `Statistik_${categoryName}_${nama_desa}`;
@@ -345,6 +338,7 @@ function exportToExcel() {
345338
method: 'get',
346339
data: function (row) {
347340
return {
341+
"tahun": $('#filter-tahun').val(),
348342
"sort": (row.order[0]?.dir === "asc" ? "" : "-") + row.columns[row
349343
.order[0]
350344
?.column]
@@ -361,7 +355,9 @@ function exportToExcel() {
361355
})
362356
})
363357
364-
grafikPie()
358+
if(data_grafik.length > 2){
359+
grafikPie()
360+
}
365361
366362
return json.data;
367363
}
@@ -397,6 +393,7 @@ className: 'dt-body-right',
397393
urlDetail.searchParams.set('nama', nilai);
398394
urlDetail.searchParams.set('tipe', $('.pilih-kategori > a.active')
399395
.text().trim());
396+
urlDetail.searchParams.set('tahun', $('#filter-tahun').val());
400397
urlDetail.searchParams.set('chart-view', true);
401398
402399
return `<a target="_blank" href="${urlDetail.href}">${nilai}</a>`
@@ -438,10 +435,10 @@ className: 'dt-body-right',
438435
});
439436
});
440437
441-
$('#filter').on('click', function (e) {
442-
statistik.draw();
438+
// Event listener for year filter change
439+
$('#filter-tahun').on('change', function () {
440+
statistik.ajax.reload();
443441
});
444-
445442
$(document).on('click', '#reset', function (e) {
446443
e.preventDefault();
447444
statistik.ajax.reload();

‎resources/views/presisi/statistik/ketenagakerjaan.blade.php‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,7 @@
3434
<h3 id="title-block"></h3>
3535
</div>
3636
<div class="row">
37-
<div class="col-auto">
38-
<a class="btn btn-sm btn-secondary" data-toggle="collapse" href="#collapse-filter" role="button"
39-
aria-expanded="true" aria-controls="collapse-filter">
40-
<i class="fas fa-filter"></i>
41-
</a>
42-
</div>
43-
37+
<x-filter-tahun />
4438
<div class="col-md-2">
4539
<button type="button" id="export-excel" class="btn btn-info btn-block btn-sm">
4640
<i class="fa fa-file-excel"></i>
@@ -193,8 +187,7 @@ function exportToExcel() {
193187
// Get current active category
194188
var activeCategory = $('#daftar-statistik .active');
195189
var categoryName = activeCategory.data('nama') || 'Statistik';
196-
var tahun = $("#tahun").val();
197-
var bulan = $("#bulan").val();
190+
var tahun = $("#filter-tahun").val();
198191
199192
// Generate dynamic filename
200193
var filename = `Statistik_${categoryName}_${nama_desa}`;
@@ -345,6 +338,7 @@ function exportToExcel() {
345338
method: 'get',
346339
data: function (row) {
347340
return {
341+
"tahun": $('#filter-tahun').val(),
348342
"sort": (row.order[0]?.dir === "asc" ? "" : "-") + row.columns[row
349343
.order[0]
350344
?.column]
@@ -361,7 +355,9 @@ function exportToExcel() {
361355
})
362356
})
363357
364-
grafikPie()
358+
if(data_grafik.length > 2){
359+
grafikPie()
360+
}
365361
366362
return json.data;
367363
}
@@ -397,6 +393,7 @@ className: 'dt-body-right',
397393
urlDetail.searchParams.set('nama', nilai);
398394
urlDetail.searchParams.set('tipe', $('.pilih-kategori > a.active')
399395
.text().trim());
396+
urlDetail.searchParams.set('tahun', $('#filter-tahun').val());
400397
urlDetail.searchParams.set('chart-view', true);
401398
402399
return `<a target="_blank" href="${urlDetail.href}">${nilai}</a>`
@@ -438,10 +435,10 @@ className: 'dt-body-right',
438435
});
439436
});
440437
441-
$('#filter').on('click', function (e) {
442-
statistik.draw();
438+
// Event listener for year filter change
439+
$('#filter-tahun').on('change', function () {
440+
statistik.ajax.reload();
443441
});
444-
445442
$(document).on('click', '#reset', function (e) {
446443
e.preventDefault();
447444
statistik.ajax.reload();

0 commit comments

Comments
 (0)