From 4e17ddb2589fb0a6bc8f0663d3f848c34d41671b Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 12 Aug 2019 19:16:16 +0200
Subject: [PATCH] Fixed #475 - chart incomes/expenditures per month (bars):
sort dates
---
.../de/deadlocker8/budgetmaster/charts/DefaultCharts.java | 4 ++--
.../resources/charts/IncomesAndExpendituresPerMonthBar.js | 2 ++
.../resources/charts/IncomesAndExpendituresPerMonthLine.js | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java b/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java
index a2b1bd550..ea52659f8 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java
@@ -23,11 +23,11 @@ public class DefaultCharts
private static final Chart CHART_INCOMES_AND_EXPENDITURES_PER_MONTH_BAR = new Chart("charts.default.incomesAndExpendituresPerMonthBar",
getChartFromFile("charts/IncomesAndExpendituresPerMonthBar.js"),
- ChartType.DEFAULT, 5);
+ ChartType.DEFAULT, 6);
private static final Chart CHART_INCOMES_AND_EXPENDITURES_PER_MONTH_LINE = new Chart("charts.default.incomesAndExpendituresPerMonthLine",
getChartFromFile("charts/IncomesAndExpendituresPerMonthLine.js"),
- ChartType.DEFAULT, 5);
+ ChartType.DEFAULT, 6);
private static final Chart CHART_INCOMES_AND_EXPENDITURES_BY_CATEGORY_BAR = new Chart("charts.default.incomesAndExpendituresByCategoryBar",
getChartFromFile("charts/IncomesAndExpendituresByCategoryBar.js"),
diff --git a/src/main/resources/charts/IncomesAndExpendituresPerMonthBar.js b/src/main/resources/charts/IncomesAndExpendituresPerMonthBar.js
index bbc45ccf5..632f107d3 100644
--- a/src/main/resources/charts/IncomesAndExpendituresPerMonthBar.js
+++ b/src/main/resources/charts/IncomesAndExpendituresPerMonthBar.js
@@ -13,6 +13,8 @@ var dates = [];
var incomes = [];
var expenditures = [];
+transactionData = transactionData.reverse();
+
for(var i = 0; i < transactionData.length; i++)
{
var transaction = transactionData[i];
diff --git a/src/main/resources/charts/IncomesAndExpendituresPerMonthLine.js b/src/main/resources/charts/IncomesAndExpendituresPerMonthLine.js
index 554310c9c..43ade597d 100644
--- a/src/main/resources/charts/IncomesAndExpendituresPerMonthLine.js
+++ b/src/main/resources/charts/IncomesAndExpendituresPerMonthLine.js
@@ -13,6 +13,8 @@ var dates = [];
var incomes = [];
var expenditures = [];
+transactionData = transactionData.reverse();
+
for(var i = 0; i < transactionData.length; i++)
{
var transaction = transactionData[i];
--
GitLab