Skip to content

Commit

Permalink
preparation for service development
Browse files Browse the repository at this point in the history
  • Loading branch information
@Labusyuk
Labusyuk committed Mar 20, 2020
1 parent ed9d114 commit 38e3cce
Show file tree
Hide file tree
Showing 3 changed files with 114 additions and 49 deletions.
18 changes: 18 additions & 0 deletions Accounting report.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,24 @@
<orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.7" level="project" />
<orderEntry type="library" name="Maven: org.jvnet.staxex:stax-ex:1.8" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.fastinfoset:FastInfoset:1.2.15" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.4.8.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
<orderEntry type="library" name="Maven: javax.persistence:javax.persistence-api:2.2" level="project" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.24.0-GA" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.2" level="project" />
<orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.1" level="project" />
<orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.1" level="project" />
<orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.7" level="project" />
<orderEntry type="library" name="Maven: org.jvnet.staxex:stax-ex:1.8" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.fastinfoset:FastInfoset:1.2.15" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.18" level="project" />
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
Expand Down
69 changes: 49 additions & 20 deletions src/main/java/sample/Controller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -26,7 +24,7 @@ public class Controller {
@FXML
public TextField fieldProductName;
@FXML
public TextField fieldProductType;
public ChoiceBox<ProductCategories> fieldProductType;
@FXML
public TextField fieldProductPrice;
@FXML
Expand All @@ -48,19 +46,19 @@ public class Controller {
private OrderService orderService = new OrderService();
private ObservableList<Orders> ordersList = FXCollections.observableArrayList();
@FXML
public TextField fieldIdOrder;
public TextField fieldOrderId;
@FXML
public ChoiceBox<String> fieldDateOrder;
public ChoiceBox<String> fieldOrderDate;
@FXML
public ChoiceBox<String> fieldTimeOrder;
public ChoiceBox<String> fieldOrderTime;
@FXML
public ChoiceBox<String> fieldHallOrder;
public ChoiceBox<String> fieldOrderHall;
@FXML
public ChoiceBox<String> fieldTableOrder;
public ChoiceBox<String> fieldOrderTable;
@FXML
public TextField fieldCustomerOrder;
public TextField fieldOrderCustomer;
@FXML
public TextField fieldTelephoneOrder;
public TextField fieldOrderTelephone;
@FXML
private TableView<Orders> tableOrder;
@FXML
Expand All @@ -82,11 +80,11 @@ public class Controller {
private ObservableList<Checks> 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<Checks> tableCheck;
@FXML
Expand All @@ -96,10 +94,41 @@ public class Controller {
@FXML
private TableColumn<Checks, Integer> priceOrderColumn;



/***ProductCategories***/
private ProductCategoriesService productCategoriesService = new ProductCategoriesService();
private ObservableList<ProductCategories> productCategoriesList = FXCollections.observableArrayList();
private ObservableList<Tables> tablesList = FXCollections.observableArrayList();
@FXML
public TextField fieldProductCategoriesId;
@FXML
public TextField fieldProductCategoriesName;
@FXML
private TableView<ProductCategories> tableProductCategories;
@FXML
private TableColumn<ProductCategories, Integer> idProductCategoriesColumn;
@FXML
private TableColumn<ProductCategories, String> nameProductCategoriesColumn;

/***Tables***/
private TableService tableService = new TableService();
private ObservableList<ProductCategories> tableList = FXCollections.observableArrayList();
@FXML
public TextField fieldTablesId;
@FXML
public TextField fieldTablesName;
@FXML
public TextField fieldTablesNumTables;
@FXML
public TextField fieldTablesPrice;
@FXML
private TableView<Tables> tableTables;
@FXML
private TableColumn<Tables, Integer> idTablesColumn;
@FXML
private TableColumn<Tables, String> hallTablesColumn;
@FXML
private TableColumn<Tables, Integer> nameNumTablesColumn;
@FXML
private TableColumn<Tables, String> priceTablesColumn;



Expand Down Expand Up @@ -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) {
Expand Down
Loading

0 comments on commit 38e3cce

Please sign in to comment.