Add Total balance field and Clear button
This commit is contained in:
@@ -41,9 +41,13 @@ public class RoutersController {
|
|||||||
@FXML
|
@FXML
|
||||||
private NumberField totalProfit;
|
private NumberField totalProfit;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private NumberField totalBalance;
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private void initialize(){
|
private void initialize(){
|
||||||
init();
|
init();
|
||||||
|
balance.numberProperty().addListener((ov, o, n) -> totalBalance.setValue(n));
|
||||||
add.disableProperty().bind(this.balance.wrongProperty().or(this.cargo.wrongProperty()));
|
add.disableProperty().bind(this.balance.wrongProperty().or(this.cargo.wrongProperty()));
|
||||||
tblOrders.setItems(FXCollections.observableArrayList());
|
tblOrders.setItems(FXCollections.observableArrayList());
|
||||||
tblOrders.getItems().addListener((ListChangeListener<OrderModel>) c -> {
|
tblOrders.getItems().addListener((ListChangeListener<OrderModel>) c -> {
|
||||||
@@ -68,6 +72,7 @@ public class RoutersController {
|
|||||||
vendors.setItems(market.vendorsProperty());
|
vendors.setItems(market.vendorsProperty());
|
||||||
vendors.getSelectionModel().selectFirst();
|
vendors.getSelectionModel().selectFirst();
|
||||||
tblOrders.getItems().clear();
|
tblOrders.getItems().clear();
|
||||||
|
totalBalance.setValue(balance.getValue());
|
||||||
totalProfit.setValue(0);
|
totalProfit.setValue(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -78,19 +83,19 @@ public class RoutersController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void onAdd(OrderModel order){
|
private void onAdd(OrderModel order){
|
||||||
balance.add(order.getProfit());
|
|
||||||
totalProfit.add(order.getProfit());
|
totalProfit.add(order.getProfit());
|
||||||
|
totalBalance.add(order.getProfit());
|
||||||
vendors.getSelectionModel().select(order.getBuyer().getVendor());
|
vendors.getSelectionModel().select(order.getBuyer().getVendor());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onRemove(OrderModel order) {
|
private void onRemove(OrderModel order) {
|
||||||
balance.sub(order.getProfit());
|
|
||||||
totalProfit.sub(order.getProfit());
|
totalProfit.sub(order.getProfit());
|
||||||
|
totalBalance.sub(order.getProfit());
|
||||||
vendors.getSelectionModel().select(order.getVendor());
|
vendors.getSelectionModel().select(order.getVendor());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addOrders(ActionEvent e){
|
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){
|
if (orders!=null){
|
||||||
tblOrders.getItems().addAll(orders);
|
tblOrders.getItems().addAll(orders);
|
||||||
}
|
}
|
||||||
@@ -103,4 +108,9 @@ public class RoutersController {
|
|||||||
tblOrders.getItems().remove(index);
|
tblOrders.getItems().remove(index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void removeAll(ActionEvent e){
|
||||||
|
tblOrders.getItems().clear();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,7 @@
|
|||||||
<HBox GridPane.columnSpan="2" GridPane.rowIndex="4" alignment="CENTER" spacing="5">
|
<HBox GridPane.columnSpan="2" GridPane.rowIndex="4" alignment="CENTER" spacing="5">
|
||||||
<Button fx:id="add" text="Добавить" onAction="#addOrders"/>
|
<Button fx:id="add" text="Добавить" onAction="#addOrders"/>
|
||||||
<Button text="Удалить" onAction="#removeSelected"/>
|
<Button text="Удалить" onAction="#removeSelected"/>
|
||||||
|
<Button text="Очистить" onAction="#removeAll" />
|
||||||
</HBox>
|
</HBox>
|
||||||
</GridPane>
|
</GridPane>
|
||||||
</TitledPane>
|
</TitledPane>
|
||||||
@@ -41,6 +42,8 @@
|
|||||||
<ColumnConstraints prefWidth="70"/>
|
<ColumnConstraints prefWidth="70"/>
|
||||||
<ColumnConstraints prefWidth="160"/>
|
<ColumnConstraints prefWidth="160"/>
|
||||||
</columnConstraints>
|
</columnConstraints>
|
||||||
|
<Label text="Баланс:"/>
|
||||||
|
<NumberField fx:id="totalBalance" prefWidth="100" GridPane.columnIndex="1" editable="false"/>
|
||||||
<Label text="Прибыль:" GridPane.rowIndex="1"/>
|
<Label text="Прибыль:" GridPane.rowIndex="1"/>
|
||||||
<NumberField fx:id="totalProfit" prefWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="1" editable="false"/>
|
<NumberField fx:id="totalProfit" prefWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="1" editable="false"/>
|
||||||
</GridPane>
|
</GridPane>
|
||||||
|
|||||||
Reference in New Issue
Block a user