From f892a8fca21f67268f3a03923770b3a05c6cebc9 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sat, 21 Nov 2020 17:08:19 +0100 Subject: [PATCH] #542 - converted command line option to property ins settings.properties --- .../java/de/deadlocker8/budgetmaster/ProgramArgs.java | 5 ----- .../budgetmaster/services/HelpersService.java | 9 +++++++++ .../templates/transactions/newTransactionMacros.ftl | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/deadlocker8/budgetmaster/ProgramArgs.java b/src/main/java/de/deadlocker8/budgetmaster/ProgramArgs.java index b15699d79..f36195409 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/ProgramArgs.java +++ b/src/main/java/de/deadlocker8/budgetmaster/ProgramArgs.java @@ -60,9 +60,4 @@ public class ProgramArgs { return RunMode.currentRunMode.equals(RunMode.TEST); } - - public static boolean isUseSimpleDatepickerForTransactions() - { - return ProgramArgs.getArgs().contains("--useSimpleDatepicker"); - } } \ No newline at end of file diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java index 50bf4d93b..3cdd03948 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java @@ -22,6 +22,7 @@ import de.deadlocker8.budgetmaster.utils.LanguageType; import de.thecodelabs.utils.util.ColorUtilsNonJavaFX; import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -49,6 +50,9 @@ public class HelpersService @Autowired private CategoryRepository categoryRepository; + @Value("${use.simple.datepicker:false}") + private boolean useSimpleDatepickerForTransactions; + public List<LanguageType> getAvailableLanguages() { return Arrays.asList(LanguageType.values()); @@ -195,4 +199,9 @@ public class HelpersService { return transactionService.getRepository().countByCategory(category); } + + public boolean isUseSimpleDatepickerForTransactions() + { + return useSimpleDatepickerForTransactions; + } } \ No newline at end of file diff --git a/src/main/resources/templates/transactions/newTransactionMacros.ftl b/src/main/resources/templates/transactions/newTransactionMacros.ftl index 1f2e7efac..16fd54458 100644 --- a/src/main/resources/templates/transactions/newTransactionMacros.ftl +++ b/src/main/resources/templates/transactions/newTransactionMacros.ftl @@ -137,7 +137,7 @@ <#assign startDate = dateService.getLongDateString(currentDate)/> </#if> - <input id="transaction-datepicker" type="text" class="datepicker<#if programArgs.isUseSimpleDatepickerForTransactions()>-simple</#if>" name="date" value="${startDate}"> + <input id="transaction-datepicker" type="text" class="datepicker<#if helpers.isUseSimpleDatepickerForTransactions()>-simple</#if>" name="date" value="${startDate}"> <label class="input-label" for="transaction-datepicker">${locale.getString("transaction.new.label.date")}</label> </div> </div> @@ -330,7 +330,7 @@ <td class="cell">${locale.getString("repeating.end.date")}</td> <td class="cell input-cell"> <div class="input-field no-margin"> - <input class="datepicker<#if programArgs.isUseSimpleDatepickerForTransactions()>-simple</#if> no-margin input-min-width" id="transaction-repeating-end-date-input" type="text" value="${endDate}"> + <input class="datepicker<#if helpers.isUseSimpleDatepickerForTransactions()>-simple</#if> no-margin input-min-width" id="transaction-repeating-end-date-input" type="text" value="${endDate}"> <label for="transaction-repeating-end-date-input"></label> </div> </td> -- GitLab