diff --git a/Files/UsersInfo.txt b/Files/UsersInfo.txt
index fe93164..247d305 100644
--- a/Files/UsersInfo.txt
+++ b/Files/UsersInfo.txt
@@ -1 +1,2 @@
-parsa,11111111,09036770230,elahie,parsa@gmail.com,965623.0
+
+parsa,11111111,09036770230,elahie,parsa@gmail.com,0.0
diff --git a/pom.xml b/pom.xml
index 319f255..b657883 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,11 @@
${junit.version}
test
+
+ org.openjfx
+ javafx-graphics
+ 19.0.2
+
diff --git a/src/main/java/com/example/blinkfood/BankController.java b/src/main/java/com/example/blinkfood/BankController.java
index 2dabde2..d89c823 100644
--- a/src/main/java/com/example/blinkfood/BankController.java
+++ b/src/main/java/com/example/blinkfood/BankController.java
@@ -57,7 +57,7 @@ void Done(MouseEvent event) throws IOException {
if (NBank.Buy(NBank.getBalance(), NBank.getCost()) != -1) {
NBank.setBalance(NBank.Buy(NBank.getBalance(), NBank.getCost()));
Server.ClientHandler.EditUser(Server.user.getUserName(), NBank.getBalance());
- BackMainMenu();
+ DoneScene();
}
}
else if (LimitedBank.isSelected()) {
@@ -65,7 +65,7 @@ else if (LimitedBank.isSelected()) {
if (LBank.Buy(LBank.getBalance(), LBank.getCost()) != -1) {
LBank.setBalance(LBank.Buy(LBank.getBalance(), LBank.getCost()));
Server.ClientHandler.EditUser(Server.user.getUserName(), LBank.getBalance());
- BackMainMenu();
+ DoneScene();
}
}
else if (TaxBank.isSelected()) {
@@ -73,17 +73,16 @@ else if (TaxBank.isSelected()) {
if (TBank.Buy(TBank.getBalance(), TBank.getCost()) != -1) {
TBank.setBalance(TBank.Buy(TBank.getBalance(), TBank.getCost()));
Server.ClientHandler.EditUser(Server.user.getUserName(), TBank.getBalance());
- BackMainMenu();
+ DoneScene();
}
}
}
- private void BackMainMenu () throws IOException {
- Server.ClientHandler.ResetRestaurants();
- FXMLLoader loader = new FXMLLoader(getClass().getResource("MainMenu.fxml"));
+ private void DoneScene () throws IOException {
+ FXMLLoader loader = new FXMLLoader(getClass().getResource("Done.fxml"));
Parent root = loader.load();
Stage stage = (Stage) TaxBank.getScene().getWindow();
- stage.setTitle("MainMenu");
+ stage.setTitle("Done !");
stage.setScene(new Scene(root));
}
diff --git a/src/main/java/com/example/blinkfood/DoneController.java b/src/main/java/com/example/blinkfood/DoneController.java
index 4c85c39..bf79a43 100644
--- a/src/main/java/com/example/blinkfood/DoneController.java
+++ b/src/main/java/com/example/blinkfood/DoneController.java
@@ -1,4 +1,28 @@
package com.example.blinkfood;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.input.MouseEvent;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+
public class DoneController {
+
+ @FXML
+ private Button BackButton;
+
+ @FXML
+ void Back(MouseEvent event) throws IOException {
+ Server.ClientHandler.ResetRestaurants();
+ FXMLLoader loader = new FXMLLoader(getClass().getResource("MainMenu.fxml"));
+ Parent root = loader.load();
+ Stage stage = (Stage) BackButton.getScene().getWindow();
+ stage.setTitle("MainMenu");
+ stage.setScene(new Scene(root));
+ }
+
}
diff --git a/src/main/resources/com/example/blinkfood/Done.fxml b/src/main/resources/com/example/blinkfood/Done.fxml
index b2d91d7..2c17748 100644
--- a/src/main/resources/com/example/blinkfood/Done.fxml
+++ b/src/main/resources/com/example/blinkfood/Done.fxml
@@ -5,14 +5,13 @@
-
-
+
-
+