fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
276 Commits 1 Branch 0 Tags
138b5cae46d5bf3cf4b98e6a079de35cc932598b
Commit Graph
91 Commits
Author SHA1 Message Date
Sunguin 138b5cae46 Improved the help menu item. 2016-09-30 14:19:54 +13:00
Sunguin c799c722b8 Added a help pop up pane. 2016-09-30 12:55:53 +13:00
Sunguin b7308f1920 Added a controller and a fxml file for getting started. 2016-09-26 14:50:49 +13:00
Sunguin Peng bd4ecd20a6 Fixed conflicts 2016-09-24 17:48:08 +12:00
Sunguin Peng 960de77476 Did rd for airport and route 2016-09-24 17:44:13 +12:00
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 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
Sunguin Peng e237d058bd Gets information for airlines 2016-09-24 14:37:55 +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 3d6dd0c2cb Atempting to get the editor to work for the flight raw data points (Currently broken) 2016-09-23 14:45:51 +12:00
Sunguin Peng ac7a4514d0 Updated add and filter for airlines. Working on serialisable file 2016-09-23 10:29:25 +12:00
Sunguin Peng 5e2ba5af90 Remade Raw Data GUI and tried oit some things on Session 2016-09-23 00:48:12 +12:00
Sunguin Peng f82cf823d8 Seperated Controllers 2016-09-22 16:21:35 +12:00
Sunguin Peng c6f5c41b7d Initial Commit 2016-09-22 15:44:22 +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
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
Sunguin Peng ab90d060bb Updated Javadoc and made a popup for not yet implemented button 2016-09-18 18:19:21 +12:00
Michael Wilson 744b96c42a Fixed some previously unknown issues from merging. 2016-09-18 13:54:56 +12:00
Michael Wilson 60b92d2170 Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/main/java/seng202/group9/Controller/SceneCode.java
 2016-09-18 13:14:00 +12:00
YaFedImYaEatIm 9e00e3666f Fixed Conflicts when merging ConnectMaps 2016-09-18 00:34:08 +12:00
Michael Wilson ff79599c9b Calculator Implimented. 2016-09-17 20:46:23 +12:00
Sunguin Peng 37e712f734 Refactoring bugs fixed again 2016-09-17 20:33:20 +12:00
YaFedImYaEatIm 5363cf8b4e COnnected maps to airlines, Airports and ROutes 2016-09-17 20:06:19 +12:00
Sunguin Peng 50cc5c6dfb Merging filter complete GUI for Airport, Airline and Route Raw Data 2016-09-17 18:22:31 +12:00
Sunguin Peng 1feb1c9153 Added filter function to the Airline GUI 2016-09-17 18:16:10 +12:00
Liam Beckett 1664a49623 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/seng202/group9/GUI/FlightSummaryController.java
 2016-09-17 18:13:02 +12:00
Liam Beckett cd8e2b0c7f Implemented the delete option for the flight paths on the Summary and Raw Data pages. 2016-09-17 18:08:42 +12:00
YaFedImYaEatIm 44ed68ee7a Added Google Maps API 2016-09-17 18:03:46 +12:00
YaFedImYaEatIm a9edea7690 Finished Google Maps API 2016-09-17 18:01:35 +12:00
Liam Beckett 62a93ad629 Implemented right click, delete ability for the flight raw data paths 2016-09-17 17:53:16 +12:00
Michael Wilson 548ffa99f1 Added webveiws for later maps implimentation. 2016-09-17 17:50:35 +12:00
Sunguin Peng 30f7b2d842 Fixed a bug from Route Filter and implemented Airport Filter in GUI 2016-09-17 17:40:24 +12:00
Liam Beckett 3508518cdd Added in the right click, delete option for the flight points in the table. 2016-09-17 17:37:39 +12:00
YaFedImYaEatIm ae3fbefd0d Initial load for GoogleMaps done 2016-09-17 16:40:25 +12:00
Sunguin Peng 4fde239167 Route Filtering on GUI 2016-09-17 16:33:20 +12:00
Michael Wilson 8c49ce4455 Merge remote-tracking branch 'origin/master' 2016-09-17 16:03:08 +12:00
Michael Wilson 3218b72941 Created pie graph viewer for Airports. 2016-09-17 16:02:27 +12:00
Liam Beckett d838274065 Merge branch 'WIP_Flight_Add_Path' into 'master' 
Implements the button 'new' on the Flight raw data page which can be used to cre…

…ate a new blank path. Currently does not reload the list view of paths to include the new path.

See merge request !12
 2016-09-17 15:46:36 +12:00
Liam Beckett 23bebdf8e3 Implements the button 'new' on the Flight raw data page which can be used to create a new blank path. Currently does not reload the list view of paths to include the new path. 2016-09-17 15:36:00 +12:00
Sunguin Peng 5cc305d896 Fixed some refactoring issues and implemented delete functions in the GUI 2016-09-17 15:06:29 +12:00
Michael Wilson eb698f17c8 Made graph work with new formatting. 2016-09-17 14:57:21 +12:00
Michael Wilson 56eeb0e9f8 Merge branch 'Analyser' 
Conflicts:
	src/main/java/seng202/group9/GUI/RouteRDController.java
 2016-09-17 14:06:24 +12:00
Liam Beckett 25fcc8cf94 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 
# Conflicts:
#	res/userdb.db
 2016-09-16 16:38:31 +12:00
Michael Wilson 92c5cf9c8b First graph displays it's data as desired. 2016-09-16 13:28:52 +12:00
Liam Beckett ff20c6435e Implemented the ablitity to manually enter flight points into the database. 2016-09-16 12:50:58 +12:00
Sunguin Peng bed13aca2f Changed GUI 2016-09-16 12:09:27 +12:00
Sunguin Peng 0cfffd258c GUI displays all fields and altered some GUI 2016-09-16 12:07:15 +12:00
Michael Wilson 87d4b42036 Fixed 2 incorrect buttons and hooked up flight buttons. 2016-09-16 09:47:36 +12:00