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

17
financer-web-client/src/main/java/de/financer/config/FinancerConfig.java
View File

@@ -13,6 +13,7 @@ public class FinancerConfig {
private String serverUrl;
private String dateFormat;
private String version;
private Integer monthPeriodStartDay;
public String getServerUrl() {
return serverUrl;
@@ -37,4 +38,20 @@ public class FinancerConfig {
public void setVersion(String version) {
this.version = version;
}
// The same property exists on the server, look there for documentation
public Integer getMonthPeriodStartDay() {
return monthPeriodStartDay;
}
public void setMonthPeriodStartDay(Integer monthPeriodStartDay) {
if (monthPeriodStartDay == null) {
throw new IllegalArgumentException("Parameter 'financer.monthPeriodStartDay' is not set!");
}
else if (monthPeriodStartDay < 1 || monthPeriodStartDay > 28) {
throw new IllegalArgumentException("Parameter 'financer.monthPeriodStartDay' is out of range! Valid range from 1-28");
}
this.monthPeriodStartDay = monthPeriodStartDay;
}
}

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.util.UriComponentsBuilder;
import java.time.LocalDate;
import java.util.List;
@Controller
@@ -33,12 +34,18 @@ public class AccountController {
final ResponseEntity<Iterable<RecurringTransaction>> rtAllActRes = new GetAllActiveRecurringTransactionsTemplate()
.exchange(this.financerConfig);
final ResponseEntity<Long> currentAssets = new GetCurrentAssetsTemplate().exchange(this.financerConfig);
final ResponseEntity<Long> currentExpenses = new GetExpensesCurrentPeriodTemplate().exchange(this.financerConfig);
final boolean showClosedBoolean = BooleanUtils.toBoolean(showClosed);
final LocalDate periodStart = LocalDate.now().withDayOfMonth(this.financerConfig.getMonthPeriodStartDay());
final LocalDate periodEnd = periodStart.plusMonths(1);
model.addAttribute("accounts", ControllerUtils.filterAndSortAccounts(response.getBody(), showClosedBoolean));
model.addAttribute("rtDueTodayCount", IterableUtils.size(rtDtRes.getBody()));
model.addAttribute("rtAllActiveCount", IterableUtils.size(rtAllActRes.getBody()));
model.addAttribute("currentAssets", currentAssets.getBody());
model.addAttribute("currentExpenses", currentExpenses.getBody());
model.addAttribute("periodStart", ControllerUtils.formatDate(this.financerConfig, periodStart));
model.addAttribute("periodEnd", ControllerUtils.formatDate(this.financerConfig, periodEnd));
model.addAttribute("showClosed", showClosedBoolean);
ControllerUtils.addVersionAttribute(model, this.financerConfig);

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

@@ -15,6 +15,7 @@ public enum Function {
TR_GET_ALL_FOR_ACCOUNT("transactions/getAllForAccount"),
TR_CREATE_TRANSACTION("transactions/createTransaction"),
TR_DELETE_TRANSACTION("transactions/deleteTransaction"),
TR_EXPENSES_CURRENT_PERIOD("transactions/getExpensesCurrentPeriod"),
RT_GET_ALL("recurringTransactions/getAll"),
RT_GET_ALL_ACTIVE("recurringTransactions/getAllActive"),

15
financer-web-client/src/main/java/de/financer/controller/template/GetExpensesCurrentPeriodTemplate.java Normal file
View File

@@ -0,0 +1,15 @@
package de.financer.controller.template;
import de.financer.config.FinancerConfig;
import de.financer.controller.Function;
import de.financer.util.ControllerUtils;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.ResponseEntity;
public class GetExpensesCurrentPeriodTemplate {
public ResponseEntity<Long> exchange(FinancerConfig financerConfig) {
return new FinancerRestTemplate<Long>().exchange(ControllerUtils
.buildUrl(financerConfig, Function.TR_EXPENSES_CURRENT_PERIOD), new ParameterizedTypeReference<Long>() {
});
}
}

4
financer-web-client/src/main/java/de/financer/util/ControllerUtils.java
View File

@@ -40,6 +40,10 @@ public class ControllerUtils {
.collect(Collectors.toList());
}
public static String formatDate(FinancerConfig financerConfig, LocalDate date) {
return date.format(DateTimeFormatter.ofPattern(financerConfig.getDateFormat()));
}
public static String formatDate(FinancerConfig financerConfig, String dateFromForm) {
if (StringUtils.isEmpty(dateFromForm)) {
return null;

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}"/>