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

Store override name in overrideRun

Deniz Cengiz 1 год назад
Родитель
Сommit
f156d59ea5

+ 1 - 1
FreeAPS/Sources/APS/Storage/OverrideStorage.swift

@@ -226,7 +226,7 @@ final class BaseOverrideStorage: OverrideStorage, Injectable {
                     eventType: OverrideStored.EventType.nsExercise,
                     createdAt: (overrideRun.startDate ?? overrideRun.override?.date) ?? Date(),
                     enteredBy: NightscoutExercise.local,
-                    notes: overrideRun.override?.name ?? "Custom Override"
+                    notes: overrideRun.name ?? "Custom Override"
                 )
             }
         }

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

@@ -918,6 +918,7 @@ extension Home.StateModel {
 
                 let newOverrideRunStored = OverrideRunStored(context: self.viewContext)
                 newOverrideRunStored.id = UUID()
+                newOverrideRunStored.name = object.name
                 newOverrideRunStored.startDate = object.date ?? .distantPast
                 newOverrideRunStored.endDate = Date()
                 newOverrideRunStored.target = NSDecimalNumber(decimal: self.calculateTarget(override: object))

+ 1 - 0
FreeAPS/Sources/Modules/OverrideProfilesConfig/OverrideProfilesStateModel.swift

@@ -205,6 +205,7 @@ extension OverrideProfilesConfig.StateModel {
                     if let canceledOverride = results.first {
                         let newOverrideRunStored = OverrideRunStored(context: self.viewContext)
                         newOverrideRunStored.id = UUID()
+                        newOverrideRunStored.name = canceledOverride.name
                         newOverrideRunStored.startDate = canceledOverride.date ?? .distantPast
                         newOverrideRunStored.endDate = Date()
                         newOverrideRunStored

+ 1 - 0
Model/Core_Data.xcdatamodeld/Core_Data.xcdatamodel/contents

@@ -124,6 +124,7 @@
         <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"/>

+ 1 - 0
OverrideRunStored+CoreDataProperties.swift

@@ -11,6 +11,7 @@ public extension OverrideRunStored {
     @NSManaged var startDate: Date?
     @NSManaged var target: NSDecimalNumber?
     @NSManaged var isUploadedToNS: Bool
+    @NSManaged var name: String?
     @NSManaged var override: OverrideStored?
 }