Initial Commit

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

@@ -1,15 +1,26 @@
 package seng202.group9.GUI;
 
 import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.layout.Pane;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 import seng202.group9.Controller.AirlineFilter;
+import seng202.group9.Controller.App;
 import seng202.group9.Controller.Dataset;
+import seng202.group9.Controller.SceneCode;
 import seng202.group9.Core.Airline;
 
 import javax.swing.*;
-
+import java.io.IOException;
+//make a class for the scenes to get the data I guess
 /**
  * The GUI controller class for airline_raw_data.fxml.
  * Extends from the abstract class {@link Controller}.
@@ -20,37 +31,37 @@ public class AirlineRDController extends Controller {
     @FXML
     private TableView<Airline> tableViewAirlineRD;
     @FXML
-    private TableColumn<Airline, String> airlIDcol;
+    private TableColumn<Airline, String> airlIDCol;
     @FXML
-    private TableColumn<Airline, String> airlNamecol;
+    private TableColumn<Airline, String> airlNameCol;
     @FXML
-    private TableColumn<Airline, String> airlAliascol;
+    private TableColumn<Airline, String> airlAliasCol;
     @FXML
-    private TableColumn<Airline, String> airlIATAcol;
+    private TableColumn<Airline, String> airlIATACol;
     @FXML
-    private TableColumn<Airline, String> airlICAOcol;
+    private TableColumn<Airline, String> airlICAOCol;
     @FXML
-    private TableColumn<Airline, String> airlCallsigncol;
+    private TableColumn<Airline, String> airlCallsignCol;
     @FXML
-    private TableColumn<Airline, String> airlCountrycol;
+    private TableColumn<Airline, String> airlCountryCol;
     @FXML
-    private TableColumn<Airline, String> airlActivecol;
+    private TableColumn<Airline, String> airlActiveCol;
 
     //Setting up text fields for adding data
     @FXML
-    private TextField airlNameBox;
+    private TextField airlNameAdd;
     @FXML
-    private TextField airlAliasBox;
+    private TextField airlAliasAdd;
     @FXML
-    private TextField airlIATABox;
+    private TextField airlIATAAdd;
     @FXML
-    private TextField airlICAOBox;
+    private TextField airlICAOAdd;
     @FXML
-    private TextField airlCallsignBox;
+    private TextField airlCallsignAdd;
     @FXML
-    private TextField airlCountryBox;
+    private TextField airlCountryAdd;
     @FXML
-    private ComboBox<String> airlActiveCBox;
+    private TextField airlActiveAdd;
 
     //Setting up text fields for filtering data
     @FXML
@@ -77,22 +88,37 @@ public class AirlineRDController extends Controller {
      */
     public void load() {
         //Sets up the table columns to be ready for use for Airline data
-        airlIDcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ID"));
+        airlIDCol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ID"));
-        airlNamecol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Name"));
+        airlNameCol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Name"));
-        airlAliascol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Alias"));
+        airlAliasCol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Alias"));
-        airlIATAcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("IATA"));
+        airlIATACol.setCellValueFactory(new PropertyValueFactory<Airline, String>("IATA"));
-        airlICAOcol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ICAO"));
+        airlICAOCol.setCellValueFactory(new PropertyValueFactory<Airline, String>("ICAO"));
-        airlCallsigncol.setCellValueFactory(new PropertyValueFactory<Airline, String>("CallSign"));
+        airlCallsignCol.setCellValueFactory(new PropertyValueFactory<Airline, String>("CallSign"));
-        airlCountrycol.setCellValueFactory(new PropertyValueFactory<Airline, String>("CountryName"));
+        airlCountryCol.setCellValueFactory(new PropertyValueFactory<Airline, String>("CountryName"));
-        airlActivecol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Active"));
+        airlActiveCol.setCellValueFactory(new PropertyValueFactory<Airline, String>("Active"));
 
         //Assigning the Dataset to the current Dataset's airlines and displaying it in a table
         theDataSet = getParent().getCurrentDataset();
         tableViewAirlineRD.setItems(FXCollections.observableArrayList(theDataSet.getAirlines()));
