#293 - added filter button to report page

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";
 	}
 

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">