Introduce periods (and other smaller stuff)

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

@@ -8,6 +8,7 @@ financer.account-overview.available-actions.create-recurring-transaction=Create
 financer.account-overview.available-actions.recurring-transaction-all=Show all recurring transactions
 financer.account-overview.available-actions.create-account-group=Create new account group
 financer.account-overview.available-actions.select-chart=Generate a chart
+financer.account-overview.available-actions.close-current-period=Close the current expense period
 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\:
@@ -16,10 +17,12 @@ financer.account-overview.status.current-expenses=Expenses in 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.balance=Balance
+financer.account-overview.table-header.spending-current-period=Spending current period
+financer.account-overview.table-header.average-spending-period=Average spending
 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}. Clicking the amount will open a graphical overview about the expenses grouped by account group
+financer.account-overview.tooltip.status.current-expenses=Period starting at {0}. Clicking the amount will open a graphical overview about the expenses grouped by account group
 financer.account-overview.tooltip.status.current-assets=Assets available at short-notice
 
 financer.account-new.title=financer\: create new account
@@ -88,6 +91,7 @@ financer.account-details.available-actions=Available actions\:
 financer.account-details.available-actions.close-account=Close account
 financer.account-details.available-actions.open-account=Open account
 financer.account-details.available-actions.back-to-overview=Back to overview
+financer.account-details.available-actions.create-transaction=Create new transaction
 financer.account-details.table-header.id=ID
 financer.account-details.table-header.fromAccount=From account
 financer.account-details.table-header.toAccount=To account
@@ -163,6 +167,7 @@ financer.chart.account-expenses-for-period.title=Expenses for period from {0} to
 financer.chart.expense-period-totals-current-year.title=Expense period totals for the current year
 financer.chart.expense-period-totals-current-year.x=Amount
 financer.chart.expense-period-totals-current-year.y=Period
+financer.chart.expense-period-totals-current-year.open-period=OPEN
 
 financer.chart.name.ACCOUNT_GROUP_EXPENSES_CURRENT_PERIOD=Expenses of the current period grouped by account group (pie chart)
 financer.chart.name.ACCOUNT_GROUP_EXPENSES_FOR_PERIOD=Expenses for a configurable period grouped by account group (pie chart)

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

@@ -8,6 +8,7 @@ financer.account-overview.available-actions.create-recurring-transaction=Neue wi
 financer.account-overview.available-actions.recurring-transaction-all=Zeige alle wiederkehrende Buchungen
 financer.account-overview.available-actions.create-account-group=Neue Konto-Gruppe erstellen
 financer.account-overview.available-actions.select-chart=Ein Diagramm erzeugen
+financer.account-overview.available-actions.close-current-period=Aktuelle Periode schlie\u00DFen
 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\:
@@ -19,7 +20,7 @@ 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}. Durch Klicken des Betrags kann eine grafische \u00DCbersicht über die Ausgaben gruppiert nach Konto-Gruppe angezeigt werden
+financer.account-overview.tooltip.status.current-expenses=Periode ab {0}. Durch Klicken des Betrags kann eine grafische \u00DCbersicht über die Ausgaben gruppiert nach Konto-Gruppe angezeigt werden
 financer.account-overview.tooltip.status.current-assets=Kurzfristig verf\u00FCgbares Verm\u00F6gen
 
 financer.account-new.title=financer\: Neues Konto erstellen
@@ -88,6 +89,7 @@ financer.account-details.available-actions=Verf\u00FCgbare Aktionen\:
 financer.account-details.available-actions.close-account=Konto schlie\u00DFen
 financer.account-details.available-actions.open-account=Konto \u00F6ffnen
 financer.account-details.available-actions.back-to-overview=Zur\u00FCck zur \u00DCbersicht
+financer.account-details.available-actions.create-transaction=Neue Buchung erstellen
 financer.account-details.table-header.id=ID
 financer.account-details.table-header.fromAccount=Von Konto
 financer.account-details.table-header.toAccount=An Konto
@@ -162,6 +164,7 @@ financer.chart.account-expenses-for-period.title=Ausgaben in der Periode vom {0}
 financer.chart.expense-period-totals-current-year.title=Gesamtbetr\u00E4ge gruppiert nach Periode für das aktuelle Jahr
 financer.chart.expense-period-totals-current-year.x=Betrag
 financer.chart.expense-period-totals-current-year.y=Periode
