From d373da891c6f9b2fedd1ff6e09c78b831da6bffc Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 18 Jul 2021 13:48:03 +0200
Subject: [PATCH] #585 - initially set display and group type
---
.../budgetmaster/charts/ChartController.java | 3 +++
src/main/resources/static/js/charts.js | 2 ++
src/main/resources/templates/charts/charts.ftl | 10 ++++++----
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
index 784975cab..3004c9a60 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
@@ -67,7 +67,10 @@ public class ChartController extends BaseController
model.addAttribute("chartSettings", defaultChartSettings);
model.addAttribute("charts", charts);
model.addAttribute("displayTypes", ChartDisplayType.values());
+ model.addAttribute("initialDisplayType", ChartDisplayType.BAR);
model.addAttribute("groupTypes", ChartGroupType.values());
+ model.addAttribute("initialGroupType", ChartGroupType.MONTH);
+
return "charts/charts";
}
diff --git a/src/main/resources/static/js/charts.js b/src/main/resources/static/js/charts.js
index b91d2ca5a..6a25b214b 100644
--- a/src/main/resources/static/js/charts.js
+++ b/src/main/resources/static/js/charts.js
@@ -106,6 +106,8 @@ $(document).ready(function()
this.classList.toggle('active', true);
});
+
+ filterChartPreviews();
});
function createDatePickerEnd(minDate, selectedDate)
diff --git a/src/main/resources/templates/charts/charts.ftl b/src/main/resources/templates/charts/charts.ftl
index 1aa0dc78d..0dd1280b3 100644
--- a/src/main/resources/templates/charts/charts.ftl
+++ b/src/main/resources/templates/charts/charts.ftl
@@ -33,7 +33,7 @@
<div class="row hide-on-small-and-down">
<div class="col s12 center-align">
<#list displayTypes as displayType>
- <@chartTypeButton item=displayType buttonClass="button-display-type"/>
+ <@chartTypeButton item=displayType buttonClass="button-display-type" initialItem=initialDisplayType/>
</#list>
</div>
</div>
@@ -43,7 +43,7 @@
<div class="row hide-on-small-and-down">
<div class="col s12 center-align">
<#list groupTypes as groupType>
- <@chartTypeButton item=groupType buttonClass="button-group-type"/>
+ <@chartTypeButton item=groupType buttonClass="button-group-type" initialItem=initialGroupType/>
</#list>
</div>
</div>
@@ -263,8 +263,10 @@
</@stepCollapsible>
</#macro>
-<#macro chartTypeButton item buttonClass>
- <a class="waves-effect waves-light btn-large background-grey text-black ${buttonClass}" data-value="${item.name()}">
+<#macro chartTypeButton item buttonClass initialItem>
+ <#assign isInitialItem=item.name()==initialItem.name()/>
+
+ <a class="waves-effect waves-light btn-large background-grey text-black ${buttonClass} <#if isInitialItem>active</#if>" data-value="${item.name()}">
<#if item.hasFontAwesomeIcon()>
<i class="${item.getIcon()} left"></i> ${locale.getString(item.getLocalizationKey())}
<#else>
--
GitLab