From f63c3f8c9299ac178c0c0dd429d023e9c78ee843 Mon Sep 17 00:00:00 2001
From: iMoHax <born19th@gmail.com>
Date: Mon, 28 Jul 2014 15:24:21 +0400
Subject: [PATCH] Add Total balance field and Clear button

---
 .../ru/trader/controllers/RoutersController.java | 16 +++++++++++++---
 client/src/main/resources/view/routers.fxml      |  3 +++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/client/src/main/java/ru/trader/controllers/RoutersController.java b/client/src/main/java/ru/trader/controllers/RoutersController.java
index 81f9602..c46ba89 100644
--- a/client/src/main/java/ru/trader/controllers/RoutersController.java
+++ b/client/src/main/java/ru/trader/controllers/RoutersController.java
@@ -41,9 +41,13 @@ public class RoutersController {
     @FXML
     private NumberField totalProfit;
 
+    @FXML
+    private NumberField totalBalance;
+
     @FXML
     private void initialize(){
         init();
+        balance.numberProperty().addListener((ov, o, n) -> totalBalance.setValue(n));
         add.disableProperty().bind(this.balance.wrongProperty().or(this.cargo.wrongProperty()));
         tblOrders.setItems(FXCollections.observableArrayList());
         tblOrders.getItems().addListener((ListChangeListener<OrderModel>) c -> {
@@ -68,6 +72,7 @@ public class RoutersController {
         vendors.setItems(market.vendorsProperty());
         vendors.getSelectionModel().selectFirst();
         tblOrders.getItems().clear();
+        totalBalance.setValue(balance.getValue());
         totalProfit.setValue(0);
     }
 
@@ -78,19 +83,19 @@ public class RoutersController {
     }
 
     private void onAdd(OrderModel order){
-        balance.add(order.getProfit());
         totalProfit.add(order.getProfit());
+        totalBalance.add(order.getProfit());
         vendors.getSelectionModel().select(order.getBuyer().getVendor());
     }
 
     private void onRemove(OrderModel order) {
-        balance.sub(order.getProfit());
         totalProfit.sub(order.getProfit());
+        totalBalance.sub(order.getProfit());
         vendors.getSelectionModel().select(order.getVendor());
     }
 
     public void addOrders(ActionEvent e){
-        Collection<OrderModel> orders = Screeners.showOrders(getOffers(), balance.getValue().doubleValue(), cargo.getValue().longValue());
+        Collection<OrderModel> orders = Screeners.showOrders(getOffers(), totalBalance.getValue().doubleValue(), cargo.getValue().longValue());
         if (orders!=null){
             tblOrders.getItems().addAll(orders);
         }
@@ -103,4 +108,9 @@ public class RoutersController {
             tblOrders.getItems().remove(index);
         }
     }
+
+    public void removeAll(ActionEvent e){
+        tblOrders.getItems().clear();
+    }
+
 }
diff --git a/client/src/main/resources/view/routers.fxml b/client/src/main/resources/view/routers.fxml
index 6796422..16a4f28 100644
--- a/client/src/main/resources/view/routers.fxml
+++ b/client/src/main/resources/view/routers.fxml
@@ -31,6 +31,7 @@
                 <HBox GridPane.columnSpan="2" GridPane.rowIndex="4" alignment="CENTER" spacing="5">
                     <Button fx:id="add" text="Добавить" onAction="#addOrders"/>
                     <Button text="Удалить" onAction="#removeSelected"/>
+                    <Button text="Очистить" onAction="#removeAll" />
                 </HBox>
             </GridPane>
         </TitledPane>
@@ -41,6 +42,8 @@
                     <ColumnConstraints prefWidth="70"/>
                     <ColumnConstraints prefWidth="160"/>
                 </columnConstraints>
+                <Label text="Баланс:"/>
+                <NumberField fx:id="totalBalance" prefWidth="100" GridPane.columnIndex="1" editable="false"/>
                 <Label text="Прибыль:"  GridPane.rowIndex="1"/>
                 <NumberField fx:id="totalProfit" prefWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="1" editable="false"/>
             </GridPane>