diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java b/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java index ad67a830060f8ebee52e1684c92e2d7dc6cbfd56..861d9a62230e4c62affd2ecf1ac3d4614667fdf1 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java +++ b/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java @@ -32,15 +32,15 @@ public class DefaultCharts private static final Chart CHART_INCOMES_AND_EXPENDITURES_BY_CATEGORY_BAR = new Chart("charts.default.incomesAndExpendituresByCategoryBar", getChartFromFile("charts/IncomesAndExpendituresByCategoryBar.js"), - ChartType.DEFAULT, 7, ChartDisplayType.BAR, ChartGroupType.NONE, "incomesAndExpendituresByCategoryBar.png"); + ChartType.DEFAULT, 8, ChartDisplayType.BAR, ChartGroupType.NONE, "incomesAndExpendituresByCategoryBar.png"); private static final Chart CHART_INCOMES_AND_EXPENDITURES_BY_CATEGORY_PIE = new Chart("charts.default.incomesAndExpendituresByCategoryPie", getChartFromFile("charts/IncomesAndExpendituresByCategoryPie.js"), - ChartType.DEFAULT, 7, ChartDisplayType.PIE, ChartGroupType.NONE, "incomesAndExpendituresByCategoryPie.png"); + ChartType.DEFAULT, 8, ChartDisplayType.PIE, ChartGroupType.NONE, "incomesAndExpendituresByCategoryPie.png"); private static final Chart CHART_INCOMES_AND_EXPENDITURES_PER_MONTH_BY_CATEGORIES = new Chart("charts.default.incomesAndExpendituresPerMonthByCategories", getChartFromFile("charts/IncomesAndExpendituresPerMonthByCategories.js"), - ChartType.DEFAULT, 22, ChartDisplayType.BAR, ChartGroupType.MONTH, "incomesAndExpendituresPerMonthByCategories.png"); + ChartType.DEFAULT, 23, ChartDisplayType.BAR, ChartGroupType.MONTH, "incomesAndExpendituresPerMonthByCategories.png"); private static final Chart CHART_REST_PER_MONTH = new Chart("charts.default.restPerMonth", getChartFromFile("charts/RestPerMonth.js"), @@ -52,7 +52,7 @@ public class DefaultCharts private static final Chart CHART_INCOMES_AND_EXPENDITURES_PER_YEAR_BY_CATEGORIES = new Chart("charts.default.incomesAndExpendituresPerYearByCategories", getChartFromFile("charts/IncomesAndExpendituresPerYearByCategories.js"), - ChartType.DEFAULT, 2, ChartDisplayType.BAR, ChartGroupType.YEAR, "incomesAndExpendituresPerYearByCategories.png"); + ChartType.DEFAULT, 3, ChartDisplayType.BAR, ChartGroupType.YEAR, "incomesAndExpendituresPerYearByCategories.png"); private static final Chart CHART_AVERAGE_TRANSACTION_AMOUNT_PER_CATEGORY = new Chart("charts.default.averageTransactionAmountPerCategory", getChartFromFile("charts/AverageTransactionAmountPerCategoryBar.js"), diff --git a/src/main/resources/charts/IncomesAndExpendituresByCategoryBar.js b/src/main/resources/charts/IncomesAndExpendituresByCategoryBar.js index d47c5670e155cf32765c0b2616f992744c8908f4..790ad279cbe576b15b34472f9877d50b312ec738 100644 --- a/src/main/resources/charts/IncomesAndExpendituresByCategoryBar.js +++ b/src/main/resources/charts/IncomesAndExpendituresByCategoryBar.js @@ -73,7 +73,7 @@ for(var j = 0; j < categoryNames.length; j++) // add border if category color is white var borderWidth = 0; - if(colors[j] === '#FFFFFF') + if(colors[j].toUpperCase().startsWith('#FFFFFF')) { borderWidth = 1; } diff --git a/src/main/resources/charts/IncomesAndExpendituresByCategoryPie.js b/src/main/resources/charts/IncomesAndExpendituresByCategoryPie.js index bf918dda4ae05f3e019c598d9f195ac5ab8e38d5..ce85015825e67f582255de2a8d86a9338e21a6f5 100644 --- a/src/main/resources/charts/IncomesAndExpendituresByCategoryPie.js +++ b/src/main/resources/charts/IncomesAndExpendituresByCategoryPie.js @@ -176,7 +176,7 @@ ${(values[index] / total * 100).toFixed(1)}% `); var borders = sums.map(item => { - if(item.color === '#FFFFFF') + if(item.color.toUpperCase().startsWith('#FFFFFF')) { return 1; } diff --git a/src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js b/src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js index c9d965a5b72d504bfdb5660fe2992200725ff7a0..5885a82913a5c8d90171ac2372f2b4a3ba0b14db 100644 --- a/src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js +++ b/src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js @@ -134,7 +134,7 @@ for(var i = 0; i < dates.length; i++) // add border if category color is white var borderWidth = 0; - if(currentValues[COLOR][j] === '#FFFFFF') + if(currentValues[COLOR][j].toUpperCase().startsWith('#FFFFFF')) { borderWidth = 1; } diff --git a/src/main/resources/charts/IncomesAndExpendituresPerYearByCategories.js b/src/main/resources/charts/IncomesAndExpendituresPerYearByCategories.js index 4a8b55dccddcabaa5d8338853323aa6c5715f977..7b40c2b3f401665559a84377ba3e65f29d6c8ea0 100644 --- a/src/main/resources/charts/IncomesAndExpendituresPerYearByCategories.js +++ b/src/main/resources/charts/IncomesAndExpendituresPerYearByCategories.js @@ -134,7 +134,7 @@ for(var i = 0; i < dates.length; i++) // add border if category color is white var borderWidth = 0; - if(currentValues[COLOR][j] === '#FFFFFF') + if(currentValues[COLOR][j].toUpperCase().startsWith('#FFFFFF')) { borderWidth = 1; }