From 683c89622db14088647df921eb2c2a28b5af7337 Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Fri, 30 Sep 2016 13:31:13 +1300 Subject: [PATCH] Initial commit for Dataset Controller --- res/userdb.db | Bin 8387584 -> 8387584 bytes .../java/seng202/group9/Controller/App.java | 1 + .../seng202/group9/Controller/Dataset.java | 8 +++ .../seng202/group9/Controller/SceneCode.java | 2 +- .../seng202/group9/GUI/DatasetController.java | 46 ++++++++++++++++++ src/main/resources/dataset_editor.fxml | 42 ++++++++++++++++ 6 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 src/main/java/seng202/group9/GUI/DatasetController.java create mode 100644 src/main/resources/dataset_editor.fxml diff --git a/res/userdb.db b/res/userdb.db index dd0d554e540363b23075e38bc1d1e7788217859e..f1f999e1300baa3dd0c00d05fc8eeac473f98ec7 100644 GIT binary patch delta 10687 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 E0T-!mg#Z8m delta 12904 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 diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java index bc481ea..f6a1c53 100644 --- a/src/main/java/seng202/group9/Controller/App.java +++ b/src/main/java/seng202/group9/Controller/App.java @@ -99,6 +99,7 @@ public class App extends Application session = new Session(); e.printStackTrace(); } + menuController.createPopUpStage(SceneCode.DATASET_CONTROLLER, 600, 400); } /** diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java index 3743aeb..8aed09a 100644 --- a/src/main/java/seng202/group9/Controller/Dataset.java +++ b/src/main/java/seng202/group9/Controller/Dataset.java @@ -2175,4 +2175,12 @@ public class Dataset { System.exit(0); } } + + /** + * Name of the dataset in the database + */ + @Override + public String toString(){ + return this.name; + } } diff --git a/src/main/java/seng202/group9/Controller/SceneCode.java b/src/main/java/seng202/group9/Controller/SceneCode.java index eb6844b..d1ae151 100644 --- a/src/main/java/seng202/group9/Controller/SceneCode.java +++ b/src/main/java/seng202/group9/Controller/SceneCode.java @@ -12,7 +12,7 @@ public enum SceneCode { AIRPORT_DIST_CALC("airport_dist_calc.fxml"), AIRLINE_ADD("airline_add_form.fxml"), AIRLINE_FILTER("airline_filter_form.fxml"), AIRPORT_ADD("airport_add_form.fxml"), AIRPORT_FILTER("airport_filter_form.fxml"), ROUTE_ADD("route_add_form.fxml"), ROUTE_FILTER("route_filter_form.fxml"), AIRLINE_EDIT("airline_edit_form.fxml"), AIRPORT_EDIT("airport_edit_form.fxml"), - ROUTE_EDIT("route_edit_form.fxml"), FLIGHT_EDITOR("flight_editor_form.fxml"); + ROUTE_EDIT("route_edit_form.fxml"), FLIGHT_EDITOR("flight_editor_form.fxml"), DATASET_CONTROLLER("dataset_editor.fxml"); private String filePath; diff --git a/src/main/java/seng202/group9/GUI/DatasetController.java b/src/main/java/seng202/group9/GUI/DatasetController.java new file mode 100644 index 0000000..26e27f4 --- /dev/null +++ b/src/main/java/seng202/group9/GUI/DatasetController.java @@ -0,0 +1,46 @@ +package seng202.group9.GUI; + +import javafx.beans.InvalidationListener; +import javafx.collections.FXCollections; +import javafx.collections.ListChangeListener; +import javafx.collections.ObservableList; +import javafx.fxml.FXML; +import javafx.scene.control.ListView; +import javafx.scene.control.TextField; +import seng202.group9.Controller.Dataset; + +import java.util.*; + +import static javafx.collections.FXCollections.observableArrayList; + +/** + * Created by fwy13 on 30/09/16. + */ +public class DatasetController extends Controller{ + + @FXML + ListView datasetView; + @FXML + TextField datasetName; + Dataset curDataset = null; + ObservableList datasetList = observableArrayList(); + + public void load() { + curDataset = getParent().getCurrentDataset(); + ArrayList datasets = getParent().getDatasets(); + datasetList = observableArrayList(datasets); + datasetView.setItems(datasetList); + } + + public void deleteDataset(){ + + } + + public void addDataset(){ + + } + + public void openDataset(){ + + } +} diff --git a/src/main/resources/dataset_editor.fxml b/src/main/resources/dataset_editor.fxml new file mode 100644 index 0000000..9e2f29c --- /dev/null +++ b/src/main/resources/dataset_editor.fxml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +