some debug

AdvProg2020 · Jun 26, 2020 · ceea427 · ceea427
1 parent b6d7b0f
commit ceea427
Show file tree

Hide file tree

Showing 23 changed files with 20 additions and 11 deletions.
diff --git a/src/main/java/controller/BuyLogPage.java b/src/main/java/controller/BuyLogPage.java
@@ -48,12 +48,16 @@ public void handle(MouseEvent e) {
                         }
                     }
                 };
-        for (BuyLog buyLog : Main.getAccount().getBuyLogList()) {
-            Button button = new Button();
-            button.setId(Integer.toString(buyLog.getCode()));
-            button.setText(Integer.toString(buyLog.getCode()));
-            button.addEventHandler(MouseEvent.MOUSE_CLICKED, eventHandler);
-            vBox.getChildren().add(button);
+        try {
+            for (BuyLog buyLog : Main.getAccount().getBuyLogList()) {
+                Button button = new Button();
+                button.setId(Integer.toString(buyLog.getCode()));
+                button.setText(Integer.toString(buyLog.getCode()));
+                button.addEventHandler(MouseEvent.MOUSE_CLICKED, eventHandler);
+                vBox.getChildren().add(button);
+            }
+        }catch (Exception e){
+
         }
         scrollPane.setContent(vBox);
     }

diff --git a/src/main/java/controller/CartPage.java b/src/main/java/controller/CartPage.java
@@ -80,6 +80,10 @@ public void showProductPage(MouseEvent mouseEvent) throws IOException {
 
 
     public void purchase(MouseEvent mouseEvent) {
+        try {
             BuyerControl.purchase(Main.getAccount(), Discount.getDiscountByCode(Integer.parseInt(discountCodeText.getText())));
+        }catch (Exception e){
+            BuyerControl.purchase(Main.getAccount(), null);
+        }
     }
 }
diff --git a/src/main/java/controller/OffPage.java b/src/main/java/controller/OffPage.java
@@ -66,7 +66,7 @@ public void back(MouseEvent mouseEvent) throws IOException {
     public void showProductPage(MouseEvent mouseEvent) throws IOException {
         if (chosenProduct != null){
             Main.setProduct(chosenProduct);
-            Main.setScene("productPage");
+            Main.setScene("ProductPage");
         }
     }
 }

diff --git a/src/main/java/controller/ProductsPage.java b/src/main/java/controller/ProductsPage.java
@@ -63,7 +63,7 @@ public void back(MouseEvent mouseEvent) throws IOException {
         public void showProductPage(MouseEvent mouseEvent) throws IOException {
             if (chosenProduct != null){
                 Main.setProduct(chosenProduct);
-                Main.setScene("productPage");
+                Main.setScene("ProductPage");
             }
         }
     }

diff --git a/src/main/java/models/Buyer.java b/src/main/java/models/Buyer.java
@@ -10,6 +10,7 @@ public Buyer(String username) {
         super(username);
         super.setAccountType(AccountType.BUYER);
         allAccounts.add(this);
+        cart = new Cart();
     }
 
     public Cart getCart() {

diff --git a/src/main/java/models/Cart.java b/src/main/java/models/Cart.java
@@ -20,8 +20,8 @@ public void changeAmountOfProduct(Product product, int change) {
 
     public int getTotalPrice() {
         int total = 0;
-        for (Product product : amountOfProducts.keySet()) {
-            total = total + product.getPrice() * amountOfProducts.get(product);
+        for (Product product : products) {
+            total = total + product.getPrice() ;
         }
         return total;
     }

diff --git a/src/main/resources/fxml/ProductPage.fxml b/src/main/resources/fxml/ProductPage.fxml
@@ -11,7 +11,7 @@
                 <Image url="@../resources/background.png" />
             </image></ImageView>
         <HBox layoutX="126.0" layoutY="58.0" />
-        <Label accessibleRole="TEXT_FIELD" alignment="CENTER" contentDisplay="CENTER" layoutX="258.0" layoutY="6.0" onMouseClicked="#showProductPage" prefHeight="25.0" prefWidth="159.0" text="products page" />
+        <Label accessibleRole="TEXT_FIELD" alignment="CENTER" contentDisplay="CENTER" layoutX="258.0" layoutY="6.0"  prefHeight="25.0" prefWidth="159.0" text="products page" />
         <Button layoutX="47.0" layoutY="282.0" mnemonicParsing="false" onMouseClicked="#back" text="back" />
         <VBox fx:id="userInfoVBox" layoutX="282.0" layoutY="58.0" prefHeight="175.0" prefWidth="100.0" />
         <Button layoutX="473.0" layoutY="74.0" mnemonicParsing="false" onMouseClicked="#addCart" prefHeight="25.0" prefWidth="119.0" text="add to cart" />

diff --git a/target/classes/controller/BuyLogPage.class b/target/classes/controller/BuyLogPage.class
diff --git a/target/classes/controller/BuyerControl.class b/target/classes/controller/BuyerControl.class
diff --git a/target/classes/controller/CartPage.class b/target/classes/controller/CartPage.class
diff --git a/target/classes/controller/EditPage.class b/target/classes/controller/EditPage.class
diff --git a/target/classes/controller/LoginRegister.class b/target/classes/controller/LoginRegister.class
diff --git a/target/classes/controller/SellerControl.class b/target/classes/controller/SellerControl.class
diff --git a/target/classes/models/Account$1.class b/target/classes/models/Account$1.class
diff --git a/target/classes/models/Product.class b/target/classes/models/Product.class
diff --git a/target/classes/models/Request.class b/target/classes/models/Request.class
diff --git a/target/classes/view/OffsPage.class b/target/classes/view/OffsPage.class
diff --git a/target/classes/view/SellerPage$1.class b/target/classes/view/SellerPage$1.class
diff --git a/target/classes/view/SellerPage$2.class b/target/classes/view/SellerPage$2.class
diff --git a/target/classes/view/SellerPage$3.class b/target/classes/view/SellerPage$3.class
diff --git a/target/classes/view/SellerPage$4.class b/target/classes/view/SellerPage$4.class
diff --git a/target/classes/view/SellerPage$5.class b/target/classes/view/SellerPage$5.class
diff --git a/target/classes/view/usersPageCommands/sellerCommands/ViewOffs.class b/target/classes/view/usersPageCommands/sellerCommands/ViewOffs.class