From 7ca0b6a65524772ecaaf2b22cb581e7a75a1a9bd Mon Sep 17 00:00:00 2001 From: iMoHax Date: Fri, 11 Sep 2015 15:51:32 +0300 Subject: [PATCH] add by time checkbox --- .../java/ru/trader/controllers/RouteSearchController.java | 8 ++++++-- client/src/main/resources/view/routeSearch.fxml | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/src/main/java/ru/trader/controllers/RouteSearchController.java b/client/src/main/java/ru/trader/controllers/RouteSearchController.java index 7bf3f50..39b9dd1 100644 --- a/client/src/main/java/ru/trader/controllers/RouteSearchController.java +++ b/client/src/main/java/ru/trader/controllers/RouteSearchController.java @@ -1,6 +1,7 @@ package ru.trader.controllers; import javafx.fxml.FXML; +import javafx.scene.control.CheckBox; import javafx.scene.control.ComboBox; import javafx.scene.control.ListView; import javafx.scene.control.TextField; @@ -24,6 +25,8 @@ public class RouteSearchController { @FXML private ComboBox toStation; @FXML + private CheckBox cbFast; + @FXML private ListView missionsList; @FXML private MissionsController missionsController; @@ -42,9 +45,9 @@ public class RouteSearchController { market = MainController.getMarket(); profile = MainController.getProfile(); SystemsProvider provider = new SystemsProvider(market); - fromSystem = new AutoCompletion<>(fromSystemText, provider, provider.getConverter()); + fromSystem = new AutoCompletion<>(fromSystemText, provider, ModelFabric.NONE_SYSTEM, provider.getConverter()); provider = new SystemsProvider(market); - toSystem = new AutoCompletion<>(toSystemText, provider, provider.getConverter()); + toSystem = new AutoCompletion<>(toSystemText, provider, ModelFabric.NONE_SYSTEM, provider.getConverter()); } private void initListeners(){ @@ -73,6 +76,7 @@ public class RouteSearchController { StationModel tS = toStation.getValue(); CrawlerSpecificator specificator = new CrawlerSpecificator(); + specificator.setByTime(cbFast.isSelected()); missionsList.getItems().forEach(m -> m.toSpecification(specificator)); market.getRoutes(f, fS, t, tS, profile.getBalance(), specificator, routes -> { Optional path = Screeners.showRouters(routes); diff --git a/client/src/main/resources/view/routeSearch.fxml b/client/src/main/resources/view/routeSearch.fxml index 3742df5..ac997e3 100644 --- a/client/src/main/resources/view/routeSearch.fxml +++ b/client/src/main/resources/view/routeSearch.fxml @@ -23,6 +23,7 @@