960de77476
Did rd for airport and route
10 years ago
5d6d35276b
Fixed for merge
10 years ago
3091d8eb63
Fixed Some Dictionary Errors in Flightpoints
10 years ago
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
10 years ago
aeae85b9e5
Fixed up some of the javadocs and did some refactoring removing unneccesary code.
10 years ago
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.
10 years ago
df5721973f
Fixed the intial validation so any lower case name will be chnaged to uppercase
10 years ago
5f8e2f2481
Got the basic functionally done on the flight point editor. Currently will change the vaule although a few bugs in the validation aspects.
10 years ago
810cd0a94f
Minor bug fix.
10 years ago
f6696e1859
Added backend controllers which pass the selected options to their respected graphs when creating the graph.
10 years ago
a386d28ea1
Made edit function work for airlines
10 years ago
f3ab8dfe14
Added Flight Point order switch JUnitTests
10 years ago
e237d058bd
Gets information for airlines
10 years ago
267a08ce68
Fixed Maven Error where ID wasn't set as the database did not establish the index before the creation of the table
10 years ago
e0f9f0c944
Merge branch 'Analysertab'
...
Conflicts:
src/main/java/seng202/group9/Controller/SceneCode.java
10 years ago
5f576595c0
Merge branch 'remaking_rd_gui'
10 years ago
d8057352f0
Added controllers for the chart option chooser menus and linked it to the rest of the app.
10 years ago
586943ac29
Did same things to airports and routes
10 years ago
f7d1e688fa
Changed the controller
10 years ago
d31bf1d15c
Changed the controller
10 years ago
c3dca82a7a
Implemented multiple delete on airlines
10 years ago
3d6dd0c2cb
Atempting to get the editor to work for the flight raw data points (Currently broken)
10 years ago
c2ac9410aa
Built fxml files used to control graph creation supporting the new customizable graph builders.
10 years ago
b7950c1649
Deleted uneccessary Duplicates message for dataset
10 years ago
4ef20aef0f
Removed uneccessary function call
10 years ago
7ffe8dcea8
Added Calculation for Heading, Leg Distance and Total Distnace also added the appropriate functio nto commit these to database.
10 years ago
a4728ea35e
Finished airline serialising
10 years ago
68277cb983
Added Some Doc String & Reset the Database from all changes
10 years ago
42a0ecfb94
Added set Current Dataset Function
10 years ago
30cf90bb40
Added Loading Datasets
10 years ago
ac7a4514d0
Updated add and filter for airlines. Working on serialisable file
10 years ago
ed15c2bd76
Added Change Path Source and Destination Airports on changing the first or last entry in the flight points
10 years ago
e19c59d66b
Initial Point Ordering Commit
10 years ago
5e2ba5af90
Remade Raw Data GUI and tried oit some things on Session
10 years ago
753247b004
Implemented the same error messages that are used in other areas of the application
10 years ago
6b799789e4
Fixed conflicts
10 years ago
f82cf823d8
Seperated Controllers
10 years ago
ab531fdcb1
Added popup loader and Scene AIRLINE_ADD
10 years ago
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.
10 years ago
c6f5c41b7d
Initial Commit
10 years ago
9568ed5522
replaced double quotes with 2 double quotes for SQL entries.
10 years ago
68eb19f745
Added Flight POint edit function
10 years ago
f59ab8e486
Add EditRoutes function
10 years ago
82113d2544
Added Edit Airline and Edit Airport
10 years ago
8f0619d20f
Made EntryParser which will parse a single entry
10 years ago
226cbbd0ce
Updated the read me file and also made a slight modification to the Flight summary fxml.
10 years ago
bc0033fad9
Added javadocs.
10 years ago
73cfca0ccc
fixed index out of array after deleting FlightPath for map
10 years ago
ddac466879
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
10 years ago
4a5d7392e5
Fixed Google Map bug and DeleteFLightPath()
10 years ago
d470d35a12
Updated ReadMe and removed help from menu bar
10 years ago
fa729ee344
Removed no working menu buttons
10 years ago
0f726bbaf4
Added new Sample file and change some parameters in FlightPathParser
10 years ago
dec72c0272
Uncommented a few necessary functions and new Sample DataFile
10 years ago
0fe8f450b0
Refreshed the Database to a clean state
10 years ago
bb535a74bf
Added LOts of Brief Javadocs
10 years ago
0672dfe86b
Merge branch 'unitTests'
10 years ago
3519c52cb1
Added Airline FIlter Javadoc
10 years ago
877e4b5b22
Made Filter Unit Tests
10 years ago
121259626f
Added Session Unit Test
10 years ago
c2bb5d2097
Dataset UnitTests Made
10 years ago
ef3a3fc240
Added Testables to AppTest
10 years ago
0de6bfafe5
Made Route Path Test.
10 years ago
6e3ba9775a
Added Flight POint Test as well as some Exceptions
10 years ago
548b5fe321
Added Flight Path Tests
10 years ago
9391b31092
Made Unit Test for COuntry
10 years ago
b232dcd7e6
Added some index checks and relavent Tests for them
10 years ago
a0959e8de6
Added City JUnit Tests
10 years ago
02c3e3ed99
Added delete Route Tests and toString test
10 years ago
b62bf7f1b1
Added COuntry tests, alternative constructor and ID error tests
10 years ago
960fdc3e96
Missing setID in coverage for routes
10 years ago
60bcc0dbf2
Fixed toString Test and added getRoute Test
10 years ago
739fce7ccf
Merge branch 'unitTests' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 into unitTests
10 years ago
80f4db950e
Added new functions to JUnitTest for Route Tests
10 years ago
c92f8e5c54
Added test cases for missing Functiosn in Airport
10 years ago
0adc57fc36
Airline Tests
10 years ago
8646e5864d
Changed some variable names for summary controller airport
10 years ago
ab90d060bb
Updated Javadoc and made a popup for not yet implemented button
10 years ago
8c656d0672
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
10 years ago
a857cfb7af
Added Redirection to SUmmary pages after Import.
10 years ago
744b96c42a
Fixed some previously unknown issues from merging.
10 years ago
8a4134ae4c
Made variables private
10 years ago
65e05177e9
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
10 years ago
57d2ed493c
Fixed Route Unit Test
10 years ago
02b484917d
Fixed calculation bug.
10 years ago
60b92d2170
Merge remote-tracking branch 'origin/master'
...
Conflicts:
src/main/java/seng202/group9/Controller/SceneCode.java
10 years ago
b2cba96dc1
Added javadoc for airline, airport and route raw data controller classes.
10 years ago
724f63956a
Added Javadoc Strings for Some functions
10 years ago
9e00e3666f
Fixed Conflicts when merging ConnectMaps
10 years ago
ff79599c9b
Calculator Implimented.
10 years ago
37e712f734
Refactoring bugs fixed again
10 years ago
5363cf8b4e
COnnected maps to airlines, Airports and ROutes
10 years ago
50cc5c6dfb
Merging filter complete GUI for Airport, Airline and Route Raw Data
10 years ago
4d662be24a
Layout change
10 years ago
1feb1c9153
Added filter function to the Airline GUI
10 years ago
bf33ec61c7
Merge fix
10 years ago
1664a49623
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/main/java/seng202/group9/GUI/FlightSummaryController.java
10 years ago
cd8e2b0c7f
Implemented the delete option for the flight paths on the Summary and Raw Data pages.
10 years ago
44ed68ee7a
Added Google Maps API
10 years ago
a9edea7690
Finished Google Maps API
10 years ago
62a93ad629
Implemented right click, delete ability for the flight raw data paths
10 years ago
548ffa99f1
Added webveiws for later maps implimentation.
10 years ago
30f7b2d842
Fixed a bug from Route Filter and implemented Airport Filter in GUI
10 years ago
3508518cdd
Added in the right click, delete option for the flight points in the table.
10 years ago
afc7d1472f
Merge remote-tracking branch 'remotes/origin/master' into WIP_Update_list
10 years ago
7333620964
Fixed the list view bug, so it will now reload the list view so that it includes the newly added path.
10 years ago
ae3fbefd0d
Initial load for GoogleMaps done
10 years ago
4fde239167
Route Filtering on GUI
10 years ago
8c49ce4455
Merge remote-tracking branch 'origin/master'
10 years ago
3218b72941
Created pie graph viewer for Airports.
10 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
10 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.
10 years ago
2613489dad
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
...
Conflicts:
res/session.ser
10 years ago
cbfe40a8fd
Edited Session Message as Importer Error messages
10 years ago
5cc305d896
Fixed some refactoring issues and implemented delete functions in the GUI
10 years ago
8b30d2c0c2
Merge remote-tracking branch 'origin/master'
10 years ago
eb698f17c8
Made graph work with new formatting.
10 years ago
8027b701a0
Added Import UI
10 years ago
56eeb0e9f8
Merge branch 'Analyser'
...
Conflicts:
src/main/java/seng202/group9/GUI/RouteRDController.java
10 years ago
f0fbc7cf24
Small check added.
10 years ago
e3ff9d3bfc
Fixed a bit of Airline GUI
10 years ago
00333b6e58
Added Session and Controller Abstract Class
10 years ago
4ff6aefd1e
Implemented Abstract Controller class which made code a lot short and easier to read
10 years ago
5641cc3728
Loaded Observers to Session loading
10 years ago
bf8c1d1fdf
Added Serialisation for the Session Code
10 years ago
d0148d9e73
Added Enums for each Open View for easier storage for Session.
10 years ago
25fcc8cf94
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
...
# Conflicts:
# res/userdb.db
10 years ago
ebe82fb6ed
Initial commit for Session
10 years ago
92c5cf9c8b
First graph displays it's data as desired.
10 years ago
b4073723f5
Merge branch 'Filter'
10 years ago
42592edfa1
Added Route Filtering
10 years ago
ff20c6435e
Implemented the ablitity to manually enter flight points into the database.
10 years ago
462f2304e4
Made Airline Filter
10 years ago
87bd23f722
Made Abstract Filter Class
10 years ago
bed13aca2f
Changed GUI
10 years ago
0cfffd258c
GUI displays all fields and altered some GUI
10 years ago
091d9e5e00
got rid of dataset test code
10 years ago
9f804affff
Merge branch 'DeleteFunctions'
10 years ago
cd94b51282
Delete Code made
10 years ago
87d4b42036
Fixed 2 incorrect buttons and hooked up flight buttons.
10 years ago
94f2d25899
Hooked up all buttons for summary pages.
10 years ago
f54b109639
Added delete dataset Function
10 years ago
de9cee785c
Changed some tests to reflect some function name changes
10 years ago
a6f5f13c0b
Merged CreateLinks Branch which allowed CreateLinks() function to work along with new Import Messages
10 years ago
fac5ec79b1
Changed Import Messages to be relavent to the type of data they import
10 years ago
693acf9b9c
Finished Create Link() establishment
10 years ago
16b9a7a8a8
Fixed routes summary.
10 years ago
58c2c6a839
Refactored some variables
10 years ago
0189cfbe1c
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
10 years ago
33aafeb510
Resized GUI and refactoring
10 years ago
Sunguin Peng
Liam Beckett
YaFedImYaEatIm
Michael
YaFedImYaEatIm