Parcourir la source

Rename suspensions as suspendAndResumeEvents & remove some comments

Joe Moran il y a 6 mois
Parent
commit
98ff8dcd5c

+ 0 - 3
Trio/Sources/APS/DeviceDataManager.swift

@@ -415,9 +415,6 @@ extension BaseDeviceDataManager: PumpManagerDelegate {
             bolusTrigger.send(false)
             bolusTrigger.send(false)
         }
         }
 
 
-        /// The new suspended and scheduledBasal PassthroughSubject var's are set here based on the PM's basalDeliveryState.
-        /// Setting suspended here replaces the pumpSuspended state var that used to be incorrectly set in updateInsulinArray().
-
         switch status.basalDeliveryState {
         switch status.basalDeliveryState {
         case let .active(at):
         case let .active(at):
             if at == .distantPast {
             if at == .distantPast {

+ 0 - 2
Trio/Sources/APS/Storage/TDDStorage.swift

@@ -660,8 +660,6 @@ extension Decimal {
     }
     }
 }
 }
 
 
-/// Moved out from findBasalRate()
-///
 /// Finds the basal rate at the specified minute offset using binary search
 /// Finds the basal rate at the specified minute offset using binary search
 /// - Parameters:
 /// - Parameters:
 ///   - totalMinutes: minute offset into a 24 hour day
 ///   - totalMinutes: minute offset into a 24 hour day

+ 1 - 4
Trio/Sources/Modules/Home/HomeStateModel+Setup/PumpHistorySetup.swift

@@ -43,12 +43,9 @@ extension Home.StateModel {
         manualTempBasal = apsManager.isManualTempBasal
         manualTempBasal = apsManager.isManualTempBasal
         tempBasals = insulinFromPersistence.filter { $0.tempBasal != nil }
         tempBasals = insulinFromPersistence.filter { $0.tempBasal != nil }
 
 
-        /// The suspensions variable is the list of all pump suspend and resume events
-        suspensions = insulinFromPersistence.filter {
+        suspendAndResumeEvents = insulinFromPersistence.filter {
             $0.type == EventType.pumpSuspend.rawValue || $0.type == EventType.pumpResume.rawValue
             $0.type == EventType.pumpSuspend.rawValue || $0.type == EventType.pumpResume.rawValue
         }
         }
-
-        /// Determining if the pump is currently suspended is now handled in DeviceDataManager
     }
     }
 
 
     // Setup Last Bolus to display the bolus progress bar
     // Setup Last Bolus to display the bolus progress bar

+ 1 - 1
Trio/Sources/Modules/Home/HomeStateModel.swift

@@ -91,7 +91,7 @@ extension Home {
         var fetchedTDDs: [TDD] = []
         var fetchedTDDs: [TDD] = []
         var insulinFromPersistence: [PumpEventStored] = []
         var insulinFromPersistence: [PumpEventStored] = []
         var tempBasals: [PumpEventStored] = []
         var tempBasals: [PumpEventStored] = []
-        var suspensions: [PumpEventStored] = [] // all of the pump suspend and resume events
+        var suspendAndResumeEvents: [PumpEventStored] = []
         var batteryFromPersistence: [OpenAPS_Battery] = []
         var batteryFromPersistence: [OpenAPS_Battery] = []
         var lastPumpBolus: PumpEventStored?
         var lastPumpBolus: PumpEventStored?
         var overrides: [OverrideStored] = []
         var overrides: [OverrideStored] = []

+ 3 - 2
Trio/Sources/Modules/Home/View/Chart/ChartElements/BasalChart.swift

@@ -104,7 +104,7 @@ extension MainChartView {
     }
     }
 
 
     func drawSuspensions() -> some ChartContent {
     func drawSuspensions() -> some ChartContent {
-        let suspensions = state.suspensions
+        let suspensions = state.suspendAndResumeEvents
         return ForEach(suspensions) { suspension in
         return ForEach(suspensions) { suspension in
             let now = Date()
             let now = Date()
 
 
@@ -154,7 +154,8 @@ extension MainChartView {
             let duration = temp.tempBasal?.duration ?? 0
             let duration = temp.tempBasal?.duration ?? 0
             let timestamp = temp.timestamp ?? Date()
             let timestamp = temp.timestamp ?? Date()
             let end = timestamp + duration.minutes
             let end = timestamp + duration.minutes
-            let isInsulinSuspended = state.suspensions.contains { $0.timestamp ?? now >= timestamp && $0.timestamp ?? now <= end }
+            let isInsulinSuspended = state.suspendAndResumeEvents
+                .contains { $0.timestamp ?? now >= timestamp && $0.timestamp ?? now <= end }
 
 
             let rate = Double(truncating: temp.tempBasal?.rate ?? Decimal.zero as NSDecimalNumber) * (isInsulinSuspended ? 0 : 1)
             let rate = Double(truncating: temp.tempBasal?.rate ?? Decimal.zero as NSDecimalNumber) * (isInsulinSuspended ? 0 : 1)