+financer.chart.expense-period-totals-current-year.open-period=OFFEN
 
 financer.chart.name.ACCOUNT_GROUP_EXPENSES_CURRENT_PERIOD=Ausgaben in der aktuellen Periode gruppiert nach Konto-Gruppe (Kuchendiagramm)
 financer.chart.name.ACCOUNT_GROUP_EXPENSES_FOR_PERIOD=Ausgaben f\u00FCr eine konfigurierbare Periode gruppiert nach Konto-Gruppe (Kuchendiagramm)

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

@@ -1,3 +1,15 @@
+v18 -> v19:
+- Fix a bug in recurring transaction handling that caused a recurring transaction with Holiday/Weekend type
+  'previous workday' and a planned occurrence on a Sunday to be due on Friday and Saturday
+- Filter from and to account lists when creating a transaction or a recurring transaction by account types that
+  are allowed in from and to
+- Add the create new transaction action to the account detail view
+- Rework periods (e.g. expense) so that the underlying technical structures are better defined. This is preparation for
+  more reports and budgeting functions
+- Add action to close the current expense period manually. This also opens a new one
+- Add spending in current expense period per account to the account overview
+- Add average spending in expense period per account to the account overview
+
 v17 -> v18:
 - Add readme to the footer
 - Translate error messages to German

financer-web-client/src/main/resources/templates/account/accountDetails.html

@@ -18,9 +18,9 @@
         <span th:text="#{financer.account-details.details.balance}"/>
         <span th:text="${#numbers.formatDecimal(account.currentBalance/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"/>
     </div>
-    <div id="group-container">
+    <div id="group-container" th:if="${account.accountGroup != null}">
         <span th:text="#{financer.account-details.details.group}"/>
-        <span th:text="${account.accountGroup?.name}"/>
+        <span th:text="${account.accountGroup.name}"/>
     </div>
 </div>
 <div id="account-details-action-container">
@@ -29,6 +29,8 @@
        th:text="#{financer.account-details.available-actions.close-account}"/>
     <a th:if="${isClosed}" th:href="@{/openAccount(key=${account.key})}"
        th:text="#{financer.account-details.available-actions.open-account}"/>
+    <a th:href="@{/newTransaction}"
+       th:text="#{financer.account-details.available-actions.create-transaction}"/>
     <a th:href="@{/accountOverview}"
        th:text="#{financer.account-details.available-actions.back-to-overview}"/>
 </div>

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

@@ -8,13 +8,14 @@
 </head>
 <body>
 <h1 th:text="#{financer.heading.account-overview}" />
+<span class="errorMessage" th:if="${errorMessage != null}" th:text="#{'financer.error-message.' + ${errorMessage}}"/>
 <div id="status-container">
     <span th:text="#{financer.account-overview.status}"/>
     <div th:title="#{financer.account-overview.tooltip.status.current-assets}">
         <span th:text="#{financer.account-overview.status.current-assets}"/>
         <span th:text="${#numbers.formatDecimal(currentAssets/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"/>
     </div>
-    <div th:title="#{'financer.account-overview.tooltip.status.current-expenses'(${#temporals.format(periodStart)}, ${#temporals.format(periodEnd)})}">
+    <div th:title="#{'financer.account-overview.tooltip.status.current-expenses'(${#temporals.format(periodStart)})}">
         <span th:text="#{financer.account-overview.status.current-expenses}"/>
         <a th:href="@{/getAccountGroupExpensesCurrentPeriod}">
             <span th:text="${#numbers.formatDecimal(currentExpenses/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}" />
@@ -28,7 +29,6 @@
         <span th:text="#{financer.account-overview.status.recurring-transaction-active}"/>
         <a th:href="@{/recurringTransactionActive}" th:text="${rtAllActiveCount}"/>
     </div>
-
 </div>
 <span th:text="#{financer.account-overview.available-actions}"/>
 <div id="action-container">
@@ -49,6 +49,10 @@
         <a th:href="@{/recurringTransactionAll}"
            th:text="#{financer.account-overview.available-actions.recurring-transaction-all}"/>
     </div>
+    <div id="action-container-sub-period">
+        <a th:href="@{/closePeriod}"
+           th:text="#{financer.account-overview.available-actions.close-current-period}"/>
+    </div>
     <div id="action-container-sub-reports">
         <a th:href="@{/selectChart}"
            th:text="#{financer.account-overview.available-actions.select-chart}"/>
@@ -59,6 +63,8 @@
         <th class="hideable-column" th:text="#{financer.account-overview.table-header.id}"/>
         <th th:text="#{financer.account-overview.table-header.key}"/>
         <th th:text="#{financer.account-overview.table-header.balance}"/>
+        <th class="hideable-column" th:text="#{financer.account-overview.table-header.spending-current-period}"/>
+        <th class="hideable-column" th:text="#{financer.account-overview.table-header.average-spending-period}"/>
         <th class="hideable-column" th:text="#{financer.account-overview.table-header.group}"/>
         <th class="hideable-column" th:text="#{financer.account-overview.table-header.type}"/>
         <th class="hideable-column" th:text="#{financer.account-overview.table-header.status}"/>
@@ -69,6 +75,12 @@
             <a th:href="@{/accountDetails(key=${acc.key})}" th:text="${acc.key}"/>
         </td>
         <td th:text="${#numbers.formatDecimal(acc.currentBalance/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"/>
+        <td th:if="${acc.spendingCurrentExpensePeriod != null}"
+            th:text="${#numbers.formatDecimal(acc.spendingCurrentExpensePeriod/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"/>
+        <td th:if="${acc.averageSpendingExpensePeriod != null}"
+            th:text="${#numbers.formatDecimal(acc.averageSpendingExpensePeriod/100D, 1, 'DEFAULT', 2, 'DEFAULT') + currencySymbol}"/>
+        <td th:if="${acc.spendingCurrentExpensePeriod == null}">-</td>
+        <td th:if="${acc.averageSpendingExpensePeriod == null}">-</td>
         <td class="hideable-column" th:text="${acc.accountGroup?.name}"/>
         <td class="hideable-column" th:text="#{'financer.account-type.' + ${acc.type}}"/>
         <td class="hideable-column" th:text="#{'financer.account-status.' + ${acc.status}}"/>

financer-web-client/src/main/resources/templates/recurringTransaction/newRecurringTransaction.html

@@ -14,12 +14,12 @@
       method="post">
     <label for="selectFromAccount" th:text="#{financer.recurring-transaction-new.label.from-account}"/>
     <select id="selectFromAccount" th:field="*{fromAccountKey}">
-        <option th:each="acc : ${accounts}" th:value="${acc.key}"
+        <option th:each="acc : ${fromAccounts}" th:value="${acc.key}"
                 th:text="#{'financer.recurring-transaction-new.account-type.' + ${acc.type}(${acc.key},${#numbers.formatDecimal(acc.currentBalance/100D, 1, 'DEFAULT', 2, 'DEFAULT')},${currencySymbol})}"/>
     </select>
     <label for="selectToAccount" th:text="#{financer.recurring-transaction-new.label.to-account}"/>
     <select id="selectToAccount" th:field="*{toAccountKey}">
-        <option th:each="acc : ${accounts}" th:value="${acc.key}"
+        <option th:each="acc : ${toAccounts}" th:value="${acc.key}"
                 th:text="#{'financer.recurring-transaction-new.account-type.' + ${acc.type}(${acc.key},${#numbers.formatDecimal(acc.currentBalance/100D, 1, 'DEFAULT', 2, 'DEFAULT')},${currencySymbol})}"/>
     </select>
     <label for="inputAmount" th:text="#{financer.recurring-transaction-new.label.amount}"/>

financer-web-client/src/main/resources/templates/transaction/newTransaction.html

@@ -14,12 +14,12 @@
       method="post">
     <label for="selectFromAccount" th:text="#{financer.transaction-new.label.from-account}"/>
     <select id="selectFromAccount" th:field="*{fromAccountKey}">
-        <option th:each="acc : ${accounts}" th:value="${acc.key}"
+        <option th:each="acc : ${fromAccounts}" th:value="${acc.key}"
                 th:text="#{'financer.transaction-new.account-type.' + ${acc.type}(${acc.key},${#numbers.formatDecimal(acc.currentBalance/100D, 1, 'DEFAULT', 2, 'DEFAULT')},${currencySymbol})}"/>
     </select>
     <label for="selectToAccount" th:text="#{financer.transaction-new.label.to-account}"/>
     <select id="selectToAccount" th:field="*{toAccountKey}">
-        <option th:each="acc : ${accounts}" th:value="${acc.key}"
+        <option th:each="acc : ${toAccounts}" th:value="${acc.key}"
                 th:text="#{'financer.transaction-new.account-type.' + ${acc.type}(${acc.key},${#numbers.formatDecimal(acc.currentBalance/100D, 1, 'DEFAULT', 2, 'DEFAULT')},${currencySymbol})}"/>
     </select>
     <label for="inputAmount" th:text="#{financer.transaction-new.label.amount}"/>