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

Fixed a few bugs though routes doesn't load.

Browse Source
main
Michael Wilson 9 years ago
parent c1f1056586
commit 3782334db7
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File

BIN
res/userdb.db
View File

Binary file not shown.

20
src/main/java/seng202/group9/GUI/RouteSummaryController.java
Unescape View File

@ -16,15 +16,15 @@ public class RouteSummaryController extends MenuController{
@FXML @FXML
private TableView<Route> tableView; private TableView<Route> tableView;
@FXML @FXML
private TableColumn<Route, String> columnName; private TableColumn<Route, String> columnAirline;
@FXML @FXML
private TableColumn<Route, String> columnCity; private TableColumn<Route, String> columnDepart;
@FXML @FXML
private TableColumn<Route, String> columnCountry; private TableColumn<Route, String> columnArrive;
@FXML @FXML
private TableColumn<Route, String> columnAltitude; private TableColumn<Route, String> columnStops;
@FXML @FXML
private TableColumn<Route, String> columnIATA; private TableColumn<Route, String> columnEquipment;
private Dataset currentData = null; private Dataset currentData = null;
@ -36,11 +36,11 @@ public class RouteSummaryController extends MenuController{
public void loadTables() { public void loadTables() {
currentData = this.parent.getCurrentDataset(); currentData = this.parent.getCurrentDataset();
columnName.setCellValueFactory(new PropertyValueFactory<Route, String>("Name")); columnAirline.setCellValueFactory(new PropertyValueFactory<Route, String>("Airline"));
columnCity.setCellValueFactory(new PropertyValueFactory<Route, String>("City")); columnDepart.setCellValueFactory(new PropertyValueFactory<Route, String>("DepartureAirport"));
columnCountry.setCellValueFactory(new PropertyValueFactory<Route, String>("Country")); columnArrive.setCellValueFactory(new PropertyValueFactory<Route, String>("ArrivalAirport"));
columnIATA.setCellValueFactory(new PropertyValueFactory<Route, String>("IATA_FFA")); columnStops.setCellValueFactory(new PropertyValueFactory<Route, String>("Stops"));
columnAltitude.setCellValueFactory(new PropertyValueFactory<Route, String>("Altitude")); columnEquipment.setCellValueFactory(new PropertyValueFactory<Route, String>("Equipment"));
currentData = this.parent.getCurrentDataset(); currentData = this.parent.getCurrentDataset();
tableView.setItems(FXCollections.observableArrayList(currentData.getRoutes())); tableView.setItems(FXCollections.observableArrayList(currentData.getRoutes()));
} }

4
src/main/resources/airline_summary.fxml
Unescape View File

@ -35,10 +35,10 @@
<Pane layoutY="52.0" prefHeight="240.0" prefWidth="480.0" AnchorPane.bottomAnchor="0.0"> <Pane layoutY="52.0" prefHeight="240.0" prefWidth="480.0" AnchorPane.bottomAnchor="0.0">
<children> <children>
<Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0" /> <Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0" />
<TableView layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="378.0"> <TableView fx:id="tableView" layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="378.0">
<columns> <columns>
<TableColumn fx:id="columnName" text="Name" /> <TableColumn fx:id="columnName" text="Name" />
<TableColumn fx:id="columnCity" prefWidth="77.0" text="City" /> <TableColumn fx:id="columnAlias" prefWidth="77.0" text="Alias" />
<TableColumn fx:id="columnCountry" prefWidth="86.0" text="Country" /> <TableColumn fx:id="columnCountry" prefWidth="86.0" text="Country" />
<TableColumn fx:id="columnIATA" prefWidth="86.0" text="IATA/FAA" /> <TableColumn fx:id="columnIATA" prefWidth="86.0" text="IATA/FAA" />
<TableColumn fx:id="columnActive" prefWidth="46.0" text="Active" /> <TableColumn fx:id="columnActive" prefWidth="46.0" text="Active" />

2
src/main/resources/airport_summary.fxml
Unescape View File

@ -36,7 +36,7 @@
<children> <children>
<Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0"> <Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0">
<children> <children>
<TableView layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="378.0"> <TableView fx:id="tableView" layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="378.0">
<columns> <columns>
<TableColumn fx:id="columnName" prefWidth="75.0" text="Name" /> <TableColumn fx:id="columnName" prefWidth="75.0" text="Name" />
<TableColumn fx:id="columnCity" prefWidth="75.0" text="City" /> <TableColumn fx:id="columnCity" prefWidth="75.0" text="City" />

12
src/main/resources/routes_summary.fxml
Unescape View File

@ -36,13 +36,13 @@
<children> <children>
<Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0"> <Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0">
<children> <children>
<TableView prefHeight="200.0" prefWidth="378.0"> <TableView fx:id="tableView" prefHeight="200.0" prefWidth="378.0">
<columns> <columns>
<TableColumn fx:id="columnName" prefWidth="75.0" text="Name" /> <TableColumn fx:id="columnAirline" prefWidth="75.0" text="Airline" />
<TableColumn fx:id="columnCity" prefWidth="75.0" text="City" /> <TableColumn fx:id="columnDepart" prefWidth="75.0" text="Depart" />
<TableColumn fx:id="columnCountry" prefWidth="75.0" text="Country" /> <TableColumn fx:id="columnArrive" prefWidth="75.0" text="Arrive" />
<TableColumn fx:id="columnAltitude" prefWidth="75.0" text="Altitude" /> <TableColumn fx:id="columnStops" prefWidth="75.0" text="Stops" />
<TableColumn fx:id="columnIATA" prefWidth="75.0" text="IATA/FAA" /> <TableColumn fx:id="columnEquipment" prefWidth="75.0" text="Equipment" />
</columns> </columns>
</TableView> </TableView>
</children> </children>

Write Preview
Loading…
Cancel
Save