Merge pull request #585 from Sjoerd-Bo3/fix/carb-counting-issue-580

kingst · web-flow · commit 814fd58adbe6 · 2025-05-29T15:58:05.000-07:00
fix: Exclude FPU entries from carb statistics calculation
diff --git a/Model/Helper/CarbEntryStored+helper.swift b/Model/Helper/CarbEntryStored+helper.swift
@@ -14,7 +14,7 @@ extension NSPredicate {
 
     static var carbsForStats: NSPredicate {
         let date = Date.threeMonthsAgo
-        return NSPredicate(format: "date >= %@", date as NSDate)
+        return NSPredicate(format: "date >= %@ AND isFPU == %@", date as NSDate, false as NSNumber)
     }
 
     static var carbsNotYetUploadedToNightscout: NSPredicate {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ extension NSPredicate {`
`14`	`14`
`15`	`15`	`static var carbsForStats: NSPredicate {`
`16`	`16`	`let date = Date.threeMonthsAgo`
`17`		`- return NSPredicate(format: "date >= %@", date as NSDate)`
	`17`	`+ return NSPredicate(format: "date >= %@ AND isFPU == %@", date as NSDate, false as NSNumber)`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`static var carbsNotYetUploadedToNightscout: NSPredicate {`