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

#293 - added filter button to report page

parent ee9fcd96
Branches
Tags
No related merge requests found
Pipeline #604 passed
...@@ -60,12 +60,13 @@ public class ReportController extends BaseController ...@@ -60,12 +60,13 @@ public class ReportController extends BaseController
private FilterHelpersService filterHelpers; private FilterHelpersService filterHelpers;
@RequestMapping("/reports") @RequestMapping("/reports")
public String reports(Model model, @CookieValue(value = "currentDate", required = false) String cookieDate) public String reports(HttpServletRequest request, Model model, @CookieValue(value = "currentDate", required = false) String cookieDate)
{ {
DateTime date = helpers.getDateTimeFromCookie(cookieDate); DateTime date = helpers.getDateTimeFromCookie(cookieDate);
model.addAttribute("reportSettings", reportSettingsService.getReportSettings()); model.addAttribute("reportSettings", reportSettingsService.getReportSettings());
model.addAttribute("currentDate", date); model.addAttribute("currentDate", date);
model.addAttribute("isFilterActive", filterHelpers.getFilterConfiguration(request).isActive());
return "reports/reports"; return "reports/reports";
} }
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
<#import "../helpers/navbar.ftl" as navbar> <#import "../helpers/navbar.ftl" as navbar>
<@navbar.navbar "reports"/> <@navbar.navbar "reports"/>
<#import "../transactions/transactionsMacros.ftl" as transactionsMacros>
<main> <main>
<div class="card main-card background-color"> <div class="card main-card background-color">
<#import "../helpers/globalDatePicker.ftl" as datePicker> <#import "../helpers/globalDatePicker.ftl" as datePicker>
...@@ -23,6 +25,12 @@ ...@@ -23,6 +25,12 @@
<input type="hidden" name="ID" value="${reportSettings.getID()?c}"/> <input type="hidden" name="ID" value="${reportSettings.getID()?c}"/>
<input type="hidden" name="date" value="${helpers.getLongDateString(currentDate)}"/> <input type="hidden" name="date" value="${helpers.getLongDateString(currentDate)}"/>
<div class="row">
<div class="col s12 center-align">
<@transactionsMacros.buttonFilter isFilterActive/>
</div>
</div>
<#-- settings --> <#-- settings -->
<div class="row"> <div class="row">
<div class="col s12 center-align"> <div class="col s12 center-align">
...@@ -83,7 +91,7 @@ ...@@ -83,7 +91,7 @@
</div> </div>
</div> </div>
<#-- button new --> <#-- button generate -->
<div class="row valign-wrapper"> <div class="row valign-wrapper">
<div class="col s12 center-align"> <div class="col s12 center-align">
<button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="buttonSave"> <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="buttonSave">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment