Re-create new core data model; re-create all entities helper files

BolusStored+CoreDataProperties.swift

@@ -1,15 +1,20 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension BolusStored {
 
-public extension BolusStored {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<BolusStored> {
-        NSFetchRequest<BolusStored>(entityName: "BolusStored")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<BolusStored> {
+        return NSFetchRequest<BolusStored>(entityName: "BolusStored")
     }
 
-    @NSManaged var amount: NSDecimalNumber?
-    @NSManaged var isExternal: Bool
-    @NSManaged var isSMB: Bool
-    @NSManaged var pumpEvent: PumpEventStored?
+    @NSManaged public var amount: NSDecimalNumber?
+    @NSManaged public var isExternal: Bool
+    @NSManaged public var isSMB: Bool
+    @NSManaged public var pumpEvent: PumpEventStored?
+
 }
 
-extension BolusStored: Identifiable {}
+extension BolusStored : Identifiable {
+
+}

CarbEntryStored+CoreDataProperties.swift

@@ -1,20 +1,25 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension CarbEntryStored {
 
-public extension CarbEntryStored {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<CarbEntryStored> {
-        NSFetchRequest<CarbEntryStored>(entityName: "CarbEntryStored")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<CarbEntryStored> {
+        return NSFetchRequest<CarbEntryStored>(entityName: "CarbEntryStored")
     }
 
-    @NSManaged var carbs: Double
-    @NSManaged var date: Date?
-    @NSManaged var fat: Double
-    @NSManaged var id: UUID?
-    @NSManaged var isFPU: Bool
-    @NSManaged var fpuID: UUID?
-    @NSManaged var note: String?
-    @NSManaged var protein: Double
-    @NSManaged var isUploadedToNS: Bool
+    @NSManaged public var carbs: Double
+    @NSManaged public var date: Date?
+    @NSManaged public var fat: Double
+    @NSManaged public var fpuID: UUID?
+    @NSManaged public var id: UUID?
+    @NSManaged public var isFPU: Bool
+    @NSManaged public var isUploadedToNS: Bool
+    @NSManaged public var note: String?
+    @NSManaged public var protein: Double
+
 }
 
-extension CarbEntryStored: Identifiable {}
+extension CarbEntryStored : Identifiable {
+
+}

Forecast+CoreDataProperties.swift

@@ -1,32 +1,38 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension Forecast {
 
-public extension Forecast {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<Forecast> {
-        NSFetchRequest<Forecast>(entityName: "Forecast")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<Forecast> {
+        return NSFetchRequest<Forecast>(entityName: "Forecast")
     }
 
-    @NSManaged var date: Date?
-    @NSManaged var id: UUID?
-    @NSManaged var type: String?
-    @NSManaged var forecastValues: Set<ForecastValue>?
-    @NSManaged var orefDetermination: OrefDetermination?
+    @NSManaged public var date: Date?
+    @NSManaged public var id: UUID?
+    @NSManaged public var type: String?
+    @NSManaged public var forecastValues: NSSet?
+    @NSManaged public var orefDetermination: OrefDetermination?
+
 }
 
 // MARK: Generated accessors for forecastValues
+extension Forecast {
 
-public extension Forecast {
     @objc(addForecastValuesObject:)
-    @NSManaged func addToForecastValues(_ value: ForecastValue)
+    @NSManaged public func addToForecastValues(_ value: ForecastValue)
 
     @objc(removeForecastValuesObject:)
-    @NSManaged func removeFromForecastValues(_ value: ForecastValue)
+    @NSManaged public func removeFromForecastValues(_ value: ForecastValue)
 
     @objc(addForecastValues:)
-    @NSManaged func addToForecastValues(_ values: NSSet)
+    @NSManaged public func addToForecastValues(_ values: NSSet)
 
     @objc(removeForecastValues:)
-    @NSManaged func removeFromForecastValues(_ values: NSSet)
+    @NSManaged public func removeFromForecastValues(_ values: NSSet)
+
 }
 
-extension Forecast: Identifiable {}
+extension Forecast : Identifiable {
+
+}

ForecastValue+CoreDataProperties.swift

@@ -1,14 +1,19 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension ForecastValue {
 
-public extension ForecastValue {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<ForecastValue> {
-        NSFetchRequest<ForecastValue>(entityName: "ForecastValue")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<ForecastValue> {
+        return NSFetchRequest<ForecastValue>(entityName: "ForecastValue")
     }
 
-    @NSManaged var index: Int32
-    @NSManaged var value: Int32
-    @NSManaged var forecast: Forecast?
+    @NSManaged public var index: Int32
+    @NSManaged public var value: Int32
+    @NSManaged public var forecast: Forecast?
+
 }
 
-extension ForecastValue: Identifiable {}
+extension ForecastValue : Identifiable {
+
+}

FreeAPS.xcodeproj/project.pbxproj

@@ -263,7 +263,6 @@
 		5887527C2BD986E1008B081D /* OpenAPSBattery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5887527B2BD986E1008B081D /* OpenAPSBattery.swift */; };
 		588752842BD9986A008B081D /* OpenAPS_Battery+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 588752822BD9986A008B081D /* OpenAPS_Battery+CoreDataClass.swift */; };
 		588752852BD9986A008B081D /* OpenAPS_Battery+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 588752832BD9986A008B081D /* OpenAPS_Battery+CoreDataProperties.swift */; };
-		5895E7E52C4BF66900127D04 /* TriosPersistentContainer.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 5895E7E32C4BF66900127D04 /* TriosPersistentContainer.xcdatamodeld */; };
 		58F107742BD1A4D000B1A680 /* Determination+helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58F107732BD1A4D000B1A680 /* Determination+helper.swift */; };
 		5A2325522BFCBF55003518CA /* NightscoutUploadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A2325512BFCBF55003518CA /* NightscoutUploadView.swift */; };
 		5A2325542BFCBF66003518CA /* NightscoutFetchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A2325532BFCBF65003518CA /* NightscoutFetchView.swift */; };
@@ -418,6 +417,7 @@
 		DBA5254DBB2586C98F61220C /* ISFEditorProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F9F137F126D9F8DEB799F26 /* ISFEditorProvider.swift */; };
 		DD1DB7CC2BECCA1F0048B367 /* BuildDetails.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD1DB7CB2BECCA1F0048B367 /* BuildDetails.swift */; };
 		DD1DB7CE2BED00CF0048B367 /* SettingsRootViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD1DB7CD2BED00CF0048B367 /* SettingsRootViewModel.swift */; };
