#760 - added new switch to transaction settings container

BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/containers/TransactionsSettingsContainer.java

@@ -11,12 +11,13 @@ import java.util.List;
 public final class TransactionsSettingsContainer implements SettingsContainer
 {
 	private Boolean restActivated;
-
+	private Boolean orderTransactionNameSuggestionsAlphabetically;
 	private List<TransactionNameKeyword> keywords;
 
-	public TransactionsSettingsContainer(Boolean restActivated, List<TransactionNameKeyword> keywords)
+	public TransactionsSettingsContainer(Boolean restActivated, Boolean orderTransactionNameSuggestionsAlphabetically, List<TransactionNameKeyword> keywords)
 	{
 		this.restActivated = restActivated;
+		this.orderTransactionNameSuggestionsAlphabetically = orderTransactionNameSuggestionsAlphabetically;
 		this.keywords = keywords;
 	}
 
@@ -33,6 +34,10 @@ public final class TransactionsSettingsContainer implements SettingsContainer
 		{
 			restActivated = false;
 		}
+		if(orderTransactionNameSuggestionsAlphabetically == null)
+		{
+			orderTransactionNameSuggestionsAlphabetically = false;
+		}
 	}
 
 	@Override
@@ -59,6 +64,7 @@ public final class TransactionsSettingsContainer implements SettingsContainer
 		final Settings settings = settingsService.getSettings();
 
 		settings.setRestActivated(restActivated);
+		settings.setOrderTransactionNameSuggestionsAlphabetically(orderTransactionNameSuggestionsAlphabetically);
 
 		return settings;
 	}

BudgetMasterServer/src/main/resources/languages/base_de.properties

@@ -269,6 +269,10 @@ settings.rest=Saldos anzeigen
 settings.rest.deactivated=Aus
 settings.rest.activated=An
 settings.rest.description=Zeigt den Saldo des letzten Monats und des aktuellen Monatsendes in der Buchungsübersicht an
+settings.transactionNameSuggestionOrder=Sortierung der Namensvorschläge
+settings.transactionNameSuggestionOrder.deactivated=nach Nutzungshäufigkeit
+settings.transactionNameSuggestionOrder.activated=alphabetisch
+settings.transactionNameSuggestionOrder.description=Legt die Sortierung von Namensvorschlägen für Buchungen fest
 settings.darkTheme=Design
 settings.darkTheme.deactivated=Helles Design
 settings.darkTheme.activated=Dunkles Design

BudgetMasterServer/src/main/resources/languages/base_en.properties

@@ -269,6 +269,10 @@ settings.rest=Show balances
 settings.rest.deactivated=Off
 settings.rest.activated=On
 settings.rest.description=Show the balance of the last month and of the current month end in the transaction overview
+settings.transactionNameSuggestionOrder=Order name suggestions
+settings.transactionNameSuggestionOrder.deactivated=by frequency of use
+settings.transactionNameSuggestionOrder.activated=alphabetically
+settings.transactionNameSuggestionOrder.description=Defines how the transaction name suggestions are ordered.
 settings.darkTheme=Theme
 settings.darkTheme.deactivated=Light Theme
 settings.darkTheme.activated=Dark Theme

BudgetMasterServer/src/main/resources/templates/settings/containers/settingsTransactions.ftl

@@ -13,16 +13,21 @@
                 <div class="table-container">
                     <div class="table-cell">
                         <div class="switch-cell-margin">${locale.getString("settings.rest")}</div>
+                        <div class="switch-cell-margin">${locale.getString("settings.transactionNameSuggestionOrder")}</div>
                     </div>
                     <div class="table-cell table-cell-spacer"></div>
                     <div class="table-cell">
                         <@settingsMacros.switch "rest" "restActivated" settings.isRestActivated()/>
+                        <@settingsMacros.switch "transactionNameSuggestionOrder" "orderTransactionNameSuggestionsAlphabetically" settings.getOrderTransactionNameSuggestionsAlphabetically()?? && settings.getOrderTransactionNameSuggestionsAlphabetically()/>
                     </div>
                     <div class="table-cell table-cell-spacer"></div>
                     <div class="table-cell">
                         <div class="switch-cell-margin">
                             <a class="btn btn-flat tooltipped text-default" data-position="bottom" data-tooltip="${locale.getString("settings.rest.description")}"><i class="material-icons">help_outline</i></a>
                         </div>
+                        <div class="switch-cell-margin">
+                            <a class="btn btn-flat tooltipped text-default" data-position="bottom" data-tooltip="${locale.getString("settings.transactionNameSuggestionOrder.description")}"><i class="material-icons">help_outline</i></a>
+                        </div>
                     </div>
                 </div>
             </div>

BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/settings/containers/TransactionSettingsContainerTest.java

@@ -27,7 +27,7 @@ class TransactionSettingsContainerTest
 	@Test
 	void test_validate_valid()
 	{
-		final TransactionsSettingsContainer container = new TransactionsSettingsContainer(true, List.of());
+		final TransactionsSettingsContainer container = new TransactionsSettingsContainer(true, true, List.of());
 
 		final Errors errors = new BeanPropertyBindingResult(container, "container");
 		container.validate(errors);
@@ -39,12 +39,13 @@ class TransactionSettingsContainerTest
 	@Test
 	void test_fixBooleans()
 	{
-		final TransactionsSettingsContainer container = new TransactionsSettingsContainer(null, List.of());
+		final TransactionsSettingsContainer container = new TransactionsSettingsContainer(null, null, List.of());
 
 		container.fixBooleans();
 
 		assertThat(container)
-				.hasFieldOrPropertyWithValue("restActivated", false);
+				.hasFieldOrPropertyWithValue("restActivated", false)
+				.hasFieldOrPropertyWithValue("orderTransactionNameSuggestionsAlphabetically", false);
 	}
 
 	@Test
@@ -54,10 +55,11 @@ class TransactionSettingsContainerTest
 
 		Mockito.when(settingsService.getSettings()).thenReturn(defaultSettings);
 
-		final TransactionsSettingsContainer container = new TransactionsSettingsContainer(false, List.of());
+		final TransactionsSettingsContainer container = new TransactionsSettingsContainer(false, false, List.of());
 		final Settings updatedSettings = container.updateSettings(settingsService);
 
 		assertThat(updatedSettings)
-				.hasFieldOrPropertyWithValue("restActivated", false);
+				.hasFieldOrPropertyWithValue("restActivated", false)
+				.hasFieldOrPropertyWithValue("orderTransactionNameSuggestionsAlphabetically", false);
 	}
 }