diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 6d6f511..0c5b730 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,15 +4,10 @@
-
+
-
-
-
-
-
@@ -223,7 +218,7 @@
-
+
@@ -545,14 +540,21 @@
1699783968670
-
+
+
+ 1699786723938
+
+
+
+ 1699786723938
+
+
-
@@ -577,7 +579,8 @@
-
+
+
diff --git a/backend/src/main/java/core/entities/timemanager/AdvancedTaskSchedule.java b/backend/src/main/java/core/entities/timemanager/AdvancedTaskSchedule.java
index 782850f..2289c09 100644
--- a/backend/src/main/java/core/entities/timemanager/AdvancedTaskSchedule.java
+++ b/backend/src/main/java/core/entities/timemanager/AdvancedTaskSchedule.java
@@ -69,6 +69,6 @@ public class AdvancedTaskSchedule extends AbstractSchedule {
@Override
public boolean isMissed(LocalDateTime timeReference) {
- return startTime == null && scheduleEnd.isBefore(timeReference);
+ return startTime == null && scheduleEnd.toLocalDate().isBefore(timeReference.toLocalDate());
}
}
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index 39558bc..3f970a6 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -115,7 +115,16 @@ public class TaskScheduleService {
}
}
} else {
- //to continue...
+ if(((AdvancedTaskSchedule) abstractSchedule).getScheduleStart().toLocalDate().isEqual(LocalDate.now())) {
+ //Schedule is today
+ if(startable && abstractSchedule.getStartTime() == null) {
+ if(abstractSchedule.getStartTime() == null) {
+ filteredSchedules.add(abstractSchedule);
+ }
+ } else if(!startable) {
+ filteredSchedules.add(abstractSchedule);
+ }
+ }
}
}
return filteredSchedules;