summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java10
-rw-r--r--src/main/resources/fxml/vehiclePane.fxml87
2 files changed, 69 insertions, 28 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java
index 6c0932b..35a4b4a 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java
@@ -3,6 +3,7 @@ package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Registration;
import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
import java.io.IOException;
import java.time.Instant;
import java.util.List;
@@ -10,6 +11,7 @@ import java.util.Optional;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.scene.Node;
+import javafx.scene.control.Label;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.text.Text;
@@ -30,6 +32,7 @@ public class VehiclePaneController {
return result;
}
+ @FXML private Label txtStatus;
@FXML private Text txtType;
@FXML private Text txtNumber;
@FXML private ImageView ivNEF;
@@ -96,6 +99,13 @@ public class VehiclePaneController {
ivQualification.setManaged(false);
}
+ txtStatus.setText(vehicle.status().name());
+ if (vehicle.status() == Status.FREI_FUNK || vehicle.status() == Status.FREI_WACHE) {
+ txtStatus.getStyleClass().add("bg-status-green");
+ } else {
+ txtStatus.getStyleClass().add("bg-status-orange");
+ }
+
this.data = vehicle;
}
diff --git a/src/main/resources/fxml/vehiclePane.fxml b/src/main/resources/fxml/vehiclePane.fxml
index 7932a9f..1cedb7c 100644
--- a/src/main/resources/fxml/vehiclePane.fxml
+++ b/src/main/resources/fxml/vehiclePane.fxml
@@ -10,57 +10,88 @@
<?import javafx.scene.text.Text?>
<?import javafx.scene.text.TextFlow?>
-<GridPane hgap="6.0" stylesheets="@/styles/main.css" styleClass="bg-white, shadowed" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.VehiclePaneController">
+<?import javafx.scene.control.Label?>
+<GridPane stylesheets="@/styles/main.css" minWidth="-Infinity" styleClass="bg-white, shadowed"
+ xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1"
+ fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.VehiclePaneController">
<columnConstraints>
- <ColumnConstraints />
- <ColumnConstraints />
- <ColumnConstraints />
- <ColumnConstraints />
+ <ColumnConstraints/>
+ <ColumnConstraints/>
+ <ColumnConstraints prefWidth="60"/>
+ <ColumnConstraints/>
</columnConstraints>
<rowConstraints>
- <RowConstraints />
- <RowConstraints />
- <RowConstraints />
- <RowConstraints />
+ <RowConstraints/>
+ <RowConstraints/>
+ <RowConstraints/>
+ <RowConstraints/>
</rowConstraints>
<padding>
- <Insets bottom="6.0" left="12.0" right="12.0" top="6.0" />
+ <Insets bottom="6.0" left="12.0" right="12.0" top="6.0"/>
</padding>
- <TextFlow GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="0">
- <Text fx:id="txtType" text="RTW">
+ <!--<Text fx:id="txtType" text="NAH" GridPane.columnIndex="0" GridPane.columnSpan="2">-->
+ <!--<font>-->
+ <!--<Font name="System Bold" size="18.0"/>-->
+ <!--</font>-->
+ <!--</Text>-->
+ <!--<Text fx:id="txtNumber" text="-10003" GridPane.halignment="LEFT" GridPane.columnIndex="2">-->
+ <!--<font>-->
+ <!--<Font size="16.0"/>-->
+ <!--</font>-->
+ <!--</Text>-->
+ <TextFlow GridPane.columnIndex="0" GridPane.columnSpan="3" prefWidth="120">
+ <Text fx:id="txtType" text="RTWSDLK" >
<font>
- <Font name="System Bold" size="18.0" />
+ <Font name="System Bold" size="18.0"/>
</font>
</Text>
- <Text fx:id="txtNumber" text="-10003">
+ <Text fx:id="txtNumber" text="-1">
<font>
- <Font size="16.0" />
+ <Font size="16.0"/>
</font>
</Text>
</TextFlow>
- <ImageView fx:id="ivNEF" fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="0" GridPane.rowIndex="1">
- <Image url="@../images/NotNEF.png" />
+ <ImageView fx:id="ivNEF" fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true"
+ GridPane.columnIndex="0" GridPane.rowIndex="1">
+ <Image url="@../images/NotNEF.png"/>
</ImageView>
- <Text fx:id="txtNEF" text="keine NEF-Halterung" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="1">
+ <Text fx:id="txtNEF" text="keine NEF-Halterung" GridPane.columnIndex="1" GridPane.columnSpan="3"
+ GridPane.rowIndex="1">
<font>
- <Font size="14.0" />
+ <Font size="14.0"/>
</font>
</Text>
- <ImageView fx:id="ivQualification" fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="0" GridPane.rowIndex="2">
- <Image url="@../images/Qualification.png" />
+ <ImageView fx:id="ivQualification" fitHeight="25.0" fitWidth="25.0" pickOnBounds="true"
+ preserveRatio="true" GridPane.columnIndex="0" GridPane.rowIndex="2">
+ <Image url="@../images/Qualification.png"/>
</ImageView>
- <Text fx:id="txtQualification" text="-" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2">
+ <Text fx:id="txtQualification" text="-" GridPane.columnIndex="1" GridPane.columnSpan="3"
+ GridPane.rowIndex="2">
<font>
- <Font size="14.0" />
+ <Font size="14.0"/>
</font>
</Text>
- <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="0" GridPane.rowIndex="3">
- <Image url="@../images/Vehicle.png" />
+ <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true"
+ GridPane.columnIndex="0" GridPane.rowIndex="3">
+ <Image url="@../images/Vehicle.png"/>
+ <GridPane.margin>
+ <Insets right="6"/>
+ </GridPane.margin>
</ImageView>
- <Text fx:id="txtRooftype" text="Hochdach" GridPane.columnIndex="1" GridPane.rowIndex="3">
+ <Text fx:id="txtRooftype" text="Mittelhochdach" GridPane.columnIndex="1" GridPane.columnSpan="3"
+ GridPane.rowIndex="3">
<font>
- <Font size="14.0" />
+ <Font size="14.0"/>
</font>
</Text>
- <Text fx:id="txtStatus" text="FREI_STATUS" GridPane.valignment="TOP" GridPane.columnIndex="3" GridPane.rowIndex="0" styleClass="text-medium"/>
+ <Label fx:id="txtStatus" text="ZUM_BERUFUNGSORT" prefWidth="100" alignment="CENTER"
+ GridPane.valignment="CENTER" GridPane.columnIndex="3"
+ GridPane.rowIndex="0" styleClass="text-medium, button">
+ <GridPane.margin>
+ <Insets left="12"/>
+ </GridPane.margin>
+ <padding>
+ <Insets topRightBottomLeft="3"/>
+ </padding>
+ </Label>
</GridPane>
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-05-04 22:55:04 +0000