Skip to content
Snippets Groups Projects
Commit d373da89 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#585 - initially set display and group type

parent b015af75
Branches
Tags
No related merge requests found
...@@ -67,7 +67,10 @@ public class ChartController extends BaseController ...@@ -67,7 +67,10 @@ public class ChartController extends BaseController
model.addAttribute("chartSettings", defaultChartSettings); model.addAttribute("chartSettings", defaultChartSettings);
model.addAttribute("charts", charts); model.addAttribute("charts", charts);
model.addAttribute("displayTypes", ChartDisplayType.values()); model.addAttribute("displayTypes", ChartDisplayType.values());
model.addAttribute("initialDisplayType", ChartDisplayType.BAR);
model.addAttribute("groupTypes", ChartGroupType.values()); model.addAttribute("groupTypes", ChartGroupType.values());
model.addAttribute("initialGroupType", ChartGroupType.MONTH);
return "charts/charts"; return "charts/charts";
} }
......
...@@ -106,6 +106,8 @@ $(document).ready(function() ...@@ -106,6 +106,8 @@ $(document).ready(function()
this.classList.toggle('active', true); this.classList.toggle('active', true);
}); });
filterChartPreviews();
}); });
function createDatePickerEnd(minDate, selectedDate) function createDatePickerEnd(minDate, selectedDate)
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<div class="row hide-on-small-and-down"> <div class="row hide-on-small-and-down">
<div class="col s12 center-align"> <div class="col s12 center-align">
<#list displayTypes as displayType> <#list displayTypes as displayType>
<@chartTypeButton item=displayType buttonClass="button-display-type"/> <@chartTypeButton item=displayType buttonClass="button-display-type" initialItem=initialDisplayType/>
</#list> </#list>
</div> </div>
</div> </div>
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<div class="row hide-on-small-and-down"> <div class="row hide-on-small-and-down">
<div class="col s12 center-align"> <div class="col s12 center-align">
<#list groupTypes as groupType> <#list groupTypes as groupType>
<@chartTypeButton item=groupType buttonClass="button-group-type"/> <@chartTypeButton item=groupType buttonClass="button-group-type" initialItem=initialGroupType/>
</#list> </#list>
</div> </div>
</div> </div>
...@@ -263,8 +263,10 @@ ...@@ -263,8 +263,10 @@
</@stepCollapsible> </@stepCollapsible>
</#macro> </#macro>
<#macro chartTypeButton item buttonClass> <#macro chartTypeButton item buttonClass initialItem>
<a class="waves-effect waves-light btn-large background-grey text-black ${buttonClass}" data-value="${item.name()}"> <#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()> <#if item.hasFontAwesomeIcon()>
<i class="${item.getIcon()} left"></i> ${locale.getString(item.getLocalizationKey())} <i class="${item.getIcon()} left"></i> ${locale.getString(item.getLocalizationKey())}
<#else> <#else>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment