fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
142 Commits 1 Branch 0 Tags
be3413a37384c0dbd822d102e8bf92c332543728
Commit Graph
142 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 76da24c06e Merge branch 'WIP_Flight_Summary_Button' into 'master' 
Implemented the raw data button on the flight summary page so it changes the scene



See merge request !7
 2016-09-15 16:12:00 +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 d62dce4041 Merge branch 'WIP_Flight_ListView_Click_Response' into 'master' 
flight list view click response



See merge request !6
 2016-09-15 13:21:20 +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
YaFedImYaEatIm 66ee9ced2d Added Singular Add Route 2016-09-14 22:29:19 +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
Liam Beckett 208621650e Minor updates to the GUI files for both raw data and summary Flight pages. Implemented the loading of data into tables for flight raw data. 2016-09-14 13:38:13 +12:00
YaFedImYaEatIm e6c468e826 Added Singular Airport Adding 2016-09-14 11:52:45 +12:00
YaFedImYaEatIm d84346de60 Added singular Airport adding 2016-09-14 11:51:39 +12:00
Sunguin Peng 3eb144ae36 Merged into master branch 2016-09-14 11:45:19 +12:00
Liam Beckett 399d1eb069 Changed the raw data GUI for flights and testing new branch 2016-09-14 11:45:04 +12:00
Sunguin Peng 6806c0d099 Linked Raw Data GUI together and tables have some data in them from the database. 2016-09-14 11:38:59 +12:00
YaFedImYaEatIm 4418bc6824 Changed files to work with merge 2016-09-14 10:40:28 +12:00
Liam Beckett 30181d39da Merge branch 'WIP_Flights' into 'master' 
Flights



See merge request !3
 2016-09-14 10:37:58 +12:00
Liam Beckett 35db19db2d Not all files were commited from the earlier commit, due to idle functionality misunderstandings 2016-09-14 10:34:54 +12:00
Liam Beckett af8617b316 Commented out tests in the App 2016-09-14 10:30:27 +12:00
YaFedImYaEatIm a89e5f7b95 Made Add Airline FUnction 2016-09-14 10:25:58 +12:00
Liam Beckett 13697ac673 Implemented the parser for basic Flight files(The one given to us in the important documents folder on learn) 2016-09-14 10:22:01 +12:00
Michael 0fa08a9d5d Fixed missing button names. 2016-09-14 10:00:12 +12:00
Michael 58c4a31441 Buttons named. 2016-09-14 09:55:20 +12:00
Michael b5b7899b7b Merge remote-tracking branch 'origin/master' 2016-09-14 08:51:32 +12:00
Michael 0182cabec6 Added summary gui components 2016-09-14 08:50:13 +12:00
Sunguin Peng dff71615cb Trialing branch for own work 2016-09-14 08:35:32 +12:00
Liam Beckett b6624f20a8 Updated the Flight Summary GUI 2016-09-14 08:29:01 +12:00
YaFedImYaEatIm dac4146f33 Added calculate Distance() 2016-09-14 08:23:30 +12:00
YaFedImYaEatIm b08f190124 Fixed Errors with Loading Flight Data FXML 2016-09-13 21:15:00 +12:00
Liam Beckett 3be9fca029 Added back in the GUI implementation for the flight raw data and summary viewer which was lost / changed earlier. Also in the process of updating their fxml files to improve the GUI 2016-09-13 21:01:58 +12:00
YaFedImYaEatIm b9308060f1 Fixed Controller after merge 2016-09-13 18:26:07 +12:00
YaFedImYaEatIm 859b19f7d5 Fixed Scene Loading 2016-09-13 18:22:28 +12:00
Liam Beckett 9c594fd474 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/seng202/group9/GUI/MenuController.java
 2016-09-13 16:42:33 +12:00