fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
132 Commits 1 Branch 0 Tags
3218b729411a50925d44c2826036a2dbf41b8903
Commit Graph
59 Commits
Author SHA1 Message Date
Michael Wilson 3218b72941 Created pie graph viewer for Airports. 2016-09-17 16:02:27 +12:00
Michael Wilson 8b30d2c0c2 Merge remote-tracking branch 'origin/master' 2016-09-17 14:58:18 +12:00
Michael Wilson eb698f17c8 Made graph work with new formatting. 2016-09-17 14:57:21 +12:00
YaFedImYaEatIm 8027b701a0 Added Import UI 2016-09-17 14:39:52 +12:00
YaFedImYaEatIm 00333b6e58 Added Session and Controller Abstract Class 2016-09-16 21:55:08 +12:00
YaFedImYaEatIm 4ff6aefd1e Implemented Abstract Controller class which made code a lot short and easier to read 2016-09-16 21:49:12 +12:00
YaFedImYaEatIm 5641cc3728 Loaded Observers to Session loading 2016-09-16 17:23:06 +12:00
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
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 cd94b51282 Delete Code made 2016-09-16 11:15:38 +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
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
Liam Beckett 39cdb4b583 Moved the database file back where it belongs. 2016-09-15 16:33:04 +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
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
YaFedImYaEatIm c7f033283d Add Singular Route Adding Function 2016-09-14 22:58:04 +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
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 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
Sunguin Peng dff71615cb Trialing branch for own work 2016-09-14 08:35:32 +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
Liam Beckett 3e5b793cb2 Trying to fix the merge conflict 2016-09-13 16:39:22 +12:00
Liam Beckett a46609b0b2 Begun work on the flight data parser, committing changes and merging in order to add another feature. 2016-09-13 16:24:43 +12:00