Skip to content

Firefly III: a personal finances manager

Clean up chart.

James Cole56973e99240b
diff --git a/resources/assets/v3/js/shared/draw-chart.js b/resources/assets/v3/js/shared/draw-chart.js
index 2cfca704e8..b3d01f28e2 100644
--- a/resources/assets/v3/js/shared/draw-chart.js
+++ b/resources/assets/v3/js/shared/draw-chart.js
@@ -123,6 +123,11 @@ function drawMultiCurrencyStackedColumnChart(url, holder, anonymous) {
data.labels.push(label);
let labelIndex = data.labels.length - 1;
+ current.entries.spent = parseFloat(current.entries.spent);
+ if(current.entries.spent < 0) {
+ current.entries.spent = current.entries.spent * -1;
+ }
+
/*
ok dus je hebt al zes labels voor alle zes de budget/currency combinaties
dus je moet nu vier datasets maken. Die elk 6 entries hebben.
@@ -142,46 +147,25 @@ function drawMultiCurrencyStackedColumnChart(url, holder, anonymous) {
datasets[key].data.push(0);
}
}
- // then set the current value:
- //if(0 === parseFloat(current.entries[keys[i]])) {
- // console.log('Budget "'+current.label+'" has no amount for "'+keys[i]+'" in '+current.currency_code+' so we skip it.', current.entries[keys[i]]);
- //console.log('EMPTY What to choose from ['+i+'] (label "'+label+'" is index: '+labelIndex+') (i: '+i+', keys[i]: '+keys[i]+')?', current.entries[keys[i]]);
- //}
- // if (0 !== parseFloat(current.entries[keys[i]])) {
- // console.log('What to choose from ['+i+'] (label "'+label+'" is index: '+labelIndex+') (i: '+i+', keys[i]: '+keys[i]+')?', current.entries[keys[i]]);
- // datasets[key].data[labelIndex] = parseFloat(current.entries[keys[i]]) * multiplier;
- // }
}
- if (
- parseFloat(current.entries.spent) * -1 <
- parseFloat(current.entries.budgeted)
- ) {
+ if (current.entries.spent < parseFloat(current.entries.budgeted)) {
// user has not overspent.
let key = "budgeted" + current.currency_code;
datasets[key].data[labelIndex] = 0; // parseFloat(current.entries.budgeted);
key = "spent" + current.currency_code;
- datasets[key].data[labelIndex] =
- parseFloat(current.entries.spent) * -1;
+ datasets[key].data[labelIndex] = current.entries.spent;
key = "left" + current.currency_code;
- datasets[key].data[labelIndex] = parseFloat(
- current.entries.left,
- );
+ datasets[key].data[labelIndex] = parseFloat(current.entries.left);
key = "overspent" + current.currency_code;
datasets[key].data[labelIndex] = 0;
}
- if (
- parseFloat(current.entries.spent) * -1 >=
- parseFloat(current.entries.budgeted) &&
- 0 !== parseFloat(current.entries.budgeted)
- ) {
+ if (current.entries.spent >= parseFloat(current.entries.budgeted) && 0 !== parseFloat(current.entries.budgeted)) {
// user has overspent!
let key = "budgeted" + current.currency_code;
- datasets[key].data[labelIndex] = parseFloat(
- current.entries.budgeted,
- );
+ datasets[key].data[labelIndex] = parseFloat(current.entries.budgeted,);
key = "spent" + current.currency_code;
datasets[key].data[labelIndex] = 0;
@@ -190,14 +174,10 @@ function drawMultiCurrencyStackedColumnChart(url, holder, anonymous) {
datasets[key].data[labelIndex] = 0;
key = "overspent" + current.currency_code;
- datasets[key].data[labelIndex] = parseFloat(
- current.entries.overspent,
- );
+ datasets[key].data[labelIndex] = parseFloat(current.entries.overspent);
}
- if (
- parseFloat(current.entries.spent) * -1 >=
- parseFloat(current.entries.budgeted) &&
+ if (current.entries.spent >= parseFloat(current.entries.budgeted) &&
0 === parseFloat(current.entries.budgeted)
) {
// user has no budget set.
@@ -205,8 +185,7 @@ function drawMultiCurrencyStackedColumnChart(url, holder, anonymous) {
datasets[key].data[labelIndex] = 0;
key = "spent" + current.currency_code;
- datasets[key].data[labelIndex] =
- parseFloat(current.entries.spent) * -1;
+ datasets[key].data[labelIndex] = current.entries.spent;
key = "left" + current.currency_code;
datasets[key].data[labelIndex] = 0;
@@ -240,99 +219,6 @@ function drawMultiCurrencyStackedColumnChart(url, holder, anonymous) {
}
}
- // loop all collected data.
- for (let i = 0; i < all.length; i++) {
- if (Object.hasOwn(all, i)) {
- // let current = all[i];
- // let label = formatLabel(current.label + " (" + current.currency_code + ")", 20);
- // console.log('Now processing "' + label + '"');
- // // add the name as a label
- // data.labels.push(label);
- // wil je dan niet eerst de labels + currencies maken in objectjes.
- // each data set is per budget (so per label):
- // if (!Object.hasOwn(datasets, label)) {
- // datasets[label] = {
- // label: label,
- // currency_code: current.currency_code,
- // budget_name: current.label,
- // data: [],
- // yAxisID: "y" + current.currency_code,
- // };
- // }
- // there must be 4 data sets with a length of X budgets * currencies.
- // there are four possible data sets for this chart
- // // TODO this is very much hard coded.
- // let keys = ["budgeted", "spent", "left", "overspent"];
- // for (let i in keys) {
- // let key = keys[i] + current.currency_code;
- // if (!Object.hasOwn(datasets, key)) {
- // datasets[key] = {
- // label: i18next.t("firefly." + keys[i]) + " (" + current.currency_code + ")",
- // currency_code: current.currency_code,
- // budget_name: current.label,
- // data: [],
- // yAxisID: "y" + current.currency_code,
- // };
- // }
- // }
- // for the first and all other datasets, create a new dataset object.
- // add the data to the dataset.
- // // add spent and left to the dataset, if they exist.
- // // console.log('current', current);
- // if (parseFloat(current.entries.spent) * -1 < parseFloat(current.entries.budgeted)) {
- // let key = "budgeted" + current.currency_code;
- // datasets[label].data.push(0);
- //
- // // user has not overspent.
- // key = "spent" + current.currency_code;
- // let value = parseFloat(current.entries.spent) * -1;
- // datasets[label].data.push(value);
- //
- // key = "left" + current.currency_code;
- // value = parseFloat(current.entries.left);
- // datasets[label].data.push(value);
- //
- // key = "overspent" + current.currency_code;
- // datasets[label].data.push(0);
- // }
- // if (parseFloat(current.entries.spent) * -1 >= parseFloat(current.entries.budgeted)) {
- // let key = "budgeted" + current.currency_code;
- // datasets[label].data.push(0);
- //
- // // user has overspent.
- // key = "spent" + current.currency_code;
- // let value = parseFloat(current.entries.spent) * -1;
- // datasets[label].data.push(value);
- //
- // key = "left" + current.currency_code;
- // datasets[label].data.push(0);
- //
- // key = "overspent" + current.currency_code;
- // value = parseFloat(current.entries.overspent);
- // datasets[label].data.push(value);
- // }
- // console.log('Current entries:')
- // console.log(current.entries);
- //
- //
- // for (let j in current.entries) {
- // // j = "spent" or earned or whatever.
- // let key = j + current.currency_code;
- // if (Object.hasOwn(datasets, key)) {
- // let value = parseFloat(current.entries[j]);
- // if(value < 0) {
- // value = value * -1;
- // }
- // datasets[key].data.push(value);
- // }
- // }
- // console.log('All generatred datasets.')
- // console.log(datasets);
- // add it to the dataset collection.
- //data.datasets.push(dataset);
- }
- }
-
data.datasets = Object.values(datasets);
// remove the standard y-axis, do not need it.
delete options.scales.y;