diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java b/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java index 5dc6a32f6801392a4550b5d2daf9d9906c18f930..503bb7c226f52c6bf6a5fabb536d3e66630e53b0 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java +++ b/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java @@ -19,23 +19,23 @@ public class DefaultCharts private static final Chart CHART_ACCOUNT_SUM_PER_DAY = new Chart("charts.default.accountSumPerDay", getChartFromFile("charts/AccountSumPerDay.js"), - ChartType.DEFAULT, 1); + ChartType.DEFAULT, 4); private static final Chart CHART_INCOMES_AND_EXPENDITURES_PER_MONTH_BAR = new Chart("charts.default.incomesAndExpendituresPerMonthBar", getChartFromFile("charts/IncomesAndExpendituresPerMonthBar.js"), - ChartType.DEFAULT, 3); + ChartType.DEFAULT, 5); private static final Chart CHART_INCOMES_AND_EXPENDITURES_PER_MONTH_LINE = new Chart("charts.default.incomesAndExpendituresPerMonthLine", getChartFromFile("charts/IncomesAndExpendituresPerMonthLine.js"), - ChartType.DEFAULT, 3); + ChartType.DEFAULT, 5); private static final Chart CHART_INCOMES_AND_EXPENDITURES_BY_CATEGORY_BAR = new Chart("charts.default.incomesAndExpendituresByCategoryBar", getChartFromFile("charts/IncomesAndExpendituresByCategoryBar.js"), - ChartType.DEFAULT, 21); + ChartType.DEFAULT, 23); private static final Chart CHART_INCOMES_AND_EXPENDITURES_PER_MONTH_BY_CATEGORIES = new Chart("charts.default.incomesAndExpendituresPerMonthByCategories", getChartFromFile("charts/IncomesAndExpendituresPerMonthByCategories.js"), - ChartType.DEFAULT, 8); + ChartType.DEFAULT, 10); public static List<Chart> getDefaultCharts() diff --git a/src/main/resources/charts/AccountSumPerDay.js b/src/main/resources/charts/AccountSumPerDay.js index b0285003182e744ddaed101f29185be2e538d633..7873da257f58190138512ee67d826a97658bc964 100644 --- a/src/main/resources/charts/AccountSumPerDay.js +++ b/src/main/resources/charts/AccountSumPerDay.js @@ -9,9 +9,11 @@ var transactionData = []; // Note: All variables starting with "localized" are only available inside default charts. // group transactions by date -var groups = transactionData.reverse().reduce((groups, transaction) => { +var groups = transactionData.reverse().reduce((groups, transaction) => +{ var date = transaction.date; - if (!groups[date]) { + if(!groups[date]) + { groups[date] = []; } groups[date].push(transaction); @@ -23,8 +25,10 @@ var previousSum = 0; var sums = []; // calculate sum for each date -for (var key in groups) { - if (groups.hasOwnProperty(key)) { +for(var key in groups) +{ + if(groups.hasOwnProperty(key)) + { var group = groups[key]; // extract all amount values @@ -74,7 +78,14 @@ var plotlyConfig = { showSendToCloud: false, displaylogo: false, showLink: false, - responsive: true + responsive: true, + displayModeBar: true, + toImageButtonOptions: { + format: 'png', + filename: 'BudgetMaster_chart_export', + height: 1080, + width: 1920, + } }; // Don't touch this line diff --git a/src/main/resources/charts/IncomesAndExpendituresByCategoryBar.js b/src/main/resources/charts/IncomesAndExpendituresByCategoryBar.js index 6d7887968065daa327d7a675ead08800c8cc0c58..89871e82fe5146e0f540bb44f8ac0184051604e8 100644 --- a/src/main/resources/charts/IncomesAndExpendituresByCategoryBar.js +++ b/src/main/resources/charts/IncomesAndExpendituresByCategoryBar.js @@ -123,7 +123,14 @@ var plotlyConfig = { showSendToCloud: false, displaylogo: false, showLink: false, - responsive: true + responsive: true, + displayModeBar: true, + toImageButtonOptions: { + format: 'png', + filename: 'BudgetMaster_chart_export', + height: 1080, + width: 1920, + } }; // Don't touch this line diff --git a/src/main/resources/charts/IncomesAndExpendituresPerMonthBar.js b/src/main/resources/charts/IncomesAndExpendituresPerMonthBar.js index 659683b813e881cb0dad27a46109dbdae4a6d404..bbc45ccf5f3996cc8c138c1c5f1b89e1e1fc602b 100644 --- a/src/main/resources/charts/IncomesAndExpendituresPerMonthBar.js +++ b/src/main/resources/charts/IncomesAndExpendituresPerMonthBar.js @@ -89,7 +89,14 @@ var plotlyConfig = { showSendToCloud: false, displaylogo: false, showLink: false, - responsive: true + responsive: true, + displayModeBar: true, + toImageButtonOptions: { + format: 'png', + filename: 'BudgetMaster_chart_export', + height: 1080, + width: 1920, + } }; // Don't touch this line diff --git a/src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js b/src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js index 060f855accf95aa50870e4d0bf234efdf0abc6f4..9967491a22b46c326532ae9676fd7476f2f718ed 100644 --- a/src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js +++ b/src/main/resources/charts/IncomesAndExpendituresPerMonthByCategories.js @@ -172,7 +172,14 @@ var plotlyConfig = { showSendToCloud: false, displaylogo: false, showLink: false, - responsive: true + responsive: true, + displayModeBar: true, + toImageButtonOptions: { + format: 'png', + filename: 'BudgetMaster_chart_export', + height: 1080, + width: 1920, + } }; // Don't touch this line diff --git a/src/main/resources/charts/IncomesAndExpendituresPerMonthLine.js b/src/main/resources/charts/IncomesAndExpendituresPerMonthLine.js index f06eb0709a28b86d2f91453a579989a9f9aa4508..554310c9ce46e94ff9ece5af23b60c5a71e8cfeb 100644 --- a/src/main/resources/charts/IncomesAndExpendituresPerMonthLine.js +++ b/src/main/resources/charts/IncomesAndExpendituresPerMonthLine.js @@ -89,7 +89,14 @@ var plotlyConfig = { showSendToCloud: false, displaylogo: false, showLink: false, - responsive: true + responsive: true, + displayModeBar: true, + toImageButtonOptions: { + format: 'png', + filename: 'BudgetMaster_chart_export', + height: 1080, + width: 1920, + } }; // Don't touch this line