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
This commit is contained in:
Michael Wilson
2016-09-15 11:11:04 +12:00
parent c1f1056586
commit 3782334db7
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/userdb.db
BIN
View File
Binary file not shown.
src/main/java/seng202/group9/GUI/RouteSummaryController.java
+10 -10
View File
@@ -16,15 +16,15 @@ public class RouteSummaryController extends MenuController{
@FXML
private TableView<Route> tableView;
@FXML
private TableColumn<Route, String> columnName;
private TableColumn<Route, String> columnAirline;
@FXML
private TableColumn<Route, String> columnCity;
private TableColumn<Route, String> columnDepart;
@FXML
private TableColumn<Route, String> columnCountry;
private TableColumn<Route, String> columnArrive;
@FXML
private TableColumn<Route, String> columnAltitude;
private TableColumn<Route, String> columnStops;
@FXML
private TableColumn<Route, String> columnIATA;
private TableColumn<Route, String> columnEquipment;
private Dataset currentData = null;
@@ -36,11 +36,11 @@ public class RouteSummaryController extends MenuController{
public void loadTables() {
currentData = this.parent.getCurrentDataset();
columnName.setCellValueFactory(new PropertyValueFactory<Route, String>("Name"));
columnCity.setCellValueFactory(new PropertyValueFactory<Route, String>("City"));
columnCountry.setCellValueFactory(new PropertyValueFactory<Route, String>("Country"));
columnIATA.setCellValueFactory(new PropertyValueFactory<Route, String>("IATA_FFA"));
columnAltitude.setCellValueFactory(new PropertyValueFactory<Route, String>("Altitude"));
columnAirline.setCellValueFactory(new PropertyValueFactory<Route, String>("Airline"));
columnDepart.setCellValueFactory(new PropertyValueFactory<Route, String>("DepartureAirport"));
columnArrive.setCellValueFactory(new PropertyValueFactory<Route, String>("ArrivalAirport"));
columnStops.setCellValueFactory(new PropertyValueFactory<Route, String>("Stops"));
columnEquipment.setCellValueFactory(new PropertyValueFactory<Route, String>("Equipment"));
currentData = this.parent.getCurrentDataset();
tableView.setItems(FXCollections.observableArrayList(currentData.getRoutes()));
}
src/main/resources/airline_summary.fxml
+2 -2
View File
@@ -35,10 +35,10 @@
<Pane layoutY="52.0" prefHeight="240.0" prefWidth="480.0" AnchorPane.bottomAnchor="0.0">
<children>
<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>
<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="columnIATA" prefWidth="86.0" text="IATA/FAA" />
<TableColumn fx:id="columnActive" prefWidth="46.0" text="Active" />
src/main/resources/airport_summary.fxml
+1 -1
View File
@@ -36,7 +36,7 @@
<children>
<Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0">
<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>
<TableColumn fx:id="columnName" prefWidth="75.0" text="Name" />
<TableColumn fx:id="columnCity" prefWidth="75.0" text="City" />
src/main/resources/routes_summary.fxml
+6 -6
View File
@@ -36,13 +36,13 @@
<children>
<Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0">
<children>
<TableView prefHeight="200.0" prefWidth="378.0">
<TableView fx:id="tableView" prefHeight="200.0" prefWidth="378.0">
<columns>
<TableColumn fx:id="columnName" prefWidth="75.0" text="Name" />
<TableColumn fx:id="columnCity" prefWidth="75.0" text="City" />
<TableColumn fx:id="columnCountry" prefWidth="75.0" text="Country" />
<TableColumn fx:id="columnAltitude" prefWidth="75.0" text="Altitude" />
<TableColumn fx:id="columnIATA" prefWidth="75.0" text="IATA/FAA" />
<TableColumn fx:id="columnAirline" prefWidth="75.0" text="Airline" />
<TableColumn fx:id="columnDepart" prefWidth="75.0" text="Depart" />
<TableColumn fx:id="columnArrive" prefWidth="75.0" text="Arrive" />
<TableColumn fx:id="columnStops" prefWidth="75.0" text="Stops" />
<TableColumn fx:id="columnEquipment" prefWidth="75.0" text="Equipment" />
</columns>
</TableView>
</children>