diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml
index a754525a3b74d7eef4b08095047067a139b95166..9f6dcb4e198cdf0c059b3b9f0c68dff8ac80b74b 100644
--- a/BudgetMasterServer/pom.xml
+++ b/BudgetMasterServer/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>BudgetMaster</artifactId>
<groupId>de.deadlocker8</groupId>
- <version>2.17.1</version>
+ <version>2.17.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,7 +33,7 @@
<sortablejs.version>1.15.3</sortablejs.version>
<mousetrap.version>1.6.5</mousetrap.version>
<codemirror.version>5.62.2</codemirror.version>
- <selenium.version>4.25.0</selenium.version>
+ <selenium.version>4.26.0</selenium.version>
<jgit.version>7.0.0.202409031743-r</jgit.version>
<natorder.version>1.1.3</natorder.version>
<itextpdf.version>5.5.13.4</itextpdf.version>
@@ -42,7 +42,7 @@
<opencsv.version>5.9</opencsv.version>
<datatables.version>2.1.0</datatables.version>
<jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
- <junit-jupiter-engine.version>5.11.2</junit-jupiter-engine.version>
+ <junit-jupiter-engine.version>5.11.3</junit-jupiter-engine.version>
<project.outputDirectory>${project.build.directory}/../build/${project.version}</project.outputDirectory>
<project.artifactName>${project.artifactId}-v${project.version}</project.artifactName>
@@ -235,7 +235,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.5.2</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java
index 5354f34bd80266464189bf592d2a0c06dcf1549d..1c94c6fa48b6722fdfe12343e5050dbbe7574c32 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java
@@ -51,6 +51,7 @@ public class AboutController extends BaseController
newsEntries.add(NewsEntry.createWithLocalizationKey("accountDescription"));
newsEntries.add(NewsEntry.createWithLocalizationKey("transactionNameSuggestionsSort"));
newsEntries.add(NewsEntry.createWithLocalizationKey("bugfixCsvImport"));
+ newsEntries.add(NewsEntry.createWithLocalizationKey("bugfixEndDateReminder"));
model.addAttribute(ModelAttributes.NEWS_ENTRIES, newsEntries);
return ReturnValues.WHATS_NEW;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
index 329ee67a39c9bfd30b8a2ea69c2a436e1cbe8739..8df0dacec58f587f3e64aa352e5e20c5cc93f3cd 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
@@ -265,6 +265,11 @@ public class HelpersService
.sorted()
.toList();
+ if(accountsWithEndDateSoon.isEmpty())
+ {
+ return new AccountEndDateReminderData(false, List.of());
+ }
+
return new AccountEndDateReminderData(true, accountsWithEndDateSoon);
}
diff --git a/BudgetMasterServer/src/main/resources/languages/base_de.properties b/BudgetMasterServer/src/main/resources/languages/base_de.properties
index 6137e7ab0502b31e04e0c80f6baa98f9a1f3a6c7..9b794ef56673fb4f1ab8e9266927a4f2fa695238 100644
--- a/BudgetMasterServer/src/main/resources/languages/base_de.properties
+++ b/BudgetMasterServer/src/main/resources/languages/base_de.properties
@@ -1,7 +1,7 @@
locale=de
# DEFAULT
-credits=Verwendete Schriftarten: Roboto<br>Verwendete Bibliotheken:<br>spring-boot-starter-parent 3.3.4<br>spring-boot-devtools 3.3.4<br>spring-boot-starter-web 3.3.4<br>spring-boot-starter-test 3.3.4<br>spring-boot-starter-security 3.3.4<br>spring-boot-starter-freemarker 3.3.4<br>spring-boot-starter-validation 3.3.4<br>spring-boot-starter-data-jpa 3.3.4<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.2<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.5.2<br>Google Material Icons<br>Vanilla-picker 2.12.3<br>SortableJS 1.15.3<br>jlibs 3.2.0<br>itextpdf 5.5.13.4<br>mousetrap 1.6.5<br>plotly 2.35.2<br>momentjs 2.30.1<br>codemirror 5.62.2<br>webjars-locator 0.52<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 7.0.0.202409031743-r<br>opencsv 5.9<br>datatables 2.1.0<br>
+credits=Verwendete Schriftarten: Roboto<br>Verwendete Bibliotheken:<br>spring-boot-starter-parent 3.3.5<br>spring-boot-devtools 3.3.5<br>spring-boot-starter-web 3.3.5<br>spring-boot-starter-test 3.3.5<br>spring-boot-starter-security 3.3.5<br>spring-boot-starter-freemarker 3.3.5<br>spring-boot-starter-validation 3.3.5<br>spring-boot-starter-data-jpa 3.3.5<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.2<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.5.2<br>Google Material Icons<br>Vanilla-picker 2.12.3<br>SortableJS 1.15.3<br>jlibs 3.2.0<br>itextpdf 5.5.13.4<br>mousetrap 1.6.5<br>plotly 2.35.2<br>momentjs 2.30.1<br>codemirror 5.62.2<br>webjars-locator 0.52<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 7.0.0.202409031743-r<br>opencsv 5.9<br>datatables 2.1.0<br>
folder=Deadlocker/BudgetMaster
roadmap.url=https://roadmaps.thecodelabs.de/roadmap/1
github.url=https://github.com/deadlocker8/BudgetMaster
@@ -170,7 +170,7 @@ info.text.update=Es ist ein Update für BudgetMaster verfügbar<br><br>Installie
info.title.backup.reminder=Zeit für ein Backup
info.text.backup.reminder=Schon mal über ein Backup nachgedacht?<br>Du solltest deine BudgetMaster Datenbank regelmäßig sichern.<br>Dies geht besonders einfach in den Einstellungen.<br>Du kannst auch ein automatisches Backup konfigurieren.<br><br>(Du wilst diese Erinnerung nicht jeden Monat sehen? Dann deaktiviere die Backuperinnerung in den Einstellungen.)
info.button.backup.reminder=Zu den Einstellungen
-info.title.account.endDate=Account end dates
+info.title.account.endDate=Konten mit Enddaten
info.text.account.endDate.soon=Die folgenden Konten erreichen demnächst ihr Enddatum:
info.text.account.endDate.general=(Du wilst diese Erinnerung nicht mehr sehen? Dann deaktiviere die Enddatumserinnerung in den Einstellungen.)
info.button.account.endDate=Zur Accountübersicht
diff --git a/BudgetMasterServer/src/main/resources/languages/base_en.properties b/BudgetMasterServer/src/main/resources/languages/base_en.properties
index 8743c9362bedcb90bb55b4f39056de532bc24947..1b24c765ef84b6a33b563d9436e13440cd78395c 100644
--- a/BudgetMasterServer/src/main/resources/languages/base_en.properties
+++ b/BudgetMasterServer/src/main/resources/languages/base_en.properties
@@ -1,7 +1,7 @@
locale=en
# DEFAULT
-credits=Fonts used: Roboto<br>Libraries used:<br>spring-boot-starter-parent 3.3.4<br>spring-boot-devtools 3.3.4<br>spring-boot-starter-web 3.3.4<br>spring-boot-starter-test 3.3.4<br>spring-boot-starter-security 3.3.4<br>pring-boot-starter-freemarker 3.3.4<br>spring-boot-starter-validation 3.3.4<br>spring-boot-starter-data-jpa 3.3.4<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.2<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.5.2<br>Google Material Icons<br>Vanilla-picker 2.12.3<br>SortableJS 1.15.3<br>jlibs 3.2.0<br>itextpdf 5.5.13.4<br>mousetrap 1.6.5<br>plotly 2.35.2<br>momentjs 2.30.1<br>codemirror 5.62.2<br>webjars-locator 0.52<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 7.0.0.202409031743-r<br>opencsv 5.9<br>datatables 2.1.0<br>
+credits=Fonts used: Roboto<br>Libraries used:<br>spring-boot-starter-parent 3.3.5<br>spring-boot-devtools 3.3.5<br>spring-boot-starter-web 3.3.5<br>spring-boot-starter-test 3.3.5<br>spring-boot-starter-security 3.3.5<br>pring-boot-starter-freemarker 3.3.5<br>spring-boot-starter-validation 3.3.5<br>spring-boot-starter-data-jpa 3.3.5<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.2<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.5.2<br>Google Material Icons<br>Vanilla-picker 2.12.3<br>SortableJS 1.15.3<br>jlibs 3.2.0<br>itextpdf 5.5.13.4<br>mousetrap 1.6.5<br>plotly 2.35.2<br>momentjs 2.30.1<br>codemirror 5.62.2<br>webjars-locator 0.52<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 7.0.0.202409031743-r<br>opencsv 5.9<br>datatables 2.1.0<br>
folder=Deadlocker/BudgetMaster
roadmap.url=https://roadmaps.thecodelabs.de/roadmap/2
github.url=https://github.com/deadlocker8/BudgetMaster
diff --git a/BudgetMasterServer/src/main/resources/languages/news_de.properties b/BudgetMasterServer/src/main/resources/languages/news_de.properties
index 49b1c3ae4d1b3f91b4aa32f049fbd2e7af86f637..102b5c9b23b0d36cbd9752df84116dc7b7fdedd5 100644
--- a/BudgetMasterServer/src/main/resources/languages/news_de.properties
+++ b/BudgetMasterServer/src/main/resources/languages/news_de.properties
@@ -12,4 +12,7 @@ news.transactionNameSuggestionsSort.headline=Einstellungsoption für die Sortier
news.transactionNameSuggestionsSort.description=Neue Einstellungsoption hinzugefügt, um festzulegen, wie die Vorschläge für Transaktionsnamen sortiert werden (alphabetisch oder nach Häufigkeit der Verwendung).
news.bugfixCsvImport.headline=Bugfix: CSV Import
-news.bugfixCsvImport.description=Fehler behoben, der verhinderte, dass beim csv-Import die richtigen Spalten ausgewählt wurden, wenn die csv-Datei weniger Zeilen als Spalten hat.
\ No newline at end of file
+news.bugfixCsvImport.description=Fehler behoben, der verhinderte, dass beim csv-Import die richtigen Spalten ausgewählt wurden, wenn die csv-Datei weniger Zeilen als Spalten hat.
+
+news.bugfixEndDateReminder.headline=Bugfix: Enddatumserinnerung
+news.bugfixEndDateReminder.description=Fehler behoben, der dazu führte, dass die Enddatumserinnerung für Konten auch angezeigt wurde, wenn keine Konten ihr Enddatum bald erreichen.
\ No newline at end of file
diff --git a/BudgetMasterServer/src/main/resources/languages/news_en.properties b/BudgetMasterServer/src/main/resources/languages/news_en.properties
index ec45762abfb52cd6a9734f7028409f4aa54c1159..dd85923ddb354dea036bc1cd5257512062ad691d 100644
--- a/BudgetMasterServer/src/main/resources/languages/news_en.properties
+++ b/BudgetMasterServer/src/main/resources/languages/news_en.properties
@@ -12,4 +12,7 @@ news.transactionNameSuggestionsSort.headline=Settings option for transaction nam
news.transactionNameSuggestionsSort.description=Add new settings option to define how transaction name suggestions are ordered (alphabetically or by frequency of use).
news.bugfixCsvImport.headline=Bugfix: CSV import
-news.bugfixCsvImport.description=Fixed a bug that prevented to select the correct columns during csv import if the csv has fewer rows than columns .
\ No newline at end of file
+news.bugfixCsvImport.description=Fixed a bug that prevented to select the correct columns during csv import if the csv has fewer rows than columns.
+
+news.bugfixEndDateReminder.headline=Bugfix: End date reminder
+news.bugfixEndDateReminder.description=Fixed a bug that caused the end date reminder for accounts to be displayed even if no accounts are about to reach their end date.
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index bffc2debd5a8809ff83669d747cf9af9be1e3eba..b81bd1a073690f01e33252e43306434bff50aa4a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ARG APP_DIR=/BudgetMaster
RUN mkdir -p $APP_DIR
RUN mkdir -p /root/.Deadlocker/BudgetMaster
-COPY BudgetMasterServer/build/2.17.1/BudgetMasterServer-v2.17.1.jar /BudgetMaster/BudgetMaster.jar
+COPY BudgetMasterServer/build/2.17.2/BudgetMasterServer-v2.17.2.jar /BudgetMaster/BudgetMaster.jar
COPY BudgetMasterServer/src/main/resources/config/templates/settings-docker.properties /root/.Deadlocker/BudgetMaster/settings.properties
RUN echo "server.port=9000" > ~/.Deadlocker/BudgetMaster/settings.properties
diff --git a/README.md b/README.md
index 17f7918b49338133ef6058c109960eadc7fc354e..41bf0eeec451e054a70e011da4f0b9e0926ad59f 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
Manage your monthly budget easily with BudgetMaster
- __start:__ 17.12.16
-- __current release:__ v2.17.1 (48) from 14.10.24
+- __current release:__ v2.17.2 (49) from 15.11.24
## Key Features
- Keep your data private - Host your own BudgetMaster server or use it in standalone mode. All data remains on your machines.
diff --git a/pom.xml b/pom.xml
index b161e0d8996160ab1d3f7e37d1df8b7a119dc044..0a9b9637f2ac2ca127c279a0d1e1475ad9080c28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<groupId>de.deadlocker8</groupId>
<artifactId>BudgetMaster</artifactId>
<packaging>pom</packaging>
- <version>2.17.1</version>
+ <version>2.17.2</version>
<name>BudgetMaster</name>
<modules>
@@ -40,7 +40,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</parent>
<properties>
@@ -50,10 +50,10 @@
<app.versionDate>${maven.build.timestamp}</app.versionDate>
<maven.build.timestamp.format>dd.MM.yy</maven.build.timestamp.format>
- <app.versionCode>48</app.versionCode>
+ <app.versionCode>49</app.versionCode>
<app.author>Robert Goldmann</app.author>
- <testcontainer.version>1.20.2</testcontainer.version>
+ <testcontainer.version>1.20.3</testcontainer.version>
<assertj-core.version>3.26.3</assertj-core.version>
</properties>