+		DD3251872C4C52F500E957C4 /* TrioPersistentContainer.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DD3251852C4C52F500E957C4 /* TrioPersistentContainer.xcdatamodeld */; };
 		DD399FB31EACB9343C944C4C /* PreferencesEditorStateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA3E609094E064C99A4752C /* PreferencesEditorStateModel.swift */; };
 		DD68889D2C386E17006E3C44 /* NightscoutExercise.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD68889C2C386E17006E3C44 /* NightscoutExercise.swift */; };
 		E00EEC0327368630002FF094 /* ServiceAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00EEBFD27368630002FF094 /* ServiceAssembly.swift */; };
@@ -850,7 +850,6 @@
 		5887527B2BD986E1008B081D /* OpenAPSBattery.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenAPSBattery.swift; sourceTree = "<group>"; };
 		588752822BD9986A008B081D /* OpenAPS_Battery+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OpenAPS_Battery+CoreDataClass.swift"; sourceTree = SOURCE_ROOT; };
 		588752832BD9986A008B081D /* OpenAPS_Battery+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OpenAPS_Battery+CoreDataProperties.swift"; sourceTree = SOURCE_ROOT; };
-		5895E7E42C4BF66900127D04 /* Core_Data.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Core_Data.xcdatamodel; sourceTree = "<group>"; };
 		58F107732BD1A4D000B1A680 /* Determination+helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Determination+helper.swift"; sourceTree = "<group>"; };
 		5A2325512BFCBF55003518CA /* NightscoutUploadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NightscoutUploadView.swift; sourceTree = "<group>"; };
 		5A2325532BFCBF65003518CA /* NightscoutFetchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NightscoutFetchView.swift; sourceTree = "<group>"; };
@@ -1010,6 +1009,7 @@
 		DC2C6489D29ECCCAD78E0721 /* NotificationsConfigStateModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NotificationsConfigStateModel.swift; sourceTree = "<group>"; };
 		DD1DB7CB2BECCA1F0048B367 /* BuildDetails.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuildDetails.swift; sourceTree = "<group>"; };
 		DD1DB7CD2BED00CF0048B367 /* SettingsRootViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsRootViewModel.swift; sourceTree = "<group>"; };
+		DD3251862C4C52F500E957C4 /* TrioPersistentContainer.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = TrioPersistentContainer.xcdatamodel; sourceTree = "<group>"; };
 		DD68889C2C386E17006E3C44 /* NightscoutExercise.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NightscoutExercise.swift; sourceTree = "<group>"; };
 		E00EEBFD27368630002FF094 /* ServiceAssembly.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceAssembly.swift; sourceTree = "<group>"; };
 		E00EEBFE27368630002FF094 /* SecurityAssembly.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecurityAssembly.swift; sourceTree = "<group>"; };
@@ -2107,10 +2107,10 @@
 		587A54C82BCDCE0F009D38E2 /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				5895E7E32C4BF66900127D04 /* TriosPersistentContainer.xcdatamodeld */,
 				BDF34F8F2C10CF8C00D51995 /* CoreDataStack.swift */,
 				5825D1052BD4056700F36E9B /* Classes+Properties */,
 				5825D1622BD405AE00F36E9B /* Helper */,
+				DD3251852C4C52F500E957C4 /* TrioPersistentContainer.xcdatamodeld */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -2867,7 +2867,6 @@
 				3811DE3125C9D49500A708ED /* HomeProvider.swift in Sources */,
 				FE41E4D629463EE20047FD55 /* NightscoutPreferences.swift in Sources */,
 				E013D872273AC6FE0014109C /* GlucoseSimulatorSource.swift in Sources */,
-				5895E7E52C4BF66900127D04 /* TriosPersistentContainer.xcdatamodeld in Sources */,
 				388E5A5C25B6F0770019842D /* JSON.swift in Sources */,
 				3811DF0225CA9FEA00A708ED /* Credentials.swift in Sources */,
 				5837A5302BD2E3C700A5DC04 /* CarbEntryStored+helper.swift in Sources */,
@@ -3062,6 +3061,7 @@
 				DD68889D2C386E17006E3C44 /* NightscoutExercise.swift in Sources */,
 				5864E8592C42CFAE00294306 /* DeterminationStorage.swift in Sources */,
 				BD7DA9A72AE06E2B00601B20 /* BolusCalculatorConfigProvider.swift in Sources */,
+				DD3251872C4C52F500E957C4 /* TrioPersistentContainer.xcdatamodeld in Sources */,
 				38192E0D261BAF980094D973 /* ConvenienceExtensions.swift in Sources */,
 				88AB39B23C9552BD6E0C9461 /* ISFEditorRootView.swift in Sources */,
 				F816825E28DB441200054060 /* HeartBeatManager.swift in Sources */,
@@ -3916,14 +3916,14 @@
 /* End XCSwiftPackageProductDependency section */
 
 /* Begin XCVersionGroup section */
-		5895E7E32C4BF66900127D04 /* TriosPersistentContainer.xcdatamodeld */ = {
+		DD3251852C4C52F500E957C4 /* TrioPersistentContainer.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
-				5895E7E42C4BF66900127D04 /* Core_Data.xcdatamodel */,
+				DD3251862C4C52F500E957C4 /* TrioPersistentContainer.xcdatamodel */,
 			);
-			currentVersion = 5895E7E42C4BF66900127D04 /* Core_Data.xcdatamodel */;
-			name = TriosPersistentContainer.xcdatamodeld;
-			path = "../backup-openiaps/Open-iAPS/Model/TriosPersistentContainer.xcdatamodeld";
+			currentVersion = DD3251862C4C52F500E957C4 /* TrioPersistentContainer.xcdatamodel */;
+			name = TrioPersistentContainer.xcdatamodeld;
+			path = "/Users/deniz.cengiz/dnzxy_workspaces/Open-iAPS/Model/TrioPersistentContainer.xcdatamodeld";
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;
 		};

GlucoseStored+CoreDataProperties.swift

