diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java b/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java index 19629848899f9cf96dbdaf63e433c8b50758743a..94e135452e1f100639d177a3ef3412fd5b2dc047 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java +++ b/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java @@ -35,7 +35,7 @@ public class DefaultCharts private static final Chart CHART_INCOMES_AND_EXPENDITURES_PER_MONTH_BY_CATEGORIES = new Chart("charts.default.incomesAndExpendituresPerMonthByCategories", getChartFromFile("charts/IncomesAndExpendituresPerMonthByCategories.js"), - ChartType.DEFAULT, 11); + ChartType.DEFAULT, 12); public static List<Chart> getDefaultCharts() diff --git a/src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js b/src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js index 0efa2e1abb9d4788f3974bc977673e7143a7e702..f0c47801eb6c1ed8c90beb9d3dd7988e0c57a700 100644 --- a/src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js +++ b/src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js @@ -17,8 +17,18 @@ const COLOR = 1; const INCOME = 2; const EXPENDITURE = 3; -var categoryNames = Array.from(new Set(transactionData.map(t => t.category.name))); -var categoryColors = Array.from(new Set(transactionData.map(t => t.category.color))); +var categoryNames = []; +var categoryColors = []; + +for(var i = 0; i < transactionData.length; i++) +{ + var currentTransaction = transactionData[i]; + if(!categoryNames.includes(currentTransaction.category.name)) + { + categoryNames.push(currentTransaction.category.name); + categoryColors.push(currentTransaction.category.color); + } +} var dates = []; var values = [];