diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java index 00294743137cac560bdb25d66184ac4faecb1a3f..2dc51d54335a8533cc26d383b9919f3f5075ae0f 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java @@ -60,12 +60,13 @@ public class ReportController extends BaseController private FilterHelpersService filterHelpers; @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); model.addAttribute("reportSettings", reportSettingsService.getReportSettings()); model.addAttribute("currentDate", date); + model.addAttribute("isFilterActive", filterHelpers.getFilterConfiguration(request).isActive()); return "reports/reports"; } diff --git a/src/main/resources/templates/reports/reports.ftl b/src/main/resources/templates/reports/reports.ftl index 323484c4ea2c88d9cbff25b0e7f2019a333e6a60..4f13257a89b0fc46bb1e1c389324ff3afedaf120 100644 --- a/src/main/resources/templates/reports/reports.ftl +++ b/src/main/resources/templates/reports/reports.ftl @@ -10,6 +10,8 @@ <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "reports"/> + <#import "../transactions/transactionsMacros.ftl" as transactionsMacros> + <main> <div class="card main-card background-color"> <#import "../helpers/globalDatePicker.ftl" as datePicker> @@ -23,6 +25,12 @@ <input type="hidden" name="ID" value="${reportSettings.getID()?c}"/> <input type="hidden" name="date" value="${helpers.getLongDateString(currentDate)}"/> + <div class="row"> + <div class="col s12 center-align"> + <@transactionsMacros.buttonFilter isFilterActive/> + </div> + </div> + <#-- settings --> <div class="row"> <div class="col s12 center-align"> @@ -83,7 +91,7 @@ </div> </div> - <#-- button new --> + <#-- button generate --> <div class="row valign-wrapper"> <div class="col s12 center-align"> <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="buttonSave">