aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/resources
diff options
context:
space:
mode:
authorTharre <tharre3@gmail.com>2018-05-22 16:39:15 +0200
committerTharre <tharre3@gmail.com>2018-05-22 16:50:43 +0200
commitef09cf53a5ca546bdb14c82f83169209e66555aa (patch)
tree540175b6b6e6f7c4d41e6c7849ef5728292641b2 /src/main/resources
parent8e0f72f0fab05749edab4142379ada393bf6676c (diff)
downloadsepm-groupproject-ef09cf53a5ca546bdb14c82f83169209e66555aa.tar.gz
sepm-groupproject-ef09cf53a5ca546bdb14c82f83169209e66555aa.tar.xz
sepm-groupproject-ef09cf53a5ca546bdb14c82f83169209e66555aa.zip
Fix conflicts and reimplement Operation.list()
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/fxml/CreateOperationController.fxml4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml
index c8e837c..236215b 100644
--- a/src/main/resources/fxml/CreateOperationController.fxml
+++ b/src/main/resources/fxml/CreateOperationController.fxml
@@ -68,11 +68,9 @@
<Label layoutX="10.0" layoutY="6.0"
text="Aktive Einsätze" styleClass="text-big">
</Label>
- <Label layoutY="12.0" text="Archiv" styleClass="text-medium" AnchorPane.rightAnchor="12"> <!--TODO: Underline-->
- </Label>
+ <Hyperlink onAction="#onArchivLinkClicked" layoutY="12.0" text="Archiv" styleClass="text-medium" AnchorPane.rightAnchor="12"/>
</AnchorPane>
<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>