Merge pull request #497 from LoopKit/restore-temp-basal

ps2 · web-flow · commit ba0ae9809ab3 · 2017-06-24T14:29:35.000-05:00
Restore last temp basal value from status extension context on launch
diff --git a/Common/Models/StatusExtensionContext.swift b/Common/Models/StatusExtensionContext.swift
@@ -25,7 +25,8 @@ struct LoopContext {
 struct NetBasalContext {
     let rate: Double
     let percentage: Double
-    let startDate: Date
+    let start: Date
+    let end: Date
 }
 
 struct SensorDisplayableContext: SensorDisplayable {
@@ -122,22 +123,25 @@ extension NetBasalContext: RawRepresentable {
         return [
             "rate": rate,
             "percentage": percentage,
-            "startDate": startDate
+            "start": start,
+            "end": end
         ]
     }
 
     init?(rawValue: RawValue) {
         guard
             let rate       = rawValue["rate"] as? Double,
             let percentage = rawValue["percentage"] as? Double,
-            let startDate  = rawValue["startDate"] as? Date
+            let start      = rawValue["start"] as? Date,
+            let end        = rawValue["end"] as? Date
         else {
             return nil
         }
 
         self.rate = rate
         self.percentage = percentage
-        self.startDate = startDate
+        self.start = start
+        self.end = end
     }
 }
 
diff --git a/Loop Status Extension/StatusViewController.swift b/Loop Status Extension/StatusViewController.swift
@@ -185,7 +185,7 @@ class StatusViewController: UIViewController, NCWidgetProviding {
         }
 
         if let netBasal = context.netBasal {
-            basalRateHUD.setNetBasalRate(netBasal.rate, percent: netBasal.percentage, at: netBasal.startDate)
+            basalRateHUD.setNetBasalRate(netBasal.rate, percent: netBasal.percentage, at: netBasal.start)
         }
 
         if let loop = context.loop {
diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
@@ -32,6 +32,7 @@
 		432E73CB1D24B3D6009AD15D /* RemoteDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 432E73CA1D24B3D6009AD15D /* RemoteDataManager.swift */; };
 		433EA4C21D9F39C900CD78FB /* PumpIDTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433EA4C11D9F39C900CD78FB /* PumpIDTableViewController.swift */; };
 		433EA4C41D9F71C800CD78FB /* CommandResponseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433EA4C31D9F71C800CD78FB /* CommandResponseViewController.swift */; };
+		43441A9C1EDB34810087958C /* StatusExtensionContext+LoopKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43441A9B1EDB34810087958C /* StatusExtensionContext+LoopKit.swift */; };
 		4346D1E71C77F5FE00ABAFE3 /* ChartTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4346D1E61C77F5FE00ABAFE3 /* ChartTableViewCell.swift */; };
 		4346D1F61C78501000ABAFE3 /* ChartPoint+Loop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4346D1F51C78501000ABAFE3 /* ChartPoint+Loop.swift */; };
 		434F54571D287FDB002A9274 /* NibLoadable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434F54561D287FDB002A9274 /* NibLoadable.swift */; };
@@ -377,6 +378,7 @@
 		4337615E1D52F487004A3647 /* GlucoseHUDView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseHUDView.swift; sourceTree = "<group>"; };
 		433EA4C11D9F39C900CD78FB /* PumpIDTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PumpIDTableViewController.swift; sourceTree = "<group>"; };
 		433EA4C31D9F71C800CD78FB /* CommandResponseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommandResponseViewController.swift; sourceTree = "<group>"; };
+		43441A9B1EDB34810087958C /* StatusExtensionContext+LoopKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "StatusExtensionContext+LoopKit.swift"; sourceTree = "<group>"; };
 		4346D1E61C77F5FE00ABAFE3 /* ChartTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartTableViewCell.swift; sourceTree = "<group>"; };
 		4346D1EF1C781BEA00ABAFE3 /* SwiftCharts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftCharts.framework; path = Carthage/Build/iOS/SwiftCharts.framework; sourceTree = "<group>"; };
 		4346D1F51C78501000ABAFE3 /* ChartPoint+Loop.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ChartPoint+Loop.swift"; sourceTree = "<group>"; };
@@ -676,6 +678,7 @@
 				438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */,
 				43D848AF1E7DCBE100DADCBC /* Result.swift */,
 				43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */,
+				43441A9B1EDB34810087958C /* StatusExtensionContext+LoopKit.swift */,
 				4328E0311CFC068900E199AA /* WatchContext+LoopKit.swift */,
 			);
 			path = Models;
@@ -1429,6 +1432,7 @@
 				C17824A51E1AD4D100D9D25C /* BolusRecommendation.swift in Sources */,
 				4F70C2131DE90339006380B7 /* StatusExtensionContext.swift in Sources */,
 				434F54571D287FDB002A9274 /* NibLoadable.swift in Sources */,
