fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
384 Commits 1 Branch 0 Tags
main
Commit Graph
81 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Liam Beckett 12c396a263 Merge branch 'Update_Path' into 'master' 
Update path



See merge request !22
 2016-10-01 16:50:04 +13:00
Liam Beckett e34e0bafee Merge remote-tracking branch 'remotes/origin/master' into Update_Path 
# Conflicts:
#	src/main/java/seng202/group9/GUI/FlightRDController.java
#	src/main/resources/flight_raw_data.fxml
 2016-10-01 16:49:06 +13:00
Liam Beckett e51aaaa7f2 Fixed bug with flight pages and an empty dataset 2016-10-01 16:43:28 +13:00
Liam Beckett 04481661c4 Removed the via column in the table 2016-10-01 16:00:43 +13:00
Liam Beckett 6ec38bcb87 Fixed the error when the user clicks on empty path fields in the flight path list view 2016-10-01 15:31:28 +13:00
Liam Beckett e17bf9b055 Fixed the move up and down bugs on for the first and last points in a path. 2016-10-01 15:02:45 +13:00
Liam Beckett 805eee58af Updated the path so that it will update when the 2nd point becomes the 1st point 2016-10-01 14:52:59 +13:00
Liam Beckett 0e1442e401 Merge branch 'WIP_Flight_Order' into 'master' 
flight order



See merge request !20
 2016-10-01 12:56:13 +13:00
Liam Beckett ccc40cfb60 MERGE 2016-10-01 12:54:31 +13:00
Liam Beckett b7990a3507 Merge remote-tracking branch 'remotes/origin/master' into WIP_Flight_Order 
# Conflicts:
#	res/userdb.db
 2016-10-01 11:38:45 +13:00
Liam Beckett 70645e7307 Started work on the ordering of flight points 2016-09-30 14:03:38 +13:00
Liam Beckett 9dde2ca025 Merge branch 'Flight_Summary_Branch' into 'master' 
Flight summary branch



See merge request !18
 2016-09-30 13:09:40 +13:00
Liam Beckett 7229ac5211 Added java doc 2016-09-30 13:08:10 +13:00
Liam Beckett eae3c34be2 Implemented the Summary information on the flight data summary page 2016-09-30 13:05:54 +13:00
Liam Beckett a8a377a893 Merge branch 'WIP_Flight_Editor' into 'master' 
flight editor



See merge request !17
 2016-09-24 17:42:22 +12:00
Liam Beckett 5d6d35276b Fixed for merge 2016-09-24 17:40:06 +12:00
Liam Beckett 1dd8258217 Deleted print for SQL Entry 2016-09-24 17:35:11 +12:00
Liam Beckett 7c3b84140d Reverted some ID's back from -1 to 1 2016-09-24 17:30:31 +12:00
Liam Beckett 3091d8eb63 Fixed Some Dictionary Errors in Flightpoints 2016-09-24 17:24:59 +12:00
Liam Beckett b1864b6467 Merge remote-tracking branch 'remotes/origin/master' into WIP_Flight_Editor 
# Conflicts:
#	res/userdb.db
#	src/main/java/seng202/group9/Controller/App.java
#	src/main/java/seng202/group9/Controller/Dataset.java
#	src/main/java/seng202/group9/Controller/SceneCode.java
#	src/main/java/seng202/group9/Controller/Session.java
#	src/main/java/seng202/group9/Core/FlightPath.java
 2016-09-24 17:03:57 +12:00
Liam Beckett 5c7991fdc1 Database 2016-09-24 16:38:41 +12:00
Liam Beckett aeae85b9e5 Fixed up some of the javadocs and did some refactoring removing unneccesary code. 2016-09-24 16:35:24 +12:00
Liam Beckett df5721973f Fixed the intial validation so any lower case name will be chnaged to uppercase 2016-09-24 16:17:29 +12:00
Liam Beckett 5f8e2f2481 Got the basic functionally done on the flight point editor. Currently will change the vaule although a few bugs in the validation aspects. 2016-09-24 16:08:41 +12:00
Liam Beckett f7d1e688fa Changed the controller 2016-09-23 16:43:49 +12:00
Liam Beckett d31bf1d15c Changed the controller 2016-09-23 16:43:28 +12:00
Liam Beckett 3d6dd0c2cb Atempting to get the editor to work for the flight raw data points (Currently broken) 2016-09-23 14:45:51 +12:00
Liam Beckett c1b338e35c Merge branch 'WIP_Flight_fixes' into 'master' 
flight fixes



See merge request !15
 2016-09-22 16:56:06 +12:00
