Route Filtering on GUI

src/main/java/seng202/group9/GUI/AirlineRDController.java

@@ -30,6 +30,7 @@ public class AirlineRDController extends Controller {
     private TableColumn<Airline, String> airlCountrycol;
     @FXML
     private TableColumn<Airline, String> airlActivecol;
+
     @FXML
     private TextField airlNameBox;
     @FXML
@@ -43,9 +44,10 @@ public class AirlineRDController extends Controller {
     @FXML
     private TextField airlCountryBox;
     @FXML
-    //private TextField airlActiveBox;
     private ComboBox<String> airlActiveCBox;
 
+
+
     private Dataset theDataSet = null;
 
     //Dummy function to test the add button.

src/main/java/seng202/group9/GUI/RouteRDController.java

@@ -7,8 +7,11 @@ import javafx.scene.control.cell.PropertyValueFactory;
 import seng202.group9.Controller.App;
 import seng202.group9.Controller.DataException;
 import seng202.group9.Controller.Dataset;
+import seng202.group9.Controller.RouteFilter;
 import seng202.group9.Core.Route;
 
+import java.util.ArrayList;
+
 /**
  * Created by Sunguin on 2016/09/14.
  */
@@ -48,6 +51,19 @@ public class RouteRDController extends Controller {
     @FXML
     private TextField rEquipmentBox;
 
+    @FXML
+    private TextField rAirlineFilter;
+    @FXML
+    private TextField rSourceFilter;
+    @FXML
+    private TextField rDestFilter;
+    @FXML
+    private TextField rCodeshareFilter;
+    @FXML
+    private TextField rStopsFilter;
+    @FXML
+    private TextField rEquipmentFilter;
+    @FXML
     private Dataset theDataSet = null;
 
     public void addRouteSingle() {
@@ -107,4 +123,30 @@ public class RouteRDController extends Controller {
         theDataSet.deleteRoute(toDelete);
         tableViewRouteRD.setItems(FXCollections.observableArrayList(theDataSet.getRoutes()));
     }
+
+    public void filterRoutes(){
+        RouteFilter filter = new RouteFilter(theDataSet.getRoutes());
+        if (rAirlineFilter.getText() != null && !rAirlineFilter.getText().equals("")) {
+            //System.out.println("Hello over here");
+            filter.filterAirline(rAirlineFilter.getText());
+        }
+        if (rSourceFilter.getText() != null) {
+            filter.filterSourceAirport(rSourceFilter.getText());
+        }
+        if (rDestFilter.getText() != null) {
+            filter.filterDestinationAirport(rDestFilter.getText());
+        }
+        if (rCodeshareFilter.getText() != null) {
+            filter.filterCodeshare(rCodeshareFilter.getText());
+        }
+        if (rStopsFilter.getText() != null) {
+            filter.filterDestinationStops(rStopsFilter.getText());
+        }
+        if (rEquipmentFilter.getText() != null) {
+            filter.filterEquipment(rEquipmentFilter.getText());
+        }
+//        System.out.println("Hello");
+//        filter.printFilter();
+        tableViewRouteRD.setItems(FXCollections.observableArrayList(filter.getFilteredData()));
+    }
 }

src/main/resources/route_raw_data.fxml

@@ -6,6 +6,7 @@
 <?import javafx.scene.control.ContextMenu?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.control.TextField?>
@@ -34,9 +35,9 @@
             </Label>
             <Button layoutX="14.0" layoutY="524.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
             <Button layoutX="656.0" layoutY="524.0" mnemonicParsing="false" onAction="#addRouteSingle" prefHeight="25.0" prefWidth="125.0" text="Add" />
-            <Pane layoutX="16.0" layoutY="53.0" prefHeight="403.0" prefWidth="765.0">
+            <Pane layoutX="16.0" layoutY="53.0" prefHeight="340.0" prefWidth="765.0">
                <children>
-                  <TableView fx:id="tableViewRouteRD" layoutX="-1.0" prefHeight="403.0" prefWidth="765.0">
+                  <TableView fx:id="tableViewRouteRD" layoutX="-1.0" prefHeight="340.0" prefWidth="765.0">
                     <columns>
                       <TableColumn fx:id="rAirlineCol" prefWidth="67.0" text="Airline" />
                       <TableColumn fx:id="rAirlineIDCol" prefWidth="86.0" text="Airline ID" />
@@ -58,7 +59,7 @@
                   </TableView>
                </children>
             </Pane>
-            <Pane layoutX="16.0" layoutY="479.0" prefHeight="32.0" prefWidth="765.0">
+            <Pane layoutX="14.0" layoutY="484.0" prefHeight="32.0" prefWidth="765.0">
                <children>
                   <TextField fx:id="rAirlineBox" layoutX="90.0" layoutY="-1.0" prefHeight="31.0" prefWidth="100.0" promptText="Airline">
                      <padding>
@@ -85,10 +86,23 @@
                         <Insets left="2.0" right="2.0" />
                      </padding>
                   </TextField>
-                  <Label layoutY="4.0" text="Enter Values:" />
+                  <Label layoutX="14.0" layoutY="4.0" text="Add Route:" />
                   <ComboBox fx:id="rCodeshareCBox" layoutX="490.0" layoutY="-1.0" prefHeight="31.0" prefWidth="100.0" promptText="Codeshare" />
                </children>
             </Pane>
+            <Pane layoutX="14.0" layoutY="405.0" prefHeight="45.0" prefWidth="724.0">
+               <children>
+                  <Label layoutX="7.0" layoutY="12.0" text="Filter :" />
+                  <TextField fx:id="rAirlineFilter" layoutX="55.0" layoutY="7.0" prefHeight="31.0" prefWidth="100.0" promptText="Airline" />
+                  <TextField fx:id="rSourceFilter" layoutX="155.0" layoutY="7.0" prefHeight="31.0" prefWidth="150.0" promptText="Source airport" />
+                  <TextField fx:id="rDestFilter" layoutX="305.0" layoutY="7.0" prefHeight="31.0" prefWidth="150.0" promptText="Destination airport" />
+                  <TextField fx:id="rCodeshareFilter" layoutX="455.0" layoutY="7.0" prefHeight="31.0" prefWidth="89.0" promptText="Codeshare" />
+                  <TextField fx:id="rStopsFilter" layoutX="544.0" layoutY="7.0" prefHeight="31.0" prefWidth="75.0" promptText="Stops" />
+                  <TextField fx:id="rEquipmentFilter" layoutX="619.0" layoutY="7.0" prefHeight="31.0" prefWidth="100.0" promptText="Equipment" />
+               </children>
+            </Pane>
+            <Separator layoutY="464.0" prefHeight="6.0" prefWidth="800.0" />
+            <Button layoutX="738.0" layoutY="412.0" mnemonicParsing="false" onAction="#filterRoutes" prefHeight="31.0" prefWidth="40.0" text="Go" />
          </children>
       </Pane>
    </children>