aboutsummaryrefslogtreecommitdiffstats
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/ui/vehiclepane/VehiclePaneController.java (renamed from src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/ui/vehiclePane/VehiclePaneController.java)29
-rw-r--r--src/main/resources/fxml/vehiclePane.fxml90
2 files changed, 67 insertions, 52 deletions
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 2b0df13..2db6f37 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
@@ -1,7 +1,13 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.ui.vehiclePane;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.ui.vehiclepane;
+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 java.io.IOException;
+import java.time.Instant;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.scene.Node;
@@ -54,12 +60,21 @@ public class VehiclePaneController {
ivNEF.setImage(new Image("../images/NotNEF.png"));
txtNEF.setText("keine NEF-Halterung");
}
- if (showQualification)
- {
- //TODO
- }
- else
- {
+ if (showQualification) {
+
+ Instant now = (new Date()).toInstant();
+ List<Registration> regs = vehicle.registrations();
+
+ assert regs != null;
+ Optional<EducationLevel> edu =
+ regs.stream()
+ .filter(reg -> reg.start().isBefore(now) && reg.end().isAfter(now))
+ .map(reg -> reg.employee().educationLevel())
+ .max(EducationLevel::compareTo);
+
+ assert edu.isPresent();
+ txtQualification.setText(edu.get().name());
+ } else {
txtQualification.setVisible(false);
txtQualification.setManaged(false);
ivQualification.setVisible(false);
diff --git a/src/main/resources/fxml/vehiclePane.fxml b/src/main/resources/fxml/vehiclePane.fxml
index 6014c72..8b1d194 100644
--- a/src/main/resources/fxml/vehiclePane.fxml
+++ b/src/main/resources/fxml/vehiclePane.fxml
@@ -10,61 +10,61 @@
<?import javafx.scene.text.Text?>
<?import javafx.scene.text.TextFlow?>
-<GridPane hgap="6.0" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.ui.vehiclePane.VehiclePaneController">
+<GridPane hgap="6.0" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1"
+ fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.ui.vehiclepane.VehiclePaneController">
<columnConstraints>
- <ColumnConstraints />
- <ColumnConstraints />
- <ColumnConstraints />
- <ColumnConstraints />
+ <ColumnConstraints/>
+ <ColumnConstraints/>
+ <ColumnConstraints/>
+ <ColumnConstraints/>
</columnConstraints>
<rowConstraints>
- <RowConstraints />
- <RowConstraints />
- <RowConstraints />
- <RowConstraints />
+ <RowConstraints/>
+ <RowConstraints/>
+ <RowConstraints/>
+ <RowConstraints/>
</rowConstraints>
<padding>
- <Insets bottom="6.0" left="6.0" right="6.0" top="6.0" />
+ <Insets bottom="6.0" left="6.0" right="6.0" top="6.0"/>
</padding>
- <children>
- <TextFlow GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="0">
- <Text text="RTW" fx:id="txtType">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- <Text text="-10003" fx:id="txtNumber">
- <font>
- <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>
- <Text fx:id="txtNEF" text="keine NEF-Halterung" GridPane.columnIndex="1" GridPane.rowIndex="1">
+ <TextFlow GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="0">
+ <Text text="RTW" fx:id="txtType">
<font>
- <Font size="14.0" />
+ <Font name="System Bold" size="18.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>
- <Text fx:id="txtQualification" text="Notarzt" GridPane.columnIndex="1" GridPane.rowIndex="2">
+ <Text text="-10003" fx:id="txtNumber">
<font>
- <Font size="14.0" />
+ <Font size="16.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>
- <Text fx:id="txtRooftype" text="Hochdach" GridPane.columnIndex="1" GridPane.rowIndex="3">
- <font>
- <Font size="14.0" />
- </font>
- </Text>
- </children>
+ </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>
+ <Text fx:id="txtNEF" text="keine NEF-Halterung" GridPane.columnIndex="1" GridPane.rowIndex="1">
+ <font>
+ <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>
+ <Text fx:id="txtQualification" text="Notarzt" GridPane.columnIndex="1" GridPane.rowIndex="2">
+ <font>
+ <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>
+ <Text fx:id="txtRooftype" text="Hochdach" GridPane.columnIndex="1" GridPane.rowIndex="3">
+ <font>
+ <Font size="14.0"/>
+ </font>
+ </Text>
</GridPane>
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-05-04 22:37:33 +0000