From 56a70543ff8268fa05c74163f403530fcdb74f31 Mon Sep 17 00:00:00 2001
From: iMoHax <monah357@mail.ru>
Date: Sat, 21 Feb 2015 14:33:22 +0300
Subject: [PATCH] add offer type to search page

---
 .../trader/controllers/SearchController.java  | 14 ++++++++++++-
 .../java/ru/trader/model/MarketModel.java     |  4 ++--
 client/src/main/resources/view/search.fxml    | 20 +++++++++++--------
 core/src/main/java/ru/trader/core/Market.java |  4 ++++
 .../java/ru/trader/core/MarketAnalyzer.java   |  4 ++--
 5 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/client/src/main/java/ru/trader/controllers/SearchController.java b/client/src/main/java/ru/trader/controllers/SearchController.java
index bd5b548..21cce18 100644
--- a/client/src/main/java/ru/trader/controllers/SearchController.java
+++ b/client/src/main/java/ru/trader/controllers/SearchController.java
@@ -9,6 +9,7 @@ import javafx.util.StringConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import ru.trader.core.MarketFilter;
+import ru.trader.core.OFFER_TYPE;
 import ru.trader.core.SERVICE_TYPE;
 import ru.trader.model.*;
 import ru.trader.model.support.BindingsHelper;
