diff options
| author | Viktoria Pundy <viktoria.pundy@aon.at> | 2018-05-18 10:00:14 +0200 |
|---|---|---|
| committer | Tharre <tharre3@gmail.com> | 2018-05-22 15:55:04 +0200 |
| commit | 8e0f72f0fab05749edab4142379ada393bf6676c (patch) | |
| tree | 65a247c72d6ddbbdd59d86f1cb22833fe0526794 /src/main | |
| parent | ffa77840d38c39cbffeaeed6c0db83598b203795 (diff) | |
| download | sepm-groupproject-8e0f72f0fab05749edab4142379ada393bf6676c.tar.gz sepm-groupproject-8e0f72f0fab05749edab4142379ada393bf6676c.tar.xz sepm-groupproject-8e0f72f0fab05749edab4142379ada393bf6676c.zip | |
Added Scrollpane for operations in archive view [#24990]
Diffstat (limited to 'src/main')
3 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java index 4991858..6eab58d 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java @@ -11,6 +11,7 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationExcepti import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException; import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException; import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException; +import java.lang.invoke.MethodHandles; import java.time.Instant; import java.util.EnumSet; import java.util.HashSet; @@ -18,10 +19,9 @@ import java.util.Set; import java.util.SortedSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.springframework.stereotype.Service; -import java.lang.invoke.MethodHandles; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; @Service public class OperationServiceImpl implements OperationService { diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchiveOperationController.java index 7bf6f2f..ecbb165 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchiveOperationController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchiveOperationController.java @@ -54,7 +54,7 @@ public class ArchiveOperationController { for (Operation operation : list) { Button b = new Button(); b.setPrefHeight(200); - b.setPrefWidth(800 / 2); + b.setPrefWidth(750 / 2); b.setText(operation.opCode()); b.setOnAction(event -> buttonClicked(b)); archiveOperationFlowPane.getChildren().add(b); diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml index b680c0f..45d128c 100644 --- a/src/main/resources/fxml/ArchiveOperation.fxml +++ b/src/main/resources/fxml/ArchiveOperation.fxml @@ -10,7 +10,11 @@ <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.userInterface.ArchiveOperationController"> <children> <AnchorPane prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: rgba(239,235,232,1);" AnchorPane.leftAnchor="200.0" /> - <FlowPane fx:id="archiveOperationFlowPane" prefHeight="650.0" prefWidth="800.0" AnchorPane.leftAnchor="200.0" /> + <ScrollPane prefHeight="650.0" prefWidth="800.0" AnchorPane.leftAnchor="200.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"> <children> <AnchorPane prefHeight="170.0" prefWidth="800.0" style="-fx-background-color: rgba(191,144,0,1);"> |