 Michael
|
028ea2dcce
|
Trying to make merge official.
|
2016-10-02 16:00:38 +13:00 |
|
|
Michael
|
a666eeef83
|
Merge remote-tracking branch 'origin/master'
Conflicts:
src/main/java/seng202/group9/Controller/SceneCode.java
src/main/java/seng202/group9/Controller/Session.java
src/main/java/seng202/group9/GUI/AirportAnalyser.java
src/main/java/seng202/group9/GUI/RouteAnalyser.java
|
2016-10-02 15:55:41 +13:00 |
|
|
Michael
|
c0ab798123
|
Minor bug fixes.
|
2016-10-02 15:49:37 +13:00 |
|
|
Michael Wilson
|
9141f5abf3
|
Error handling added.
|
2016-10-02 13:41:07 +13:00 |
|
|
Michael Wilson
|
8ac6606b76
|
Pie graph fully hooked up.
|
2016-10-01 20:07:13 +13:00 |
|
|
Michael
|
810cd0a94f
|
Minor bug fix.
|
2016-09-24 15:39:15 +12:00 |
|
|
Michael
|
f6696e1859
|
Added backend controllers which pass the selected options to their respected graphs when creating the graph.
|
2016-09-24 15:28:38 +12:00 |
|
|
Michael
|
e0f9f0c944
|
Merge branch 'Analysertab'
Conflicts:
src/main/java/seng202/group9/Controller/SceneCode.java
|
2016-09-24 13:48:52 +12:00 |
|
|
Michael Wilson
|
d8057352f0
|
Added controllers for the chart option chooser menus and linked it to the rest of the app.
|
2016-09-24 11:38:18 +12:00 |
|
|
Michael
|
c2ac9410aa
|
Built fxml files used to control graph creation supporting the new customizable graph builders.
|
2016-09-23 14:34:24 +12:00 |
|
|
Michael
|
bc0033fad9
|
Added javadocs.
|
2016-09-19 15:22:24 +12:00 |
|
|
Michael Wilson
|
744b96c42a
|
Fixed some previously unknown issues from merging.
|
2016-09-18 13:54:56 +12:00 |
|
|
Michael Wilson
|
02b484917d
|
Fixed calculation bug.
|
2016-09-18 13:29:02 +12:00 |
|
|
Michael Wilson
|
60b92d2170
|
Merge remote-tracking branch 'origin/master'
Conflicts:
src/main/java/seng202/group9/Controller/SceneCode.java
|
2016-09-18 13:14:00 +12:00 |
|
|
Michael Wilson
|
ff79599c9b
|
Calculator Implimented.
|
2016-09-17 20:46:23 +12:00 |
|
|
Michael Wilson
|
548ffa99f1
|
Added webveiws for later maps implimentation.
|
2016-09-17 17:50:35 +12:00 |
|
|
Michael Wilson
|
8c49ce4455
|
Merge remote-tracking branch 'origin/master'
|
2016-09-17 16:03:08 +12:00 |
|
|
Michael Wilson
|
3218b72941
|
Created pie graph viewer for Airports.
|
2016-09-17 16:02:27 +12:00 |
|
|
Michael Wilson
|
8b30d2c0c2
|
Merge remote-tracking branch 'origin/master'
|
2016-09-17 14:58:18 +12:00 |
|
|
Michael Wilson
|
eb698f17c8
|
Made graph work with new formatting.
|
2016-09-17 14:57:21 +12:00 |
|
|
Michael Wilson
|
56eeb0e9f8
|
Merge branch 'Analyser'
Conflicts:
src/main/java/seng202/group9/GUI/RouteRDController.java
|
2016-09-17 14:06:24 +12:00 |
|
|
Michael Wilson
|
f0fbc7cf24
|
Small check added.
|
2016-09-17 14:02:11 +12:00 |
|
|
Michael Wilson
|
92c5cf9c8b
|
First graph displays it's data as desired.
|
2016-09-16 13:28:52 +12:00 |
|
|
Michael Wilson
|
87d4b42036
|
Fixed 2 incorrect buttons and hooked up flight buttons.
|
2016-09-16 09:47:36 +12:00 |
|
|
Michael Wilson
|
94f2d25899
|
Hooked up all buttons for summary pages.
|
2016-09-16 09:31:02 +12:00 |
|
|
Michael Wilson
|
16b9a7a8a8
|
Fixed routes summary.
|
2016-09-15 21:22:08 +12:00 |
|
|
Michael
|
273d694490
|
Fixed summary files FXML.
|
2016-09-15 16:30:20 +12:00 |
|
|
Michael
|
27888ed689
|
Merge remote-tracking branch 'origin/master'
|
2016-09-15 16:14:23 +12:00 |
|
|
Michael
|
e914c50498
|
Merge branch 'WIP_Summary'
Conflicts:
res/userdb.db
src/main/resources/airline_summary.fxml
src/main/resources/airport_summary.fxml
|
2016-09-15 16:08:30 +12:00 |
|
|
Michael
|
cd1c505dc6
|
Merge remote-tracking branch 'origin/master'
|
2016-09-15 15:13:49 +12:00 |
|
|
Michael Wilson
|
3782334db7
|
Fixed a few bugs though routes doesn't load.
|
2016-09-15 11:11:04 +12:00 |
|
|
Michael Wilson
|
c1f1056586
|
Stopped exception on load.
|
2016-09-14 23:01:01 +12:00 |
|
|
Michael Wilson
|
91ad64d399
|
Buttons temporarily removed and a few fixes made.
|
2016-09-14 22:16:24 +12:00 |
|
|
Michael Wilson
|
d744442ba2
|
Buttons on summary pages have been linked to proper functions.
|
2016-09-14 21:39:19 +12:00 |
|
|
Michael Wilson
|
11197a0400
|
Hooked up the Summary pages to the Menu bar.
|
2016-09-14 21:13:05 +12:00 |
|
|
Michael Wilson
|
9da9b40176
|
Route Summary controller code built though currently has nothing calling it and has not been tested.
|
2016-09-14 21:05:35 +12:00 |
|
|
Michael Wilson
|
a1bf694699
|
Airport Summary controller code built though currently has nothing calling it and has not been tested.
|
2016-09-14 20:47:15 +12:00 |
|
|
Michael Wilson
|
ab21d0f25d
|
Airline Summary controller code built though currently has nothing calling it and has not been tested.
|
2016-09-14 20:33:58 +12:00 |
|
|
Michael
|
0fa08a9d5d
|
Fixed missing button names.
|
2016-09-14 10:00:12 +12:00 |
|
|
Michael
|
58c4a31441
|
Buttons named.
|
2016-09-14 09:55:20 +12:00 |
|
|
Michael
|
b5b7899b7b
|
Merge remote-tracking branch 'origin/master'
|
2016-09-14 08:51:32 +12:00 |
|
|
Michael
|
0182cabec6
|
Added summary gui components
|
2016-09-14 08:50:13 +12:00 |
|