fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
254 Commits 1 Branch 0 Tags
b1864b6467d8061c00c01d41f4d6da25b9545e92
Commit Graph
254 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Liam Beckett b1864b6467 Merge remote-tracking branch 'remotes/origin/master' into WIP_Flight_Editor 
# Conflicts:
#	res/userdb.db
#	src/main/java/seng202/group9/Controller/App.java
#	src/main/java/seng202/group9/Controller/Dataset.java
#	src/main/java/seng202/group9/Controller/SceneCode.java
#	src/main/java/seng202/group9/Controller/Session.java
#	src/main/java/seng202/group9/Core/FlightPath.java
 2016-09-24 17:03:57 +12:00
Liam Beckett 5c7991fdc1 Database 2016-09-24 16:38:41 +12:00
Liam Beckett aeae85b9e5 Fixed up some of the javadocs and did some refactoring removing unneccesary code. 2016-09-24 16:35:24 +12:00
YaFedImYaEatIm 9e21e32cd8 Fixed Some Errors with Editting Airports with non existing Cities and Countries. Also made it so that if they are new cities they will be added to the database. 2016-09-24 16:31:33 +12:00
Liam Beckett df5721973f Fixed the intial validation so any lower case name will be chnaged to uppercase 2016-09-24 16:17:29 +12:00
Liam Beckett 5f8e2f2481 Got the basic functionally done on the flight point editor. Currently will change the vaule although a few bugs in the validation aspects. 2016-09-24 16:08:41 +12:00
YaFedImYaEatIm 8d55e7dbca Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-24 14:54:59 +12:00
YaFedImYaEatIm f3ab8dfe14 Added Flight Point order switch JUnitTests 2016-09-24 14:54:44 +12:00
Fan-Wu Yang dbc5ed1080 Added how to ignore database changes. 2016-09-24 14:46:54 +12:00
YaFedImYaEatIm 267a08ce68 Fixed Maven Error where ID wasn't set as the database did not establish the index before the creation of the table 2016-09-24 14:15:16 +12:00
Sunguin Peng 5f576595c0 Merge branch 'remaking_rd_gui' 2016-09-24 13:17:59 +12:00
Sunguin Peng c9d2047761 Attempting to merge 2016-09-24 13:16:43 +12:00
Sunguin Peng 586943ac29 Did same things to airports and routes 2016-09-24 00:00:36 +12:00
Liam Beckett f7d1e688fa Changed the controller 2016-09-23 16:43:49 +12:00
Liam Beckett d31bf1d15c Changed the controller 2016-09-23 16:43:28 +12:00
Sunguin Peng c3dca82a7a Implemented multiple delete on airlines 2016-09-23 14:46:58 +12:00
Liam Beckett 3d6dd0c2cb Atempting to get the editor to work for the flight raw data points (Currently broken) 2016-09-23 14:45:51 +12:00
YaFedImYaEatIm b7950c1649 Deleted uneccessary Duplicates message for dataset 2016-09-23 13:15:38 +12:00
YaFedImYaEatIm 4ef20aef0f Removed uneccessary function call 2016-09-23 11:59:45 +12:00
YaFedImYaEatIm 7ffe8dcea8 Added Calculation for Heading, Leg Distance and Total Distnace also added the appropriate functio nto commit these to database. 2016-09-23 11:58:47 +12:00
Sunguin Peng a4728ea35e Finished airline serialising 2016-09-23 11:01:19 +12:00
YaFedImYaEatIm 68277cb983 Added Some Doc String & Reset the Database from all changes 2016-09-23 10:43:00 +12:00
YaFedImYaEatIm 42a0ecfb94 Added set Current Dataset Function 2016-09-23 10:42:11 +12:00
YaFedImYaEatIm 30cf90bb40 Added Loading Datasets 2016-09-23 10:38:02 +12:00
Sunguin Peng ac7a4514d0 Updated add and filter for airlines. Working on serialisable file 2016-09-23 10:29:25 +12:00
YaFedImYaEatIm ed15c2bd76 Added Change Path Source and Destination Airports on changing the first or last entry in the flight points 2016-09-23 10:16:56 +12:00
YaFedImYaEatIm e19c59d66b Initial Point Ordering Commit 2016-09-23 09:45:33 +12:00
Sunguin Peng 5e2ba5af90 Remade Raw Data GUI and tried oit some things on Session 2016-09-23 00:48:12 +12:00
Liam Beckett c1b338e35c Merge branch 'WIP_Flight_fixes' into 'master' 
flight fixes



See merge request !15
 2016-09-22 16:56:06 +12:00
Liam Beckett 753247b004 Implemented the same error messages that are used in other areas of the application 2016-09-22 16:53:46 +12:00
Sunguin Peng 6b799789e4 Fixed conflicts 2016-09-22 16:23:01 +12:00
Sunguin Peng f82cf823d8 Seperated Controllers 2016-09-22 16:21:35 +12:00
YaFedImYaEatIm ab531fdcb1 Added popup loader and Scene AIRLINE_ADD 2016-09-22 16:17:45 +12:00
Liam Beckett c1df5bd066 Fixed the small bug in the Name validation and also improved the error messages when adding a new Flight path and inputting an incorrect ICAO code. 2016-09-22 16:08:31 +12:00
Sunguin Peng c6f5c41b7d Initial Commit 2016-09-22 15:44:22 +12:00
YaFedImYaEatIm 9568ed5522 replaced double quotes with 2 double quotes for SQL entries. 2016-09-22 01:13:37 +12:00
YaFedImYaEatIm 68eb19f745 Added Flight POint edit function 2016-09-22 01:10:26 +12:00
YaFedImYaEatIm f59ab8e486 Add EditRoutes function 2016-09-22 00:53:37 +12:00
YaFedImYaEatIm 82113d2544 Added Edit Airline and Edit Airport 2016-09-22 00:42:19 +12:00
YaFedImYaEatIm 8f0619d20f Made EntryParser which will parse a single entry 2016-09-22 00:02:23 +12:00
YaFedImYaEatIm f35a21bc89 Added Alternative Run Method 2016-09-19 16:24:02 +12:00
YaFedImYaEatIm 58b96c5be3 Updated how to run and necessary Files needed to run this Program 2016-09-19 16:22:14 +12:00
Sunguin Peng 226cbbd0ce Updated the read me file and also made a slight modification to the Flight summary fxml. 2016-09-19 15:42:05 +12:00
Michael bc0033fad9 Added javadocs. 2016-09-19 15:22:24 +12:00
YaFedImYaEatIm 73cfca0ccc fixed index out of array after deleting FlightPath for map 2016-09-19 15:00:09 +12:00
YaFedImYaEatIm ddac466879 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-19 14:47:05 +12:00
YaFedImYaEatIm 4a5d7392e5 Fixed Google Map bug and DeleteFLightPath() 2016-09-19 14:46:55 +12:00
Sunguin Peng d470d35a12 Updated ReadMe and removed help from menu bar 2016-09-19 14:42:00 +12:00
Liam Beckett fa729ee344 Removed no working menu buttons 2016-09-19 09:15:05 +12:00
Liam Beckett f7b7e8de6c Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-19 09:11:36 +12:00