arifal/sibedas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix data and dashboard count and sum

Browse Source
This commit is contained in:
arifal hidayat
2025-08-08 03:17:04 +07:00
parent 588e3ad5e2
commit 1288ab509d
19 changed files with 182 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/js/dashboards/bigdata.js
View File

@@ -44,7 +44,7 @@ class BigData {
async getBigDataResume(filterByDate) {
try {
const response = await fetch(
`${GlobalConfig.apiHost}/api/bigdata-resume?filterByDate=${filterByDate}`,
`${GlobalConfig.apiHost}/api/bigdata-resume?filterByDate=${filterByDate}&type=simbg`,
{
credentials: "include",
headers: {

2
resources/js/dashboards/lack-of-potential.js
View File

@@ -49,7 +49,7 @@ class LackOfPotential {
async getDataTotalPotensi(filterDate) {
try {
const response = await fetch(
`${GlobalConfig.apiHost}/api/bigdata-resume?filterByDate=${filterDate}`,
`${GlobalConfig.apiHost}/api/bigdata-resume?filterByDate=${filterDate}&type=leader`,
{
credentials: "include",
headers: {

2
resources/js/dashboards/leader.js
View File

@@ -44,7 +44,7 @@ class BigData {
async getBigDataResume(filterByDate) {
try {
const response = await fetch(
`${GlobalConfig.apiHost}/api/bigdata-resume?filterByDate=${filterByDate}`,
`${GlobalConfig.apiHost}/api/bigdata-resume?filterByDate=${filterByDate}&&type=leader`,
{
credentials: "include",
headers: {

2
resources/js/dashboards/pbg.js
View File

@@ -120,7 +120,7 @@ class DashboardPBG {
async getResume(filterByDate) {
try {
const response = await fetch(
`${GlobalConfig.apiHost}/api/bigdata-resume?filterByDate=${filterByDate}`,
`${GlobalConfig.apiHost}/api/bigdata-resume?filterByDate=${filterByDate}&type=leader`,
{
credentials: "include",
headers: {

8
resources/js/dashboards/potentials/inside_system.js
View File

@@ -15,8 +15,10 @@ class DashboardPotentialInsideSystem {
this.reklameCount = this.allCountData.total_reklame ?? 0;
this.pdamCount = this.allCountData.total_pdam ?? 0;
this.tataRuangCount = this.allCountData.total_tata_ruang ?? 0;
this.tataRuangUsahaCount = this.allCountData.total_tata_ruang_usaha ?? 0;
this.tataRuangNonUsahaCount = this.allCountData.total_tata_ruang_non_usaha ?? 0;
this.tataRuangUsahaCount =
this.allCountData.total_tata_ruang_usaha ?? 0;
this.tataRuangNonUsahaCount =
this.allCountData.total_tata_ruang_non_usaha ?? 0;
let dataReportTourism = this.allCountData.data_report;
@@ -51,7 +53,7 @@ class DashboardPotentialInsideSystem {
async getDataTotalPotensi(filterDate) {
try {
const response = await fetch(
`${GlobalConfig.apiHost}/api/bigdata-resume?filterByDate=${filterDate}`,
`${GlobalConfig.apiHost}/api/bigdata-resume?filterByDate=${filterDate}&type=leader`,
{
credentials: "include",
headers: {

2
resources/js/dashboards/potentials/outside_system.js
View File

@@ -21,7 +21,7 @@ class DashboardPotentialOutsideSystem {
async getBigDataResume(filterDate) {
try {
const response = await fetch(
`${GlobalConfig.apiHost}/api/bigdata-resume?filterByDate=${filterDate}`,
`${GlobalConfig.apiHost}/api/bigdata-resume?filterByDate=${filterDate}&type=leader`,
{
credentials: "include",
headers: {

6
resources/js/global-config.js
View File

@@ -5,7 +5,7 @@ export function addThousandSeparators(value, fractionDigits = 2) {
// Convert to string first if it's a number
if (typeof value === "number") {
return new Intl.NumberFormat("en-US", {
return new Intl.NumberFormat("id-ID", {
minimumFractionDigits: fractionDigits,
maximumFractionDigits: fractionDigits,
}).format(value);
@@ -26,8 +26,8 @@ export function addThousandSeparators(value, fractionDigits = 2) {
if (isNaN(number)) return null; // Return null if conversion fails
// Format the number with thousand separators
return new Intl.NumberFormat("en-US", {
// Format the number with Indonesian format (dot for thousands, comma for decimal)
return new Intl.NumberFormat("id-ID", {
minimumFractionDigits: fractionDigits,
maximumFractionDigits: fractionDigits,
}).format(number);

11
resources/js/pbg-task/index.js
View File

@@ -1,6 +1,8 @@
import { Grid, html } from "gridjs/dist/gridjs.umd.js";
import GlobalConfig from "../global-config";
import { Dropzone } from "dropzone";
import { addThousandSeparators } from "../global-config";
Dropzone.autoDiscover = false;
class PbgTasks {
@@ -87,6 +89,9 @@ class PbgTasks {
"Function Type",
"Consultation Type",
{ name: "Due Date" },
{
name: "Retribution",
},
{
name: "Action",
formatter: (cell) => {
@@ -191,6 +196,12 @@ class PbgTasks {
item.function_type,
item.consultation_type,
item.due_date,
item.pbg_task_retributions
? addThousandSeparators(
item.pbg_task_retributions
.nilai_retribusi_bangunan
)
: "-",
item,
]),
total: (data) => data.meta.total,

2
resources/views/dashboards/bigdata.blade.php
View File

@@ -13,7 +13,7 @@
<div class="d-flex justify-content-between align-items-center mt-3 ms-2">
<h2 class="text-danger m-0">
ANALISA BIG DATA PROSES PBG <br>
MELALUI APLIKASI SIBEDAS PBG
MELALUI APLIKASI SIBEDAS PBG (SIMBG)
</h2>
<div class="text-black text-end d-flex flex-column align-items-end me-3">
<span class="fs-5">Terakhir di update - {{$latest_created}}</span>

2
resources/views/dashboards/leader.blade.php
View File

@@ -13,7 +13,7 @@
<div class="d-flex justify-content-between align-items-center mt-3 ms-2">
<h2 class="text-danger m-0">
ANALISA BIG DATA PROSES PBG <br>
MELALUI APLIKASI SIBEDAS PBG
MELALUI APLIKASI SIBEDAS PBG (LEADER)
</h2>
<div class="text-black text-end d-flex flex-column align-items-end me-3">
<span class="fs-5">Terakhir di update - {{$latest_created}}</span>

6
resources/views/pbg_task/show.blade.php
View File

@@ -153,7 +153,7 @@
</div>
<div class="mb-3">
<dt>Nilai SHST</dt>
<dd>{{$data->pbg_task_retributions->nilai_shst}}</dd>
<dd>{{ number_format($data->pbg_task_retributions->nilai_shst, 2, ',', '.') }}</dd>
</div>
<div class="mb-3">
<dt>Indeks Integrasi</dt>
@@ -167,7 +167,7 @@
<div class="col-md-6">
<div class="mb-3">
<dt>Nilai Retribusi Bangunan</dt>
<dd>{{$data->pbg_task_retributions->nilai_retribusi_bangunan}}</dd>
<dd>{{ number_format($data->pbg_task_retributions->nilai_retribusi_bangunan, 2, ',', '.') }}</dd>
</div>
<div class="mb-3">
<dt>Nilai Prasarana</dt>
@@ -183,7 +183,7 @@
</div>
<div class="mb-3">
<dt>SKRD Amount</dt>
<dd>{{$data->pbg_task_retributions->skrd_amount}}</dd>
<dd>{{ number_format($data->pbg_task_retributions->skrd_amount, 2, ',', '.') }}</dd>
</div>
</div>
</div>