@@ -26,6 +27,10 @@ public class SearchController {
     @FXML
     private ComboBox<SystemModel> source;
     @FXML
+    private RadioButton rbSeller;
+    @FXML
+    private RadioButton rbBuyer;
+    @FXML
     private ComboBox<ItemModel> items;
     @FXML
     private NumberField distance;
@@ -50,11 +55,17 @@ public class SearchController {
 
     private final List<ResultEntry> results = FXCollections.observableArrayList();
     private final ObservableList<ItemModel> itemsList = FXCollections.observableArrayList();
+    private final ToggleGroup offerType = new ToggleGroup();
 
     private MarketModel market;
 
     @FXML
     private void initialize() {
+        rbBuyer.setToggleGroup(offerType);
+        rbBuyer.setUserData(OFFER_TYPE.BUY);
+        rbSeller.setToggleGroup(offerType);
+        rbSeller.setUserData(OFFER_TYPE.SELL);
+        rbSeller.setSelected(true);
         items.setCellFactory(new CustomListCell<>(ItemModel::getName));
         items.setConverter(new StringConverter<ItemModel>() {
             @Override
@@ -108,7 +119,8 @@ public class SearchController {
             Collection<StationModel> stations = market.getStations(filter);
             fill(stations);
         } else {
-            Collection<OfferModel> offers = market.getOffers(item, filter);
+            OFFER_TYPE oType = (OFFER_TYPE) offerType.getSelectedToggle().getUserData();
+            Collection<OfferModel> offers = market.getOffers(oType, item, filter);
             fill(offers);
         }
     }
diff --git a/client/src/main/java/ru/trader/model/MarketModel.java b/client/src/main/java/ru/trader/model/MarketModel.java
index c212b54..e477421 100644
--- a/client/src/main/java/ru/trader/model/MarketModel.java
+++ b/client/src/main/java/ru/trader/model/MarketModel.java
@@ -123,8 +123,8 @@ public class MarketModel {
         return market.getStat(type, item);
     }
 
-    public ObservableList<OfferModel> getOffers(ItemModel item, MarketFilter filter){
-        return BindingsHelper.observableList(analyzer.getOffers(item.getItem(), filter), modeler::get);
+    public ObservableList<OfferModel> getOffers(OFFER_TYPE offerType, ItemModel item, MarketFilter filter){
+        return BindingsHelper.observableList(analyzer.getOffers(offerType, item.getItem(), filter), modeler::get);
     }
 
     public Collection<StationModel> getStations(MarketFilter filter){
diff --git a/client/src/main/resources/view/search.fxml b/client/src/main/resources/view/search.fxml
index a906c87..2f3bae1 100644
--- a/client/src/main/resources/view/search.fxml
+++ b/client/src/main/resources/view/search.fxml
@@ -26,12 +26,16 @@
             </columnConstraints>
             <Label text="%search.text.from" />
             <ComboBox fx:id="source" prefWidth="150" GridPane.columnIndex="1" />
-            <Label text="%search.text.item" GridPane.rowIndex="1"/>
-            <ComboBox fx:id="items" prefWidth="150" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
-            <Label text="%search.text.distance" GridPane.rowIndex="2" />
-            <NumberField fx:id="distance" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-            <Label text="%filter.services" GridPane.rowIndex="3" />
-            <TilePane hgap="5" vgap="5" tileAlignment="BASELINE_LEFT" GridPane.columnSpan="2" GridPane.rowIndex="4" >
+            <HBox GridPane.columnSpan="2" GridPane.rowIndex="1" spacing="10" alignment="BOTTOM_CENTER">
+                <RadioButton fx:id="rbSeller" text="%market.order.seller"/>
+                <RadioButton fx:id="rbBuyer" text="%market.order.buyer" />
+            </HBox>
+            <Label text="%search.text.item" GridPane.rowIndex="2"/>
+            <ComboBox fx:id="items" prefWidth="150" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+            <Label text="%search.text.distance" GridPane.rowIndex="3" />
+            <NumberField fx:id="distance" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+            <Label text="%filter.services" GridPane.rowIndex="4" />
+            <TilePane hgap="5" vgap="5" tileAlignment="BASELINE_LEFT" GridPane.columnSpan="2" GridPane.rowIndex="5" >
                 <CheckBox fx:id="cbMarket" text="%services.MARKET"/>
                 <CheckBox fx:id="cbBlackMarket" text="%services.BLACK_MARKET"/>
                 <CheckBox fx:id="cbRepair" text="%services.REPAIR"/>
@@ -41,8 +45,8 @@
                 <CheckBox fx:id="cbMediumLandpad" text="%services.MEDIUM_LANDPAD"/>
                 <CheckBox fx:id="cbLargeLandpad" text="%services.LARGE_LANDPAD"/>
             </TilePane>
-            <Separator GridPane.columnSpan="2" GridPane.rowIndex="5" GridPane.margin="$separator_margin"/>
-            <HBox GridPane.columnSpan="2" GridPane.rowIndex="6" spacing="10" alignment="CENTER">
+            <Separator GridPane.columnSpan="2" GridPane.rowIndex="6" GridPane.margin="$separator_margin"/>
+            <HBox GridPane.columnSpan="2" GridPane.rowIndex="7" spacing="10" alignment="CENTER">
                 <Button text="%search.button.find" onAction="#searchStations" />
             </HBox>
         </GridPane>
diff --git a/core/src/main/java/ru/trader/core/Market.java b/core/src/main/java/ru/trader/core/Market.java
index 1300d91..88d54f1 100644
--- a/core/src/main/java/ru/trader/core/Market.java
+++ b/core/src/main/java/ru/trader/core/Market.java
@@ -57,6 +57,10 @@ public interface Market {
         return getStatBuy(item).getOffers();
     }
 
+    default Collection<Offer> getOffers(OFFER_TYPE offerType, Item item){
+        return getStat(offerType, item).getOffers();
+    }
+
     default void add(Market market){
         // add groups
         Collection<Group> groups = market.getGroups();
diff --git a/core/src/main/java/ru/trader/core/MarketAnalyzer.java b/core/src/main/java/ru/trader/core/MarketAnalyzer.java
index 9c5b979..b2ea9b3 100644
--- a/core/src/main/java/ru/trader/core/MarketAnalyzer.java
+++ b/core/src/main/java/ru/trader/core/MarketAnalyzer.java
@@ -64,8 +64,8 @@ public class MarketAnalyzer {
         this.limit = count;
     }
 
-    public Collection<Offer> getOffers(Item item, MarketFilter filter){
-        Collection<Offer> offers = market.getSell(item);
+    public Collection<Offer> getOffers(OFFER_TYPE offerType, Item item, MarketFilter filter){
+        Collection<Offer> offers = market.getOffers(offerType, item);
         Collection<Offer> res = new ArrayList<>(offers.size());
         callback.setMax(offers.size());
         for (Offer offer : offers) {