Просмотр исходного кода

Merge pull request #363 from loopandlearn/trio-indefinite-overrides

Limit displayed override duration to 'Hours of Prediction' after current time
Marion Barker 1 год назад
Родитель
Сommit
00c7d0f5ce
1 измененных файлов с 5 добавлено и 3 удалено
  1. 5 3
      LoopFollow/Controllers/Nightscout/Treatments/Overrides.swift

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

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