From f440fb9d8647764975e999425c0d17e60670ae65 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Tue, 5 Nov 2019 23:43:37 +0100
Subject: [PATCH] Fixed #494 - Fixed #494 -
---
.../java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java | 2 +-
src/main/resources/charts/IncomesAndExpendituresPerYearBar.js | 2 +-
src/main/resources/languages/_de.properties | 2 ++
src/main/resources/languages/_en.properties | 2 ++
4 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 774f119e6..306301666 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java
@@ -48,7 +48,7 @@ public class DefaultCharts
private static final Chart CHART_INCOMES_AND_EXPENDITURES_PER_YEAR_BAR = new Chart("charts.default.incomesAndExpendituresPerYearBar",
getChartFromFile("charts/IncomesAndExpendituresPerYearBar.js"),
- ChartType.DEFAULT, 1);
+ ChartType.DEFAULT, 2);
public static List<Chart> getDefaultCharts()
diff --git a/src/main/resources/charts/IncomesAndExpendituresPerYearBar.js b/src/main/resources/charts/IncomesAndExpendituresPerYearBar.js
index d0759b7f2..42aa9a831 100644
--- a/src/main/resources/charts/IncomesAndExpendituresPerYearBar.js
+++ b/src/main/resources/charts/IncomesAndExpendituresPerYearBar.js
@@ -102,4 +102,4 @@ var plotlyConfig = {
};
// Don't touch this line
-Plotly.newPlot('chart-canvas', plotlyData, plotlyLayout, plotlyConfig);
\ No newline at end of file
+Plotly.newPlot("containerID", plotlyData, plotlyLayout, plotlyConfig);
\ No newline at end of file
diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties
index 78ce42f66..b594a4b0f 100644
--- a/src/main/resources/languages/_de.properties
+++ b/src/main/resources/languages/_de.properties
@@ -347,6 +347,8 @@ charts.default.incomesAndExpendituresPerMonthByCategories=Eingaben/Ausgaben pro
charts.default.incomesAndExpendituresPerMonthByCategories.localization='{"label1": "Ausgaben", "label2": "Einnahmen"'}
charts.default.restPerMonth=Rest pro Monat
charts.default.restPerMonth.localization='{"label1": "Rest in "'}
+charts.default.incomesAndExpendituresPerYearBar=Eingaben/Ausgaben pro Jahr (Balkendiagramm)
+charts.default.incomesAndExpendituresPerYearBar.localization='{"axisY": "Summe in ", "traceName1": "Einnahmen", "traceName2": "Ausgaben"'}
chart.new.label.name=Name
chart.new.label.script=Script
diff --git a/src/main/resources/languages/_en.properties b/src/main/resources/languages/_en.properties
index 58ffb5696..7de5eb6bc 100644
--- a/src/main/resources/languages/_en.properties
+++ b/src/main/resources/languages/_en.properties
@@ -347,6 +347,8 @@ charts.default.incomesAndExpendituresPerMonthByCategories=Incomes/Expenditures p
charts.default.incomesAndExpendituresPerMonthByCategories.localization='{"label1": "Expenditures", "label2": "Incomes"'}
charts.default.restPerMonth=Rest per month
charts.default.restPerMonth.localization='{"label1": "Rest in "'}
+charts.default.incomesAndExpendituresPerYearBar=Incomes/Expenditures per year (Bar chart)
+charts.default.incomesAndExpendituresPerYearBar.localization='{"axisY": "Sum in ", "traceName1": "Incomes", "traceName2": "Expenditures"'}
chart.new.label.name=Name
chart.new.label.script=Script
--
GitLab