diff --git a/Dockerfile b/Dockerfile index 73e1ca45e9cc7f8b9281a251f466d62536d14f5e..5f7946bb8a6421d439bb1cadde36553df5bb27b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM tomcat:9-jdk17 RUN rm -rf /usr/local/tomcat/webapps/* -COPY build/2.9.0/BudgetMaster-v2.9.0.war $CATALINA_HOME/webapps/ROOT.war +COPY build/2.9.1/BudgetMaster-v2.9.1.war $CATALINA_HOME/webapps/ROOT.war COPY src/main/resources/config/templates/settings-docker.properties /root/.Deadlocker/BudgetMaster/settings.properties EXPOSE 8080 \ No newline at end of file diff --git a/Dockerfile_jre b/Dockerfile_jre index 83ee4bab3c1f4f19d2dec3dd2097eec32db7430d..d9d8b93a837026c95056cdb2ac442944dd7ad3f1 100644 --- a/Dockerfile_jre +++ b/Dockerfile_jre @@ -5,7 +5,7 @@ ARG APP_DIR=/BudgetMaster RUN mkdir -p $APP_DIR RUN mkdir -p /root/.Deadlocker/BudgetMaster -COPY build/2.9.0/BudgetMaster-v2.9.0.jar /BudgetMaster/BudgetMaster.jar +COPY build/2.9.1/BudgetMaster-v2.9.1.jar /BudgetMaster/BudgetMaster.jar COPY 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/pom.xml b/pom.xml index 701039b9fbfafc151f9b5f1a1c56c569ce4270ba..6007ea2c7a18bf64da56123ab150ee95eecdb6b7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>de.deadlocker8</groupId> <artifactId>BudgetMaster</artifactId> - <version>2.9.0</version> + <version>2.9.1</version> <name>BudgetMaster</name> <repositories> @@ -77,7 +77,7 @@ <app.versionDate>${maven.build.timestamp}</app.versionDate> <maven.build.timestamp.format>dd.MM.yy</maven.build.timestamp.format> - <app.versionCode>35</app.versionCode> + <app.versionCode>36</app.versionCode> <app.author>Robert Goldmann</app.author> <project.outputDirectory>build/${project.version}</project.outputDirectory> diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java index 39ee8cfba0c33a864ca6ed942289c9212a98def4..f2b4fcbfd3cfd3a5294bc3314e3bf8cd4683197e 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java @@ -53,6 +53,7 @@ public class AboutController extends BaseController newsEntries.add(NewsEntry.createWithLocalizationKey("saveAndContinue")); newsEntries.add(NewsEntry.createWithLocalizationKey("newCharts")); newsEntries.add(NewsEntry.createWithLocalizationKey("fix.transferDirectionInCharts")); + newsEntries.add(NewsEntry.createWithLocalizationKey("fix.repeatingTransactions")); model.addAttribute(ModelAttributes.NEWS_ENTRIES, newsEntries); return ReturnValues.WHATS_NEW; diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java index 1e5e3b9b5c9abb55d8b9331f645b79068ef1b671..d0ee062c3f887e86af167d71404e44f5885818b4 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java @@ -218,7 +218,7 @@ public class TransactionController extends BaseController repeatingEnd = new RepeatingEndAfterXTimes(Integer.parseInt(repeatingEndValue)); break; case DATE: - LocalDate endDate = LocalDate.parse(repeatingEndValue, DateTimeFormatter.ofPattern(DateFormatStyle.NORMAL.getKey()).withLocale(settingsService.getSettings().getLanguage().getLocale())); + LocalDate endDate = LocalDate.parse(repeatingEndValue, DateTimeFormatter.ofPattern(DateFormatStyle.LONG.getKey()).withLocale(settingsService.getSettings().getLanguage().getLocale())); repeatingEnd = new RepeatingEndDate(endDate); break; } diff --git a/src/main/resources/languages/news_de.properties b/src/main/resources/languages/news_de.properties index 6cf823423f0e7a6fe3ce280310b300f6e1847c46..5a758f5acd5d94631b37fec054214fb14008d453 100644 --- a/src/main/resources/languages/news_de.properties +++ b/src/main/resources/languages/news_de.properties @@ -19,3 +19,7 @@ news.newCharts.description=BudgetMaster bietet jetzt vier neue Standarddiagramme news.fix.transferDirectionInCharts.headline=Bugfix: Verhalten von Umbuchungen in Diagrammen news.fix.transferDirectionInCharts.description=Umbuchungen werden in Diagrammen nun entsprechend ihrer Richtung behandelt. + +news.fix.repeatingTransactions.headline=Bugfix: Fehler beim Speichern von wiederholenden Buchungen behoben +news.fix.repeatingTransactions.description=Fehler behoben, der beim Speichern von Buchungen, die sich wiederholen und an einem bestimmten Datum enden sollen, entstand. + diff --git a/src/main/resources/languages/news_en.properties b/src/main/resources/languages/news_en.properties index 5b3543c43a63c6179140660a27ecaaca609a5fca..ca46d84a06551f612792fa539eddcf3d96a1d299 100644 --- a/src/main/resources/languages/news_en.properties +++ b/src/main/resources/languages/news_en.properties @@ -19,3 +19,6 @@ news.newCharts.description=BudgetMaster now features four new default charts. news.fix.transferDirectionInCharts.headline=Bugfix: Transfer direction in charts news.fix.transferDirectionInCharts.description=The direction of a transfer is now respected in charts. + +news.fix.repeatingTransactions.headline=Bugfix: Fixed error when saving repeating transactions +news.fix.repeatingTransactions.description=Fixed an error that occurred when saving repeating transaction that should end on a certain date.