From 166ff610e62f0671f65a6fd27d4760f0881eb6f4 Mon Sep 17 00:00:00 2001 From: Andreas Weninger Date: Fri, 11 May 2018 16:17:42 +0200 Subject: UI Changes Main Window --- .../resources/fxml/CreateOperationController.fxml | 179 ++++++++++++--------- 1 file changed, 101 insertions(+), 78 deletions(-) (limited to 'src/main/resources/fxml/CreateOperationController.fxml') diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml index 086a5d1..18a1508 100644 --- a/src/main/resources/fxml/CreateOperationController.fxml +++ b/src/main/resources/fxml/CreateOperationController.fxml @@ -5,91 +5,114 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + + - + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From 3990268905e3223276160e2a32c74d4f05d0796e Mon Sep 17 00:00:00 2001 From: Andreas Weninger Date: Mon, 14 May 2018 16:31:12 +0200 Subject: Reworking MainWindow UI. --- .../ui/vehiclepane/VehiclePaneController.java | 5 +- .../resources/fxml/CreateOperationController.fxml | 153 ++++++++------------- src/main/resources/fxml/vehiclePane.fxml | 2 +- src/main/resources/styles/main.css | 28 ++++ 4 files changed, 90 insertions(+), 98 deletions(-) (limited to 'src/main/resources/fxml/CreateOperationController.fxml') diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/ui/vehiclepane/VehiclePaneController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/ui/vehiclepane/VehiclePaneController.java index 29230f3..d0dcbae 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/ui/vehiclepane/VehiclePaneController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/ui/vehiclepane/VehiclePaneController.java @@ -88,6 +88,9 @@ public class VehiclePaneController { } public void setSelected(boolean selected) { - // TODO + rootElement.getStyleClass().clear(); + + if (selected) rootElement.getStyleClass().add("shadowed-yellow"); + else rootElement.getStyleClass().add("shadowed-white"); } } diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml index 18a1508..88fe26a 100644 --- a/src/main/resources/fxml/CreateOperationController.fxml +++ b/src/main/resources/fxml/CreateOperationController.fxml @@ -13,106 +13,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface.CreateOperationController" + stylesheets="@/styles/main.css"> + + + - + + - + - - + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/main/resources/fxml/vehiclePane.fxml b/src/main/resources/fxml/vehiclePane.fxml index 38be664..79cfaf9 100644 --- a/src/main/resources/fxml/vehiclePane.fxml +++ b/src/main/resources/fxml/vehiclePane.fxml @@ -10,7 +10,7 @@ - + diff --git a/src/main/resources/styles/main.css b/src/main/resources/styles/main.css index e69de29..11a069e 100644 --- a/src/main/resources/styles/main.css +++ b/src/main/resources/styles/main.css @@ -0,0 +1,28 @@ +.shadowed-white { + -fx-background-color: white; + -fx-effect: dropshadow(gaussian, rgba(100,100,100,0.8), 5, 0, 0, 3); +} + +.shadowed-yellow { + -fx-background-color: #FFE699; + -fx-effect: dropshadow(gaussian, rgba(100,100,100,0.8), 5, 0, 0, 3); +} + +.text-big { + -fx-font-size: 18px; +} + +.text-medium { + -fx-font-size: 14px; +} + +.text-small { + -fx-font-size: 14px; +} + +.button { + -fx-background-radius: 0em; + -fx-background-color: darkgreen; + -fx-text-fill: white; + -fx-font-weight: bold; +} \ No newline at end of file -- cgit v1.2.3-70-g09d2 From fa6ac1c592c22ac688123fabed062879881dc843 Mon Sep 17 00:00:00 2001 From: Andreas Weninger Date: Fri, 18 May 2018 11:15:50 +0200 Subject: Updated Visuals in MainWindow. --- .../resources/fxml/CreateOperationController.fxml | 30 +++++++++++++++------- src/main/resources/styles/main.css | 4 +++ 2 files changed, 25 insertions(+), 9 deletions(-) (limited to 'src/main/resources/fxml/CreateOperationController.fxml') diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml index 88fe26a..54e08b0 100644 --- a/src/main/resources/fxml/CreateOperationController.fxml +++ b/src/main/resources/fxml/CreateOperationController.fxml @@ -10,19 +10,31 @@ + + - + + + + + + + + - + - + - - + + - + - - + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/main/resources/fxml/vehiclePane.fxml b/src/main/resources/fxml/vehiclePane.fxml index 79cfaf9..38be664 100644 --- a/src/main/resources/fxml/vehiclePane.fxml +++ b/src/main/resources/fxml/vehiclePane.fxml @@ -10,7 +10,7 @@ - + -- cgit v1.2.3-70-g09d2 From 689d8f9b2092473c7c10c8a39744c8a2c8765ce4 Mon Sep 17 00:00:00 2001 From: Andreas Weninger Date: Mon, 14 May 2018 16:31:12 +0200 Subject: Reworking MainWindow UI. --- .../resources/fxml/CreateOperationController.fxml | 153 ++++++++------------- src/main/resources/fxml/vehiclePane.fxml | 2 +- 2 files changed, 58 insertions(+), 97 deletions(-) (limited to 'src/main/resources/fxml/CreateOperationController.fxml') diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml index 18a1508..88fe26a 100644 --- a/src/main/resources/fxml/CreateOperationController.fxml +++ b/src/main/resources/fxml/CreateOperationController.fxml @@ -13,106 +13,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface.CreateOperationController" + stylesheets="@/styles/main.css"> + + + - + + - + - - + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/main/resources/fxml/vehiclePane.fxml b/src/main/resources/fxml/vehiclePane.fxml index 38be664..79cfaf9 100644 --- a/src/main/resources/fxml/vehiclePane.fxml +++ b/src/main/resources/fxml/vehiclePane.fxml @@ -10,7 +10,7 @@ - + -- cgit v1.2.3-70-g09d2 From 3f84016b6f9136f8d877e15ace1b214ea67c75b2 Mon Sep 17 00:00:00 2001 From: Andreas Weninger Date: Tue, 15 May 2018 12:10:59 +0200 Subject: Status menu FXML & Controller --- .../controller/StatusMenuController.java | 32 ++++++++++++++++++++++ .../groupphase/einsatzverwaltung/dto/Vehicle.java | 2 +- .../resources/fxml/CreateOperationController.fxml | 3 +- src/main/resources/fxml/statusMenu.fxml | 20 +++++++++++--- src/main/resources/styles/main.css | 17 ++++++++++++ 5 files changed, 68 insertions(+), 6 deletions(-) (limited to 'src/main/resources/fxml/CreateOperationController.fxml') diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/StatusMenuController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/StatusMenuController.java index 50f4359..d4e5b04 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/StatusMenuController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/StatusMenuController.java @@ -1,13 +1,45 @@ package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller; +import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status; import java.net.URL; import java.util.ResourceBundle; +import javafx.fxml.FXML; import javafx.fxml.Initializable; +import javafx.geometry.Insets; +import javafx.scene.control.Button; +import javafx.scene.input.MouseEvent; +import javafx.scene.layout.VBox; +import org.springframework.stereotype.Controller; +@Controller public class StatusMenuController implements Initializable { + @FXML + private VBox vboxMain; + @Override public void initialize(URL location, ResourceBundle resources) { + for (Status status : Status.values()) { + if (status == Status.ABGEMELDET) { + continue; + } + + Button btn = new Button(status.name()); + + btn.setPrefWidth(Double.MAX_VALUE); + btn.setPadding(new Insets(6)); + if (status == Status.FREI_FUNK || status == Status.FREI_WACHE) { + btn.getStyleClass().add("button-free-status"); + } else { + btn.getStyleClass().add("button-other-status"); + } + btn.getStyleClass().add("text-medium"); + + vboxMain.getChildren().add(vboxMain.getChildren().size() - 1, btn); + } + } + public void unregister(MouseEvent mouseEvent) { + //TODO } } diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Vehicle.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Vehicle.java index 84d9c92..e81db0b 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Vehicle.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Vehicle.java @@ -24,11 +24,11 @@ public abstract class Vehicle { public enum Status { ABGEMELDET, FREI_WACHE, + FREI_FUNK, ZUM_BERUFUNGSORT, AM_BERUFUNGSORT, ZUM_ZIELORT, AM_ZIELORT, - FREI_FUNK, } public abstract long id(); diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml index 88fe26a..cb8239d 100644 --- a/src/main/resources/fxml/CreateOperationController.fxml +++ b/src/main/resources/fxml/CreateOperationController.fxml @@ -45,7 +45,7 @@ text="Fahrzeuge:" styleClass="text-medium"/> + + + + -- cgit v1.2.3-70-g09d2 From 3921e1bb05b7fa449bc72f136b3ede62984614af Mon Sep 17 00:00:00 2001 From: Martin Weick Date: Thu, 24 May 2018 14:00:04 +0200 Subject: Add onOperationCodeChanged method + format in fxml --- .../resources/fxml/CreateOperationController.fxml | 28 +++++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'src/main/resources/fxml/CreateOperationController.fxml') diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml index dbdb4ef..9b063e3 100644 --- a/src/main/resources/fxml/CreateOperationController.fxml +++ b/src/main/resources/fxml/CreateOperationController.fxml @@ -13,15 +13,19 @@ xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface.CreateOperationController" stylesheets="@/styles/main.css"> - + -