ソースを参照

fix glucose bobble not updating when manual glucose was entered

polscm32 2 年 前
コミット
98a1e76478
1 ファイル変更4 行追加7 行削除
  1. 4 7
      FreeAPS/Sources/Modules/Home/HomeStateModel.swift

+ 4 - 7
FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -236,20 +236,17 @@ extension Home {
                 guard let self = self else { return }
                 guard let self = self else { return }
                 let filteredGlucose = self.provider.filteredGlucose(hours: self.filteredHours)
                 let filteredGlucose = self.provider.filteredGlucose(hours: self.filteredHours)
 
 
-                for glucose in filteredGlucose {
-                    if glucose.type == GlucoseType.manual.rawValue {
-                        self.manualGlucose.append(glucose)
-                    } else {
-                        self.glucose.append(glucose)
-                    }
-                }
+                self.glucose += filteredGlucose
+                self.manualGlucose += filteredGlucose.filter { $0.type == GlucoseType.manual.rawValue }
 
 
                 self.recentGlucose = self.glucose.last
                 self.recentGlucose = self.glucose.last
+
                 if self.glucose.count >= 2 {
                 if self.glucose.count >= 2 {
                     self.glucoseDelta = (self.recentGlucose?.glucose ?? 0) - (self.glucose[self.glucose.count - 2].glucose ?? 0)
                     self.glucoseDelta = (self.recentGlucose?.glucose ?? 0) - (self.glucose[self.glucose.count - 2].glucose ?? 0)
                 } else {
                 } else {
                     self.glucoseDelta = nil
                     self.glucoseDelta = nil
                 }
                 }
+
                 self.alarm = self.provider.glucoseStorage.alarm
                 self.alarm = self.provider.glucoseStorage.alarm
             }
             }
         }
         }