diff --git a/Accounting report.iml b/Accounting report.iml index 3af661f..3d1d5a8 100644 --- a/Accounting report.iml +++ b/Accounting report.iml @@ -40,6 +40,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/sample/Controller.java b/src/main/java/sample/Controller.java index 22be1b4..9e42427 100644 --- a/src/main/java/sample/Controller.java +++ b/src/main/java/sample/Controller.java @@ -10,9 +10,7 @@ import javafx.scene.input.MouseEvent; import sample.model.*; import javafx.scene.control.TableColumn; -import sample.service.CheckService; -import sample.service.OrderService; -import sample.service.ProductService; +import sample.service.*; import java.time.LocalTime; import java.util.Date; @@ -26,7 +24,7 @@ public class Controller { @FXML public TextField fieldProductName; @FXML - public TextField fieldProductType; + public ChoiceBox fieldProductType; @FXML public TextField fieldProductPrice; @FXML @@ -48,19 +46,19 @@ public class Controller { private OrderService orderService = new OrderService(); private ObservableList ordersList = FXCollections.observableArrayList(); @FXML - public TextField fieldIdOrder; + public TextField fieldOrderId; @FXML - public ChoiceBox fieldDateOrder; + public ChoiceBox fieldOrderDate; @FXML - public ChoiceBox fieldTimeOrder; + public ChoiceBox fieldOrderTime; @FXML - public ChoiceBox fieldHallOrder; + public ChoiceBox fieldOrderHall; @FXML - public ChoiceBox fieldTableOrder; + public ChoiceBox fieldOrderTable; @FXML - public TextField fieldCustomerOrder; + public TextField fieldOrderCustomer; @FXML - public TextField fieldTelephoneOrder; + public TextField fieldOrderTelephone; @FXML private TableView tableOrder; @FXML @@ -82,11 +80,11 @@ public class Controller { private ObservableList checksList = FXCollections.observableArrayList(); private CheckService checkService = new CheckService(); @FXML - public ChoiceBox fieldNameCheck; + public ChoiceBox fieldCheckName; @FXML - public TextField fieldCountCheck; + public TextField fieldCheckCount; @FXML - public TextField fieldPriceCheck; + public TextField fieldCheckPrice; @FXML private TableView tableCheck; @FXML @@ -96,10 +94,41 @@ public class Controller { @FXML private TableColumn priceOrderColumn; - - + /***ProductCategories***/ + private ProductCategoriesService productCategoriesService = new ProductCategoriesService(); private ObservableList productCategoriesList = FXCollections.observableArrayList(); - private ObservableList tablesList = FXCollections.observableArrayList(); + @FXML + public TextField fieldProductCategoriesId; + @FXML + public TextField fieldProductCategoriesName; + @FXML + private TableView tableProductCategories; + @FXML + private TableColumn idProductCategoriesColumn; + @FXML + private TableColumn nameProductCategoriesColumn; + + /***Tables***/ + private TableService tableService = new TableService(); + private ObservableList tableList = FXCollections.observableArrayList(); + @FXML + public TextField fieldTablesId; + @FXML + public TextField fieldTablesName; + @FXML + public TextField fieldTablesNumTables; + @FXML + public TextField fieldTablesPrice; + @FXML + private TableView tableTables; + @FXML + private TableColumn idTablesColumn; + @FXML + private TableColumn hallTablesColumn; + @FXML + private TableColumn nameNumTablesColumn; + @FXML + private TableColumn priceTablesColumn; @@ -138,20 +167,20 @@ public void onClickProductTableView(MouseEvent mouseEvent) { if(index<0)return; fieldProductId.setText(Integer.toString(tableProduct.getSelectionModel().getTableView().getItems().get(index).getId())); fieldProductName.setText(tableProduct.getSelectionModel().getTableView().getItems().get(index).getName()); - fieldProductType.setText(tableProduct.getSelectionModel().getTableView().getItems().get(index).getType()); + ///fieldProductType.setText(tableProduct.getSelectionModel().getTableView().getItems().get(index).getType()); fieldProductPrice.setText(Integer.toString(tableProduct.getSelectionModel().getTableView().getItems().get(index).getPrice())); fieldProductCount.setText(Integer.toString(tableProduct.getSelectionModel().getTableView().getItems().get(index).getCount())); } public void onClickProductApply(MouseEvent mouseEvent) { - Product product = new Product(Integer.valueOf(fieldProductId.getText()),fieldProductName.getText(),fieldProductType.getText(), Integer.valueOf(fieldProductPrice.getText()),Integer.valueOf(fieldProductCount.getText())); + /*Product product = new Product(Integer.valueOf(fieldProductId.getText()),fieldProductName.getText(),fieldProductType.getText(), Integer.valueOf(fieldProductPrice.getText()),Integer.valueOf(fieldProductCount.getText())); if(!fieldProductId.getText().isEmpty() && productService.findById(Integer.valueOf(fieldProductId.getText()))!=null){ productService.update(product); }else{ productService.save(product); } productList.clear(); - productList.addAll(productService.findAll()); + productList.addAll(productService.findAll());*/ } public void onClickProductDelete(MouseEvent mouseEvent) { diff --git a/src/main/resources/fxml/sample.fxml b/src/main/resources/fxml/sample.fxml index ac824af..a304b3c 100644 --- a/src/main/resources/fxml/sample.fxml +++ b/src/main/resources/fxml/sample.fxml @@ -25,15 +25,15 @@ - + - + - + @@ -45,20 +45,20 @@ - - - -