+				43441A9C1EDB34810087958C /* StatusExtensionContext+LoopKit.swift in Sources */,
 				4FF4D1001E18374700846527 /* WatchContext.swift in Sources */,
 				4315D28A1CA5F45E00589052 /* DiagnosticLogger+LoopKit.swift in Sources */,
 				43C418B51CE0575200405B6A /* ShareGlucose+GlucoseKit.swift in Sources */,
diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift
@@ -627,7 +627,8 @@ final class DeviceDataManager {
         statusExtensionManager = StatusExtensionDataManager(deviceDataManager: self)
         loopManager = LoopDataManager(
             delegate: self,
-            lastLoopCompleted: statusExtensionManager.context?.loop?.lastCompleted
+            lastLoopCompleted: statusExtensionManager.context?.loop?.lastCompleted,
+            lastTempBasal: statusExtensionManager.context?.netBasal?.tempBasal
         )
         watchManager = WatchDataManager(deviceDataManager: self)
         nightscoutDataManager = NightscoutDataManager(deviceDataManager: self)
diff --git a/Loop/Managers/LoopDataManager.swift b/Loop/Managers/LoopDataManager.swift
@@ -42,6 +42,7 @@ final class LoopDataManager {
     init(
         delegate: LoopDataManagerDelegate,
         lastLoopCompleted: Date?,
+        lastTempBasal: DoseEntry?,
         basalRateSchedule: BasalRateSchedule? = UserDefaults.standard.basalRateSchedule,
         carbRatioSchedule: CarbRatioSchedule? = UserDefaults.standard.carbRatioSchedule,
         insulinActionDuration: TimeInterval? = UserDefaults.standard.insulinActionDuration,
@@ -50,6 +51,7 @@ final class LoopDataManager {
     ) {
         self.delegate = delegate
         self.lastLoopCompleted = lastLoopCompleted
+        self.lastTempBasal = lastTempBasal
         self.settings = settings
 
         carbStore = CarbStore(
diff --git a/Loop/Managers/StatusExtensionDataManager.swift b/Loop/Managers/StatusExtensionDataManager.swift
@@ -55,8 +55,9 @@ final class StatusExtensionDataManager {
                 context.netBasal = NetBasalContext(
                     rate: 2.1,
                     percentage: 0.6,
-                    startDate:
-                    Date(timeIntervalSinceNow: -250)
+                    start:
+                    Date(timeIntervalSinceNow: -250),
+                    end: Date(timeIntervalSinceNow: .minutes(30))
                 )
                 context.predictedGlucose = PredictedGlucoseContext(
                     values: (1...36).map { 89.123 + Double($0 * 5) }, // 3 hours of linear data
@@ -120,7 +121,7 @@ final class StatusExtensionDataManager {
                     scheduledBasal: scheduledBasal
                 )
 
-                context.netBasal = NetBasalContext(rate: netBasal.rate, percentage: netBasal.percent, startDate: netBasal.startDate)
+                context.netBasal = NetBasalContext(rate: netBasal.rate, percentage: netBasal.percent, start: netBasal.start, end: netBasal.end)
             }
             
             if let reservoir = manager.doseStore.lastReservoirValue,
diff --git a/Loop/Models/NetBasal.swift b/Loop/Models/NetBasal.swift
@@ -13,12 +13,14 @@ import LoopKit
 struct NetBasal {
     let rate: Double
     let percent: Double
-    let startDate: Date
+    let start: Date
+    let end: Date
     
     init(lastTempBasal: DoseEntry?, maxBasal: Double?, scheduledBasal: AbsoluteScheduleValue<Double>) {
         if let lastTempBasal = lastTempBasal, lastTempBasal.endDate > Date(), let maxBasal = maxBasal {
             rate = lastTempBasal.unitsPerHour - scheduledBasal.value
-            startDate = lastTempBasal.startDate
+            start = lastTempBasal.startDate
+            end = lastTempBasal.endDate
             
             if rate < 0 {
                 percent = rate / scheduledBasal.value
@@ -30,9 +32,11 @@ struct NetBasal {
             percent = 0
             
             if let lastTempBasal = lastTempBasal, lastTempBasal.endDate > scheduledBasal.startDate {
-                startDate = lastTempBasal.endDate
+                start = lastTempBasal.endDate
+                end = scheduledBasal.endDate
             } else {
-                startDate = scheduledBasal.startDate
+                start = scheduledBasal.startDate
+                end = scheduledBasal.endDate
             }
         }
     }
diff --git a/Loop/Models/StatusExtensionContext+LoopKit.swift b/Loop/Models/StatusExtensionContext+LoopKit.swift
@@ -0,0 +1,24 @@
+//
+//  StatusExtensionContext+LoopKit.swift
+//  Loop
+//
+//  Copyright © 2017 LoopKit Authors. All rights reserved.
+//
+
+import InsulinKit
+
+extension NetBasalContext {
+    var tempBasal: DoseEntry? {
+        guard rate != 0 else {
+            return nil
+        }
+
+        return DoseEntry(
+            type: .tempBasal,
+            startDate: start,
+            endDate: end,
+            value: rate,
+            unit: .unitsPerHour
+        )
+    }
+}
diff --git a/Loop/View Controllers/StatusTableViewController.swift b/Loop/View Controllers/StatusTableViewController.swift
@@ -317,7 +317,7 @@ final class StatusTableViewController: ChartsTableViewController {
                     scheduledBasal: scheduledBasal
                 )
 
-                self.hudView.basalRateHUD.setNetBasalRate(netBasal.rate, percent: netBasal.percent, at: netBasal.startDate)
+                self.hudView.basalRateHUD.setNetBasalRate(netBasal.rate, percent: netBasal.percent, at: netBasal.start)
             }
 
             // Fetch the current IOB subtitle

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ struct LoopContext {`
`25`	`25`	`struct NetBasalContext {`
`26`	`26`	`let rate: Double`
`27`	`27`	`let percentage: Double`
`28`		`- let startDate: Date`
	`28`	`+ let start: Date`
	`29`	`+ let end: Date`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`struct SensorDisplayableContext: SensorDisplayable {`
`@@ -122,22 +123,25 @@ extension NetBasalContext: RawRepresentable {`
`122`	`123`	`return [`
`123`	`124`	`"rate": rate,`
`124`	`125`	`"percentage": percentage,`
`125`		`- "startDate": startDate`
	`126`	`+ "start": start,`
	`127`	`+ "end": end`
`126`	`128`	`]`
`127`	`129`	`}`
`128`	`130`
`129`	`131`	`init?(rawValue: RawValue) {`
`130`	`132`	`guard`
`131`	`133`	`let rate = rawValue["rate"] as? Double,`
`132`	`134`	`let percentage = rawValue["percentage"] as? Double,`
`133`		`- let startDate = rawValue["startDate"] as? Date`
	`135`	`+ let start = rawValue["start"] as? Date,`
	`136`	`+ let end = rawValue["end"] as? Date`
`134`	`137`	`else {`
`135`	`138`	`return nil`
`136`	`139`	`}`
`137`	`140`
`138`	`141`	`self.rate = rate`
`139`	`142`	`self.percentage = percentage`
`140`		`- self.startDate = startDate`
	`143`	`+ self.start = start`
	`144`	`+ self.end = end`
`141`	`145`	`}`
`142`	`146`	`}`
`143`	`147`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ class StatusViewController: UIViewController, NCWidgetProviding {`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`if let netBasal = context.netBasal {`
`188`		`- basalRateHUD.setNetBasalRate(netBasal.rate, percent: netBasal.percentage, at: netBasal.startDate)`
	`188`	`+ basalRateHUD.setNetBasalRate(netBasal.rate, percent: netBasal.percentage, at: netBasal.start)`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`if let loop = context.loop {`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,9 @@ final class StatusExtensionDataManager {`
`55`	`55`	`context.netBasal = NetBasalContext(`
`56`	`56`	`rate: 2.1,`
`57`	`57`	`percentage: 0.6,`
`58`		`- startDate:`
`59`		`- Date(timeIntervalSinceNow: -250)`
	`58`	`+ start:`
	`59`	`+ Date(timeIntervalSinceNow: -250),`
	`60`	`+ end: Date(timeIntervalSinceNow: .minutes(30))`
`60`	`61`	`)`
`61`	`62`	`context.predictedGlucose = PredictedGlucoseContext(`
`62`	`63`	`values: (1...36).map { 89.123 + Double($0 * 5) }, // 3 hours of linear data`
`@@ -120,7 +121,7 @@ final class StatusExtensionDataManager {`
`120`	`121`	`scheduledBasal: scheduledBasal`
`121`	`122`	`)`
`122`	`123`
`123`		`- context.netBasal = NetBasalContext(rate: netBasal.rate, percentage: netBasal.percent, startDate: netBasal.startDate)`
	`124`	`+ context.netBasal = NetBasalContext(rate: netBasal.rate, percentage: netBasal.percent, start: netBasal.start, end: netBasal.end)`
`124`	`125`	`}`
`125`	`126`
`126`	`127`	`if let reservoir = manager.doseStore.lastReservoirValue,`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ final class StatusTableViewController: ChartsTableViewController {`
`317`	`317`	`scheduledBasal: scheduledBasal`
`318`	`318`	`)`
`319`	`319`
`320`		`- self.hudView.basalRateHUD.setNetBasalRate(netBasal.rate, percent: netBasal.percent, at: netBasal.startDate)`
	`320`	`+ self.hudView.basalRateHUD.setNetBasalRate(netBasal.rate, percent: netBasal.percent, at: netBasal.start)`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`// Fetch the current IOB subtitle`