Introduce module financer-common that hosts common code for server and (web) client
Also various fixes all over the place
This commit is contained in:
@@ -19,6 +19,7 @@ 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-overview.tooltip.status.current-assets=Assets available at short-notice
|
||||
|
||||
financer.account-new.title=financer\: create new account
|
||||
financer.account-new.label.key=Key\:
|
||||
@@ -133,6 +134,8 @@ financer.heading.recurring-transaction-list.active=financer\: active recurring t
|
||||
financer.heading.recurring-transaction-list.all=financer\: all recurring transaction
|
||||
financer.heading.recurring-to-transaction-with-amount=financer\: create transaction from recurring with amount
|
||||
|
||||
financer.cancel-back-to-overview=Cancel and back to overview
|
||||
|
||||
financer.error-message.UNKNOWN_ERROR=An unknown error occurred!
|
||||
financer.error-message.INVALID_ACCOUNT_TYPE=The selected account type is not valid!
|
||||
financer.error-message.FROM_ACCOUNT_NOT_FOUND=The specified from account has not been found!
|
||||
|
||||
@@ -19,6 +19,7 @@ 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-overview.tooltip.status.current-assets=Kurzfristig verf\u00FCgbares Verm\u00F6gen
|
||||
|
||||
financer.account-new.title=financer\: Neues Konto erstellen
|
||||
financer.account-new.label.key=Schl\u00FCssel\:
|
||||
@@ -131,4 +132,6 @@ financer.heading.account-details=financer\: Kontodetails f\u00FCr {0}
|
||||
financer.heading.recurring-transaction-list.dueToday=financer\: wiederkehrende Buchungen heute f\u00E4llig
|
||||
financer.heading.recurring-transaction-list.active=financer\: aktive wiederkehrende Buchungen
|
||||
financer.heading.recurring-transaction-list.all=financer\: alle wiederkehrende Buchungen
|
||||
financer.heading.recurring-to-transaction-with-amount=financer\: Buchung mit Betrag aus wiederkehrender Buchung erstellen
|
||||
financer.heading.recurring-to-transaction-with-amount=financer\: Buchung mit Betrag aus wiederkehrender Buchung erstellen
|
||||
|
||||
financer.cancel-back-to-overview=Abbrechen und zur \u00DCbersicht
|
||||
@@ -74,6 +74,14 @@ tr:hover {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
input[type=submit] {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
#footer-container {
|
||||
margin-top: 1em;
|
||||
}
|
||||
|
||||
#footer-container * {
|
||||
display: block;
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
<td class="hideable-column" th:text="${transaction.id}"/>
|
||||
<td th:text="${transaction.fromAccount.key}" />
|
||||
<td th:text="${transaction.toAccount.key}" />
|
||||
<td th:text="${transaction.date}" />
|
||||
<td th:text="${#temporals.format(transaction.date)}" />
|
||||
<td th:text="${#numbers.formatDecimal(transaction.amount/100D, 1, 'DEFAULT', 2, 'DEFAULT')}"/>
|
||||
<td th:text="${transaction.description}" />
|
||||
<td th:text="${transaction.recurringTransaction != null}" />
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
<h1 th:text="#{financer.heading.account-overview}" />
|
||||
<div id="status-container">
|
||||
<span th:text="#{financer.account-overview.status}"/>
|
||||
<div>
|
||||
<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')}"/>
|
||||
</div>
|
||||
<div th:title="#{'financer.account-overview.tooltip.status.current-expenses'(${periodStart}, ${periodEnd})}">
|
||||
<div th:title="#{'financer.account-overview.tooltip.status.current-expenses'(${#temporals.format(periodStart)}, ${#temporals.format(periodEnd)})}">
|
||||
<span th:text="#{financer.account-overview.status.current-expenses}"/>
|
||||
<span th:text="${#numbers.formatDecimal(currentExpenses/100D, 1, 'DEFAULT', 2, 'DEFAULT')}"/>
|
||||
</div>
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<body>
|
||||
<h1 th:text="#{financer.heading.account-new}" />
|
||||
<span class="errorMessage" th:if="${errorMessage != null}" th:text="#{'financer.error-message.' + ${errorMessage}}"/>
|
||||
<a th:href="@{/accountOverview}" th:text="#{financer.cancel-back-to-overview}"/>
|
||||
<form id="new-account-form" action="#" th:action="@{/saveAccount}" th:object="${form}" method="post">
|
||||
<label for="inputKey" th:text="#{financer.account-new.label.key}"/>
|
||||
<input type="text" id="inputKey" th:field="*{key}" />
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<body>
|
||||
<h1 th:text="#{financer.heading.account-group-new}" />
|
||||
<span class="errorMessage" th:if="${errorMessage != null}" th:text="#{'financer.error-message.' + ${errorMessage}}"/>
|
||||
<a th:href="@{/accountOverview}" th:text="#{financer.cancel-back-to-overview}"/>
|
||||
<form id="new-account-group-form" action="#" th:action="@{/saveAccountGroup}" th:object="${form}" method="post">
|
||||
<label for="inputName" th:text="#{financer.account-group-new.label.name}"/>
|
||||
<input type="text" id="inputName" th:field="*{name}" />
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<body>
|
||||
<h1 th:text="#{financer.heading.recurring-transaction-new}" />
|
||||
<span class="errorMessage" th:if="${errorMessage != null}" th:text="#{'financer.error-message.' + ${errorMessage}}"/>
|
||||
<a th:href="@{/accountOverview}" th:text="#{financer.cancel-back-to-overview}"/>
|
||||
<form id="new-recurring-transaction-form" action="#" th:action="@{/saveRecurringTransaction}" th:object="${form}"
|
||||
method="post">
|
||||
<label for="selectFromAccount" th:text="#{financer.recurring-transaction-new.label.from-account}"/>
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<body>
|
||||
<h1 th:text="#{financer.heading.recurring-to-transaction-with-amount}" />
|
||||
<span class="errorMessage" th:if="${errorMessage != null}" th:text="#{'financer.error-message.' + ${errorMessage}}"/>
|
||||
<a th:href="@{/accountOverview}" th:text="#{financer.cancel-back-to-overview}"/>
|
||||
<form id="recurring-to-transaction-with-amount-form" action="#" th:action="@{/createTransactionWithAmount}" th:object="${form}"
|
||||
method="post">
|
||||
<label for="inputAmount" th:text="#{financer.recurring-to-transaction-with-amount.label.amount}"/>
|
||||
|
||||
@@ -30,8 +30,8 @@
|
||||
<td>
|
||||
<a th:href="@{/accountDetails(key=${rt.toAccount.key})}" th:text="${rt.toAccount.key}"/>
|
||||
</td>
|
||||
<td th:text="${rt.firstOccurrence}"/>
|
||||
<td th:text="${rt.lastOccurrence}"/>
|
||||
<td th:text="${#temporals.format(rt.firstOccurrence)}"/>
|
||||
<td th:text="${#temporals.format(rt.lastOccurrence)}"/>
|
||||
<td th:text="${#numbers.formatDecimal(rt.amount/100D, 1, 'DEFAULT', 2, 'DEFAULT')}"/>
|
||||
<td th:text="${rt.description}"/>
|
||||
<td th:text="#{'financer.interval-type.' + ${rt.intervalType}}"/>
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<body>
|
||||
<h1 th:text="#{financer.heading.transaction-new}" />
|
||||
<span class="errorMessage" th:if="${errorMessage != null}" th:text="#{'financer.error-message.' + ${errorMessage}}"/>
|
||||
<a th:href="@{/accountOverview}" th:text="#{financer.cancel-back-to-overview}"/>
|
||||
<form id="new-transaction-form" action="#" th:action="@{/saveTransaction}" th:object="${form}"
|
||||
method="post">
|
||||
<label for="selectFromAccount" th:text="#{financer.transaction-new.label.from-account}"/>
|
||||
@@ -29,5 +30,6 @@
|
||||
<input type="text" id="inputDescription" th:field="*{description}"/>
|
||||
<input type="submit" th:value="#{financer.transaction-new.submit}"/>
|
||||
</form>
|
||||
<div th:replace="includes/footer :: footer"/>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user