From 4d7e495f269987c334aba2f69cae322221039ac1 Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Tue, 15 May 2018 19:49:21 +0200
Subject: Included ArchivOperation into CreateOperation [#24990]

---
 .../userInterface/ArchivOperationController.java            | 13 +++++++++++++
 src/main/resources/fxml/ArchivOperation.fxml                |  4 ++--
 src/main/resources/fxml/CreateOperationController.fxml      |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java
index 1ec1610..c52766f 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java
@@ -4,9 +4,14 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.DBOperation
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationService;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationServiceImpl;
 import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.layout.FlowPane;
 
 public class ArchivOperationController {
 
+    public FlowPane archiveOperationFlowPane;
+
     public ArchivOperationController(){
 
     }
@@ -16,6 +21,14 @@ public class ArchivOperationController {
         this.operationService = operationService;
     }
 
+    @FXML
+    public void initialize(){
+            Button b1 = new Button();
+            b1.setPrefHeight(200);
+            b1.setPrefWidth(650/2);
+            archiveOperationFlowPane.getChildren().add(b1);
+    }
+
 
 
 }
diff --git a/src/main/resources/fxml/ArchivOperation.fxml b/src/main/resources/fxml/ArchivOperation.fxml
index 3fe5e8b..0efc9d9 100644
--- a/src/main/resources/fxml/ArchivOperation.fxml
+++ b/src/main/resources/fxml/ArchivOperation.fxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.FlowPane?>
 
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" />
+<FlowPane fx:id="archiveOperationFlowPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface.ArchivOperationController"/>
diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index 3958872..c8e837c 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -74,4 +74,5 @@
   <FlowPane fx:id="fpVehicles" hgap="12" layoutX="40.0" layoutY="228.0" prefHeight="388.0"
     prefWidth="920.0" vgap="12">
   </FlowPane>
+  <fx:include source="ArchivOperation.fxml" fx:id="archivOperation"/>
 </AnchorPane>
-- 
cgit v1.2.3-70-g09d2