diff --git a/res/userdb.db b/res/userdb.db index 7f22613..475b344 100644 Binary files a/res/userdb.db and b/res/userdb.db differ diff --git a/src/main/java/seng202/group9/GUI/GettingStartedController.java b/src/main/java/seng202/group9/GUI/GettingStartedController.java index c241f96..0ecc58e 100644 --- a/src/main/java/seng202/group9/GUI/GettingStartedController.java +++ b/src/main/java/seng202/group9/GUI/GettingStartedController.java @@ -12,18 +12,22 @@ public class GettingStartedController extends Controller { } public void importAirlines() { + getParent().getMenuController().changeDatasetPrompt(); Importer importer = new Importer(SceneCode.AIRLINE_RAW_DATA, getParent(), getParent().getPrimaryStage()); } public void importAirports() { + getParent().getMenuController().changeDatasetPrompt(); Importer importer = new Importer(SceneCode.AIRPORT_RAW_DATA, getParent(), getParent().getPrimaryStage()); } public void importRoutes() { + getParent().getMenuController().changeDatasetPrompt(); Importer importer = new Importer(SceneCode.ROUTE_RAW_DATA, getParent(), getParent().getPrimaryStage()); } public void importFlightData() { + getParent().getMenuController().changeDatasetPrompt(); Importer importer = new Importer(SceneCode.FLIGHT_RAW_DATA, getParent(), getParent().getPrimaryStage()); } diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java index 9673414..70399eb 100644 --- a/src/main/java/seng202/group9/GUI/MenuController.java +++ b/src/main/java/seng202/group9/GUI/MenuController.java @@ -1,6 +1,7 @@ package seng202.group9.GUI; import java.net.URL; +import java.util.Optional; import java.util.ResourceBundle; import javax.swing.JOptionPane; @@ -8,6 +9,8 @@ import javax.swing.JOptionPane; import javafx.fxml.Initializable; import javafx.scene.control.Alert; +import javafx.scene.control.ButtonBar; +import javafx.scene.control.ButtonType; import seng202.group9.Controller.App; import seng202.group9.Controller.Dataset; import seng202.group9.Controller.SceneCode; @@ -18,19 +21,22 @@ import seng202.group9.Controller.SceneCode; public class MenuController extends Controller{ public void importAirports(){ + changeDatasetPrompt(); Importer importer = new Importer(SceneCode.AIRPORT_RAW_DATA, getParent(), getParent().getPrimaryStage()); - } public void importAirlines(){ + changeDatasetPrompt(); Importer importer = new Importer(SceneCode.AIRLINE_RAW_DATA, getParent(), getParent().getPrimaryStage()); } public void importRoutes(){ + changeDatasetPrompt(); Importer importer = new Importer(SceneCode.ROUTE_RAW_DATA, getParent(), getParent().getPrimaryStage()); } public void importFlightData(){ + changeDatasetPrompt(); Importer importer = new Importer(SceneCode.FLIGHT_RAW_DATA, getParent(), getParent().getPrimaryStage()); } @@ -93,5 +99,19 @@ public class MenuController extends Controller{ // TODO Auto-generated method stub } + + public void changeDatasetPrompt(){ + ButtonType yes = new ButtonType("Yes", ButtonBar.ButtonData.YES); + ButtonType no = new ButtonType("No", ButtonBar.ButtonData.NO); + Alert alert = new Alert(Alert.AlertType.CONFIRMATION, "", yes, no); + alert.setTitle("Dataset Change?"); + alert.setHeaderText("You are about to import Data"); + alert.setContentText("Would you like to change Datasets?"); + //alert.showAndWait(); + Optional result = alert.showAndWait(); + if (result.isPresent() && result.get() == yes) { + createPopUpStage(SceneCode.DATASET_CONTROLLER, 600, 400); + } + } }