+    }
+
+    /**
+     * Opens the Airline add form.
+     */
+    public void openAdd() {
+        try {
+            FXMLLoader loader = new FXMLLoader();
+            Parent root = loader.load(getClass().getClassLoader().getResource("airline_add_form.fxml"));
+            Stage filter = new Stage();
+            filter.initModality(Modality.APPLICATION_MODAL);
+            filter.setResizable(false);
+            filter.setTitle("Add New Airline");
+            filter.setScene(new Scene(root, 600, 370));
+            filter.show();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
 
-        //Initializes the value for the drop-down menu for Active for adding a new Airline
-        airlActiveCBox.setValue("Y");
-        airlActiveCBox.getItems().addAll("Y", "N");
     }
 
     /**
@@ -103,45 +129,35 @@ public class AirlineRDController extends Controller {
     public void addAirlineSingle() {
         //Tries to add a new airline and clears the fields to their initial state if successful.
         //Otherwise an error message will pop up with what is wrong with the manual data.
+
+        //How to get this dataset into here to show data?
         try {
             theDataSet.addAirline(
-                    airlNameBox.getText(),
+                    airlNameAdd.getText(),
-                    airlAliasBox.getText(),
+                    airlAliasAdd.getText(),
-                    airlIATABox.getText(),
+                    airlIATAAdd.getText(),
-                    airlICAOBox.getText(),
+                    airlICAOAdd.getText(),
-                    airlCallsignBox.getText(),
+                    airlCallsignAdd.getText(),
-                    airlCountryBox.getText(),
+                    airlCountryAdd.getText(),
-                    airlActiveCBox.getSelectionModel().getSelectedItem().toString());
+                    airlActiveAdd.getText());
-            airlNameBox.clear();
+            airlNameAdd.clear();
-            airlAliasBox.clear();
+            airlAliasAdd.clear();
-            airlIATABox.clear();
+            airlIATAAdd.clear();
-            airlICAOBox.clear();
+            airlICAOAdd.clear();
-            airlCallsignBox.clear();
+            airlCallsignAdd.clear();
-            airlCountryBox.clear();
+            airlCountryAdd.clear();
-            airlActiveCBox.getSelectionModel().clearSelection();
+            airlActiveAdd.getText();
-            airlActiveCBox.setValue("Y");
             tableViewAirlineRD.setItems(FXCollections.observableArrayList(theDataSet.getAirlines()));
-        } catch ( Exception e ) {
+        } catch (Exception e) {
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("Airline Data Error");
             alert.setHeaderText("Error adding a custom airline entry.");
+            System.out.println(e);
             alert.setContentText(e.getMessage());
             alert.showAndWait();
         }
     }
 
-    /**
-     * Deletes a single selected airline entry from the database.
-     * Updates the GUI accordingly.
-     * @see Dataset
-     */
-    public void deleteAirline() {
-        //Gets an airline from the table and deletes it before updating the table
-        Airline toDelete = tableViewAirlineRD.getSelectionModel().getSelectedItem();
-        theDataSet.deleteAirline(toDelete);
-        tableViewAirlineRD.setItems(FXCollections.observableArrayList(theDataSet.getAirlines()));
-    }
-
     /**
      * Filters airlines by any field.
      * These are specified by what the user has typed in the filter boxes.
@@ -150,6 +166,7 @@ public class AirlineRDController extends Controller {
      */
     public void filterAirlines() {
         //The filter function also operates like a search function
+        //theDataSet = getParent().getCurrentDataset();
         AirlineFilter filter = new AirlineFilter(theDataSet.getAirlines());
         if (airlNameFilter.getText() != null) {
             filter.filterName(airlNameFilter.getText());
@@ -176,6 +193,36 @@ public class AirlineRDController extends Controller {
         tableViewAirlineRD.setItems(FXCollections.<Airline>observableArrayList(filter.getFilteredData()));
     }
 
+    /**
+     * Deletes a single selected airline entry from the database.
+     * Updates the GUI accordingly.
+     * @see Dataset
+     */
+    public void deleteAirline() {
+        //Gets an airline from the table and deletes it before updating the table
+        Airline toDelete = tableViewAirlineRD.getSelectionModel().getSelectedItem();
+        theDataSet.deleteAirline(toDelete);
+        tableViewAirlineRD.setItems(FXCollections.observableArrayList(theDataSet.getAirlines()));
+    }
+
+    /**
+     * Opens the Airline Filter form.
+     */
+    public void openFilter() {
+        try {
+            Parent root = FXMLLoader.load(getClass().getResource("/airline_filter_form.fxml"));
+            final Stage filter = new Stage();
+            filter.initModality(Modality.APPLICATION_MODAL);
+            filter.setResizable(false);
+            filter.setTitle("Airline Filter");
+            filter.setScene(new Scene(root, 600, 370));
+            filter.show();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+
     /**
      * Analyses the current data and creates a graph based on the data.
      * Currently not implemented yet.
@@ -183,4 +230,8 @@ public class AirlineRDController extends Controller {
     public void analyse_Button() {
         JOptionPane.showMessageDialog(null, "This is not Implemented yet");
     }
+
+    public void airlineSummaryButton() {
+        replaceSceneContent(SceneCode.AIRLINE_SUMMARY);
+    }
 }

src/main/resources/airline_add_form.fxml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.text.Font?>
+
+<GridPane hgap="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="370.0" prefWidth="600.0" vgap="10.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirlineRDController">
+  <columnConstraints>
+    <ColumnConstraints hgrow="SOMETIMES" maxWidth="280.0" minWidth="10.0" prefWidth="125.0" />
+    <ColumnConstraints hgrow="SOMETIMES" maxWidth="515.0" minWidth="10.0" prefWidth="445.0" />
+  </columnConstraints>
+  <rowConstraints>
+    <RowConstraints maxHeight="30.0" minHeight="0.0" prefHeight="30.0" vgrow="SOMETIMES" />
+    <RowConstraints maxHeight="30.0" minHeight="4.0" prefHeight="30.0" vgrow="SOMETIMES" />
+    <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+  </rowConstraints>
+   <padding>
+      <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+   </padding>
+   <children>
+      <Label text="Add New Airline" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.valignment="TOP">
+         <font>
+            <Font size="18.0" />
+         </font>
+      </Label>
+      <Label text="Name*" GridPane.halignment="LEFT" GridPane.rowIndex="1">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <Label text="Alias*" GridPane.halignment="LEFT" GridPane.rowIndex="2">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <Label text="IATA" GridPane.halignment="LEFT" GridPane.rowIndex="3">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <Label text="ICAO" GridPane.halignment="LEFT" GridPane.rowIndex="4">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <Label text="Callsign" GridPane.halignment="LEFT" GridPane.rowIndex="5">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <Label text="Country*" GridPane.halignment="LEFT" GridPane.rowIndex="6">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <Label text="Active" GridPane.halignment="LEFT" GridPane.rowIndex="7">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <Button mnemonicParsing="false" onAction="#addAirlineSingle" text="Add Airline" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="8" />
+      <TextField fx:id="airlNameAdd" prefHeight="31.0" prefWidth="432.0" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="1" />
+      <TextField fx:id="airlAliasAdd" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2" />
+      <TextField fx:id="airlIATAAdd" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="3" />
+      <TextField fx:id="airlICAOAdd" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="4" />
+      <TextField fx:id="airlCallsignAdd" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="5" />
+      <TextField fx:id="airlCountryAdd" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="6" />
+      <TextField fx:id="airlActiveAdd" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="7" />
+      <Label text="* = required field" GridPane.rowIndex="8" />
+   </children>
+</GridPane>

src/main/resources/airline_filter_form.fxml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.text.Font?>
+
+<GridPane hgap="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="370.0" prefWidth="600.0" vgap="10.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirlineRDController">
+   <columnConstraints>
+      <ColumnConstraints hgrow="SOMETIMES" maxWidth="280.0" minWidth="10.0" prefWidth="125.0" />
+      <ColumnConstraints hgrow="SOMETIMES" maxWidth="515.0" minWidth="10.0" prefWidth="445.0" />
+   </columnConstraints>
+   <rowConstraints>
+      <RowConstraints maxHeight="30.0" minHeight="0.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="30.0" minHeight="4.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+   </rowConstraints>
+   <padding>
+      <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+   </padding>
+   <children>
+      <Label text="Search Airlines" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.valignment="TOP">
+         <font>
+            <Font size="18.0" />
+         </font>
+      </Label>
+      <Label text="Name" GridPane.halignment="LEFT" GridPane.rowIndex="1">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <Label text="Alias" GridPane.halignment="LEFT" GridPane.rowIndex="2">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <Label text="IATA" GridPane.halignment="LEFT" GridPane.rowIndex="3">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <Label text="ICAO" GridPane.halignment="LEFT" GridPane.rowIndex="4">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <Label text="Callsign" GridPane.halignment="LEFT" GridPane.rowIndex="5">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <Label text="Country" GridPane.halignment="LEFT" GridPane.rowIndex="6">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <Label text="Active" GridPane.halignment="LEFT" GridPane.rowIndex="7">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Label>
+      <Button mnemonicParsing="false" onAction="#filterAirlines" text="Apply Conditions" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="8" />
+      <TextField fx:id="airlNameFilter" prefHeight="31.0" prefWidth="432.0" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="1" />
+      <TextField fx:id="airlAliasFilter" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2" />
+      <TextField fx:id="airlIATAFilter" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="3" />
+      <TextField fx:id="airlICAOFilter" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="4" />
+      <TextField fx:id="airlCallsignFilter" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="5" />
+      <TextField fx:id="airlCountryFilter" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="6" />
+      <TextField fx:id="airlActiveFilter" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="7" />
+   </children>
+</GridPane>

src/main/resources/airline_raw_data.fxml

@@ -2,148 +2,81 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.ContextMenu?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
-<?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="568.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirlineRDController">
+<GridPane alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="568.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirlineRDController">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
   </columnConstraints>
   <rowConstraints>
-    <RowConstraints maxHeight="457.0" minHeight="10.0" prefHeight="403.0" vgrow="SOMETIMES" />
+    <RowConstraints maxHeight="50.0" minHeight="0.0" prefHeight="50.0" vgrow="SOMETIMES" />
-    <RowConstraints maxHeight="129.0" minHeight="10.0" prefHeight="111.0" vgrow="SOMETIMES" />
+    <RowConstraints maxHeight="450.0" minHeight="10.0" prefHeight="450.0" vgrow="SOMETIMES" />
+    <RowConstraints maxHeight="68.0" minHeight="0.0" prefHeight="68.0" vgrow="SOMETIMES" />
   </rowConstraints>
    <children>
-      <Pane prefHeight="600.0" prefWidth="800.0" GridPane.columnSpan="2" GridPane.rowSpan="2">
+      <Label text="Airline Raw Data" GridPane.halignment="LEFT" GridPane.valignment="TOP">
+         <font>
+            <Font size="36.0" />
+         </font>
+         <GridPane.margin>
+            <Insets left="15.0" />
+         </GridPane.margin>
+      </Label>
+      <TableView fx:id="tableViewAirlineRD" prefHeight="200.0" prefWidth="908.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
+        <columns>
+          <TableColumn fx:id="airlIDCol" prefWidth="75.0" text="Airline ID" />
+            <TableColumn fx:id="airlNameCol" prefWidth="400.0" text="Name" />
+            <TableColumn fx:id="airlAliasCol" prefWidth="75.0" text="Alias" />
+            <TableColumn fx:id="airlIATACol" prefWidth="75.0" text="IATA" />
+            <TableColumn fx:id="airlICAOCol" prefWidth="75.0" text="ICAO" />
+            <TableColumn fx:id="airlCallsignCol" prefWidth="400.0" text="Callsign" />
+            <TableColumn fx:id="airlCountryCol" prefWidth="200.0" text="Country" />
+            <TableColumn fx:id="airlActiveCol" prefWidth="75.0" text="Active" />
+        </columns>
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" />
+         </GridPane.margin>
+         <contextMenu>
+            <ContextMenu>
+               <items>
+                  <MenuItem mnemonicParsing="false" onAction="#deleteAirline" text="Delete" />
+               </items>
+            </ContextMenu>
+         </contextMenu>
+      </TableView>
+      <HBox prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2" GridPane.halignment="RIGHT" GridPane.rowIndex="2" GridPane.valignment="BASELINE">
          <children>
-            <Label layoutX="14.0" layoutY="14.0" text="Airline Raw Data">
+            <Button mnemonicParsing="false" onAction="#analyse_Button" text="Analyse Airline Data">
-               <font>
+               <HBox.margin>
-                  <Font size="29.0" />
+                  <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-               </font>
+               </HBox.margin>
-            </Label>
+            </Button>
-            <Button layoutX="14.0" layoutY="526.0" mnemonicParsing="false" onAction="#analyse_Button" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
+            <Button mnemonicParsing="false" onAction="#openFilter" text="Filter Airline Data">
-            <Button layoutX="654.0" layoutY="526.0" mnemonicParsing="false" onAction="#addAirlineSingle" prefHeight="25.0" prefWidth="125.0" text="Add" />
+               <HBox.margin>
-            <Pane layoutX="14.0" layoutY="57.0" prefHeight="340.0" prefWidth="765.0">
+                  <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-               <children>
+               </HBox.margin>
-                  <TableView fx:id="tableViewAirlineRD" layoutX="1.0" prefHeight="340.0" prefWidth="765.0">
+            </Button>
-                    <columns>
+            <Button mnemonicParsing="false" nodeOrientation="LEFT_TO_RIGHT" onAction="#openAdd" text="Add New Airline">
-                      <TableColumn fx:id="airlIDcol" prefWidth="83.0" text="Airline ID" />
+               <HBox.margin>
-                      <TableColumn fx:id="airlNamecol" prefWidth="450.0" text="Name" />
+                  <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                        <TableColumn fx:id="airlAliascol" minWidth="0.0" prefWidth="56.0" text="Alias" />
+               </HBox.margin>
-                        <TableColumn fx:id="airlIATAcol" minWidth="0.0" prefWidth="59.0" text="IATA" />
+            </Button>
-                        <TableColumn fx:id="airlICAOcol" minWidth="0.0" prefWidth="68.0" text="ICAO" />
-                        <TableColumn fx:id="airlCallsigncol" minWidth="0.0" prefWidth="400.0" text="Callsign" />
-                        <TableColumn fx:id="airlCountrycol" minWidth="0.0" prefWidth="200.0" text="Country" />
-                        <TableColumn fx:id="airlActivecol" minWidth="8.0" prefWidth="66.0" text="Active" />
-                    </columns>
-                     <contextMenu>
-                        <ContextMenu>
-                          <items>
-                            <MenuItem mnemonicParsing="false" onAction="#deleteAirline" text="Delete" />
-                          </items>
-                        </ContextMenu>
-                     </contextMenu>
-                  </TableView>
-               </children>
-            </Pane>
-            <ScrollPane layoutX="14.0" layoutY="467.0" prefHeight="56.0" prefWidth="765.0">
-               <content>
-                  <Pane prefHeight="37.0" prefWidth="1436.0">
-                     <children>
-                        <TextField fx:id="airlNameBox" layoutX="97.0" layoutY="3.0" prefHeight="31.0" prefWidth="450.0" promptText="Name">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="airlAliasBox" layoutX="547.0" layoutY="3.0" prefHeight="31.0" prefWidth="56.0" promptText="Alias">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="airlIATABox" layoutX="603.0" layoutY="3.0" prefHeight="31.0" prefWidth="59.0" promptText="IATA">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="airlICAOBox" layoutX="662.0" layoutY="3.0" prefHeight="31.0" prefWidth="68.0" promptText="ICAO">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="airlCallsignBox" layoutX="730.0" layoutY="3.0" prefHeight="31.0" prefWidth="400.0" promptText="Callsign">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="airlCountryBox" layoutX="1130.0" layoutY="3.0" prefHeight="31.0" prefWidth="200.0" promptText="Country">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <Label layoutX="14.0" layoutY="6.0" prefHeight="25.0" prefWidth="84.0" text="Add Airline:" />
-                        <ComboBox fx:id="airlActiveCBox" layoutX="1330.0" layoutY="3.0" prefHeight="31.0" prefWidth="102.0" promptText="Active" />
-                     </children>
-                  </Pane>
-               </content>
-            </ScrollPane>
-            <ScrollPane layoutX="14.0" layoutY="406.0" prefHeight="56.0" prefWidth="713.0">
-               <content>
-                  <Pane prefHeight="37.0" prefWidth="1315.0">
-                     <children>
-                        <TextField fx:id="airlNameFilter" layoutX="57.0" layoutY="3.0" prefHeight="31.0" prefWidth="400.0" promptText="Name">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="airlAliasFilter" layoutX="457.0" layoutY="3.0" prefHeight="31.0" prefWidth="56.0" promptText="Alias">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="airlIATAFilter" layoutX="513.0" layoutY="3.0" prefHeight="31.0" prefWidth="59.0" promptText="IATA">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="airlICAOFilter" layoutX="572.0" layoutY="3.0" prefHeight="31.0" prefWidth="68.0" promptText="ICAO">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="airlCallsignFilter" layoutX="640.0" layoutY="3.0" prefHeight="31.0" prefWidth="400.0" promptText="Callsign">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <TextField fx:id="airlCountryFilter" layoutX="1040.0" layoutY="3.0" prefHeight="31.0" prefWidth="200.0" promptText="Country">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                        <Label layoutX="10.0" layoutY="6.0" prefHeight="25.0" prefWidth="47.0" text="Filter :" />
-                        <TextField fx:id="airlActiveFilter" layoutX="1240.0" layoutY="3.0" prefHeight="31.0" prefWidth="66.0" promptText="Active">
-                           <padding>
-                              <Insets left="2.0" right="2.0" />
-                           </padding>
-                        </TextField>
-                     </children>
-                  </Pane>
-               </content>
-            </ScrollPane>
-            <Button layoutX="733.0" layoutY="416.0" mnemonicParsing="false" onAction="#filterAirlines" prefHeight="31.0" prefWidth="40.0" text="Go" />
          </children>
-      </Pane>
+      </HBox>
+      <Button mnemonicParsing="false" nodeOrientation="LEFT_TO_RIGHT" onAction="#airlineSummaryButton" text="Back to Airline Summary" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2" GridPane.valignment="TOP">
+         <GridPane.margin>
+            <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+         </GridPane.margin>
+      </Button>
    </children>
 </GridPane>