fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
308 Commits 1 Branch 0 Tags
ee239d9d6b262b757990adfe13547c81b70da465
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
YaFedImYaEatIm ee239d9d6b Added catching for no Paths in Dataset 2016-10-01 18:06:46 +13:00
YaFedImYaEatIm 4118d2762c Refreshing side when tflight data is edited 2016-10-01 18:00:25 +13:00
YaFedImYaEatIm 3f54e0998b Fixed Liam's silly, not setting dataset. And Sunguin's merge deleting Liam's Move up and Down buttons 2016-10-01 17:35:25 +13:00
YaFedImYaEatIm 262547e590 Fixed JUnitTests as well as added a few tweaks to the flight point moving 2016-09-30 15:32:07 +13:00
YaFedImYaEatIm e0d074af19 Made the Dataset chooser not mess with the menu and fixed merge problems 2016-09-30 15:21:50 +13:00
YaFedImYaEatIm 94fc6a8921 Open, delete and add dataset now work 2016-09-30 14:55:02 +13:00
YaFedImYaEatIm b94fcb6c29 Fixed some merge rollback RAWRgit add .git add . 2016-09-30 14:17:33 +13:00
YaFedImYaEatIm 683c89622d Initial commit for Dataset Controller 2016-09-30 13:31:13 +13:00
YaFedImYaEatIm dd2045d147 Fixed Filter Data Dictionary Key error from the GUI 2016-09-30 13:19:40 +13:00
YaFedImYaEatIm 79b73f845e Reverted Merge Error where changes were deleted 2016-09-30 10:48:59 +13:00
YaFedImYaEatIm 5c1dbe775e Reverted some merge error 2016-09-30 10:36:21 +13:00
YaFedImYaEatIm 7e94a272f0 Optimised Delete Flight Path Function and changed flight Analyser button from private to public 2016-09-24 18:41:08 +12:00
YaFedImYaEatIm 7396ea1f04 Fixed up delete Flight Point so that it updates the flight path on delete as well as recalulating distances 2016-09-24 18:18:34 +12:00
YaFedImYaEatIm 4582f4de61 Fixed Edit Dictionary key entries 2016-09-24 18:13:08 +12:00
YaFedImYaEatIm 2f6a4a156f Fixed pull merge Errors 2016-09-24 18:06:26 +12:00
YaFedImYaEatIm f220bd98aa Added Key Comments 2016-09-24 18:04:21 +12:00
YaFedImYaEatIm 9e21e32cd8 Fixed Some Errors with Editting Airports with non existing Cities and Countries. Also made it so that if they are new cities they will be added to the database. 2016-09-24 16:31:33 +12:00
YaFedImYaEatIm 8d55e7dbca Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-24 14:54:59 +12:00
YaFedImYaEatIm f3ab8dfe14 Added Flight Point order switch JUnitTests 2016-09-24 14:54:44 +12:00
YaFedImYaEatIm 267a08ce68 Fixed Maven Error where ID wasn't set as the database did not establish the index before the creation of the table 2016-09-24 14:15:16 +12:00
YaFedImYaEatIm b7950c1649 Deleted uneccessary Duplicates message for dataset 2016-09-23 13:15:38 +12:00
YaFedImYaEatIm 4ef20aef0f Removed uneccessary function call 2016-09-23 11:59:45 +12:00
YaFedImYaEatIm 7ffe8dcea8 Added Calculation for Heading, Leg Distance and Total Distnace also added the appropriate functio nto commit these to database. 2016-09-23 11:58:47 +12:00
YaFedImYaEatIm 68277cb983 Added Some Doc String & Reset the Database from all changes 2016-09-23 10:43:00 +12:00
YaFedImYaEatIm 42a0ecfb94 Added set Current Dataset Function 2016-09-23 10:42:11 +12:00
YaFedImYaEatIm 30cf90bb40 Added Loading Datasets 2016-09-23 10:38:02 +12:00
YaFedImYaEatIm ed15c2bd76 Added Change Path Source and Destination Airports on changing the first or last entry in the flight points 2016-09-23 10:16:56 +12:00
YaFedImYaEatIm e19c59d66b Initial Point Ordering Commit 2016-09-23 09:45:33 +12:00
YaFedImYaEatIm ab531fdcb1 Added popup loader and Scene AIRLINE_ADD 2016-09-22 16:17:45 +12:00
YaFedImYaEatIm 9568ed5522 replaced double quotes with 2 double quotes for SQL entries. 2016-09-22 01:13:37 +12:00
YaFedImYaEatIm 68eb19f745 Added Flight POint edit function 2016-09-22 01:10:26 +12:00
YaFedImYaEatIm f59ab8e486 Add EditRoutes function 2016-09-22 00:53:37 +12:00
YaFedImYaEatIm 82113d2544 Added Edit Airline and Edit Airport 2016-09-22 00:42:19 +12:00
YaFedImYaEatIm 8f0619d20f Made EntryParser which will parse a single entry 2016-09-22 00:02:23 +12:00
YaFedImYaEatIm f35a21bc89 Added Alternative Run Method 2016-09-19 16:24:02 +12:00
YaFedImYaEatIm 58b96c5be3 Updated how to run and necessary Files needed to run this Program 2016-09-19 16:22:14 +12:00
YaFedImYaEatIm 73cfca0ccc fixed index out of array after deleting FlightPath for map 2016-09-19 15:00:09 +12:00
YaFedImYaEatIm ddac466879 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-19 14:47:05 +12:00
YaFedImYaEatIm 4a5d7392e5 Fixed Google Map bug and DeleteFLightPath() 2016-09-19 14:46:55 +12:00
YaFedImYaEatIm 0f726bbaf4 Added new Sample file and change some parameters in FlightPathParser 2016-09-19 08:26:46 +12:00
YaFedImYaEatIm dec72c0272 Uncommented a few necessary functions and new Sample DataFile 2016-09-19 08:07:46 +12:00
YaFedImYaEatIm 0fe8f450b0 Refreshed the Database to a clean state 2016-09-19 07:02:54 +12:00
YaFedImYaEatIm bb535a74bf Added LOts of Brief Javadocs 2016-09-19 06:50:14 +12:00
YaFedImYaEatIm 0672dfe86b Merge branch 'unitTests' 2016-09-19 06:11:41 +12:00
YaFedImYaEatIm 3519c52cb1 Added Airline FIlter Javadoc 2016-09-19 06:11:17 +12:00
YaFedImYaEatIm 877e4b5b22 Made Filter Unit Tests 2016-09-19 06:06:58 +12:00
YaFedImYaEatIm 121259626f Added Session Unit Test 2016-09-19 05:44:40 +12:00
YaFedImYaEatIm c2bb5d2097 Dataset UnitTests Made 2016-09-19 05:38:04 +12:00
YaFedImYaEatIm ef3a3fc240 Added Testables to AppTest 2016-09-19 02:16:20 +12:00
YaFedImYaEatIm 0de6bfafe5 Made Route Path Test. 2016-09-19 01:52:38 +12:00
YaFedImYaEatIm 6e3ba9775a Added Flight POint Test as well as some Exceptions 2016-09-19 01:43:06 +12:00
YaFedImYaEatIm 548b5fe321 Added Flight Path Tests 2016-09-19 01:24:15 +12:00
YaFedImYaEatIm 9391b31092 Made Unit Test for COuntry 2016-09-19 00:51:51 +12:00
YaFedImYaEatIm b232dcd7e6 Added some index checks and relavent Tests for them 2016-09-19 00:11:57 +12:00
YaFedImYaEatIm a0959e8de6 Added City JUnit Tests 2016-09-18 23:54:31 +12:00
YaFedImYaEatIm 02c3e3ed99 Added delete Route Tests and toString test 2016-09-18 23:38:54 +12:00
YaFedImYaEatIm b62bf7f1b1 Added COuntry tests, alternative constructor and ID error tests 2016-09-18 23:27:06 +12:00
YaFedImYaEatIm 960fdc3e96 Missing setID in coverage for routes 2016-09-18 23:19:27 +12:00
YaFedImYaEatIm 60bcc0dbf2 Fixed toString Test and added getRoute Test 2016-09-18 23:14:47 +12:00
YaFedImYaEatIm 739fce7ccf Merge branch 'unitTests' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 into unitTests 2016-09-18 23:06:11 +12:00
YaFedImYaEatIm 80f4db950e Added new functions to JUnitTest for Route Tests 2016-09-18 23:05:46 +12:00
YaFedImYaEatIm 0adc57fc36 Airline Tests 2016-09-18 18:42:15 +12:00
YaFedImYaEatIm 8c656d0672 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-18 13:59:39 +12:00
YaFedImYaEatIm a857cfb7af Added Redirection to SUmmary pages after Import. 2016-09-18 13:59:33 +12:00
YaFedImYaEatIm 8a4134ae4c Made variables private 2016-09-18 13:43:59 +12:00
YaFedImYaEatIm 65e05177e9 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-18 13:35:18 +12:00
YaFedImYaEatIm 57d2ed493c Fixed Route Unit Test 2016-09-18 13:35:06 +12:00
YaFedImYaEatIm 618afd4a92 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-18 13:29:18 +12:00
YaFedImYaEatIm 724f63956a Added Javadoc Strings for Some functions 2016-09-18 01:21:30 +12:00
YaFedImYaEatIm 9e00e3666f Fixed Conflicts when merging ConnectMaps 2016-09-18 00:34:08 +12:00
YaFedImYaEatIm 84e273de1f Merge branch 'ConnectMaps' 2016-09-17 20:07:02 +12:00
YaFedImYaEatIm 5363cf8b4e COnnected maps to airlines, Airports and ROutes 2016-09-17 20:06:19 +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
YaFedImYaEatIm ae3fbefd0d Initial load for GoogleMaps done 2016-09-17 16:40:25 +12:00
YaFedImYaEatIm 2613489dad Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 
Conflicts:
	res/session.ser
 2016-09-17 15:15:29 +12:00
YaFedImYaEatIm cbfe40a8fd Edited Session Message as Importer Error messages 2016-09-17 15:09:21 +12:00
YaFedImYaEatIm 03bac3b6dd Made it so that the session file is ignored 2016-09-17 15:08:53 +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
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
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
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
YaFedImYaEatIm f54b109639 Added delete dataset Function 2016-09-16 08:49:01 +12:00
YaFedImYaEatIm de9cee785c Changed some tests to reflect some function name changes 2016-09-16 00:19:57 +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
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