Fixed Filter Data Dictionary Key error from the GUI

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

@@ -81,17 +81,11 @@ public class AirlineRDController extends Controller {
      */
     public void openFilter() {
         createPopUpStage(SceneCode.AIRLINE_FILTER, 600, 370);
-
+        ArrayList<Airline> d = new ArrayList();
-        if (currentSession.getFilteredAirlines() != null) {
+        for (int key: currentSession.getFilteredAirlines().keySet()){
-            ArrayList<Airline> d = new ArrayList();
+            d.add(theDataSet.getAirlineDictionary().get(currentSession.getFilteredAirlines().get(key)));
-            for (int i = 0; i < theDataSet.getAirlines().size(); i++) {
-                if (currentSession.getFilteredAirlines().containsValue(theDataSet.getAirlines().get(i).getName())
-                        && currentSession.getFilteredAirlines().containsKey(i)) {
-                    d.add(theDataSet.getAirlines().get(i));
-                }
-            }
-            tableViewAirlineRD.setItems(FXCollections.observableArrayList(d));
         }
+        tableViewAirlineRD.setItems(FXCollections.observableArrayList(d));
     }
 
 

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

@@ -88,17 +88,11 @@ public class AirportRDController extends Controller{
 
     public void openFilter() {
         createPopUpStage(SceneCode.AIRPORT_FILTER, 600, 480);
-
+        ArrayList<Airport> d = new ArrayList();
-        if (currentSession.getFilteredAirports() != null) {
+        for (int key: currentSession.getFilteredAirports().keySet()){
-            ArrayList<Airport> d = new ArrayList();
+            d.add(theDataSet.getAirportDictionary().get(currentSession.getFilteredAirports().get(key)));
-            for (int i = 0; i < theDataSet.getAirports().size(); i++) {
-                if (currentSession.getFilteredAirports().containsValue(theDataSet.getAirports().get(i).getName())
-                        && currentSession.getFilteredAirports().containsKey(i)) {
-                    d.add(theDataSet.getAirports().get(i));
-                }
-            }
-            tableViewAirportRD.setItems(FXCollections.observableArrayList(d));
         }
+        tableViewAirportRD.setItems(FXCollections.observableArrayList(d));
     }
 
     /**

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

@@ -72,11 +72,12 @@ public class RouteFilterController extends Controller {
         alert.showAndWait();
 
         //currentSession.setFilteredAirlines(FXCollections.observableArrayList(filter.getFilteredData()));
-
+        //routeAirline + routeSourceAirport + routeArrvAirport + routeCodeShare + routeStops + routeEquip
         HashMap<Integer, String> routesHM = new HashMap<Integer, String>();
         ArrayList<Route> routes = filter.getFilteredData();
         for (int index = 0; index < routes.size(); index++) {
-            routesHM.put(index, routes.get(index).getAirlineName());
+            routesHM.put(index, routes.get(index).getAirlineName() + routes.get(index).getDepartureAirport() + routes.get(index).getArrivalAirport()
+                    + routes.get(index).getCode() + routes.get(index).getStops() + routes.get(index).getEquipment());
         }
         currentSession.setFilteredRoutes(routesHM);
 

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

@@ -78,16 +78,12 @@ public class RouteRDController extends Controller {
 
     public void openFilter() {
         createPopUpStage(SceneCode.ROUTE_FILTER, 600, 330);
-        if (currentSession.getFilteredRoutes() != null) {
+
-            ArrayList<Route> d = new ArrayList();
+        ArrayList<Route> d = new ArrayList();
-            for (int i = 0; i < theDataSet.getRoutes().size(); i++) {
+        for (int key: currentSession.getFilteredRoutes().keySet()){
-                if (currentSession.getFilteredRoutes().containsValue(theDataSet.getRoutes().get(i).getAirlineName())
+            d.add(theDataSet.getRouteDictionary().get(currentSession.getFilteredRoutes().get(key)));
-                        && currentSession.getFilteredRoutes().containsKey(i)) {
-                    d.add(theDataSet.getRoutes().get(i));
-                }
-            }
-            tableViewRouteRD.setItems(FXCollections.observableArrayList(d));
         }
+        tableViewRouteRD.setItems(FXCollections.observableArrayList(d));
     }
 
     /**

src/test/java/seng202/group9/FilterUnitTest.java

@@ -31,6 +31,10 @@ public class FilterUnitTest {
 
         int size = airlineFilter.getFilteredData().size();
 
+        airlineFilter.filterCountry("New Zealand");
+        assertTrue(airlineFilter.getFilteredData().size() == 25);
+        airlineFilter.reset();
+
         airlineFilter.filterActive("Y");
 
         assertTrue(size != airlineFilter.getFilteredData().size());