Browse Source

Limit displayed override duration to 'Hours of Prediction' after current time

Jonas Björkert 1 năm trước cách đây
mục cha
commit
d768523adf

+ 5 - 3
LoopFollow/Controllers/Nightscout/Treatments/Overrides.swift

@@ -56,12 +56,14 @@ extension MainViewController {
                 if (low == nil && high != nil) || (low != nil && high == nil) { return }
                 range = [low ?? 0, high ?? 0]
             }
-            
+
+            // Limit displayed override duration to 'Hours of Prediction' after current time
             var endDate = dateTimeStamp + duration
-/*            if endDate > maxEndDate {
+            if endDate > maxEndDate {
                 endDate = maxEndDate
+                duration = endDate - dateTimeStamp
             }
-*/
+
             if dateTimeStamp <= now && now < endDate {
                 activeOverrideNote = currentEntry["notes"] as? String
             }

+ 2 - 2
LoopFollow/Task/TaskScheduler.swift

@@ -49,7 +49,7 @@ class TaskScheduler {
 
     func rescheduleTask(id: TaskID, to newRunDate: Date) {
         let timeString = self.formatTime(newRunDate)
-        LogManager.shared.log(category: .taskScheduler, message: "Reschedule Task \(id): next run = \(timeString)", isDebug: true)
+        //LogManager.shared.log(category: .taskScheduler, message: "Reschedule Task \(id): next run = \(timeString)", isDebug: true)
 
         queue.async {
             guard var existingTask = self.tasks[id] else {
@@ -124,7 +124,7 @@ class TaskScheduler {
             updatedTask.nextRun = .distantFuture
             tasks[taskID] = updatedTask
 
-            LogManager.shared.log(category: .taskScheduler, message: "Executing task \(taskID)", isDebug: true)
+            //LogManager.shared.log(category: .taskScheduler, message: "Executing task \(taskID)", isDebug: true)
 
             DispatchQueue.main.async {
                 task.action()