From db55a9bea42a2c489be9a3f5f9979998fcccde00 Mon Sep 17 00:00:00 2001
From: Joyelle Ndagijimana <njoyelle2@gmail.com>
Date: Tue, 13 May 2025 09:09:46 +0200
Subject: [PATCH] fix: deadline nullable maken om errors te vermijden

---
 backend/src/entities/assignments/assignment.entity.ts |  2 +-
 frontend/src/views/assignments/UserAssignments.vue    | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/backend/src/entities/assignments/assignment.entity.ts b/backend/src/entities/assignments/assignment.entity.ts
index 1bddd39d..88c3160f 100644
--- a/backend/src/entities/assignments/assignment.entity.ts
+++ b/backend/src/entities/assignments/assignment.entity.ts
@@ -26,7 +26,7 @@ export class Assignment {
     @Property({ type: 'string' })
     learningPathHruid!: string;
 
-    @Property({ type: 'datetime' })
+    @Property({ type: 'datetime', nullable: true })
     deadline?: Date;
 
     @Enum({
diff --git a/frontend/src/views/assignments/UserAssignments.vue b/frontend/src/views/assignments/UserAssignments.vue
index 1a097149..476ee197 100644
--- a/frontend/src/views/assignments/UserAssignments.vue
+++ b/frontend/src/views/assignments/UserAssignments.vue
@@ -109,15 +109,13 @@
 
     function getDeadlineClass(deadline?: string | Date): string {
         if (!deadline) return "";
+
         const date = new Date(deadline);
         const now = new Date();
-        const isToday =
-            date.getDate() === now.getDate() &&
-            date.getMonth() === now.getMonth() &&
-            date.getFullYear() === now.getFullYear();
+        const in24Hours = new Date(now.getTime() + 24 * 60 * 60 * 1000);
 
         if (date.getTime() < now.getTime()) return "deadline-passed";
-        if (isToday) return "deadline-today";
+        if (date.getTime() <= in24Hours.getTime()) return "deadline-in24hours";
         return "deadline-upcoming";
     }
 
@@ -259,7 +257,7 @@
         font-weight: bold;
     }
 
-    .assignment-deadline.deadline-today {
+    .assignment-deadline.deadline-in24hours {
         color: #f57c00;
         font-weight: bold;
     }