polscm32 2 лет назад
Родитель
Сommit
d0c052f8c3

+ 1 - 0
FreeAPS/Sources/Modules/Bolus/BolusStateModel.swift

@@ -485,6 +485,7 @@ extension Bolus {
                 newCarbEntry.carbs = Double(carbs)
                 newCarbEntry.fat = Double(fat)
                 newCarbEntry.protein = Double(protein)
+                newCarbEntry.date = Date()
                 self.context.perform {
                     do {
                         try self.context.save()

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

@@ -92,7 +92,8 @@ struct MainChartView: View {
 
     @FetchRequest(
         entity: MealsStored.entity(),
-        sortDescriptors: [NSSortDescriptor(keyPath: \MealsStored.date, ascending: true)]
+        sortDescriptors: [NSSortDescriptor(keyPath: \MealsStored.date, ascending: true)],
+        predicate: NSPredicate.predicateForOneDayAgo
     ) var carbsFromPersistence: FetchedResults<MealsStored>
 
     private var bolusFormatter: NumberFormatter {

+ 1 - 1
Model/NSPredicates.swift

@@ -19,6 +19,6 @@ extension NSPredicate {
 
     static var predicateFor30MinAgo: NSPredicate {
         let date = Date.halfHourAgo
-        return NSPredicate(format: "date > %@", date as NSDate)
+        return NSPredicate(format: "date >= %@", date as NSDate)
     }
 }