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

#774 - account overview: add filter controls

parent 4afa528b
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
BudgetMasterServer/src/main/resources/languages/base_de.properties
+ 2
− 0
View file @ a168c542
...@@ -371,6 +371,8 @@ account.all=Alle Konten ...@@ -371,6 +371,8 @@ account.all=Alle Konten
account.tooltip.default=Als Standardkonto festlegen account.tooltip.default=Als Standardkonto festlegen
account.tooltip.endDate.soon=Das Enddatum für dieses Konto wird in {0} Tagen erreicht! account.tooltip.endDate.soon=Das Enddatum für dieses Konto wird in {0} Tagen erreicht!
account.tooltip.endDate.done=Das Enddatum für dieses Konto wurde vor {0} Tagen erreicht! account.tooltip.endDate.done=Das Enddatum für dieses Konto wurde vor {0} Tagen erreicht!
account.label.endDate.with=mit
account.label.endDate.without=ohne
account.state.full.access=Vollzugriff account.state.full.access=Vollzugriff
account.state.read.only=Lesezugriff account.state.read.only=Lesezugriff
......
BudgetMasterServer/src/main/resources/languages/base_en.properties
+ 2
− 0
View file @ a168c542
...@@ -370,6 +370,8 @@ account.all=All Accounts ...@@ -370,6 +370,8 @@ account.all=All Accounts
account.tooltip.default=Set as default account account.tooltip.default=Set as default account
account.tooltip.endDate.soon=The end date for this account will be reached in {0} days! account.tooltip.endDate.soon=The end date for this account will be reached in {0} days!
account.tooltip.endDate.done=The end date for this account was reached {0} days ago! account.tooltip.endDate.done=The end date for this account was reached {0} days ago!
account.label.endDate.with=with
account.label.endDate.without=without
account.state.full.access=Full access account.state.full.access=Full access
account.state.read.only=Read-only account.state.read.only=Read-only
......
BudgetMasterServer/src/main/resources/static/css/accounts.css
+ 8
− 0
View file @ a168c542
...@@ -31,3 +31,11 @@ ...@@ -31,3 +31,11 @@
border: 3px solid var(--color-text); border: 3px solid var(--color-text);
line-height: 32px !important; line-height: 32px !important;
} }
.account-container th {
vertical-align: top;
}
.account-container th.vertical-align-middle {
vertical-align: middle;
}
\ No newline at end of file
BudgetMasterServer/src/main/resources/templates/accounts/accounts.ftl
+ 56
− 8
View file @ a168c542
...@@ -25,20 +25,69 @@ ...@@ -25,20 +25,69 @@
<br> <br>
<div class="container account-container"> <div class="container account-container">
<table class="bordered"> <table class="bordered">
<thead> <thead class="hide-on-med-and-down">
<tr> <tr>
<th>${locale.getString("account.new.label.state")}</th> <th></th>
<th>${locale.getString("account.new.label.endDate")}</th> <th>
<th>${locale.getString("account.new.label.icon")}</th> <div>${locale.getString("account.new.label.state")}</div>
<th>${locale.getString("account.new.label.name")}</th> <div>
<th>${locale.getString("transaction.new.label.description")}</th> <label>
<th>${locale.getString("categories.actions")}</th> <input type="checkbox" />
<span><i class="fas fa-edit placeholder-icon-right"></i>${locale.getString("account.state.full.access")}</span>
</label>
</div>
<div>
<label>
<input type="checkbox" />
<span><i class="fas fa-lock placeholder-icon-right"></i>${locale.getString("account.state.read.only")}</span>
</label>
</div>
<div>
<label>
<input type="checkbox" />
<span><i class="far fa-eye-slash placeholder-icon-right"></i>${locale.getString("account.state.hidden")}</span>
</label>
</div>
</th>
<th>
<div>${locale.getString("account.new.label.endDate")}</div>
<div>
<label>
<input type="checkbox" />
<span><i class="fas fa-bell placeholder-icon-right"></i>${locale.getString("account.label.endDate.with")}</span>
</label>
</div>
<div>
<label>
<input type="checkbox" />
<span><i class="fas fa-bell-slash placeholder-icon-right"></i>${locale.getString("account.label.endDate.without")}</span>
</label>
</div>
</th>
<th>
<div>${locale.getString("account.new.label.name")}</div>
<div class="input-field">
<input type="text" id="accounts-filter-name">
</div>
</th>
<th>
<div>${locale.getString("transaction.new.label.description")}</div>
<div class="input-field">
<input type="text" id="accounts-filter-description">
</div>
</th>
<th class="vertical-align-middle">
<button class="btn waves-effect waves-light background-green" type="submit" id="accounts-filter-button">
<i class="fas fa-filter left"></i>${locale.getString("filter.apply")}
</button>
</th>
</tr> </tr>
</thead> </thead>
<#list accounts as account> <#list accounts as account>
<#if (account.getType().name() == "CUSTOM")> <#if (account.getType().name() == "CUSTOM")>
<tr class="account-overview-row"> <tr class="account-overview-row">
<td><@customSelectMacros.accountIcon account account.getName() "text-blue"/></td>
<td> <td>
<#if account.getAccountState().name() == "READ_ONLY"> <#if account.getAccountState().name() == "READ_ONLY">
<div class="placeholder-icon placeholder-icon-right"></div> <div class="placeholder-icon placeholder-icon-right"></div>
...@@ -58,7 +107,6 @@ ...@@ -58,7 +107,6 @@
<div class="placeholder-icon"></div> <div class="placeholder-icon"></div>
</#if> </#if>
</td> </td>
<td><@customSelectMacros.accountIcon account account.getName() "text-blue"/></td>
<td>${account.getName()}</td> <td>${account.getName()}</td>
<td> <td>
<div class="truncate account-description"> <div class="truncate account-description">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment