From 6f3f64297be1f694e73db616ff000dfede211965 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sat, 26 May 2018 16:00:10 +0200
Subject: Included fxml-Files

Included fxml-Files "ArchiveOperation", "createCar", "listEmployees" and "RegistrationWindow" in "CreateOperationController". Therefore these windows are not standalone windows anymore but part of the main window. Additionally, methods were added to their respective controllers in order to show and hide the windows
---
 src/main/resources/fxml/ArchiveOperation.fxml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/main/resources/fxml/ArchiveOperation.fxml')

diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index 88b5b39..7eace12 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -7,15 +7,14 @@
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1200.0" style="-fx-background-color: BLACK;" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.ArchiveOperationController">
+<AnchorPane fx:id="archiveOperationAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: BLACK;" visible="false" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.ArchiveOperationController">
   <children>
-    <AnchorPane prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: rgba(239,235,232,1);" AnchorPane.leftAnchor="200.0" />
-      <ScrollPane prefHeight="650.0" prefWidth="800.0" AnchorPane.leftAnchor="200.0">
+      <ScrollPane prefHeight="650.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0">
          <content>
           <FlowPane fx:id="archiveOperationFlowPane" prefHeight="650.0" prefWidth="800.0" />
          </content>
       </ScrollPane>
-      <AnchorPane fx:id="apDetails" layoutX="201.0" prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: rgba(239,235,232,1);" visible="false" AnchorPane.leftAnchor="201.0" AnchorPane.topAnchor="0.0">
+      <AnchorPane fx:id="apDetails" layoutX="201.0" prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: rgba(239,235,232,1);" visible="false" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
             <AnchorPane prefHeight="170.0" prefWidth="800.0" style="-fx-background-color: rgba(191,144,0,1);">
                <children>
-- 
cgit v1.2.3-70-g09d2