Voomra/trader
Archived
0
Fork 0
Code Activity

Add Total balance field and Clear button

Browse Source
This commit is contained in:
iMoHax
2014-07-28 15:24:21 +04:00
parent a0b846deb0
commit f63c3f8c92
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/main/java/ru/trader/controllers/RoutersController.java
View File

@@ -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();
}
}

3
client/src/main/resources/view/routers.fxml
View File

@@ -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>