Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• 60bcc0dbf2 Fixed toString Test and added getRoute Test YaFedImYaEatIm 2016-09-18 23:14:47 +12:00
• 739fce7ccf Merge branch 'unitTests' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 into unitTests YaFedImYaEatIm 2016-09-18 23:06:11 +12:00
• 80f4db950e Added new functions to JUnitTest for Route Tests YaFedImYaEatIm 2016-09-18 23:05:46 +12:00
• c92f8e5c54 Added test cases for missing Functiosn in Airport YaFedImYaEatIm 2016-09-18 21:22:35 +12:00
• d43fd1bdd6 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 Liam Beckett 2016-09-18 19:43:06 +12:00
• 0adc57fc36 Airline Tests YaFedImYaEatIm 2016-09-18 18:42:15 +12:00
• 8646e5864d Changed some variable names for summary controller airport Sunguin Peng 2016-09-18 18:40:13 +12:00
• ab90d060bb Updated Javadoc and made a popup for not yet implemented button Sunguin Peng 2016-09-18 18:19:21 +12:00
• 8c656d0672 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 YaFedImYaEatIm 2016-09-18 13:59:39 +12:00
• a857cfb7af Added Redirection to SUmmary pages after Import. YaFedImYaEatIm 2016-09-18 13:59:33 +12:00
• 744b96c42a Fixed some previously unknown issues from merging. Michael Wilson 2016-09-18 13:54:56 +12:00
• 7ebfa6c182 Merge remote-tracking branch 'origin/master' Liam Beckett 2016-09-18 13:45:35 +12:00
• 8a4134ae4c Made variables private YaFedImYaEatIm 2016-09-18 13:43:59 +12:00
• 65e05177e9 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 YaFedImYaEatIm 2016-09-18 13:35:18 +12:00
• 57d2ed493c Fixed Route Unit Test YaFedImYaEatIm 2016-09-18 13:35:06 +12:00
• 0c98916c04 Merge remote-tracking branch 'origin/master' Liam Beckett 2016-09-18 13:34:09 +12:00
• 618afd4a92 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 YaFedImYaEatIm 2016-09-18 13:29:18 +12:00
• 02b484917d Fixed calculation bug. Michael Wilson 2016-09-18 13:29:02 +12:00
• 60b92d2170 Merge remote-tracking branch 'origin/master' Michael Wilson 2016-09-18 13:14:00 +12:00
• ffae933085 Database Liam Beckett 2016-09-18 11:27:17 +12:00
• b2cba96dc1 Added javadoc for airline, airport and route raw data controller classes. Sunguin Peng 2016-09-18 10:38:54 +12:00
• 724f63956a Added Javadoc Strings for Some functions YaFedImYaEatIm 2016-09-18 01:21:30 +12:00
• 9e00e3666f Fixed Conflicts when merging ConnectMaps YaFedImYaEatIm 2016-09-18 00:34:08 +12:00
• ff79599c9b Calculator Implimented. Michael Wilson 2016-09-17 20:46:23 +12:00
• 37e712f734 Refactoring bugs fixed again Sunguin Peng 2016-09-17 20:33:20 +12:00
• 84e273de1f Merge branch 'ConnectMaps' YaFedImYaEatIm 2016-09-17 20:07:02 +12:00
• 5363cf8b4e COnnected maps to airlines, Airports and ROutes YaFedImYaEatIm 2016-09-17 20:06:19 +12:00
• 50cc5c6dfb Merging filter complete GUI for Airport, Airline and Route Raw Data Sunguin Peng 2016-09-17 18:22:31 +12:00
• 4d662be24a Layout change Liam Beckett 2016-09-17 18:16:13 +12:00
• 1feb1c9153 Added filter function to the Airline GUI Sunguin Peng 2016-09-17 18:16:10 +12:00
• bf33ec61c7 Merge fix Liam Beckett 2016-09-17 18:14:17 +12:00
• 1664a49623 Merge remote-tracking branch 'origin/master' Liam Beckett 2016-09-17 18:13:02 +12:00
• cd8e2b0c7f Implemented the delete option for the flight paths on the Summary and Raw Data pages. Liam Beckett 2016-09-17 18:08:42 +12:00
• 44ed68ee7a Added Google Maps API YaFedImYaEatIm 2016-09-17 18:03:46 +12:00
• a9edea7690 Finished Google Maps API YaFedImYaEatIm 2016-09-17 18:01:35 +12:00
• 62a93ad629 Implemented right click, delete ability for the flight raw data paths Liam Beckett 2016-09-17 17:53:16 +12:00
• 548ffa99f1 Added webveiws for later maps implimentation. Michael Wilson 2016-09-17 17:50:35 +12:00
• 30f7b2d842 Fixed a bug from Route Filter and implemented Airport Filter in GUI Sunguin Peng 2016-09-17 17:40:24 +12:00
• 3508518cdd Added in the right click, delete option for the flight points in the table. Liam Beckett 2016-09-17 17:37:39 +12:00
• be3413a373 Merge branch 'WIP_Update_list' into 'master' Liam Beckett 2016-09-17 16:48:08 +12:00
• afc7d1472f Merge remote-tracking branch 'remotes/origin/master' into WIP_Update_list Liam Beckett 2016-09-17 16:46:41 +12:00
• 42bbb327c4 Database Liam Beckett 2016-09-17 16:45:47 +12:00
• 7333620964 Fixed the list view bug, so it will now reload the list view so that it includes the newly added path. Liam Beckett 2016-09-17 16:45:11 +12:00
• ae3fbefd0d Initial load for GoogleMaps done YaFedImYaEatIm 2016-09-17 16:40:25 +12:00
• 4fde239167 Route Filtering on GUI Sunguin Peng 2016-09-17 16:33:20 +12:00
• 8c49ce4455 Merge remote-tracking branch 'origin/master' Michael Wilson 2016-09-17 16:03:08 +12:00
• 3218b72941 Created pie graph viewer for Airports. Michael Wilson 2016-09-17 16:02:27 +12:00
• d838274065 Merge branch 'WIP_Flight_Add_Path' into 'master' Liam Beckett 2016-09-17 15:46:36 +12:00
• 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. Liam Beckett 2016-09-17 15:36:00 +12:00
• 2613489dad Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 YaFedImYaEatIm 2016-09-17 15:15:29 +12:00
• cbfe40a8fd Edited Session Message as Importer Error messages YaFedImYaEatIm 2016-09-17 15:09:21 +12:00
• 03bac3b6dd Made it so that the session file is ignored YaFedImYaEatIm 2016-09-17 15:08:53 +12:00
• 5cc305d896 Fixed some refactoring issues and implemented delete functions in the GUI Sunguin Peng 2016-09-17 15:06:29 +12:00
• 8b30d2c0c2 Merge remote-tracking branch 'origin/master' Michael Wilson 2016-09-17 14:58:18 +12:00
• eb698f17c8 Made graph work with new formatting. Michael Wilson 2016-09-17 14:57:21 +12:00
• 8027b701a0 Added Import UI YaFedImYaEatIm 2016-09-17 14:39:52 +12:00
• 56eeb0e9f8 Merge branch 'Analyser' Michael Wilson 2016-09-17 14:06:24 +12:00
• f0fbc7cf24 Small check added. Michael Wilson 2016-09-17 14:02:11 +12:00
• e3ff9d3bfc Fixed a bit of Airline GUI Sunguin Peng 2016-09-17 11:52:07 +12:00
• 00333b6e58 Added Session and Controller Abstract Class YaFedImYaEatIm 2016-09-16 21:55:08 +12:00
• 4ff6aefd1e Implemented Abstract Controller class which made code a lot short and easier to read YaFedImYaEatIm 2016-09-16 21:49:12 +12:00
• 5641cc3728 Loaded Observers to Session loading YaFedImYaEatIm 2016-09-16 17:23:06 +12:00
• bf8c1d1fdf Added Serialisation for the Session Code YaFedImYaEatIm 2016-09-16 17:03:17 +12:00
• d0148d9e73 Added Enums for each Open View for easier storage for Session. YaFedImYaEatIm 2016-09-16 17:00:25 +12:00
• 68081c664e Merge branch 'WIP_Flights_Adder' into 'master' Liam Beckett 2016-09-16 16:41:50 +12:00
• 25fcc8cf94 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 Liam Beckett 2016-09-16 16:38:31 +12:00
• 55db945a9d Database Liam Beckett 2016-09-16 16:27:28 +12:00
• ebe82fb6ed Initial commit for Session YaFedImYaEatIm 2016-09-16 14:10:48 +12:00
• 92c5cf9c8b First graph displays it's data as desired. Michael Wilson 2016-09-16 13:28:52 +12:00
• b4073723f5 Merge branch 'Filter' YaFedImYaEatIm 2016-09-16 12:52:42 +12:00
• 42592edfa1 Added Route Filtering YaFedImYaEatIm 2016-09-16 12:52:15 +12:00
• ff20c6435e Implemented the ablitity to manually enter flight points into the database. Liam Beckett 2016-09-16 12:50:58 +12:00
• 462f2304e4 Made Airline Filter YaFedImYaEatIm 2016-09-16 12:45:24 +12:00
• 87bd23f722 Made Abstract Filter Class YaFedImYaEatIm 2016-09-16 12:42:29 +12:00
• bed13aca2f Changed GUI Sunguin Peng 2016-09-16 12:09:27 +12:00
• 0cfffd258c GUI displays all fields and altered some GUI Sunguin Peng 2016-09-16 12:07:15 +12:00
• 091d9e5e00 got rid of dataset test code YaFedImYaEatIm 2016-09-16 11:19:10 +12:00
• 9f804affff Merge branch 'DeleteFunctions' YaFedImYaEatIm 2016-09-16 11:16:31 +12:00
• cd94b51282 Delete Code made YaFedImYaEatIm 2016-09-16 11:15:38 +12:00
• 87d4b42036 Fixed 2 incorrect buttons and hooked up flight buttons. Michael Wilson 2016-09-16 09:47:36 +12:00
• 94f2d25899 Hooked up all buttons for summary pages. Michael Wilson 2016-09-16 09:31:02 +12:00
• f54b109639 Added delete dataset Function YaFedImYaEatIm 2016-09-16 08:49:01 +12:00
• de9cee785c Changed some tests to reflect some function name changes YaFedImYaEatIm 2016-09-16 00:19:57 +12:00
• a6f5f13c0b Merged CreateLinks Branch which allowed CreateLinks() function to work along with new Import Messages YaFedImYaEatIm 2016-09-16 00:13:55 +12:00
• fac5ec79b1 Changed Import Messages to be relavent to the type of data they import YaFedImYaEatIm 2016-09-16 00:06:57 +12:00
• 693acf9b9c Finished Create Link() establishment YaFedImYaEatIm 2016-09-16 00:03:57 +12:00
• 16b9a7a8a8 Fixed routes summary. Michael Wilson 2016-09-15 21:22:08 +12:00
• 58c2c6a839 Refactored some variables YaFedImYaEatIm 2016-09-15 17:01:42 +12:00
• 0189cfbe1c Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 Sunguin Peng 2016-09-15 16:54:24 +12:00
• 33aafeb510 Resized GUI and refactoring Sunguin Peng 2016-09-15 16:53:56 +12:00
• 605717a3c2 Resized GUI and changed add for GUI to not include ID Sunguin Peng 2016-09-15 16:51:11 +12:00
• ddcb3f65a7 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 Liam Beckett 2016-09-15 16:49:13 +12:00
• 39cdb4b583 Moved the database file back where it belongs. Liam Beckett 2016-09-15 16:33:04 +12:00
• 273d694490 Fixed summary files FXML. Michael 2016-09-15 16:30:20 +12:00
• 57c7a4d326 Added a web view to the fxml for the summary page so we can implement the maps API Liam Beckett 2016-09-15 16:26:36 +12:00
• 27888ed689 Merge remote-tracking branch 'origin/master' Michael 2016-09-15 16:14:23 +12:00
• 76da24c06e Merge branch 'WIP_Flight_Summary_Button' into 'master' Liam Beckett 2016-09-15 16:12:00 +12:00
• 11ad212c2e Implemented the raw data button on the flight summary page so it changes the scene Liam Beckett 2016-09-15 16:10:52 +12:00
• e914c50498 Merge branch 'WIP_Summary' Michael 2016-09-15 16:08:30 +12:00
• cd1c505dc6 Merge remote-tracking branch 'origin/master' Michael 2016-09-15 15:13:49 +12:00