fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
246 Commits 1 Branch 0 Tags
9e21e32cd8333649c52ea957001f0785620966b9
Commit Graph
201 Commits
Author SHA1 Message Date
YaFedImYaEatIm bf8c1d1fdf Added Serialisation for the Session Code 2016-09-16 17:03:17 +12:00
YaFedImYaEatIm d0148d9e73 Added Enums for each Open View for easier storage for Session. 2016-09-16 17:00:25 +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
YaFedImYaEatIm ebe82fb6ed Initial commit for Session 2016-09-16 14:10:48 +12:00
Michael Wilson 92c5cf9c8b First graph displays it's data as desired. 2016-09-16 13:28:52 +12:00
YaFedImYaEatIm b4073723f5 Merge branch 'Filter' 2016-09-16 12:52:42 +12:00
YaFedImYaEatIm 42592edfa1 Added Route Filtering 2016-09-16 12:52:15 +12:00
Liam Beckett ff20c6435e Implemented the ablitity to manually enter flight points into the database. 2016-09-16 12:50:58 +12:00
YaFedImYaEatIm 462f2304e4 Made Airline Filter 2016-09-16 12:45:24 +12:00
YaFedImYaEatIm 87bd23f722 Made Abstract Filter Class 2016-09-16 12:42:29 +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
YaFedImYaEatIm 091d9e5e00 got rid of dataset test code 2016-09-16 11:19:10 +12:00
YaFedImYaEatIm 9f804affff Merge branch 'DeleteFunctions' 2016-09-16 11:16:31 +12:00
YaFedImYaEatIm cd94b51282 Delete Code made 2016-09-16 11:15:38 +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
YaFedImYaEatIm f54b109639 Added delete dataset Function 2016-09-16 08:49:01 +12:00
YaFedImYaEatIm a6f5f13c0b Merged CreateLinks Branch which allowed CreateLinks() function to work along with new Import Messages 2016-09-16 00:13:55 +12:00
YaFedImYaEatIm fac5ec79b1 Changed Import Messages to be relavent to the type of data they import 2016-09-16 00:06:57 +12:00
YaFedImYaEatIm 693acf9b9c Finished Create Link() establishment 2016-09-16 00:03:57 +12:00
Michael Wilson 16b9a7a8a8 Fixed routes summary. 2016-09-15 21:22:08 +12:00
YaFedImYaEatIm 58c2c6a839 Refactored some variables 2016-09-15 17:01:42 +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 c1ac1ca6e3 Added in some comment for the functions and classes that didnt have them 2016-09-15 13:18:39 +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
YaFedImYaEatIm c7f033283d Add Singular Route Adding Function 2016-09-14 22:58:04 +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
Michael Wilson 9da9b40176 Route Summary controller code built though currently has nothing calling it and has not been tested. 2016-09-14 21:05:35 +12:00
Michael Wilson a1bf694699 Airport Summary controller code built though currently has nothing calling it and has not been tested. 2016-09-14 20:47:15 +12:00
Michael Wilson ab21d0f25d Airline Summary controller code built though currently has nothing calling it and has not been tested. 2016-09-14 20:33:58 +12:00
Liam Beckett 9912f2c3af Merge branch 'WIP_Flight_RawData' into 'master' 
flight raw data



See merge request !4
 2016-09-14 13:43:31 +12:00