ab90d060bb
Updated Javadoc and made a popup for not yet implemented button
9 years ago
8c656d0672
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
9 years ago
a857cfb7af
Added Redirection to SUmmary pages after Import.
9 years ago
744b96c42a
Fixed some previously unknown issues from merging.
9 years ago
8a4134ae4c
Made variables private
9 years ago
65e05177e9
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
9 years ago
57d2ed493c
Fixed Route Unit Test
9 years ago
02b484917d
Fixed calculation bug.
9 years ago
60b92d2170
Merge remote-tracking branch 'origin/master'
...
Conflicts:
src/main/java/seng202/group9/Controller/SceneCode.java
9 years ago
b2cba96dc1
Added javadoc for airline, airport and route raw data controller classes.
9 years ago
724f63956a
Added Javadoc Strings for Some functions
9 years ago
9e00e3666f
Fixed Conflicts when merging ConnectMaps
9 years ago
ff79599c9b
Calculator Implimented.
9 years ago
37e712f734
Refactoring bugs fixed again
9 years ago
5363cf8b4e
COnnected maps to airlines, Airports and ROutes
9 years ago
50cc5c6dfb
Merging filter complete GUI for Airport, Airline and Route Raw Data
9 years ago
4d662be24a
Layout change
9 years ago
1feb1c9153
Added filter function to the Airline GUI
9 years ago
bf33ec61c7
Merge fix
9 years ago
1664a49623
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/main/java/seng202/group9/GUI/FlightSummaryController.java
9 years ago
cd8e2b0c7f
Implemented the delete option for the flight paths on the Summary and Raw Data pages.
9 years ago
44ed68ee7a
Added Google Maps API
9 years ago
a9edea7690
Finished Google Maps API
9 years ago
62a93ad629
Implemented right click, delete ability for the flight raw data paths
9 years ago
548ffa99f1
Added webveiws for later maps implimentation.
9 years ago
30f7b2d842
Fixed a bug from Route Filter and implemented Airport Filter in GUI
9 years ago
3508518cdd
Added in the right click, delete option for the flight points in the table.
9 years ago
afc7d1472f
Merge remote-tracking branch 'remotes/origin/master' into WIP_Update_list
9 years ago
7333620964
Fixed the list view bug, so it will now reload the list view so that it includes the newly added path.
9 years ago
ae3fbefd0d
Initial load for GoogleMaps done
9 years ago
4fde239167
Route Filtering on GUI
9 years ago
8c49ce4455
Merge remote-tracking branch 'origin/master'
9 years ago
3218b72941
Created pie graph viewer for Airports.
9 years ago
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
9 years ago
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.
9 years ago
2613489dad
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
...
Conflicts:
res/session.ser
9 years ago
cbfe40a8fd
Edited Session Message as Importer Error messages
9 years ago
5cc305d896
Fixed some refactoring issues and implemented delete functions in the GUI
9 years ago
8b30d2c0c2
Merge remote-tracking branch 'origin/master'
9 years ago
eb698f17c8
Made graph work with new formatting.
9 years ago
8027b701a0
Added Import UI
9 years ago
56eeb0e9f8
Merge branch 'Analyser'
...
Conflicts:
src/main/java/seng202/group9/GUI/RouteRDController.java
9 years ago
f0fbc7cf24
Small check added.
9 years ago
e3ff9d3bfc
Fixed a bit of Airline GUI
9 years ago
00333b6e58
Added Session and Controller Abstract Class
9 years ago
4ff6aefd1e
Implemented Abstract Controller class which made code a lot short and easier to read
9 years ago
5641cc3728
Loaded Observers to Session loading
9 years ago
bf8c1d1fdf
Added Serialisation for the Session Code
9 years ago
d0148d9e73
Added Enums for each Open View for easier storage for Session.
9 years ago
25fcc8cf94
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
...
# Conflicts:
# res/userdb.db
9 years ago
ebe82fb6ed
Initial commit for Session
9 years ago
92c5cf9c8b
First graph displays it's data as desired.
9 years ago
b4073723f5
Merge branch 'Filter'
9 years ago
42592edfa1
Added Route Filtering
9 years ago
ff20c6435e
Implemented the ablitity to manually enter flight points into the database.
9 years ago
462f2304e4
Made Airline Filter
9 years ago
87bd23f722
Made Abstract Filter Class
9 years ago
bed13aca2f
Changed GUI
9 years ago
0cfffd258c
GUI displays all fields and altered some GUI
9 years ago
091d9e5e00
got rid of dataset test code
9 years ago
9f804affff
Merge branch 'DeleteFunctions'
9 years ago
cd94b51282
Delete Code made
9 years ago
87d4b42036
Fixed 2 incorrect buttons and hooked up flight buttons.
9 years ago
94f2d25899
Hooked up all buttons for summary pages.
9 years ago
f54b109639
Added delete dataset Function
9 years ago
de9cee785c
Changed some tests to reflect some function name changes
9 years ago
a6f5f13c0b
Merged CreateLinks Branch which allowed CreateLinks() function to work along with new Import Messages
9 years ago
fac5ec79b1
Changed Import Messages to be relavent to the type of data they import
9 years ago
693acf9b9c
Finished Create Link() establishment
9 years ago
16b9a7a8a8
Fixed routes summary.
9 years ago
58c2c6a839
Refactored some variables
9 years ago
0189cfbe1c
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
9 years ago
33aafeb510
Resized GUI and refactoring
9 years ago
605717a3c2
Resized GUI and changed add for GUI to not include ID
9 years ago
ddcb3f65a7
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
9 years ago
39cdb4b583
Moved the database file back where it belongs.
9 years ago
273d694490
Fixed summary files FXML.
9 years ago
57c7a4d326
Added a web view to the fxml for the summary page so we can implement the maps API
9 years ago
27888ed689
Merge remote-tracking branch 'origin/master'
9 years ago
11ad212c2e
Implemented the raw data button on the flight summary page so it changes the scene
9 years ago
e914c50498
Merge branch 'WIP_Summary'
...
Conflicts:
res/userdb.db
src/main/resources/airline_summary.fxml
src/main/resources/airport_summary.fxml
9 years ago
cd1c505dc6
Merge remote-tracking branch 'origin/master'
9 years ago
ae522e14d3
Made route RD display things in the table and added functionality to the add button
9 years ago
c1ac1ca6e3
Added in some comment for the functions and classes that didnt have them
9 years ago
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.
9 years ago
3782334db7
Fixed a few bugs though routes doesn't load.
9 years ago
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
9 years ago
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
9 years ago
f33cdca373
Applied single entry add methods to GUI for Airports and Airlines. Made error pop ups for them as well.
9 years ago
c1f1056586
Stopped exception on load.
9 years ago
c7f033283d
Add Singular Route Adding Function
9 years ago
91ad64d399
Buttons temporarily removed and a few fixes made.
9 years ago
d744442ba2
Buttons on summary pages have been linked to proper functions.
9 years ago
11197a0400
Hooked up the Summary pages to the Menu bar.
9 years ago
9da9b40176
Route Summary controller code built though currently has nothing calling it and has not been tested.
9 years ago
a1bf694699
Airport Summary controller code built though currently has nothing calling it and has not been tested.
9 years ago
ab21d0f25d
Airline Summary controller code built though currently has nothing calling it and has not been tested.
9 years ago
9912f2c3af
Merge branch 'WIP_Flight_RawData' into 'master'
...
flight raw data
See merge request !4
9 years ago
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.
9 years ago
e6c468e826
Added Singular Airport Adding
9 years ago
d84346de60
Added singular Airport adding
9 years ago
3eb144ae36
Merged into master branch
9 years ago
399d1eb069
Changed the raw data GUI for flights and testing new branch
9 years ago
6806c0d099
Linked Raw Data GUI together and tables have some data in them from the database.
9 years ago
4418bc6824
Changed files to work with merge
9 years ago
30181d39da
Merge branch 'WIP_Flights' into 'master'
...
Flights
See merge request !3
9 years ago
35db19db2d
Not all files were commited from the earlier commit, due to idle functionality misunderstandings
9 years ago
af8617b316
Commented out tests in the App
9 years ago
a89e5f7b95
Made Add Airline FUnction
9 years ago
13697ac673
Implemented the parser for basic Flight files(The one given to us in the important documents folder on learn)
9 years ago
0fa08a9d5d
Fixed missing button names.
9 years ago
58c4a31441
Buttons named.
9 years ago
b5b7899b7b
Merge remote-tracking branch 'origin/master'
9 years ago
0182cabec6
Added summary gui components
9 years ago
dff71615cb
Trialing branch for own work
9 years ago
b6624f20a8
Updated the Flight Summary GUI
9 years ago
dac4146f33
Added calculate Distance()
9 years ago
b08f190124
Fixed Errors with Loading Flight Data FXML
9 years ago
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
9 years ago
b9308060f1
Fixed Controller after merge
9 years ago
859b19f7d5
Fixed Scene Loading
9 years ago
9c594fd474
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/main/java/seng202/group9/GUI/MenuController.java
9 years ago
3e5b793cb2
Trying to fix the merge conflict
9 years ago
a46609b0b2
Begun work on the flight data parser, committing changes and merging in order to add another feature.
9 years ago
6f14fc48f0
Added Raw Data loader for Airline
9 years ago
d7ddf99842
Added Sample Loading for the GUI
9 years ago
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.
9 years ago
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.
9 years ago
9cc02bb305
Added in the drop down menu for the view tab on the menu bar. This provides individual links to the different GUI pages.
9 years ago
19ee2d2fff
Moved files around to get resources folder for maven
9 years ago
a0f5505e27
Added Route Parser to Dataset, Runtime takes a while optimisation may be needed
9 years ago
6f861400c2
Added Dataset Implementation as well as fixing a small bugs
9 years ago
ffa26bc944
Starting run time changed to run some of the Dataset Parser Functions
9 years ago
4c53609a45
Added Current Dataset Variable
9 years ago
bbb9a250ba
Parsers, Core Files and Dataset Controllers
9 years ago
f0e1691f69
Initial commit for Airport Unit Test
9 years ago
5d70c087ac
Added Name Attribute and changed location to city as it was vague
9 years ago
67f4bbd762
Added comment to exception unit test handler
9 years ago
af3a30011a
Added Javadoc to Airport and configured a few variable types.
9 years ago
eac9a931b6
Added Route Unit Tests and DataException Exceptions Class
9 years ago
c096cf07dc
Finished basic airline JUnit test
9 years ago
ccb852e670
Completed the first draft GUI for airline, airport and route raw data viewers.
9 years ago
8111b9d35d
Added in the GUI template for the raw flight data view.
9 years ago
c3a6dd406b
Added in the GUI template for the flight data summary.
9 years ago
392246dfed
Added java doc to route as well as reordered the constructor to match openflights.org/data
9 years ago
215e626afc
Added Unit tests to Airline (Missing Add, Set and Get routes)
9 years ago
8d6c1badcb
Wrote java doc for Airline as well as fixed up constructor order to match the openflights layout. Lastly added a toString function which returns the name of the Airline.
9 years ago
9f7d53c192
Added setters for Core classes
9 years ago
03cf245b5c
Added Core Package Test JUnit Class (Empty)
9 years ago
09675d9d3f
Finished Core Skeleton
9 years ago
e1d72c318d
Partial Skeleton of the project
9 years ago
db6bed2d2c
Took away 3+4=7 unit failure test
10 years ago
f471e8ce31
Added non working unit test testAdd()
10 years ago
09aa6c97fc
Removed unecessary file hierachy
10 years ago
Sunguin Peng
YaFedImYaEatIm
Michael Wilson
Liam Beckett