Liam Beckett 753247b004 Implemented the same error messages that are used in other areas of the application 2016-09-22 16:53:46 +12:00
Liam Beckett c1df5bd066 Fixed the small bug in the Name validation and also improved the error messages when adding a new Flight path and inputting an incorrect ICAO code. 2016-09-22 16:08:31 +12:00
Liam Beckett fa729ee344 Removed no working menu buttons 2016-09-19 09:15:05 +12:00
Liam Beckett f7b7e8de6c Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-19 09:11:36 +12:00
Liam Beckett b5d04ef922 Merge remote-tracking branch 'origin/master' 2016-09-19 08:18:12 +12:00
Liam Beckett d43fd1bdd6 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-18 19:43:06 +12:00
Liam Beckett 7ebfa6c182 Merge remote-tracking branch 'origin/master' 2016-09-18 13:45:35 +12:00
Liam Beckett 0c98916c04 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	res/userdb.db
 2016-09-18 13:34:09 +12:00
Liam Beckett ffae933085 Database 2016-09-18 11:27:17 +12:00
Liam Beckett 4d662be24a Layout change 2016-09-17 18:16:13 +12:00
Liam Beckett bf33ec61c7 Merge fix 2016-09-17 18:14:17 +12:00
Liam Beckett 1664a49623 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/seng202/group9/GUI/FlightSummaryController.java
 2016-09-17 18:13:02 +12:00
Liam Beckett cd8e2b0c7f Implemented the delete option for the flight paths on the Summary and Raw Data pages. 2016-09-17 18:08:42 +12:00
Liam Beckett 62a93ad629 Implemented right click, delete ability for the flight raw data paths 2016-09-17 17:53:16 +12:00
Liam Beckett 3508518cdd Added in the right click, delete option for the flight points in the table. 2016-09-17 17:37:39 +12:00
Liam Beckett be3413a373 Merge branch 'WIP_Update_list' into 'master' 
update list



See merge request !13
 2016-09-17 16:48:08 +12:00
Liam Beckett afc7d1472f Merge remote-tracking branch 'remotes/origin/master' into WIP_Update_list 2016-09-17 16:46:41 +12:00
Liam Beckett 42bbb327c4 Database 2016-09-17 16:45:47 +12:00
Liam Beckett 7333620964 Fixed the list view bug, so it will now reload the list view so that it includes the newly added path. 2016-09-17 16:45:11 +12:00
Liam Beckett d838274065 Merge branch 'WIP_Flight_Add_Path' into 'master' 
Implements the button 'new' on the Flight raw data page which can be used to cre…

…ate a new blank path. Currently does not reload the list view of paths to include the new path.

See merge request !12
 2016-09-17 15:46:36 +12:00
Liam Beckett 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. 2016-09-17 15:36:00 +12:00
Liam Beckett 68081c664e Merge branch 'WIP_Flights_Adder' into 'master' 
Flights adder



See merge request !11
 2016-09-16 16:41:50 +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
Liam Beckett 55db945a9d Database 2016-09-16 16:27:28 +12:00
Liam Beckett ff20c6435e Implemented the ablitity to manually enter flight points into the database. 2016-09-16 12:50:58 +12:00
Liam Beckett ddcb3f65a7 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-15 16:49:13 +12:00
Liam Beckett 39cdb4b583 Moved the database file back where it belongs. 2016-09-15 16:33:04 +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
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
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
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
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
Liam Beckett 399d1eb069 Changed the raw data GUI for flights and testing new branch 2016-09-14 11:45:04 +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
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
Liam Beckett b6624f20a8 Updated the Flight Summary GUI 2016-09-14 08:29:01 +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
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
Liam Beckett b7674fc8ea Added in the Raw Flight Data page which now appears as a new window something again we will need to fix, have updated the menu.fxml document to include the tags for the two menu buttons for flight. Have realized that I will have to rework the GUI so that it scales better. 2016-09-13 13:46:25 +12:00
Liam Beckett 83ccf04d85 Implemented the GUI to open for the Flight Data Summary page however was unable to get it to open in the same stage so it opens in a new window. This is something to address later. 2016-09-13 13:23:44 +12:00
Liam Beckett ef3028c8c4 Merge branch 'ImplementFlightGUI' into 'master' 
Added in the drop down menu for the view tab on the menu bar. This provides indi…

Didnt mean to branch off at this point

See merge request !1
 2016-09-13 11:07:16 +12:00
Liam 9cc02bb305 Added in the drop down menu for the view tab on the menu bar. This provides individual links to the different GUI pages. 2016-09-13 11:05:36 +12:00
Liam 8111b9d35d Added in the GUI template for the raw flight data view. 2016-08-19 12:29:02 +12:00
Liam c3a6dd406b Added in the GUI template for the flight data summary. 2016-08-19 12:28:36 +12:00