fanwuyang/SENG301
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Users can share rides now but can't see shared ones yet

Browse Source
This commit is contained in:
Fan-Wu Yang
2017-05-28 19:27:58 +12:00
parent 8abe49ab15
commit e4ed24f12d
39 changed files with 257 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
target/classes/controllers/AddRideController.class
BIN
View File
Binary file not shown.
target/classes/controllers/AddRouteController.class
BIN
View File
Binary file not shown.
target/classes/controllers/AddStopsController.class
BIN
View File
Binary file not shown.
target/classes/controllers/AddTripController$1.class
BIN
View File
Binary file not shown.
target/classes/controllers/AddTripController$2.class
BIN
View File
Binary file not shown.
target/classes/controllers/AddTripController.class
BIN
View File
Binary file not shown.
target/classes/controllers/BaseController.class
BIN
View File
Binary file not shown.
target/classes/controllers/Controller.class
BIN
View File
Binary file not shown.
target/classes/controllers/Main.class
BIN
View File
Binary file not shown.
target/classes/controllers/MainController.class
BIN
View File
Binary file not shown.
target/classes/controllers/MyTripsController.class
BIN
View File
Binary file not shown.
target/classes/model/DataManager.class
BIN
View File
Binary file not shown.
target/classes/model/Ride.class
BIN
View File
Binary file not shown.
target/classes/model/SharedTrip.class
BIN
View File
Binary file not shown.
target/classes/scenes/base.fxml
+29 -2
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.text.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import java.lang.*?>
@@ -9,7 +10,7 @@
<children>
<GridPane fx:id="base" layoutX="56.0" layoutY="75.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="200.0" minWidth="200.0" prefWidth="200.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="200.0" prefWidth="200.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308" minWidth="10.0" />
</columnConstraints>
<rowConstraints>
@@ -17,7 +18,7 @@
<RowConstraints maxHeight="30.0" minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Accordion GridPane.rowSpan="2">
<Accordion maxWidth="200.0" minWidth="200.0" prefWidth="200.0" GridPane.rowSpan="2">
<panes>
<TitledPane animated="false" text="User Profile">
<content>
@@ -65,10 +66,36 @@
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints />
</rowConstraints>
<children>
<VBox>
<children>
<AnchorPane>
<children>
<Label alignment="CENTER" contentDisplay="CENTER" text="Actions" textAlignment="CENTER" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
<font>
<Font name="System Bold" size="14.0" />
</font>
</Label>
</children>
</AnchorPane>
<Separator prefWidth="200.0" />
<AnchorPane>
<children>
<Button mnemonicParsing="false" onAction="#shareRide" text="Share Ride" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
</children>
</AnchorPane>
<AnchorPane>
<children>
<Label alignment="CENTER" text="Add Information" textAlignment="JUSTIFY" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
<font>
<Font name="System Bold" size="14.0" />
</font>
</Label>
</children>
</AnchorPane>
<Separator prefWidth="200.0" />
<AnchorPane>
<children>
<Button mnemonicParsing="false" onAction="#addRide" text="Add Ride" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.hgrow="ALWAYS" GridPane.valignment="TOP" GridPane.vgrow="ALWAYS" />
target/classes/scenes/mytrips.fxml
+22 -3
View File
@@ -38,8 +38,8 @@
</Label>
<TableView fx:id="stopsList" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
<columns>
<TableColumn prefWidth="104.0" text="Time" />
<TableColumn prefWidth="95.0" text="Stop" />
<TableColumn fx:id="stopTimeColumn" prefWidth="104.0" text="Time" />
<TableColumn fx:id="stopNameColumn" prefWidth="95.0" text="Stop" />
</columns>
</TableView>
<Label text="Information" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1">
@@ -58,6 +58,8 @@
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label text="Ride:" />
@@ -71,6 +73,11 @@
<Label fx:id="endDateLabel" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="4" />
<HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER">
<children>
<Label fx:id="sundayLabel" style="-fx-border-color: #F0F0F0; -fx-border-width: 1;" text="S">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
</Label>
<Label fx:id="mondayLabel" style="-fx-border-color: #F0F0F0; -fx-border-width: 1;" text="M" AnchorPane.bottomAnchor="23.0" AnchorPane.topAnchor="22.0">
<HBox.margin>
<Insets />
@@ -99,11 +106,23 @@
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
</Label>
<Label fx:id="saturdayLabel" style="-fx-border-color: #F0F0F0; -fx-border-width: 1;" text="S">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
</Label>
</children>
</HBox>
<AnchorPane GridPane.columnSpan="2" GridPane.rowIndex="6">
<children>
<Button mnemonicParsing="false" onAction="#shareThisRide" text="Share This Ride" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" GridPane.rowIndex="5" />
</children>
</AnchorPane>
<TextField fx:id="seatsAvailable" text="0" GridPane.columnIndex="1" GridPane.rowIndex="5" />
<Label text="Seats Available:" GridPane.rowIndex="5" />
</children>
<GridPane.margin>
<Insets left="10.0" />
<Insets left="10.0" right="10.0" />
</GridPane.margin>
</GridPane>
</children>
target/classes/serialisation/rides.json
+1 -1
View File
@@ -1 +1 @@
[{"model":"Nissan March","colour":"Baby Blue","licensePlate":"H19405661","year":2004,"numSeats":4}]
[{"model":"a","colour":"a","licensePlate":"a","year":1996,"numSeats":5}]
target/classes/serialisation/routes.json
+1 -1
View File
@@ -1 +1 @@
[{"name":"University to Dorms","serialisedStops":[{"address":"1 University Drive"},{"address":"1 Homestead Lane"}]}]
[{"name":"asdf","serialisedStops":[{"address":"54 fwqfqwf"}]}]
target/classes/serialisation/sharedtrips.json
+1
View File
@@ -0,0 +1 @@
[{"serialisedRoute":[{"serialiseTime":"3:00","serialiseName":"54 fwqfqwf"}],"direction":"University","ride":{"model":"a","colour":"a","licensePlate":"a","year":1996,"numSeats":5},"days":[true,false,false,true,false,true,false],"reoccur":true,"endDate":"2017-06-08","name":"safsdf"}]
target/classes/serialisation/stops.json
+1 -1
View File
@@ -1 +1 @@
[{"address":"1 University Drive"},{"address":"1 Homestead Lane"}]
[{"address":"54 fwqfqwf"}]
target/classes/serialisation/trips.json
+1 -1
View File
@@ -1 +1 @@
[{"serialisedRoute":[{"serialiseTime":"3:00","serialiseName":"1 University Drive"},{"serialiseTime":"3:10","serialiseName":"1 Homestead Lane"}],"direction":"Home","ride":{"model":"Nissan March","colour":"Baby Blue","licensePlate":"H19405661","year":2004,"numSeats":4},"days":[true,false,false,false,false,false,false],"reoccur":false,"endDate":"","name":"University to Home"}]
[{"serialisedRoute":[{"serialiseTime":"3:00","serialiseName":"54 fwqfqwf"}],"direction":"University","ride":{"model":"a","colour":"a","licensePlate":"a","year":1996,"numSeats":5},"days":[true,false,false,true,false,true,false],"reoccur":true,"endDate":"2017-06-08","name":"safsdf"}]
target/classes/utils/DataManagerSerialiser$1.class
BIN
View File
Binary file not shown.
target/classes/utils/DataManagerSerialiser$2.class
BIN
View File
Binary file not shown.
target/classes/utils/DataManagerSerialiser$3.class
BIN
View File
Binary file not shown.
target/classes/utils/DataManagerSerialiser$4.class
BIN
View File
Binary file not shown.
target/classes/utils/DataManagerSerialiser$5.class
BIN
View File
Binary file not shown.
target/classes/utils/DataManagerSerialiser.class
BIN
View File
Binary file not shown.