diff --git a/res/userdb.db b/res/userdb.db index e7dff5b..649a5af 100644 Binary files a/res/userdb.db and b/res/userdb.db differ diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java index 3743aeb..6fcf2ff 100644 --- a/src/main/java/seng202/group9/Controller/Dataset.java +++ b/src/main/java/seng202/group9/Controller/Dataset.java @@ -2100,9 +2100,6 @@ public class Dataset { int curIndex = flightPath.getFlightPoints().indexOf(flightPoint); flightPath.getFlightPoints().remove(flightPoint); int indexToAdd = index; - if (curIndex < index){ - indexToAdd --; - } flightPath.getFlightPoints().add(indexToAdd, flightPoint); Connection c = null; diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java index e3e37ce..93085fd 100644 --- a/src/main/java/seng202/group9/GUI/FlightRDController.java +++ b/src/main/java/seng202/group9/GUI/FlightRDController.java @@ -246,6 +246,29 @@ public class FlightRDController extends Controller { flightPathListView(); } + public void movePointUp(){ + FlightPoint toMove = flightTableView.getSelectionModel().getSelectedItem(); + int toMoveIndex = flightTableView.getSelectionModel().getSelectedIndex(); + try{ + theDataSet.moveFlightPoint(toMove, toMoveIndex-1); + } catch (DataException e) { + e.printStackTrace(); + } + updateTable(currentPathIndex); + + } + + public void movePointDown(){ + FlightPoint toMove = flightTableView.getSelectionModel().getSelectedItem(); + int toMoveIndex = flightTableView.getSelectionModel().getSelectedIndex(); + try{ + theDataSet.moveFlightPoint(toMove, toMoveIndex+1); + } catch (DataException e) { + e.printStackTrace(); + } + updateTable(currentPathIndex); + } + /** * Updates the table so that when the database is changed (deleted or edited) it still shows the correct data values. * @param currentPathIndex The index of the current path in the Path array list. diff --git a/src/main/java/seng202/group9/GUI/FlightSummaryController.java b/src/main/java/seng202/group9/GUI/FlightSummaryController.java index 4be3376..c5a99f4 100644 --- a/src/main/java/seng202/group9/GUI/FlightSummaryController.java +++ b/src/main/java/seng202/group9/GUI/FlightSummaryController.java @@ -96,12 +96,8 @@ public class FlightSummaryController extends Controller { Airport sourceAirport = null; Airport destinationAirport = null; - System.out.println(firstPointICAO); - System.out.println(lastPointICAO); - for (int i=0; i < airportList.size(); i++){ Airport current = airportList.get(i); - System.out.println(current.getICAO()); if(current.getICAO().equals(firstPointICAO)){ sourceAirport = current; } diff --git a/src/main/resources/flight_raw_data.fxml b/src/main/resources/flight_raw_data.fxml index 2bafa76..78a6df2 100644 --- a/src/main/resources/flight_raw_data.fxml +++ b/src/main/resources/flight_raw_data.fxml @@ -155,6 +155,8 @@ + +