fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
160 Commits 1 Branch 0 Tags
9e00e3666f690a6e1c3d18370e823aef1316ae4c
Commit Graph
69 Commits
Author SHA1 Message Date
YaFedImYaEatIm 9e00e3666f Fixed Conflicts when merging ConnectMaps 2016-09-18 00:34:08 +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
Michael Wilson 94f2d25899 Hooked up all buttons for summary pages. 2016-09-16 09:31:02 +12:00
Sunguin Peng 0189cfbe1c Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-15 16:54:24 +12:00
Sunguin Peng 33aafeb510 Resized GUI and refactoring 2016-09-15 16:53:56 +12:00
Sunguin Peng 605717a3c2 Resized GUI and changed add for GUI to not include ID 2016-09-15 16:51:11 +12:00
Liam Beckett ddcb3f65a7 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-15 16:49:13 +12:00
Liam Beckett 39cdb4b583 Moved the database file back where it belongs. 2016-09-15 16:33:04 +12:00
Michael 273d694490 Fixed summary files FXML. 2016-09-15 16:30:20 +12:00
Liam Beckett 57c7a4d326 Added a web view to the fxml for the summary page so we can implement the maps API 2016-09-15 16:26:36 +12:00
Michael 27888ed689 Merge remote-tracking branch 'origin/master' 2016-09-15 16:14:23 +12:00
Liam Beckett 11ad212c2e Implemented the raw data button on the flight summary page so it changes the scene 2016-09-15 16:10:52 +12:00
Michael e914c50498 Merge branch 'WIP_Summary' 
Conflicts:
	res/userdb.db
	src/main/resources/airline_summary.fxml
	src/main/resources/airport_summary.fxml
 2016-09-15 16:08:30 +12:00
Michael cd1c505dc6 Merge remote-tracking branch 'origin/master' 2016-09-15 15:13:49 +12:00
Sunguin Peng ae522e14d3 Made route RD display things in the table and added functionality to the add button 2016-09-15 13:57:56 +12:00
Liam Beckett 6049e5b1a5 Implemented the Flight lists response to being clicked. Now in the raw data when a list item is selected then it changes the displayed table data. 2016-09-15 13:11:28 +12:00
Michael Wilson 3782334db7 Fixed a few bugs though routes doesn't load. 2016-09-15 11:11:04 +12:00
Liam Beckett 8192c59bb4 Merge branch 'WIP_Flight_Path_List' into 'master' 
Implemented the list view of the different paths in the database. Currently only…

… displays the names without any response when clicked. Also made slight adjustments to the summary and raw data Flight GUIs

See merge request !5
 2016-09-15 10:24:42 +12:00
Liam Beckett f212be8dbd Implemented the list view of the different paths in the database. Currently only displays the names without any response when clicked. Also made slight adjustments to the summary and raw data Flight GUIs 2016-09-15 10:14:33 +12:00
Sunguin Peng f33cdca373 Applied single entry add methods to GUI for Airports and Airlines. Made error pop ups for them as well. 2016-09-15 00:49:06 +12:00
Michael Wilson c1f1056586 Stopped exception on load. 2016-09-14 23:01:01 +12:00
Michael Wilson 91ad64d399 Buttons temporarily removed and a few fixes made. 2016-09-14 22:16:24 +12:00
Michael Wilson d744442ba2 Buttons on summary pages have been linked to proper functions. 2016-09-14 21:39:19 +12:00
Michael Wilson 11197a0400 Hooked up the Summary pages to the Menu bar. 2016-09-14 21:13:05 +12:00