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

#585 - added macro for filter options

parent 0fe2e128
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/main/resources/templates/charts/charts.ftl
+ 57
− 50
View file @ 3f404abd
...@@ -63,61 +63,14 @@ ...@@ -63,61 +63,14 @@
</div> </div>
<input type="hidden" name="chartID" value=""> <input type="hidden" name="chartID" value="">
<div class="container"> <@dateSelect/>
<div class="row">
<div class="col s12">
<div class="card" id="chart-date-card">
<div class="card-content">
<div class="row">
<div class="input-field col s6 m6 l4 offset-l2">
<#assign startDate = dateService.getLongDateString(chartSettings.getStartDate())/>
<input id="chart-datepicker" type="text" class="datepicker" name="startDate" value="${startDate}">
<label for="chart-datepicker">${locale.getString("chart.steps.second.label.start")}</label>
</div>
<div class="input-field col s6 m6 l4 ">
<#assign endDate = dateService.getLongDateString(chartSettings.getEndDate())/>
<input id="chart-datepicker-end" type="text" class="datepicker" name="endDate" value="${endDate}">
<label for="chart-datepicker-end">${locale.getString("chart.steps.second.label.end")}</label>
</div>
</div>
<@quickDateOptions/>
<script>
startDate = "${startDate}".split(".");
startDate = new Date(startDate[2], startDate[1] - 1, startDate[0]);
endDate = "${endDate}".split(".");
endDate = new Date(endDate[2], endDate[1] - 1, endDate[0]);
</script>
</div>
</div>
</div>
</div>
</div>
<div class="container"> <@filterOptions/>
<div class="row">
<div class="col s12 no-margin-top center-align">
<ul class="collapsible">
<li>
<div class="collapsible-header"><i class="fas fa-filter"></i>Filter</div>
<div class="collapsible-body"><@filterMacros.filterModalContent chartSettings.getFilterConfiguration() "filterConfiguration"/></div>
</li>
</ul>
</div>
</div>
</div>
<@filterMacros.filterModalCharts chartSettings.getFilterConfiguration()/>
<#-- buttons --> <#-- buttons -->
<div class="row center-align"> <div class="row center-align">
<div class="col s12"> <div class="col s12">
<button class="btn waves-effect waves-light background-blue" type="submit" <button class="btn waves-effect waves-light background-blue" type="submit" name="buttonSave">
name="buttonSave">
<i class="material-icons left">show_chart</i>${locale.getString("chart.show")} <i class="material-icons left">show_chart</i>${locale.getString("chart.show")}
</button> </button>
</div> </div>
...@@ -195,6 +148,43 @@ ...@@ -195,6 +148,43 @@
</div> </div>
</#macro> </#macro>
<#macro dateSelect>
<div class="container">
<div class="row">
<div class="col s12">
<div class="card" id="chart-date-card">
<div class="card-content">
<div class="row">
<div class="input-field col s6 m6 l4 offset-l2">
<#assign startDate = dateService.getLongDateString(chartSettings.getStartDate())/>
<input id="chart-datepicker" type="text" class="datepicker" name="startDate" value="${startDate}">
<label for="chart-datepicker">${locale.getString("chart.steps.second.label.start")}</label>
</div>
<div class="input-field col s6 m6 l4 ">
<#assign endDate = dateService.getLongDateString(chartSettings.getEndDate())/>
<input id="chart-datepicker-end" type="text" class="datepicker" name="endDate" value="${endDate}">
<label for="chart-datepicker-end">${locale.getString("chart.steps.second.label.end")}</label>
</div>
</div>
<@quickDateOptions/>
<script>
startDate = "${startDate}".split(".");
startDate = new Date(startDate[2], startDate[1] - 1, startDate[0]);
endDate = "${endDate}".split(".");
endDate = new Date(endDate[2], endDate[1] - 1, endDate[0]);
</script>
</div>
</div>
</div>
</div>
</div>
</#macro>
<#macro quickDateOptions> <#macro quickDateOptions>
<div class="row no-margin-bottom"> <div class="row no-margin-bottom">
<div class="col s12 m12 l8 offset-l2 no-margin-top"> <div class="col s12 m12 l8 offset-l2 no-margin-top">
...@@ -225,3 +215,20 @@ ...@@ -225,3 +215,20 @@
<#macro quickDateOption index localizationKey> <#macro quickDateOption index localizationKey>
<td class="quick-date" data-quick="${index}">${locale.getString(localizationKey)}</td> <td class="quick-date" data-quick="${index}">${locale.getString(localizationKey)}</td>
</#macro> </#macro>
<#macro filterOptions>
<div class="container">
<div class="row">
<div class="col s12 no-margin-top center-align">
<ul class="collapsible">
<li>
<div class="collapsible-header"><i class="fas fa-filter"></i>Filter</div>
<div class="collapsible-body"><@filterMacros.filterModalContent chartSettings.getFilterConfiguration() "filterConfiguration"/></div>
</li>
</ul>
</div>
</div>
</div>
<@filterMacros.filterModalCharts chartSettings.getFilterConfiguration()/>
</#macro>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment