From 866b54a8bf9f17ae160b68eda184a110ffd568ad Mon Sep 17 00:00:00 2001 From: MK13 Date: Mon, 10 Jun 2019 02:29:43 +0200 Subject: [PATCH] Add flag to control whether to remind about maturity of rec. transaction --- .../controller/RecurringTransactionController.java | 3 ++- .../de/financer/form/NewRecurringTransactionForm.java | 9 +++++++++ .../java/de/financer/model/RecurringTransaction.java | 9 +++++++++ src/main/resources/i18n/message.properties | 1 + src/main/resources/i18n/message_de_DE.properties | 3 ++- .../recurringTransaction/newRecurringTransaction.html | 2 ++ 6 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/financer/controller/RecurringTransactionController.java b/src/main/java/de/financer/controller/RecurringTransactionController.java index 68417ba..c3dab13 100644 --- a/src/main/java/de/financer/controller/RecurringTransactionController.java +++ b/src/main/java/de/financer/controller/RecurringTransactionController.java @@ -50,7 +50,8 @@ public class RecurringTransactionController { .queryParam("lastOccurrence", ControllerUtils.formatDate(this.financerConfig, form.getLastOccurrence())) .queryParam("holidayWeekendType", form.getHolidayWeekendType()) .queryParam("intervalType", form.getIntervalType()) - .queryParam("description", form.getDescription()); + .queryParam("description", form.getDescription()) + .queryParam("remind", form.getRemind()); final ResponseEntity response = new StringTemplate().exchange(builder); diff --git a/src/main/java/de/financer/form/NewRecurringTransactionForm.java b/src/main/java/de/financer/form/NewRecurringTransactionForm.java index 3f7d419..a077eb0 100644 --- a/src/main/java/de/financer/form/NewRecurringTransactionForm.java +++ b/src/main/java/de/financer/form/NewRecurringTransactionForm.java @@ -9,6 +9,7 @@ public class NewRecurringTransactionForm { private String lastOccurrence; private String intervalType; private String holidayWeekendType; + private Boolean remind; public String getFromAccountKey() { return fromAccountKey; @@ -73,4 +74,12 @@ public class NewRecurringTransactionForm { public void setHolidayWeekendType(String holidayWeekendType) { this.holidayWeekendType = holidayWeekendType; } + + public Boolean getRemind() { + return remind; + } + + public void setRemind(Boolean remind) { + this.remind = remind; + } } diff --git a/src/main/java/de/financer/model/RecurringTransaction.java b/src/main/java/de/financer/model/RecurringTransaction.java index 417596f..a2d486a 100644 --- a/src/main/java/de/financer/model/RecurringTransaction.java +++ b/src/main/java/de/financer/model/RecurringTransaction.java @@ -12,6 +12,7 @@ public class RecurringTransaction { private LocalDate firstOccurrence; private LocalDate lastOccurrence; private HolidayWeekendType holidayWeekendType; + private boolean remind; public Long getId() { return id; @@ -80,4 +81,12 @@ public class RecurringTransaction { public void setIntervalType(IntervalType intervalType) { this.intervalType = intervalType; } + + public boolean isRemind() { + return remind; + } + + public void setRemind(boolean remind) { + this.remind = remind; + } } diff --git a/src/main/resources/i18n/message.properties b/src/main/resources/i18n/message.properties index 791ee78..daf3ce3 100644 --- a/src/main/resources/i18n/message.properties +++ b/src/main/resources/i18n/message.properties @@ -43,6 +43,7 @@ financer.recurring-transaction-new.label.last-occurrence=Last occurrence\: financer.recurring-transaction-new.label.interval-type=Interval\: financer.recurring-transaction-new.label.holiday-weekend-type=Holiday/weekend rule\: financer.recurring-transaction-new.label.description=Description\: +financer.recurring-transaction-new.label.remind=Remind if due\: financer.recurring-transaction-new.submit=Create recurring transaction financer.recurring-transaction-new.account-type.BANK={0}|Bank|{1} financer.recurring-transaction-new.account-type.CASH={0}|Cash|{1} diff --git a/src/main/resources/i18n/message_de_DE.properties b/src/main/resources/i18n/message_de_DE.properties index 7c99954..d91e4b9 100644 --- a/src/main/resources/i18n/message_de_DE.properties +++ b/src/main/resources/i18n/message_de_DE.properties @@ -43,6 +43,7 @@ financer.recurring-transaction-new.label.last-occurrence=Letztes Auftreten\: financer.recurring-transaction-new.label.interval-type=Intervall\: financer.recurring-transaction-new.label.holiday-weekend-type=Feiertag-/Wochenendregel\: financer.recurring-transaction-new.label.description=Beschreibung\: +financer.recurring-transaction-new.label.remind=Erinnern wenn f\u00E4llig\: financer.recurring-transaction-new.submit=Wiederkehrende Buchung erstellen financer.recurring-transaction-new.account-type.BANK={0}|Bank|{1} financer.recurring-transaction-new.account-type.CASH={0}|Bar|{1} @@ -67,7 +68,7 @@ financer.recurring-transaction-list.table-header.actions=Aktionen financer.recurring-transaction-list.table.actions.createTransaction=Erstelle Buchung financer.recurring-transaction-list.table.actions.createTransactionWithAmount=Erstelle Buchung mit Betrag financer.recurring-transaction-list.table.actions.editRecurringTransaction=Bearbeiten -financer.recurring-transaction-list.table.actions.deleteRecurringTransaction=Löschen +financer.recurring-transaction-list.table.actions.deleteRecurringTransaction=L\u00F6schen financer.account-details.title=financer\: Kontodetails financer.account-details.available-actions=Verf\u00FCgbare Aktionen\: diff --git a/src/main/resources/templates/recurringTransaction/newRecurringTransaction.html b/src/main/resources/templates/recurringTransaction/newRecurringTransaction.html index 9fad278..3d1c603 100644 --- a/src/main/resources/templates/recurringTransaction/newRecurringTransaction.html +++ b/src/main/resources/templates/recurringTransaction/newRecurringTransaction.html @@ -39,6 +39,8 @@