diff --git a/client/src/main/java/ru/trader/controllers/VendorEditorController.java b/client/src/main/java/ru/trader/controllers/VendorEditorController.java index 489be49..c87fd78 100644 --- a/client/src/main/java/ru/trader/controllers/VendorEditorController.java +++ b/client/src/main/java/ru/trader/controllers/VendorEditorController.java @@ -68,7 +68,15 @@ public class VendorEditorController { items.getSelectionModel().setCellSelectionEnabled(true); buy.setCellFactory(TextFieldCell.forTableColumn(new PriceStringConverter())); sell.setCellFactory(TextFieldCell.forTableColumn(new PriceStringConverter())); + actSave.disabledProperty().bind(x.wrongProperty().or(y.wrongProperty().or(z.wrongProperty()))); fillItems(); + name.setOnAction((v)->x.requestFocus()); + x.setOnAction((v) -> z.requestFocus()); + z.setOnAction((v) -> y.requestFocus()); + y.setOnAction((v) -> { + items.requestFocus(); + items.getSelectionModel().select(0, buy); + }); } public Action showDialog(Parent parent, Parent content, VendorModel vendor){ @@ -96,6 +104,9 @@ public class VendorEditorController { private void reset(){ name.setText(""); + x.setValue(0); + y.setValue(0); + z.setValue(0); items.getItems().forEach(FakeOffer::reset); } diff --git a/client/src/main/resources/view/vEditor.fxml b/client/src/main/resources/view/vEditor.fxml index e3d728c..e78ef7f 100644 --- a/client/src/main/resources/view/vEditor.fxml +++ b/client/src/main/resources/view/vEditor.fxml @@ -17,10 +17,10 @@