add description

Labusyuk · Feb 26, 2020 · b71efbb · b71efbb
1 parent 40397ab
commit b71efbb
Show file tree

Hide file tree

Showing 16 changed files with 243 additions and 160 deletions.
diff --git a/Accounting report.iml b/Accounting report.iml
@@ -3,7 +3,9 @@
   <component name="FacetManager">
     <facet type="hibernate" name="Hibernate">
       <configuration>
-        <datasource-map />
+        <datasource-map>
+          <unit-entry name="hibernate.cfg.xml" />
+        </datasource-map>
         <naming-strategy-map />
         <deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/src/main/resources/hibernate.cfg.xml" />
       </configuration>
@@ -20,15 +22,15 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.4.9.Final" 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.1.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" 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" />
@@ -38,8 +40,8 @@
     <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.11" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.protobuf:protobuf-java:2.6.0" 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" />
   </component>
 </module>
diff --git a/pom.xml b/pom.xml
@@ -27,12 +27,12 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>5.4.9.Final</version>
+            <version>5.4.8.Final</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.11</version>
+            <version>8.0.18</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/src/main/java/sample/Controller.java b/src/main/java/sample/Controller.java
@@ -3,16 +3,20 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.input.MouseEvent;
-import sample.dao.ProductDao;
 import sample.model.*;
 import javafx.scene.control.TableColumn;
+import sample.service.CheckService;
 import sample.service.OrderService;
 import sample.service.ProductService;
 
