fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
330 Commits 1 Branch 0 Tags
af25df2f2bd8fd76411e8185570b78e5f504d36c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
YaFedImYaEatIm af25df2f2b Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-10-02 15:35:01 +13:00
YaFedImYaEatIm ae82d7000a Added Pop Up Map 2016-10-02 15:34:54 +13:00
YaFedImYaEatIm 5f2967e9cc Simplified get Route By Airport 2016-10-02 01:37:42 +13:00
YaFedImYaEatIm 3f26aff3d2 Added Routes By Equipment 2016-10-02 01:36:15 +13:00
YaFedImYaEatIm f930f7664e Made the first one of each Airline, Airport and Route tables load each load 2016-10-02 00:58:00 +13:00
YaFedImYaEatIm 1e65e8ef37 Fixed Dataset Changing Error and Selected Table Item Indices Error 2016-10-02 00:52:53 +13:00
YaFedImYaEatIm 236b93ed85 Added Routes By Airport Menu 2016-10-02 00:52:03 +13:00
YaFedImYaEatIm b31fa6e24b Added Connection error message to google maps. 2016-10-01 23:19:16 +13:00
YaFedImYaEatIm 021a03c6b4 Added if dataset open/add incase dataset is null to all pages that require a non null dataset to exist. 2016-10-01 23:10:36 +13:00
YaFedImYaEatIm e217d23ebc Created button in menu to open/change the dataset 2016-10-01 22:55:34 +13:00
YaFedImYaEatIm fe485184d9 Added change dataset prompts to import functions 2016-10-01 22:51:04 +13:00
YaFedImYaEatIm af27e408f4 Made VIA column in Flight Points invisible 2016-10-01 22:28:11 +13:00
YaFedImYaEatIm df6f2a9c93 Cleaned up unnecessary entries for the flight point adder 2016-10-01 22:25:48 +13:00
YaFedImYaEatIm 12601287b2 removed IATA/FFA column and added Number of ROutes column 2016-10-01 22:01:40 +13:00
YaFedImYaEatIm ca12ff4202 Fixed flightPaths adding new flight path error 2016-10-01 18:53:20 +13:00
YaFedImYaEatIm 8f5bd3e192 Added Cannot delte if the flight path only has 2 points 2016-10-01 18:37:09 +13:00
YaFedImYaEatIm fdce7e2f2f Made Delete update the Flight Path Information 2016-10-01 18:25:56 +13:00
YaFedImYaEatIm 986e22bf1e Moved Add Listeners to Initilisation function to prevent 500000000000 stacks of listeners 2016-10-01 18:16:16 +13:00
YaFedImYaEatIm a1f02b7cfb Initialised the LIstener in the Initilisation method instead of an onclick function 2016-10-01 18:14:44 +13:00
YaFedImYaEatIm 1cdc1f387c Changed OnMouseClick to OnMenu Change to prevent errors 2016-10-01 18:13:37 +13:00
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