Add flag to control whether to remind about maturity of rec. transaction
This commit is contained in:
@@ -50,7 +50,8 @@ public class RecurringTransactionController {
|
|||||||
.queryParam("lastOccurrence", ControllerUtils.formatDate(this.financerConfig, form.getLastOccurrence()))
|
.queryParam("lastOccurrence", ControllerUtils.formatDate(this.financerConfig, form.getLastOccurrence()))
|
||||||
.queryParam("holidayWeekendType", form.getHolidayWeekendType())
|
.queryParam("holidayWeekendType", form.getHolidayWeekendType())
|
||||||
.queryParam("intervalType", form.getIntervalType())
|
.queryParam("intervalType", form.getIntervalType())
|
||||||
.queryParam("description", form.getDescription());
|
.queryParam("description", form.getDescription())
|
||||||
|
.queryParam("remind", form.getRemind());
|
||||||
|
|
||||||
final ResponseEntity<String> response = new StringTemplate().exchange(builder);
|
final ResponseEntity<String> response = new StringTemplate().exchange(builder);
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ public class NewRecurringTransactionForm {
|
|||||||
private String lastOccurrence;
|
private String lastOccurrence;
|
||||||
private String intervalType;
|
private String intervalType;
|
||||||
private String holidayWeekendType;
|
private String holidayWeekendType;
|
||||||
|
private Boolean remind;
|
||||||
|
|
||||||
public String getFromAccountKey() {
|
public String getFromAccountKey() {
|
||||||
return fromAccountKey;
|
return fromAccountKey;
|
||||||
@@ -73,4 +74,12 @@ public class NewRecurringTransactionForm {
|
|||||||
public void setHolidayWeekendType(String holidayWeekendType) {
|
public void setHolidayWeekendType(String holidayWeekendType) {
|
||||||
this.holidayWeekendType = holidayWeekendType;
|
this.holidayWeekendType = holidayWeekendType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Boolean getRemind() {
|
||||||
|
return remind;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRemind(Boolean remind) {
|
||||||
|
this.remind = remind;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ public class RecurringTransaction {
|
|||||||
private LocalDate firstOccurrence;
|
private LocalDate firstOccurrence;
|
||||||
private LocalDate lastOccurrence;
|
private LocalDate lastOccurrence;
|
||||||
private HolidayWeekendType holidayWeekendType;
|
private HolidayWeekendType holidayWeekendType;
|
||||||
|
private boolean remind;
|
||||||
|
|
||||||
public Long getId() {
|
public Long getId() {
|
||||||
return id;
|
return id;
|
||||||
@@ -80,4 +81,12 @@ public class RecurringTransaction {
|
|||||||
public void setIntervalType(IntervalType intervalType) {
|
public void setIntervalType(IntervalType intervalType) {
|
||||||
this.intervalType = intervalType;
|
this.intervalType = intervalType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isRemind() {
|
||||||
|
return remind;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRemind(boolean remind) {
|
||||||
|
this.remind = remind;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.interval-type=Interval\:
|
||||||
financer.recurring-transaction-new.label.holiday-weekend-type=Holiday/weekend rule\:
|
financer.recurring-transaction-new.label.holiday-weekend-type=Holiday/weekend rule\:
|
||||||
financer.recurring-transaction-new.label.description=Description\:
|
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.submit=Create recurring transaction
|
||||||
financer.recurring-transaction-new.account-type.BANK={0}|Bank|{1}
|
financer.recurring-transaction-new.account-type.BANK={0}|Bank|{1}
|
||||||
financer.recurring-transaction-new.account-type.CASH={0}|Cash|{1}
|
financer.recurring-transaction-new.account-type.CASH={0}|Cash|{1}
|
||||||
|
|||||||
@@ -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.interval-type=Intervall\:
|
||||||
financer.recurring-transaction-new.label.holiday-weekend-type=Feiertag-/Wochenendregel\:
|
financer.recurring-transaction-new.label.holiday-weekend-type=Feiertag-/Wochenendregel\:
|
||||||
financer.recurring-transaction-new.label.description=Beschreibung\:
|
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.submit=Wiederkehrende Buchung erstellen
|
||||||
financer.recurring-transaction-new.account-type.BANK={0}|Bank|{1}
|
financer.recurring-transaction-new.account-type.BANK={0}|Bank|{1}
|
||||||
financer.recurring-transaction-new.account-type.CASH={0}|Bar|{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.createTransaction=Erstelle Buchung
|
||||||
financer.recurring-transaction-list.table.actions.createTransactionWithAmount=Erstelle Buchung mit Betrag
|
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.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.title=financer\: Kontodetails
|
||||||
financer.account-details.available-actions=Verf\u00FCgbare Aktionen\:
|
financer.account-details.available-actions=Verf\u00FCgbare Aktionen\:
|
||||||
|
|||||||
@@ -39,6 +39,8 @@
|
|||||||
</select>
|
</select>
|
||||||
<label for="inputDescription" th:text="#{financer.recurring-transaction-new.label.description}"/>
|
<label for="inputDescription" th:text="#{financer.recurring-transaction-new.label.description}"/>
|
||||||
<input type="text" id="inputDescription" th:field="*{description}"/>
|
<input type="text" id="inputDescription" th:field="*{description}"/>
|
||||||
|
<label for="inputRemind" th:text="#{financer.recurring-transaction-new.label.remind}" />
|
||||||
|
<input type="checkbox" id="inputRemind" th:field="*{remind}" />
|
||||||
<input type="submit" th:value="#{financer.recurring-transaction-new.submit}"/>
|
<input type="submit" th:value="#{financer.recurring-transaction-new.submit}"/>
|
||||||
</form>
|
</form>
|
||||||
<div th:replace="includes/footer :: footer"/>
|
<div th:replace="includes/footer :: footer"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user