@@ -1,17 +1,22 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension GlucoseStored {
 
-public extension GlucoseStored {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<GlucoseStored> {
-        NSFetchRequest<GlucoseStored>(entityName: "GlucoseStored")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<GlucoseStored> {
+        return NSFetchRequest<GlucoseStored>(entityName: "GlucoseStored")
     }
 
-    @NSManaged var date: Date?
-    @NSManaged var direction: String?
-    @NSManaged var glucose: Int16
-    @NSManaged var id: UUID?
-    @NSManaged var isManual: Bool
-    @NSManaged var isUploadedToNS: Bool
+    @NSManaged public var date: Date?
+    @NSManaged public var direction: String?
+    @NSManaged public var glucose: Int16
+    @NSManaged public var id: UUID?
+    @NSManaged public var isManual: Bool
+    @NSManaged public var isUploadedToNS: Bool
+
 }
 
-extension GlucoseStored: Identifiable {}
+extension GlucoseStored : Identifiable {
+
+}

ImportError+CoreDataProperties.swift

@@ -1,13 +1,18 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension ImportError {
 
-public extension ImportError {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<ImportError> {
-        NSFetchRequest<ImportError>(entityName: "ImportError")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<ImportError> {
+        return NSFetchRequest<ImportError>(entityName: "ImportError")
     }
 
-    @NSManaged var date: Date?
-    @NSManaged var error: String?
+    @NSManaged public var date: Date?
+    @NSManaged public var error: String?
+
 }
 
-extension ImportError: Identifiable {}
+extension ImportError : Identifiable {
+
+}

LoopStatRecord+CoreDataProperties.swift

@@ -1,16 +1,21 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension LoopStatRecord {
 
-public extension LoopStatRecord {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<LoopStatRecord> {
-        NSFetchRequest<LoopStatRecord>(entityName: "LoopStatRecord")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<LoopStatRecord> {
+        return NSFetchRequest<LoopStatRecord>(entityName: "LoopStatRecord")
     }
 
-    @NSManaged var duration: Double
-    @NSManaged var end: Date?
-    @NSManaged var interval: Double
-    @NSManaged var loopStatus: String?
-    @NSManaged var start: Date?
+    @NSManaged public var duration: Double
+    @NSManaged public var end: Date?
+    @NSManaged public var interval: Double
+    @NSManaged public var loopStatus: String?
+    @NSManaged public var start: Date?
+
 }
 
-extension LoopStatRecord: Identifiable {}
+extension LoopStatRecord : Identifiable {
+
+}

MealPresetStored+CoreDataProperties.swift

@@ -1,15 +1,20 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension MealPresetStored {
 
-public extension MealPresetStored {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<MealPresetStored> {
-        NSFetchRequest<MealPresetStored>(entityName: "MealPresetStored")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<MealPresetStored> {
+        return NSFetchRequest<MealPresetStored>(entityName: "MealPresetStored")
     }
 
-    @NSManaged var carbs: NSDecimalNumber?
-    @NSManaged var dish: String?
-    @NSManaged var fat: NSDecimalNumber?
-    @NSManaged var protein: NSDecimalNumber?
+    @NSManaged public var carbs: NSDecimalNumber?
+    @NSManaged public var dish: String?
+    @NSManaged public var fat: NSDecimalNumber?
+    @NSManaged public var protein: NSDecimalNumber?
+
 }
 
-extension MealPresetStored: Identifiable {}
+extension MealPresetStored : Identifiable {
+
+}

Model/CoreDataStack.swift

@@ -44,7 +44,7 @@ class CoreDataStack: ObservableObject {
 
     /// A persistent container to set up the Core Data Stack
     lazy var persistentContainer: NSPersistentContainer = {
-        let container = NSPersistentContainer(name: "TriosPersistentContainer")
+        let container = NSPersistentContainer(name: "TrioPersistentContainer")
 
         guard let description = container.persistentStoreDescriptions.first else {
             fatalError("Failed \(DebuggingIdentifiers.failed) to retrieve a persistent store description")

Model/TriosPersistentContainer.xcdatamodeld/contents

@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22757" systemVersion="23F79" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
+    <entity name="BolusStored" representedClassName="BolusStored" syncable="YES">
+        <attribute name="amount" optional="YES" attributeType="Decimal" defaultValueString="0"/>
+        <attribute name="isExternal" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="isSMB" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <relationship name="pumpEvent" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="PumpEventStored" inverseName="bolus" inverseEntity="PumpEventStored"/>
+    </entity>
+    <entity name="CarbEntryStored" representedClassName="CarbEntryStored" syncable="YES">
+        <attribute name="carbs" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
+        <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="fat" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
+        <attribute name="fpuID" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
+        <attribute name="id" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
+        <attribute name="isFPU" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
+        <attribute name="isUploadedToNS" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
+        <attribute name="note" optional="YES" attributeType="String"/>
+        <attribute name="protein" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
+        <fetchIndex name="byDate">
+            <fetchIndexElement property="date" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byIsFPU">
+            <fetchIndexElement property="isFPU" type="Binary" order="ascending"/>
+        </fetchIndex>
+    </entity>
+    <entity name="Forecast" representedClassName="Forecast" syncable="YES">
+        <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="id" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
+        <attribute name="type" optional="YES" attributeType="String"/>
+        <relationship name="forecastValues" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="ForecastValue" inverseName="forecast" inverseEntity="ForecastValue"/>
+        <relationship name="orefDetermination" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="OrefDetermination" inverseName="forecasts" inverseEntity="OrefDetermination"/>
+        <fetchIndex name="byDate">
+            <fetchIndexElement property="date" type="Binary" order="descending"/>
+        </fetchIndex>
+    </entity>
+    <entity name="ForecastValue" representedClassName="ForecastValue" syncable="YES">
+        <attribute name="index" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="value" optional="YES" attributeType="Integer 32" defaultValueString="0.0" usesScalarValueType="YES"/>
+        <relationship name="forecast" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Forecast" inverseName="forecastValues" inverseEntity="Forecast"/>
+    </entity>
+    <entity name="GlucoseStored" representedClassName="GlucoseStored" syncable="YES">
+        <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="direction" optional="YES" attributeType="String"/>
+        <attribute name="glucose" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="id" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
+        <attribute name="isManual" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="isUploadedToNS" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
+        <fetchIndex name="byDate">
+            <fetchIndexElement property="date" type="Binary" order="descending"/>
+        </fetchIndex>
+        <fetchIndex name="byIsManual">
+            <fetchIndexElement property="isManual" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byIsUploadedToNS">
+            <fetchIndexElement property="isUploadedToNS" type="Binary" order="ascending"/>
+        </fetchIndex>
+    </entity>
+    <entity name="ImportError" representedClassName="ImportError" syncable="YES">
+        <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="error" optional="YES" attributeType="String"/>
+    </entity>
+    <entity name="LoopStatRecord" representedClassName="LoopStatRecord" syncable="YES">
+        <attribute name="duration" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
+        <attribute name="end" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="interval" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
+        <attribute name="loopStatus" optional="YES" attributeType="String"/>
+        <attribute name="start" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+    </entity>
+    <entity name="MealPresetStored" representedClassName="MealPresetStored" syncable="YES">
+        <attribute name="carbs" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="dish" optional="YES" attributeType="String"/>
+        <attribute name="fat" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="protein" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+    </entity>
+    <entity name="OpenAPS_Battery" representedClassName="OpenAPS_Battery" syncable="YES">
+        <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="display" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
+        <attribute name="id" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
+        <attribute name="percent" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="status" optional="YES" attributeType="String"/>
+        <attribute name="voltage" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <fetchIndex name="byDate">
+            <fetchIndexElement property="date" type="Binary" order="descending"/>
+        </fetchIndex>
+    </entity>
+    <entity name="OrefDetermination" representedClassName="OrefDetermination" syncable="YES">
+        <attribute name="bolus" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="carbRatio" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="carbsRequired" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="cob" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="currentTarget" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="deliverAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="duration" optional="YES" attributeType="Decimal" defaultValueString="0"/>
+        <attribute name="enacted" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
+        <attribute name="eventualBG" optional="YES" attributeType="Decimal" defaultValueString="0"/>
+        <attribute name="expectedDelta" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="glucose" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="id" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
+        <attribute name="insulinForManualBolus" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="insulinReq" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="insulinSensitivity" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="iob" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="isUploadedToNS" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
+        <attribute name="manualBolusErrorString" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="minDelta" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="rate" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="reason" optional="YES" attributeType="String"/>
+        <attribute name="received" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
+        <attribute name="reservoir" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="scheduledBasal" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="sensitivityRatio" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="smbToDeliver" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="temp" optional="YES" attributeType="String"/>
+        <attribute name="tempBasal" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="threshold" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="timestamp" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="timestampEnacted" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="totalDailyDose" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <relationship name="forecasts" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Forecast" inverseName="orefDetermination" inverseEntity="Forecast"/>
+        <fetchIndex name="byDate">
+            <fetchIndexElement property="deliverAt" type="Binary" order="descending"/>
+        </fetchIndex>
+    </entity>
+    <entity name="OverrideRunStored" representedClassName="OverrideRunStored" syncable="YES">
+        <attribute name="endDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="id" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
+        <attribute name="isUploadedToNS" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
+        <attribute name="name" optional="YES" attributeType="String"/>
+        <attribute name="startDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="target" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <relationship name="override" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="OverrideStored" inverseName="overrideRun" inverseEntity="OverrideStored"/>
+        <fetchIndex name="byDate">
+            <fetchIndexElement property="startDate" type="Binary" order="ascending"/>
+        </fetchIndex>
+    </entity>
+    <entity name="OverrideStored" representedClassName="OverrideStored" syncable="YES">
+        <attribute name="advancedSettings" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="cr" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="duration" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="enabled" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="end" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="id" optional="YES" attributeType="String"/>
+        <attribute name="indefinite" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="isf" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="isfAndCr" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="isPreset" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="isUploadedToNS" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
+        <attribute name="name" optional="YES" attributeType="String"/>
+        <attribute name="orderPosition" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="percentage" optional="YES" attributeType="Double" defaultValueString="100" usesScalarValueType="YES"/>
+        <attribute name="smbIsAlwaysOff" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="smbIsOff" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="smbMinutes" optional="YES" attributeType="Decimal" defaultValueString="30"/>
+        <attribute name="start" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="target" optional="YES" attributeType="Decimal" defaultValueString="0"/>
+        <attribute name="uamMinutes" optional="YES" attributeType="Decimal" defaultValueString="30"/>
+        <relationship name="overrideRun" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="OverrideRunStored" inverseName="override" inverseEntity="OverrideRunStored"/>
+        <fetchIndex name="byDate">
+            <fetchIndexElement property="date" type="Binary" order="descending"/>
+        </fetchIndex>
+        <fetchIndex name="byIsPreset">
+            <fetchIndexElement property="isPreset" type="Binary" order="ascending"/>
+        </fetchIndex>
+    </entity>
+    <entity name="PumpEventStored" representedClassName="PumpEventStored" syncable="YES">
+        <attribute name="id" optional="YES" attributeType="String"/>
+        <attribute name="isUploadedToNS" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
+        <attribute name="note" optional="YES" attributeType="String"/>
+        <attribute name="timestamp" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="type" optional="YES" attributeType="String"/>
+        <relationship name="bolus" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="BolusStored" inverseName="pumpEvent" inverseEntity="BolusStored"/>
+        <relationship name="tempBasal" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="TempBasalStored" inverseName="pumpEvent" inverseEntity="TempBasalStored"/>
+        <fetchIndex name="byTimestamp">
+            <fetchIndexElement property="timestamp" type="Binary" order="descending"/>
+        </fetchIndex>
+        <uniquenessConstraints>
+            <uniquenessConstraint>
+                <constraint value="id"/>
+            </uniquenessConstraint>
+        </uniquenessConstraints>
+    </entity>
+    <entity name="StatsData" representedClassName="StatsData" syncable="YES">
+        <attribute name="lastrun" attributeType="Date" defaultDateTimeInterval="704497620" usesScalarValueType="NO"/>
+    </entity>
+    <entity name="TempBasalStored" representedClassName="TempBasalStored" syncable="YES">
+        <attribute name="duration" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="rate" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="tempType" optional="YES" attributeType="String"/>
+        <relationship name="pumpEvent" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="PumpEventStored" inverseName="tempBasal" inverseEntity="PumpEventStored"/>
+    </entity>
+    <entity name="TempTargets" representedClassName="TempTargets" syncable="YES">
+        <attribute name="active" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="duration" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="hbt" optional="YES" attributeType="Double" defaultValueString="160" usesScalarValueType="YES"/>
+        <attribute name="id" optional="YES" attributeType="String"/>
+        <attribute name="startDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <fetchIndex name="byDate">
+            <fetchIndexElement property="date" type="Binary" order="descending"/>
+        </fetchIndex>
+    </entity>
+    <entity name="TempTargetsSlider" representedClassName="TempTargetsSlider" syncable="YES">
+        <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="defaultHBT" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
+        <attribute name="duration" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+        <attribute name="enabled" optional="YES" attributeType="Boolean" defaultValueString="100" usesScalarValueType="YES"/>
+        <attribute name="hbt" optional="YES" attributeType="Double" defaultValueString="160" usesScalarValueType="YES"/>
+        <attribute name="id" optional="YES" attributeType="String" defaultValueString="empy"/>
+        <attribute name="isPreset" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <fetchIndex name="byDate">
+            <fetchIndexElement property="date" type="Binary" order="descending"/>
+        </fetchIndex>
+    </entity>
+</model>

OpenAPS_Battery+CoreDataProperties.swift

@@ -1,17 +1,22 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension OpenAPS_Battery {
 
-public extension OpenAPS_Battery {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<OpenAPS_Battery> {
-        NSFetchRequest<OpenAPS_Battery>(entityName: "OpenAPS_Battery")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<OpenAPS_Battery> {
+        return NSFetchRequest<OpenAPS_Battery>(entityName: "OpenAPS_Battery")
     }
 
-    @NSManaged var date: Date?
-    @NSManaged var display: Bool
-    @NSManaged var id: UUID?
-    @NSManaged var percent: Int16
-    @NSManaged var status: String?
-    @NSManaged var voltage: NSDecimalNumber?
+    @NSManaged public var date: Date?
+    @NSManaged public var display: Bool
+    @NSManaged public var id: UUID?
+    @NSManaged public var percent: Int16
+    @NSManaged public var status: String?
+    @NSManaged public var voltage: NSDecimalNumber?
+
 }
 
-extension OpenAPS_Battery: Identifiable {}
+extension OpenAPS_Battery : Identifiable {
+
+}

OrefDetermination+CoreDataProperties.swift

@@ -1,60 +1,66 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension OrefDetermination {
 
-public extension OrefDetermination {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<OrefDetermination> {
-        NSFetchRequest<OrefDetermination>(entityName: "OrefDetermination")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<OrefDetermination> {
+        return NSFetchRequest<OrefDetermination>(entityName: "OrefDetermination")
     }
 
-    @NSManaged var bolus: NSDecimalNumber?
-    @NSManaged var carbRatio: NSDecimalNumber?
-    @NSManaged var carbsRequired: Int16
-    @NSManaged var cob: Int16
-    @NSManaged var currentTarget: NSDecimalNumber?
-    @NSManaged var deliverAt: Date?
-    @NSManaged var duration: NSDecimalNumber?
-    @NSManaged var enacted: Bool
-    @NSManaged var eventualBG: NSDecimalNumber?
-    @NSManaged var expectedDelta: NSDecimalNumber?
-    @NSManaged var glucose: NSDecimalNumber?
-    @NSManaged var id: UUID?
-    @NSManaged var insulinForManualBolus: NSDecimalNumber?
-    @NSManaged var insulinReq: NSDecimalNumber?
-    @NSManaged var insulinSensitivity: NSDecimalNumber?
-    @NSManaged var iob: NSDecimalNumber?
-    @NSManaged var manualBolusErrorString: NSDecimalNumber?
-    @NSManaged var minDelta: NSDecimalNumber?
-    @NSManaged var rate: NSDecimalNumber?
-    @NSManaged var reason: String?
-    @NSManaged var received: Bool
-    @NSManaged var reservoir: NSDecimalNumber?
-    @NSManaged var scheduledBasal: NSDecimalNumber?
-    @NSManaged var sensitivityRatio: NSDecimalNumber?
-    @NSManaged var smbToDeliver: NSDecimalNumber?
-    @NSManaged var temp: String?
-    @NSManaged var tempBasal: NSDecimalNumber?
-    @NSManaged var threshold: NSDecimalNumber?
-    @NSManaged var timestamp: Date?
-    @NSManaged var timestampEnacted: Date?
-    @NSManaged var totalDailyDose: NSDecimalNumber?
-    @NSManaged var isUploadedToNS: Bool
-    @NSManaged var forecasts: NSSet?
+    @NSManaged public var bolus: NSDecimalNumber?
+    @NSManaged public var carbRatio: NSDecimalNumber?
+    @NSManaged public var carbsRequired: Int16
+    @NSManaged public var cob: Int16
+    @NSManaged public var currentTarget: NSDecimalNumber?
+    @NSManaged public var deliverAt: Date?
+    @NSManaged public var duration: NSDecimalNumber?
+    @NSManaged public var enacted: Bool
+    @NSManaged public var eventualBG: NSDecimalNumber?
+    @NSManaged public var expectedDelta: NSDecimalNumber?
+    @NSManaged public var glucose: NSDecimalNumber?
+    @NSManaged public var id: UUID?
+    @NSManaged public var insulinForManualBolus: NSDecimalNumber?
+    @NSManaged public var insulinReq: NSDecimalNumber?
+    @NSManaged public var insulinSensitivity: NSDecimalNumber?
+    @NSManaged public var iob: NSDecimalNumber?
+    @NSManaged public var isUploadedToNS: Bool
+    @NSManaged public var manualBolusErrorString: NSDecimalNumber?
+    @NSManaged public var minDelta: NSDecimalNumber?
+    @NSManaged public var rate: NSDecimalNumber?
+    @NSManaged public var reason: String?
+    @NSManaged public var received: Bool
+    @NSManaged public var reservoir: NSDecimalNumber?
+    @NSManaged public var scheduledBasal: NSDecimalNumber?
+    @NSManaged public var sensitivityRatio: NSDecimalNumber?
+    @NSManaged public var smbToDeliver: NSDecimalNumber?
+    @NSManaged public var temp: String?
+    @NSManaged public var tempBasal: NSDecimalNumber?
+    @NSManaged public var threshold: NSDecimalNumber?
+    @NSManaged public var timestamp: Date?
+    @NSManaged public var timestampEnacted: Date?
+    @NSManaged public var totalDailyDose: NSDecimalNumber?
+    @NSManaged public var forecasts: NSSet?
+
 }
 
 // MARK: Generated accessors for forecasts
+extension OrefDetermination {
 
-public extension OrefDetermination {
     @objc(addForecastsObject:)
-    @NSManaged func addToForecasts(_ value: Forecast)
+    @NSManaged public func addToForecasts(_ value: Forecast)
 
     @objc(removeForecastsObject:)
-    @NSManaged func removeFromForecasts(_ value: Forecast)
+    @NSManaged public func removeFromForecasts(_ value: Forecast)
 
     @objc(addForecasts:)
-    @NSManaged func addToForecasts(_ values: NSSet)
+    @NSManaged public func addToForecasts(_ values: NSSet)
 
     @objc(removeForecasts:)
-    @NSManaged func removeFromForecasts(_ values: NSSet)
+    @NSManaged public func removeFromForecasts(_ values: NSSet)
+
 }
 
-extension OrefDetermination: Identifiable {}
+extension OrefDetermination : Identifiable {
+
+}

OverrideRunStored+CoreDataProperties.swift

@@ -1,18 +1,23 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension OverrideRunStored {
 
-public extension OverrideRunStored {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<OverrideRunStored> {
-        NSFetchRequest<OverrideRunStored>(entityName: "OverrideRunStored")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<OverrideRunStored> {
+        return NSFetchRequest<OverrideRunStored>(entityName: "OverrideRunStored")
     }
 
-    @NSManaged var endDate: Date?
-    @NSManaged var id: UUID?
-    @NSManaged var startDate: Date?
-    @NSManaged var target: NSDecimalNumber?
-    @NSManaged var isUploadedToNS: Bool
-    @NSManaged var name: String?
-    @NSManaged var override: OverrideStored?
+    @NSManaged public var endDate: Date?
+    @NSManaged public var id: UUID?
+    @NSManaged public var isUploadedToNS: Bool
+    @NSManaged public var name: String?
+    @NSManaged public var startDate: Date?
+    @NSManaged public var target: NSDecimalNumber?
+    @NSManaged public var override: OverrideStored?
+
 }
 
-extension OverrideRunStored: Identifiable {}
+extension OverrideRunStored : Identifiable {
+
+}

OverrideStored+CoreDataProperties.swift

@@ -1,33 +1,38 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension OverrideStored {
 
-public extension OverrideStored {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<OverrideStored> {
-        NSFetchRequest<OverrideStored>(entityName: "OverrideStored")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<OverrideStored> {
+        return NSFetchRequest<OverrideStored>(entityName: "OverrideStored")
     }
 
-    @NSManaged var advancedSettings: Bool
-    @NSManaged var cr: Bool
-    @NSManaged var date: Date?
-    @NSManaged var duration: NSDecimalNumber?
-    @NSManaged var enabled: Bool
-    @NSManaged var end: NSDecimalNumber?
-    @NSManaged var id: String?
-    @NSManaged var indefinite: Bool
-    @NSManaged var isf: Bool
-    @NSManaged var isfAndCr: Bool
-    @NSManaged var isPreset: Bool
-    @NSManaged var name: String?
-    @NSManaged var orderPosition: Int16
-    @NSManaged var percentage: Double
-    @NSManaged var smbIsAlwaysOff: Bool
-    @NSManaged var smbIsOff: Bool
-    @NSManaged var smbMinutes: NSDecimalNumber?
-    @NSManaged var start: NSDecimalNumber?
-    @NSManaged var target: NSDecimalNumber?
-    @NSManaged var uamMinutes: NSDecimalNumber?
-    @NSManaged var isUploadedToNS: Bool
-    @NSManaged var overrideRun: OverrideRunStored?
+    @NSManaged public var advancedSettings: Bool
+    @NSManaged public var cr: Bool
+    @NSManaged public var date: Date?
+    @NSManaged public var duration: NSDecimalNumber?
+    @NSManaged public var enabled: Bool
+    @NSManaged public var end: NSDecimalNumber?
+    @NSManaged public var id: String?
+    @NSManaged public var indefinite: Bool
+    @NSManaged public var isf: Bool
+    @NSManaged public var isfAndCr: Bool
+    @NSManaged public var isPreset: Bool
+    @NSManaged public var isUploadedToNS: Bool
+    @NSManaged public var name: String?
+    @NSManaged public var orderPosition: Int16
+    @NSManaged public var percentage: Double
+    @NSManaged public var smbIsAlwaysOff: Bool
+    @NSManaged public var smbIsOff: Bool
+    @NSManaged public var smbMinutes: NSDecimalNumber?
+    @NSManaged public var start: NSDecimalNumber?
+    @NSManaged public var target: NSDecimalNumber?
+    @NSManaged public var uamMinutes: NSDecimalNumber?
+    @NSManaged public var overrideRun: OverrideRunStored?
+
 }
 
-extension OverrideStored: Identifiable {}
+extension OverrideStored : Identifiable {
+
+}

PumpEventStored+CoreDataProperties.swift

@@ -1,18 +1,23 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension PumpEventStored {
 
-public extension PumpEventStored {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<PumpEventStored> {
-        NSFetchRequest<PumpEventStored>(entityName: "PumpEventStored")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<PumpEventStored> {
+        return NSFetchRequest<PumpEventStored>(entityName: "PumpEventStored")
     }
 
-    @NSManaged var id: String?
-    @NSManaged var timestamp: Date?
-    @NSManaged var type: String?
-    @NSManaged var isUploadedToNS: Bool
-    @NSManaged var note: String?
-    @NSManaged var bolus: BolusStored?
-    @NSManaged var tempBasal: TempBasalStored?
+    @NSManaged public var id: String?
+    @NSManaged public var isUploadedToNS: Bool
+    @NSManaged public var note: String?
+    @NSManaged public var timestamp: Date?
+    @NSManaged public var type: String?
+    @NSManaged public var bolus: BolusStored?
+    @NSManaged public var tempBasal: TempBasalStored?
+
 }
 
-extension PumpEventStored: Identifiable {}
+extension PumpEventStored : Identifiable {
+
+}

StatsData+CoreDataProperties.swift

@@ -1,12 +1,17 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension StatsData {
 
-public extension StatsData {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<StatsData> {
-        NSFetchRequest<StatsData>(entityName: "StatsData")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<StatsData> {
+        return NSFetchRequest<StatsData>(entityName: "StatsData")
     }
 
-    @NSManaged var lastrun: Date?
+    @NSManaged public var lastrun: Date?
+
 }
 
-extension StatsData: Identifiable {}
+extension StatsData : Identifiable {
+
+}

TempBasalStored+CoreDataProperties.swift

@@ -1,15 +1,20 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension TempBasalStored {
 
-public extension TempBasalStored {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<TempBasalStored> {
-        NSFetchRequest<TempBasalStored>(entityName: "TempBasalStored")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<TempBasalStored> {
+        return NSFetchRequest<TempBasalStored>(entityName: "TempBasalStored")
     }
 
-    @NSManaged var duration: Int16
-    @NSManaged var rate: NSDecimalNumber?
-    @NSManaged var tempType: String?
-    @NSManaged var pumpEvent: PumpEventStored?
+    @NSManaged public var duration: Int16
+    @NSManaged public var rate: NSDecimalNumber?
+    @NSManaged public var tempType: String?
+    @NSManaged public var pumpEvent: PumpEventStored?
+
 }
 
-extension TempBasalStored: Identifiable {}
+extension TempBasalStored : Identifiable {
+
+}

TempTargets+CoreDataProperties.swift

@@ -1,17 +1,22 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension TempTargets {
 
-public extension TempTargets {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<TempTargets> {
-        NSFetchRequest<TempTargets>(entityName: "TempTargets")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<TempTargets> {
+        return NSFetchRequest<TempTargets>(entityName: "TempTargets")
     }
 
-    @NSManaged var active: Bool
-    @NSManaged var date: Date?
-    @NSManaged var duration: NSDecimalNumber?
-    @NSManaged var hbt: Double
-    @NSManaged var id: String?
-    @NSManaged var startDate: Date?
+    @NSManaged public var active: Bool
+    @NSManaged public var date: Date?
+    @NSManaged public var duration: NSDecimalNumber?
+    @NSManaged public var hbt: Double
+    @NSManaged public var id: String?
+    @NSManaged public var startDate: Date?
+
 }
 
-extension TempTargets: Identifiable {}
+extension TempTargets : Identifiable {
+
+}

TempTargetsSlider+CoreDataProperties.swift

@@ -1,18 +1,23 @@
-import CoreData
 import Foundation
+import CoreData
+
+
+extension TempTargetsSlider {
 
-public extension TempTargetsSlider {
-    @nonobjc class func fetchRequest() -> NSFetchRequest<TempTargetsSlider> {
-        NSFetchRequest<TempTargetsSlider>(entityName: "TempTargetsSlider")
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<TempTargetsSlider> {
+        return NSFetchRequest<TempTargetsSlider>(entityName: "TempTargetsSlider")
     }
 
-    @NSManaged var date: Date?
-    @NSManaged var defaultHBT: Double
-    @NSManaged var duration: NSDecimalNumber?
-    @NSManaged var enabled: Bool
-    @NSManaged var hbt: Double
-    @NSManaged var id: String?
-    @NSManaged var isPreset: Bool
+    @NSManaged public var date: Date?
+    @NSManaged public var defaultHBT: Double
+    @NSManaged public var duration: NSDecimalNumber?
+    @NSManaged public var enabled: Bool
+    @NSManaged public var hbt: Double
+    @NSManaged public var id: String?
+    @NSManaged public var isPreset: Bool
+
 }
 
-extension TempTargetsSlider: Identifiable {}
+extension TempTargetsSlider : Identifiable {
+
+}