diff --git a/src/main/java/de/deadlocker8/budgetmaster/entities/transaction/Transaction_.java b/src/main/java/de/deadlocker8/budgetmaster/entities/transaction/Transaction_.java
index 2a8a1cccfd47310b9d6dc520812077dec01c7a2a..311580ba5417940badde745678bbbef97f2ffc9f 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/entities/transaction/Transaction_.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/entities/transaction/Transaction_.java
@@ -6,6 +6,7 @@ import de.deadlocker8.budgetmaster.entities.category.Category;
import de.deadlocker8.budgetmaster.repeating.RepeatingOption;
import org.joda.time.DateTime;
+import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
import java.util.List;
@@ -20,6 +21,6 @@ public class Transaction_
public static volatile SingularAttribute<Transaction, Category> category;
public static volatile SingularAttribute<Transaction, String> name;
public static volatile SingularAttribute<Transaction, String> description;
- public static volatile SingularAttribute<Transaction, List<Tag>> tags;
+ public static volatile ListAttribute<Transaction, List<Tag>> tags;
public static volatile SingularAttribute<Transaction, RepeatingOption> repeatingOption;
}
diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties
index 48ef1dfe6e1ee885984334375e14a6566226d74b..e6f25bd9d0d9bc90ac189f179d08f54be546d874 100644
--- a/src/main/resources/languages/_de.properties
+++ b/src/main/resources/languages/_de.properties
@@ -37,6 +37,7 @@ title.datepicker.month=Monat w
title.account.new=Neues Konto
title.account.edit=Konto bearbeiten
title.category.budgets=Verbrauch nach Kategorien
+title.filter=Filter
# MISC
category.none=Keine Kategorie
@@ -237,6 +238,9 @@ report.incomes=Einnahmen:
report.expenditures=Ausgaben:
report.budget.rest=Restbudget:
+# filter
+filter.active=Filter aktiv
+
# home menu
home.menu.accounts=Konten erlauben es mehrere Buchungen zu gruppieren. Du kannst so viele Konten erstellen, wie du m�chtest. Zum Erstellen, Aktualisieren oder L�schen von Accounts klicke hier.
home.menu.transactions=Buchungen sind das zentrale Element von BudgetMaster. Gib ihnen einen Namen und eine Beschreibung, weise ihnen eine Kategorie und ein Konto zu, konfiguriere sie als wiederholend und markiere sie mit Tags. Um Buchungen zu erstellen, zu bearbeiten oder zu l�schen einfach hier klicken.
diff --git a/src/main/resources/languages/_en.properties b/src/main/resources/languages/_en.properties
index 43abb2eddd6d35104e21921a7636e5b05f9b531c..8b944f71610e1ef648b2ad79b926b2460befe03a 100644
--- a/src/main/resources/languages/_en.properties
+++ b/src/main/resources/languages/_en.properties
@@ -37,6 +37,7 @@ title.datepicker.month=Choose month
title.account.new=New Account
title.account.edit=Edit Account
title.category.budgets=Consumption by categories
+title.filter=Filter
# MISC
category.none=No Category
@@ -236,6 +237,9 @@ report.incomes=Incomes:
report.expenditures=Expenditures:
report.budget.rest=Remaining Budget:
+# filter
+filter.active=Filter active
+
# home menu
home.menu.accounts=Accounts allow you to group multiple transactions. You can create as many accounts as you want. Create, update and delete them by clicking here.
home.menu.transactions=Transactions are the key element of BudgetMaster. Give them a name and description, assign a category and account to them, configure them as recurring, and mark them with tags. You can create, edit and delete them by clicking here.
diff --git a/src/main/resources/templates/transactions/transactions.ftl b/src/main/resources/templates/transactions/transactions.ftl
index 4c71b09a3320b351c9afa976245157a42dc99f9d..c725104268dcd16c5b39dcec83a17a16768917af 100644
--- a/src/main/resources/templates/transactions/transactions.ftl
+++ b/src/main/resources/templates/transactions/transactions.ftl
@@ -41,10 +41,8 @@
</div>
</div>
- <#-- button new -->
- <div class="row valign-wrapper">
- <div class="col s12 center-align"><a href="<@s.url '/transactions/newTransaction'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">add</i>${locale.getString("title.transaction.new")}</a></div>
- </div>
+ <#-- buttons -->
+ <@transactionsMacros.buttons true/>
<#-- transactions list -->
<br>
diff --git a/src/main/resources/templates/transactions/transactionsMacros.ftl b/src/main/resources/templates/transactions/transactionsMacros.ftl
index c90f3e9e2ce16114ed6729e475bdd2b8d3a6cb4d..87bc2818871127046428821dcac773fb7ec82fdd 100644
--- a/src/main/resources/templates/transactions/transactionsMacros.ftl
+++ b/src/main/resources/templates/transactions/transactionsMacros.ftl
@@ -73,4 +73,41 @@
<a href="<@s.url '/transactions/${transaction.ID?c}/delete'/>" class="modal-action modal-close waves-effectwaves-light green btn-flat white-text">${locale.getString("delete")}</a>
</div>
</div>
+</#macro>
+
+<#macro buttons isFilterActive>
+ <div class="row hide-on-small-only valign-wrapper">
+ <div class="col s6 right-align">
+ <@buttonNew/>
+ </div>
+
+ <div class="col s6 left-align">
+ <@buttonFilter isFilterActive/>
+ </div>
+ </div>
+
+ <div class="hide-on-med-and-up valign-wrapper">
+ <div class="row center-align">
+ <div class="col s12">
+ <@buttonNew/>
+ </div>
+ </div>
+ <div class="row center-align">
+ <div class="col s12">
+ <@buttonFilter isFilterActive/>
+ </div>
+ </div>
+ </div>
+</#macro>
+
+<#macro buttonNew>
+ <a href="<@s.url '/transactions/newTransaction'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">add</i>${locale.getString("title.transaction.new")}</a>
+</#macro>
+
+<#macro buttonFilter isFilterActive>
+ <#if isFilterActive>
+ <a href="<@s.url '/filter'/>" class="waves-effect waves-light btn budgetmaster-red"><i class="fas fa-filter left"></i>${locale.getString("filter.active")}</a>
+ <#else>
+ <a href="<@s.url '/filter'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="fas fa-filter left"></i>${locale.getString("title.filter")}</a>
+ </#if>
</#macro>
\ No newline at end of file