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

Add current expenses to the overview

Browse Source 
The period start is configurable.
This commit is contained in:
MK13
2019-06-24 22:44:05 +02:00
parent 6ec073d08e
commit 6009592b61
14 changed files with 125 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
financer-web-client/src/main/resources/config/application.properties
View File

@@ -27,4 +27,7 @@ financer.dateFormat=dd.MM.yyyy
financer.version=@project.version@
financer.serverUrl=http://localhost:8080/financer-server/
spring.messages.basename=i18n/message
spring.messages.basename=i18n/message
# The day of month indicating the start of an expense period. Valid values range from 1-28
financer.monthPeriodStartDay=15

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

@@ -11,12 +11,14 @@ financer.account-overview.status=Status\:
financer.account-overview.status.recurring-transaction-due-today=Recurring transactions due today\:
financer.account-overview.status.recurring-transaction-active=Active recurring transactions\:
financer.account-overview.status.current-assets=Current assets\:
financer.account-overview.status.current-expenses=Expenses of the current period\:
financer.account-overview.table-header.id=ID
financer.account-overview.table-header.key=Account
financer.account-overview.table-header.group=Group
financer.account-overview.table-header.balance=Current Balance
financer.account-overview.table-header.type=Type
financer.account-overview.table-header.status=Status
financer.account-overview.tooltip.status.current-expenses=Period from {0} to {1}
financer.account-new.title=financer\: create new account
financer.account-new.label.key=Key\:

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

@@ -11,12 +11,14 @@ financer.account-overview.status=Status\:
financer.account-overview.status.recurring-transaction-due-today=Wiederkehrende Buchungen heute f\u00E4llig\:
financer.account-overview.status.recurring-transaction-active=Aktive wiederkehrende Buchungen\:
financer.account-overview.status.current-assets=Umlaufverm\u00F6gen\:
financer.account-overview.status.current-expenses=Ausgaben in der aktuellen Periode\:
financer.account-overview.table-header.id=ID
financer.account-overview.table-header.key=Konto
financer.account-overview.table-header.group=Gruppe
financer.account-overview.table-header.balance=Kontostand
financer.account-overview.table-header.type=Typ
financer.account-overview.table-header.status=Status
financer.account-overview.tooltip.status.current-expenses=Periode ab {0} bis {1}
financer.account-new.title=financer\: Neues Konto erstellen
financer.account-new.label.key=Schl\u00FCssel\:

4
financer-web-client/src/main/resources/templates/account/accountOverview.html
View File

@@ -14,6 +14,10 @@
<span th:text="#{financer.account-overview.status.current-assets}"/>
<span th:text="${#numbers.formatDecimal(currentAssets/100D, 1, 'DEFAULT', 2, 'DEFAULT')}"/>
</div>
<div th:title="#{'financer.account-overview.tooltip.status.current-expenses'(${periodStart}, ${periodEnd})}">
<span th:text="#{financer.account-overview.status.current-expenses}"/>
<span th:text="${#numbers.formatDecimal(currentExpenses/100D, 1, 'DEFAULT', 2, 'DEFAULT')}"/>
</div>
<div>
<span th:text="#{financer.account-overview.status.recurring-transaction-due-today}"/>
<a th:href="@{/recurringTransactionDueToday}" th:text="${rtDueTodayCount}"/>