summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViktoria Pundy <viktoria.pundy@aon.at>2018-05-15 18:10:48 +0200
committerTharre <tharre3@gmail.com>2018-05-22 15:16:38 +0200
commit89ff04e30ccffd18429613a3f31a4f2d088030d4 (patch)
tree60a0be911dbf97fc5f644f39103c2143ecb02c31
parent16e8d50e0c320f3028d0e1324d15c9cb9ce33085 (diff)
downloadsepm-groupproject-89ff04e30ccffd18429613a3f31a4f2d088030d4.tar.gz
sepm-groupproject-89ff04e30ccffd18429613a3f31a4f2d088030d4.tar.xz
sepm-groupproject-89ff04e30ccffd18429613a3f31a4f2d088030d4.zip
Added elements for archive page [#24990]
-rw-r--r--src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java21
-rw-r--r--src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java1
-rw-r--r--src/main/resources/fxml/ArchivOperation.fxml6
3 files changed, 28 insertions, 0 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
new file mode 100644
index 0000000..1ec1610
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java
@@ -0,0 +1,21 @@
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface;
+
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.DBOperationDAO;
+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;
+
+public class ArchivOperationController {
+
+ public ArchivOperationController(){
+
+ }
+ OperationService operationService;
+
+ public void setServices(OperationService operationService){
+ this.operationService = operationService;
+ }
+
+
+
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
index 083e7d0..ed155db 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
@@ -55,6 +55,7 @@ public class CreateOperationController {
public ListView lvActiveOperations;
public Label lblChosenVehicles;
public FlowPane fpVehicles;
+ @FXML ArchivOperationController archivOperationController;
private LinkedList<Vehicle> chosenVehicles = new LinkedList<>();
diff --git a/src/main/resources/fxml/ArchivOperation.fxml b/src/main/resources/fxml/ArchivOperation.fxml
new file mode 100644
index 0000000..3fe5e8b
--- /dev/null
+++ b/src/main/resources/fxml/ArchivOperation.fxml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.AnchorPane?>
+
+
+<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" />