diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java b/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java index 774f119e691421ed4e0adcfacdd95c54591abd93..3063016668c055626ea5b7fe24ccb9861ffd7f9d 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 d0759b7f21cb22d4bfa75ae7ed9e1fa3a0c4d5a1..42aa9a8318a76888c2c3dc61452b9abcea6632eb 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 78ce42f66114dee099896bcaf5f10f80c8d60f4f..b594a4b0f7032b62236552b38e198f767c34aab5 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 58ffb5696180f87a819aa0900588ef808347df19..7de5eb6bc7edaf8a51e5ec7bde13112ab596653b 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