+import java.time.LocalTime;
+import java.util.Date;
+
 public class Controller {
     /***PRODUCTS***/
     private ProductService productService = new ProductService();
@@ -42,11 +46,60 @@ public class Controller {
 
     /***ORDER***/
     private OrderService orderService = new OrderService();
-    private ObservableList<Order> orderList = FXCollections.observableArrayList();
+    private ObservableList<Orders> ordersList = FXCollections.observableArrayList();
+    @FXML
+    public TextField fieldIdOrder;
+    @FXML
+    public ChoiceBox<String> fieldDateOrder;
+    @FXML
+    public ChoiceBox<String> fieldTimeOrder;
+    @FXML
+    public ChoiceBox<String> fieldHallOrder;
+    @FXML
+    public ChoiceBox<String> fieldTableOrder;
+    @FXML
+    public TextField fieldCustomerOrder;
+    @FXML
+    public TextField fieldTelephoneOrder;
+    @FXML
+    private TableView<Orders> tableOrder;
+    @FXML
+    private TableColumn<Orders, Integer> idOrderColumn;
+    @FXML
+    private TableColumn<Orders, Date> dateOrderColumn;
+    @FXML
+    private TableColumn<Orders, LocalTime> timeOrderColumn;
+    @FXML
+    private TableColumn<Orders, Tables> hallOrderColumn;
+    @FXML
+    private TableColumn<Orders, Tables> tableOrderColumn;
+    @FXML
+    private TableColumn<Orders, String> customerOrderColumn;
+    @FXML
+    private TableColumn<Orders, String> telephoneOrderColumn;
+
+    /***CHECK***/
+    private ObservableList<Checks> checksList = FXCollections.observableArrayList();
+    private CheckService checkService = new CheckService();
+    @FXML
+    public ChoiceBox fieldNameCheck;
+    @FXML
+    public TextField fieldCountCheck;
+    @FXML
+    public TextField fieldPriceCheck;
+    @FXML
+    private TableView<Checks> tableCheck;
+    @FXML
+    private TableColumn<Checks, String> nameOrderColumn;
+    @FXML
+    private TableColumn<Checks, Integer> countOrderColumn;
+    @FXML
+    private TableColumn<Checks, Integer> priceOrderColumn;
+
+
 
-    private ObservableList<Check> checkList = FXCollections.observableArrayList();
     private ObservableList<ProductCategories> productCategoriesList = FXCollections.observableArrayList();
-    private ObservableList<Table> tableList = FXCollections.observableArrayList();
+    private ObservableList<Tables> tablesList = FXCollections.observableArrayList();
 
 
 
@@ -61,23 +114,26 @@ private void initialize() {
         priceProductColumn.setCellValueFactory(new PropertyValueFactory<Product, Integer>("price"));
         countProductColumn.setCellValueFactory(new PropertyValueFactory<Product, Integer>("count"));
         tableProduct.setItems(productList);
+
+        idOrderColumn.setCellValueFactory(new PropertyValueFactory<Orders, Integer>("id"));
+        dateOrderColumn.setCellValueFactory(new PropertyValueFactory<Orders, Date>("date"));
+        timeOrderColumn.setCellValueFactory(new PropertyValueFactory<Orders, LocalTime>("localTime"));
+        hallOrderColumn.setCellValueFactory(new PropertyValueFactory<Orders, Tables>("table"));
+        tableOrderColumn.setCellValueFactory(new PropertyValueFactory<Orders, Tables>("table"));
+        customerOrderColumn.setCellValueFactory(new PropertyValueFactory<Orders, String>("сustomer"));
+        telephoneOrderColumn.setCellValueFactory(new PropertyValueFactory<Orders, String>("telephone"));
+        tableOrder.setItems(ordersList);
+
     }
 
     private void initData() {
         productList.addAll(productService.findAll());
-
-/*
-        productList.add(new Product(1, "Xiaomi A1","Телефон",500,600,0,1));
-        productList.add(new Product(2, "Samsung Galaxy S5","Телефон",800,100,0,1));
-        productList.add(new Product(3, "Iphone XS", "Телефон", 1000,1200,0,1));
-        productList.add(new Product(4, "Nokia", "Телефон", 20,21,0,1));
-        productList.add(new Product(5, "Samsung HotBench", "Мікрохвильова піч", 1000,1200,0,1));
-        for(Product product:productList)
-            productDao.create(product);
-*/
+        ordersList.addAll(orderService.findAll());
     }
 
-    public void onClickTableView(MouseEvent mouseEvent) {
+
+
+    public void onClickProductTableView(MouseEvent mouseEvent) {
         int index = tableProduct.getSelectionModel().getSelectedIndex();
         if(index<0)return;
         fieldProductId.setText(Integer.toString(tableProduct.getSelectionModel().getTableView().getItems().get(index).getId()));
@@ -87,7 +143,7 @@ public void onClickTableView(MouseEvent mouseEvent) {
         fieldProductCount.setText(Integer.toString(tableProduct.getSelectionModel().getTableView().getItems().get(index).getCount()));
     }
 
-    public void onClickApply(MouseEvent mouseEvent) {
+    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()));
         if(!fieldProductId.getText().isEmpty() && productService.findById(Integer.valueOf(fieldProductId.getText()))!=null){
             productService.update(product);
@@ -98,12 +154,34 @@ public void onClickApply(MouseEvent mouseEvent) {
         productList.addAll(productService.findAll());
     }
 
-    public void onClickDelete(MouseEvent mouseEvent) {
+    public void onClickProductDelete(MouseEvent mouseEvent) {
         if (!fieldProductId.getText().isEmpty() && productService.findById(Integer.valueOf(fieldProductId.getText())) != null) {
 
             productService.deleteById(Integer.valueOf(fieldProductId.getText()));
         }
         productList.clear();
         productList.addAll(productService.findAll());
     }
+
+/*    public void onClickOrderApply(MouseEvent mouseEvent) {
+        Order order = new Order(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());
+    }
+
+    public void onClickOrderDelete(MouseEvent mouseEvent) {
+        if (!fieldProductId.getText().isEmpty() && productService.findById(Integer.valueOf(fieldProductId.getText())) != null) {
+
+            productService.deleteById(Integer.valueOf(fieldProductId.getText()));
+        }
+        productList.clear();
+        productList.addAll(productService.findAll());
+    }*/
+
+
 }
diff --git a/src/main/java/sample/dao/CheckDao.java b/src/main/java/sample/dao/CheckDao.java
@@ -2,48 +2,47 @@
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
-import sample.model.Check;
-import sample.model.Product;
+import sample.model.Checks;
 import sample.utils.HibernateSessionFactoryUtil;
 
 import java.util.List;
 
-public class CheckDao implements EntityDao<Integer, Check> {
+public class CheckDao implements EntityDao<Integer, Checks> {
     @Override
-    public Check findById(Integer id) {
-        return HibernateSessionFactoryUtil.getSessionFactory().openSession().get(Check.class, id);
+    public Checks findById(Integer id) {
+        return HibernateSessionFactoryUtil.getSessionFactory().openSession().get(Checks.class, id);
     }
 
     @Override
-    public void save(Check check) {
+    public void save(Checks checks) {
         Session session = HibernateSessionFactoryUtil.getSessionFactory().openSession();
         Transaction tx1 = session.beginTransaction();
-        session.save(check);
+        session.save(checks);
         tx1.commit();
         session.close();
     }
 
     @Override
-    public void update(Check check) {
+    public void update(Checks checks) {
         Session session = HibernateSessionFactoryUtil.getSessionFactory().openSession();
         Transaction tx1 = session.beginTransaction();
-        session.update(check);
+        session.update(checks);
         tx1.commit();
         session.close();
     }
 
     @Override
-    public void delete(Check check) {
+    public void delete(Checks checks) {
         Session session = HibernateSessionFactoryUtil.getSessionFactory().openSession();
         Transaction tx1 = session.beginTransaction();
-        session.delete(check);
+        session.delete(checks);
         tx1.commit();
         session.close();
     }
 
     @Override
-    public List<Check> findAll() {
-        List<Check> checks = (List<Check>) HibernateSessionFactoryUtil.getSessionFactory().openSession();
+    public List<Checks> findAll() {
+        List<Checks> checks = (List<Checks>) HibernateSessionFactoryUtil.getSessionFactory().openSession();
         return checks;
     }
 }
diff --git a/src/main/java/sample/dao/OrderDao.java b/src/main/java/sample/dao/OrderDao.java
@@ -2,47 +2,47 @@
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
-import sample.model.Order;
+import sample.model.Orders;
 import sample.utils.HibernateSessionFactoryUtil;
 
 import java.util.List;
 
-public class OrderDao implements EntityDao<Integer, Order> {
+public class OrderDao implements EntityDao<Integer, Orders> {
     @Override
-    public Order findById(Integer id) {
-        return HibernateSessionFactoryUtil.getSessionFactory().openSession().get(Order.class, id);
+    public Orders findById(Integer id) {
+        return HibernateSessionFactoryUtil.getSessionFactory().openSession().get(Orders.class, id);
     }
 
     @Override
-    public void save(Order order) {
+    public void save(Orders orders) {
         Session session = HibernateSessionFactoryUtil.getSessionFactory().openSession();
         Transaction tx1 = session.beginTransaction();
-        session.save(order);
+        session.save(orders);
         tx1.commit();
         session.close();
     }
 
     @Override
-    public void update(Order order) {
+    public void update(Orders orders) {
         Session session = HibernateSessionFactoryUtil.getSessionFactory().openSession();
         Transaction tx1 = session.beginTransaction();
-        session.update(order);
+        session.update(orders);
         tx1.commit();
         session.close();
     }
 
     @Override
-    public void delete(Order order) {
+    public void delete(Orders orders) {
         Session session = HibernateSessionFactoryUtil.getSessionFactory().openSession();
         Transaction tx1 = session.beginTransaction();
-        session.delete(order);
+        session.delete(orders);
         tx1.commit();
         session.close();
     }
 
     @Override
-    public List<Order> findAll() {
-        List<Order> orders = (List<Order>) HibernateSessionFactoryUtil.getSessionFactory().openSession();
+    public List<Orders> findAll() {
+        List<Orders> orders = (List<Orders>) HibernateSessionFactoryUtil.getSessionFactory().openSession().createQuery("From Orders").list();;
         return orders;
     }
 }
diff --git a/src/main/java/sample/dao/ProductCategoriesDao.java b/src/main/java/sample/dao/ProductCategoriesDao.java
@@ -2,7 +2,6 @@
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
-import sample.model.Order;
 import sample.model.ProductCategories;
 import sample.utils.HibernateSessionFactoryUtil;