MK13/financer
1
0
Fork 0
Code Issues 10 Actions Activity

Transaction search improvements

Browse Source
This commit is contained in:
MK13
2020-11-13 22:59:02 +01:00
parent b756b7d614
commit a15b54064b
6 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
financer-web-client/src/main/java/de/financer/controller/AccountController.java
View File

@@ -130,6 +130,7 @@ public class AccountController {
model.addAttribute("account", account);
model.addAttribute("transactions", transactions);
model.addAttribute("showActionDelete", true);
model.addAttribute("showSum", false);
model.addAttribute("isClosed", AccountStatus.CLOSED.equals(account.getStatus()));
}
catch(FinancerRestException e) {

4
financer-web-client/src/main/java/de/financer/controller/TransactionController.java
View File

@@ -38,6 +38,7 @@ public class TransactionController {
public String searchTransaction(Model model) {
model.addAttribute("form", new SearchTransactionsForm());
model.addAttribute("showActionDelete", false);
model.addAttribute("showSum", false);
ControllerUtils.addVersionAttribute(model, this.financerConfig);
ControllerUtils.addCurrencySymbol(model, this.financerConfig);
@@ -56,8 +57,11 @@ public class TransactionController {
new ParameterizedTypeReference<Iterable<SearchTransactionsResponseDto>>() {
});
Long trxSum = IterableUtils.toList(trxs).stream().mapToLong(t -> t.getAmount()).sum();
model.addAttribute("transactions", trxs);
model.addAttribute("transactionSum", trxSum);
model.addAttribute("showSum", true);
model.addAttribute("transactionCount", IterableUtils.size(trxs));
}
catch(FinancerRestException e) {

1
financer-web-client/src/main/resources/i18n/message.properties
View File

@@ -94,6 +94,7 @@ financer.recurring-transaction-list.table.actions.deleteRecurringTransaction=Del
financer.recurring-transaction-list.table.taxRelevant.true=Yes
financer.recurring-transaction-list.table.taxRelevant.false=No
financer.recurring-transaction-list.back-to-overview=Back to overview
financer.transaction-list.tooltip.amount.sum=Sum\: {0}
financer.account-details.title=financer\: account details
financer.account-details.available-actions=Available actions\:

1
financer-web-client/src/main/resources/i18n/message_de_DE.properties
View File

@@ -94,6 +94,7 @@ financer.recurring-transaction-list.table.actions.deleteRecurringTransaction=L\u
financer.recurring-transaction-list.table.taxRelevant.true=Ja
financer.recurring-transaction-list.table.taxRelevant.false=Nein
financer.recurring-transaction-list.back-to-overview=Zur\u00FCck zur \u00DCbersicht
financer.transaction-list.tooltip.amount.sum=Summe\: {0}
financer.account-details.title=financer\: Kontodetails
financer.account-details.available-actions=Verf\u00FCgbare Aktionen\:

1
financer-web-client/src/main/resources/static/changelog.txt
View File

@@ -2,6 +2,7 @@ v33 -> v34:
- Fix a bug in the parsing of FQL
- Add the transaction description field to the FQL search
- Add LIKE support to the FQL search
- Add tooltip with sum of transaction amounts to the FQL search amount table header column
v32 -> v33:
- Introduce Holiday/Weekend Type SKIP to skip an occurrence of a recurring transaction once, if the due date is either a

11
financer-web-client/src/main/resources/templates/transaction/transactionList.html
View File

@@ -8,7 +8,14 @@
<th th:text="#{financer.transaction-list.table-header.fromAccount}"/>
<th th:text="#{financer.transaction-list.table-header.toAccount}"/>
<th th:text="#{financer.transaction-list.table-header.date}"/>
<th th:text="#{financer.transaction-list.table-header.amount}"/>
<!--
Horrible hack to get unescaped text in the tooltip of the th tag
See: http://forum.thymeleaf.org/How-to-get-unescaped-text-into-title-attribute-td4027791.html
-->
<th th:utext="'&lt;div title=&quot;__#{'financer.transaction-list.tooltip.amount.sum'(${#numbers.formatDecimal(transactionSum/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol})}__&quot;&gt;__#{financer.transaction-list.table-header.amount}__&lt;/div&gt;'"
th:if="${showSum}"/>
<th th:text="#{financer.transaction-list.table-header.amount}"
th:if="${!showSum}"/>
<th th:text="#{financer.transaction-list.table-header.description}"/>
<th th:text="#{financer.transaction-list.table-header.byRecurring}"/>
<th th:text="#{financer.transaction-list.table-header.taxRelevant}"/>
@@ -19,7 +26,7 @@
<td th:text="${transaction.fromAccount.key}" />
<td th:text="${transaction.toAccount.key}" />
<td th:text="${#temporals.format(transaction.date)}" />
<td th:utext="${#numbers.formatDecimal(transaction.amount/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"/>
<td th:utext="${#numbers.formatDecimal(transaction.amount/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}" />
<td th:text="${transaction.description}" />
<td th:if="${transaction.recurring}" th:text="#{financer.transaction-list.table.recurring.yes}" />
<td th:if="${!transaction.recurring}" th:text="#{financer.transaction-list.table.recurring.no}" />