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

include fixes by @AndreasStokholm

polscm32 1 год назад
Родитель
Сommit
285fac9775

+ 1 - 2
FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -705,8 +705,7 @@ extension Home.StateModel {
             onContext: context,
             predicate: NSPredicate.determinationsForCobIobCharts,
             key: "deliverAt",
-            ascending: true,
-            fetchLimit: 288,
+            ascending: false,
             batchSize: 50,
             propertiesToFetch: ["cob", "iob", "deliverAt"]
         )

+ 2 - 2
FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift

@@ -108,7 +108,7 @@ struct MainChartView: View {
     }
 
     private var interpolationFactor: Double {
-        Double(state.enactedAndNonEnactedDeterminations.last?.cob ?? 1) * 10
+        Double(state.enactedAndNonEnactedDeterminations.first?.cob ?? 1) * 10
     }
 
     private var selectedGlucose: GlucoseStored? {
@@ -154,7 +154,7 @@ struct MainChartView: View {
                             yAxisChartData()
                             scroller.scrollTo("MainChart", anchor: .trailing)
                         }
-                        .onChange(of: state.enactedAndNonEnactedDeterminations.last?.deliverAt) { _ in
+                        .onChange(of: state.enactedAndNonEnactedDeterminations.first?.deliverAt) { _ in
                             updateStartEndMarkers()
                             yAxisChartDataCobChart()
                             yAxisChartDataIobChart()

+ 2 - 2
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -444,7 +444,7 @@ extension Home {
                     Text(
                         (
                             numberFormatter
-                                .string(from: (state.enactedAndNonEnactedDeterminations.last?.iob ?? 0) as NSNumber) ?? "0"
+                                .string(from: (state.enactedAndNonEnactedDeterminations.first?.iob ?? 0) as NSNumber) ?? "0"
                         ) +
                             NSLocalizedString(" U", comment: "Insulin unit")
                     )
@@ -460,7 +460,7 @@ extension Home {
                     Text(
                         (
                             numberFormatter
-                                .string(from: (state.enactedAndNonEnactedDeterminations.last?.cob ?? 0) as NSNumber) ?? "0"
+                                .string(from: (state.enactedAndNonEnactedDeterminations.first?.cob ?? 0) as NSNumber) ?? "0"
                         ) +
                             NSLocalizedString(" g", comment: "gram of carbs")
                     )