From 72399586da1e2d45b694411b98ed4a091077880d Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Mon, 21 May 2018 19:26:40 +0200
Subject: Revert DTO changes from commit:166ff610

DTOs should never contain logic.
---
 .../assignment/groupphase/einsatzverwaltung/dto/Registration.java  | 7 -------
 .../einsatzverwaltung/ui/vehiclepane/VehiclePaneController.java    | 4 +++-
 .../einsatzverwaltung/userInterface/CreateOperationController.java | 4 +++-
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Registration.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Registration.java
index 93530bc..8551266 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Registration.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dto/Registration.java
@@ -2,7 +2,6 @@ package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto;
 
 import com.google.auto.value.AutoValue;
 import java.time.Instant;
-import java.util.Date;
 
 @AutoValue
 public abstract class Registration {
@@ -18,12 +17,6 @@ public abstract class Registration {
         return new AutoValue_Registration.Builder().id(0);
     }
 
-    public boolean isActive() {
-        Instant now = (new Date()).toInstant();
-
-        return start().isBefore(now) && end().isAfter(now);
-    }
-
     @AutoValue.Builder
     public abstract static class Builder {
         public abstract Builder id(long id);
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 a5f4d15..405eee3 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
@@ -4,6 +4,7 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.Ed
 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.List;
 import java.util.Optional;
 import javafx.fxml.FXML;
@@ -70,12 +71,13 @@ public class VehiclePaneController {
         }
         if (showQualification) {
 
+            Instant now = Instant.now();
             List<Registration> regs = vehicle.registrations();
 
             assert regs != null;
             Optional<EducationLevel> edu =
                     regs.stream()
-                            .filter(Registration::isActive)
+                            .filter(reg -> reg.start().isBefore(now) && reg.end().isAfter(now))
                             .map(reg -> reg.employee().educationLevel())
                             .max(EducationLevel::compareTo);
 
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
index 446ca50..083e7d0 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
@@ -170,9 +170,11 @@ public class CreateOperationController {
                                 != null; // Otherwise the element shouldn't be in the list.
 
                         List<Registration> newRegistrations = new ArrayList<>();
+                        Instant now = Instant.now();
 
                         for (Registration registration : registrations) {
-                            if (registration.isActive()) {
+                            if (registration.start().isBefore(now)
+                                    && registration.end().isAfter(now)) {
                                 newRegistrations.add(
                                         registration
                                                 .toBuilder()
-- 
cgit v1.2.3-70-g09d2