fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added change dataset prompts to import functions

Browse Source
This commit is contained in:
YaFedImYaEatIm
2016-10-01 22:51:04 +13:00
parent af27e408f4
commit fe485184d9
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/userdb.db
BIN
View File
Binary file not shown.
src/main/java/seng202/group9/GUI/GettingStartedController.java
+4
View File
@@ -12,18 +12,22 @@ public class GettingStartedController extends Controller {
} }
public void importAirlines() { public void importAirlines() {
getParent().getMenuController().changeDatasetPrompt();
Importer importer = new Importer(SceneCode.AIRLINE_RAW_DATA, getParent(), getParent().getPrimaryStage()); Importer importer = new Importer(SceneCode.AIRLINE_RAW_DATA, getParent(), getParent().getPrimaryStage());
} }
public void importAirports() { public void importAirports() {
getParent().getMenuController().changeDatasetPrompt();
Importer importer = new Importer(SceneCode.AIRPORT_RAW_DATA, getParent(), getParent().getPrimaryStage()); Importer importer = new Importer(SceneCode.AIRPORT_RAW_DATA, getParent(), getParent().getPrimaryStage());
} }
public void importRoutes() { public void importRoutes() {
getParent().getMenuController().changeDatasetPrompt();
Importer importer = new Importer(SceneCode.ROUTE_RAW_DATA, getParent(), getParent().getPrimaryStage()); Importer importer = new Importer(SceneCode.ROUTE_RAW_DATA, getParent(), getParent().getPrimaryStage());
} }
public void importFlightData() { public void importFlightData() {
getParent().getMenuController().changeDatasetPrompt();
Importer importer = new Importer(SceneCode.FLIGHT_RAW_DATA, getParent(), getParent().getPrimaryStage()); Importer importer = new Importer(SceneCode.FLIGHT_RAW_DATA, getParent(), getParent().getPrimaryStage());
} }
src/main/java/seng202/group9/GUI/MenuController.java
+21 -1
View File
@@ -1,6 +1,7 @@
package seng202.group9.GUI; package seng202.group9.GUI;
import java.net.URL; import java.net.URL;
import java.util.Optional;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
@@ -8,6 +9,8 @@ import javax.swing.JOptionPane;
import javafx.fxml.Initializable; import javafx.fxml.Initializable;
import javafx.scene.control.Alert; import javafx.scene.control.Alert;
import javafx.scene.control.ButtonBar;
import javafx.scene.control.ButtonType;
import seng202.group9.Controller.App; import seng202.group9.Controller.App;
import seng202.group9.Controller.Dataset; import seng202.group9.Controller.Dataset;
import seng202.group9.Controller.SceneCode; import seng202.group9.Controller.SceneCode;
@@ -18,19 +21,22 @@ import seng202.group9.Controller.SceneCode;
public class MenuController extends Controller{ public class MenuController extends Controller{
public void importAirports(){ public void importAirports(){
changeDatasetPrompt();
Importer importer = new Importer(SceneCode.AIRPORT_RAW_DATA, getParent(), getParent().getPrimaryStage()); Importer importer = new Importer(SceneCode.AIRPORT_RAW_DATA, getParent(), getParent().getPrimaryStage());
} }
public void importAirlines(){ public void importAirlines(){
changeDatasetPrompt();
Importer importer = new Importer(SceneCode.AIRLINE_RAW_DATA, getParent(), getParent().getPrimaryStage()); Importer importer = new Importer(SceneCode.AIRLINE_RAW_DATA, getParent(), getParent().getPrimaryStage());
} }
public void importRoutes(){ public void importRoutes(){
changeDatasetPrompt();
Importer importer = new Importer(SceneCode.ROUTE_RAW_DATA, getParent(), getParent().getPrimaryStage()); Importer importer = new Importer(SceneCode.ROUTE_RAW_DATA, getParent(), getParent().getPrimaryStage());
} }
public void importFlightData(){ public void importFlightData(){
changeDatasetPrompt();
Importer importer = new Importer(SceneCode.FLIGHT_RAW_DATA, getParent(), getParent().getPrimaryStage()); Importer importer = new Importer(SceneCode.FLIGHT_RAW_DATA, getParent(), getParent().getPrimaryStage());
} }
@@ -94,4 +100,18 @@ public class MenuController extends Controller{
} }
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<ButtonType> result = alert.showAndWait();
if (result.isPresent() && result.get() == yes) {
createPopUpStage(SceneCode.DATASET_CONTROLLER, 600, 400);
}
}
} }