diff --git a/res/userdb.db b/res/userdb.db index 30702da..8fe5407 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 c879b44..ed55270 100644 --- a/src/main/java/seng202/group9/Controller/Dataset.java +++ b/src/main/java/seng202/group9/Controller/Dataset.java @@ -1189,22 +1189,14 @@ public class Dataset { * @param id * @param name * @param type - * @param via * @param altitude * @param latitude * @param longitude - * @param heading - * @param legDist - * @param totDist */ - public void addFlightPointToPath(int id, String name, String type, String via, String altitude, String latitude, String longitude, - String heading, String legDist, String totDist , int index) throws DataException{ + public void addFlightPointToPath(int id, String name, String type, String altitude, String latitude, String longitude, int index) throws DataException{ double altitudeVal = 0.0; double latitudeVal = 0.0; double longitudeVal = 0.0; - int headingVal = 0; - double legDistVal = 0.0; - double totalDistVal = 0.0; try{ altitudeVal = Double.parseDouble(altitude); @@ -1221,20 +1213,8 @@ public class Dataset { }catch (NumberFormatException e){ throw new DataException("Longitude must be a double value"); } - try{ - headingVal = Integer.parseInt(heading); - }catch (NumberFormatException e){ - throw new DataException("Heading must be a integer value"); - } - try{ - legDistVal = Double.parseDouble(legDist); - }catch (NumberFormatException e){ - throw new DataException("Leg DIstance must be a double value"); - } - try{ - totalDistVal = Double.parseDouble(totDist); - }catch (NumberFormatException e){ - throw new DataException("Total Distance must be a double value"); + if (index == -1){ + index = flightPathDictionary.get(id).getFlightPoints().size(); } Connection c = null; Statement stmt; @@ -1252,12 +1232,11 @@ public class Dataset { stmt = c.createStatement(); String insertFlightPointQuery = "INSERT INTO `" + this.name + "_Flight_Points` (`Index_ID`, `Name`, `Type`," + - " `Altitude`, `Latitude`, `Longitude`, `Heading`, `Tot_Dist`, `Leg_Dist`, `Via`, `Order`) VALUES "; + " `Altitude`, `Latitude`, `Longitude`, `Order`) VALUES "; String flightType = type.replace("\"", "\"\""); String flightName = name.replace("\"", "\"\""); insertFlightPointQuery += "(" + id +", \""+ flightName +"\", \"" + flightType + "\", "+ altitudeVal + ", " + - "" + latitudeVal + ", " + longitudeVal + ", " + headingVal + ", " + totalDistVal + ", " + legDistVal + - ", \"" + via + "\", "+index+")"; + "" + latitudeVal + ", " + longitudeVal + ", "+index+")"; stmt.execute(insertFlightPointQuery); stmt.close(); //move all the points after this forward @@ -1297,11 +1276,10 @@ public class Dataset { System.exit(0); } - FlightPoint pointToAdd = new FlightPoint(name, pointID+1, id, type, via, headingVal, altitudeVal, legDistVal, - totalDistVal,latitudeVal, longitudeVal); - updateFlightPointInfo(flightPathDictionary.get(Integer.valueOf(id))); + FlightPoint pointToAdd = new FlightPoint(type, pointID+1, id, name, altitudeVal, latitudeVal, longitudeVal); flightPathDictionary.get(Integer.valueOf(id)).addFlightPoint(pointToAdd, index); flightPointDictionary.put(pointID + 1, pointToAdd); + updateFlightPointInfo(flightPathDictionary.get(Integer.valueOf(id))); } /*** @@ -1311,9 +1289,8 @@ public class Dataset { * @throws DataException */ public void addFlightPointToPath(FlightPoint point, int index) throws DataException{ - addFlightPointToPath(point.getIndex(), point.getName(), point.getType(), point.getVia(), String.valueOf(point.getAltitude()), - String.valueOf( point.getLatitude()),String.valueOf(point.getLongitude()), - String.valueOf(point.getHeading()), String.valueOf(point.getLegDistance()), String.valueOf(point.getTotalDistance()), index); + addFlightPointToPath(point.getIndex(), point.getName(), point.getType(), String.valueOf(point.getAltitude()), + String.valueOf( point.getLatitude()),String.valueOf(point.getLongitude()), index); } /*** * Adds a single flight Point to an Existing FLight Path appended on the end of the list. @@ -1321,9 +1298,8 @@ public class Dataset { * @throws DataException */ public void addFlightPointToPath(FlightPoint point) throws DataException{ - addFlightPointToPath(point.getIndex(), point.getName(), point.getType(), point.getVia(), String.valueOf(point.getAltitude()), - String.valueOf( point.getLatitude()),String.valueOf(point.getLongitude()), - String.valueOf(point.getHeading()), String.valueOf(point.getLegDistance()), String.valueOf(point.getTotalDistance()), -1); + addFlightPointToPath(point.getIndex(), point.getName(), point.getType(), String.valueOf(point.getAltitude()), + String.valueOf( point.getLatitude()),String.valueOf(point.getLongitude()), -1); } /** @@ -1331,19 +1307,14 @@ public class Dataset { * @param id * @param name * @param type - * @param via * @param altitude * @param latitude * @param longitude - * @param heading - * @param legDist - * @param totDist * @throws DataException */ - public void addFlightPointToPath(int id, String name, String type, String via, String altitude, String latitude, String longitude, - String heading, String legDist, String totDist) throws DataException{ - addFlightPointToPath(id, name, type, via, altitude, latitude, longitude, heading, legDist, totDist, -1); + public void addFlightPointToPath(int id, String name, String type, String altitude, String latitude, String longitude) throws DataException{ + addFlightPointToPath(id, name, type, altitude, latitude, longitude, -1); } /** * This is called in conjunction to the App deleteDataset DO NOT CALL UNLESS THROUGH APP.DELETEDATASET diff --git a/src/main/java/seng202/group9/Core/FlightPoint.java b/src/main/java/seng202/group9/Core/FlightPoint.java index d4538e7..88b0b7c 100644 --- a/src/main/java/seng202/group9/Core/FlightPoint.java +++ b/src/main/java/seng202/group9/Core/FlightPoint.java @@ -60,6 +60,24 @@ public class FlightPoint { this.longitude = longitude; } + public FlightPoint(String type, int id, int index, String name, double altitude, double latitude, double longitude){ + //extra calculations will have to be used to find heading, legdistance and total distance. If necessary + //Type 1 file the file the lecturers gave us + //indexID = flight path ID + //ID = unique Auto Increment value + this.name = name; + this.ID = id; + this.indexID = index; + this.type = type; + this.via = ""; + this.heading = 0; + this.altitude = altitude; + this.legDistance = 0.0; + this.totalDistance = 0.0; + this.latitude = latitude; + this.longitude = longitude; + } + /** * Constructor when getting points from the database. * @param name Name for the point. diff --git a/src/main/java/seng202/group9/GUI/FlightAddController.java b/src/main/java/seng202/group9/GUI/FlightAddController.java index d33f44a..cec96de 100644 --- a/src/main/java/seng202/group9/GUI/FlightAddController.java +++ b/src/main/java/seng202/group9/GUI/FlightAddController.java @@ -18,20 +18,12 @@ public class FlightAddController extends Controller { @FXML private TextField fTypeAdd; @FXML - private TextField fViaAdd; - @FXML private TextField fAltitudeAdd; @FXML private TextField fLatitudeAdd; @FXML private TextField fLongitudeAdd; @FXML - private TextField fHeadingAdd; - @FXML - private TextField fLegDistAdd; - @FXML - private TextField fTotDistAdd; - @FXML private Button flightAddButton; //Set an empty Dataset to be assigned later @@ -49,13 +41,9 @@ public class FlightAddController extends Controller { theDataSet.addFlightPointToPath(currentSession.getCurrentFlightPathID(), fNameAdd.getText(), fTypeAdd.getText(), - fViaAdd.getText(), fAltitudeAdd.getText(), fLatitudeAdd.getText(), - fLongitudeAdd.getText(), - fHeadingAdd.getText(), - fLegDistAdd.getText(), - fTotDistAdd.getText()); + fLongitudeAdd.getText()); Alert alert = new Alert(Alert.AlertType.INFORMATION); alert.setTitle("Flight Point Add Successful"); alert.setHeaderText("New Flight Point added!"); diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java index ed61468..d94b8b9 100644 --- a/src/main/java/seng202/group9/GUI/FlightRDController.java +++ b/src/main/java/seng202/group9/GUI/FlightRDController.java @@ -154,7 +154,7 @@ public class FlightRDController extends Controller { public void openAdd() { Session session = getParent().getSession(); session.setCurrentFlightPathtID(currentPathId); - createPopUpStage(SceneCode.FLIGHT_ADD, 600, 400); + createPopUpStage(SceneCode.FLIGHT_ADD, 600, 280); //flightTableView.setItems(FXCollections.observableArrayList(theDataSet.getAirports())); updateTable(currentPathIndex); } diff --git a/src/main/resources/flight_add_form.fxml b/src/main/resources/flight_add_form.fxml index 896e86f..a82c803 100644 --- a/src/main/resources/flight_add_form.fxml +++ b/src/main/resources/flight_add_form.fxml @@ -1,5 +1,10 @@ + + + + + @@ -9,7 +14,7 @@ - + @@ -22,10 +27,6 @@ - - - - @@ -46,50 +47,26 @@ -