From 6aa177bc4def43fc5919f7f360e8f1db63be13c7 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Thu, 28 Sep 2017 19:20:16 +0200
Subject: [PATCH] small adjustments to ui for #186

---
 .../logic/serverconnection/ServerConnection.java             | 2 +-
 .../budgetmaster/ui/controller/SearchController.java         | 5 ++---
 src/de/deadlocker8/budgetmaster/ui/fxml/SearchGUI.fxml       | 2 +-
 .../server/payment/search/PaymentSearch.java                 | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/de/deadlocker8/budgetmaster/logic/serverconnection/ServerConnection.java b/src/de/deadlocker8/budgetmaster/logic/serverconnection/ServerConnection.java
index 40d93c169..eea404083 100644
--- a/src/de/deadlocker8/budgetmaster/logic/serverconnection/ServerConnection.java
+++ b/src/de/deadlocker8/budgetmaster/logic/serverconnection/ServerConnection.java
@@ -331,7 +331,7 @@ public class ServerConnection
 		}
 	}
 	
-	public ArrayList<Payment> getPaymentForSearch(String query, boolean searchName, boolean searchDescription, boolean searchCategoryName, boolean searchTags) throws Exception
+	public ArrayList<Payment> getPaymentsForSearch(String query, boolean searchName, boolean searchDescription, boolean searchCategoryName, boolean searchTags) throws Exception
 	{
 		String urlString = settings.getUrl() + "/payment/search?secret=" + Helpers.getURLEncodedString(settings.getSecret()) + "&query=" + query;
 		if(searchName)
diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/SearchController.java b/src/de/deadlocker8/budgetmaster/ui/controller/SearchController.java
index 510448aa2..34558b992 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/SearchController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/SearchController.java
@@ -249,10 +249,9 @@ public class SearchController extends BaseController implements Styleable
 		
 		Worker.runLater(() -> {
 			try 
-			{
-				
+			{				
 				ServerConnection connection = new ServerConnection(controller.getSettings());
-				ArrayList<Payment> payments = connection.getPaymentForSearch(query, 
+				ArrayList<Payment> payments = connection.getPaymentsForSearch(query, 
 																			checkBoxName.isSelected(), 
 																			checkBoxDescription.isSelected(), 
 																			checkBoxCategoryName.isSelected(),
diff --git a/src/de/deadlocker8/budgetmaster/ui/fxml/SearchGUI.fxml b/src/de/deadlocker8/budgetmaster/ui/fxml/SearchGUI.fxml
index dbc0176ec..a22a3db2b 100644
--- a/src/de/deadlocker8/budgetmaster/ui/fxml/SearchGUI.fxml
+++ b/src/de/deadlocker8/budgetmaster/ui/fxml/SearchGUI.fxml
@@ -78,7 +78,7 @@
                         <HBox fx:id="hboxSearchByAmount" alignment="CENTER" spacing="10.0" HBox.hgrow="ALWAYS">
                            <children>
                               <TextField fx:id="textFieldAmountMin" prefHeight="25.0" prefWidth="55.0" />
-                              <HBox fx:id="hboxRangeSlider" prefHeight="32.0" prefWidth="123.0" />
+                              <HBox fx:id="hboxRangeSlider" prefHeight="32.0" prefWidth="123.0" HBox.hgrow="ALWAYS" />
                               <TextField fx:id="textFieldAmountMax" prefHeight="25.0" prefWidth="55.0" />
                            </children>
                         </HBox>
diff --git a/src/de/deadlocker8/budgetmasterserver/server/payment/search/PaymentSearch.java b/src/de/deadlocker8/budgetmasterserver/server/payment/search/PaymentSearch.java
index 42e718dff..7976f0086 100644
--- a/src/de/deadlocker8/budgetmasterserver/server/payment/search/PaymentSearch.java
+++ b/src/de/deadlocker8/budgetmasterserver/server/payment/search/PaymentSearch.java
@@ -75,7 +75,7 @@ public class PaymentSearch implements Route
 	private boolean meetsCriteria(Request req, Payment payment)
 	{
 		if(req.queryMap("query").value().toLowerCase().equals(""))
-			return false;
+			return true;
 		
 		if(!req.queryParams().contains("name") && !req.queryParams().contains("description") && !req.queryParams().contains("categoryName") && !req.queryParams().contains("tags"))
 			return false;
-- 
GitLab