Merge pull request #473 from LoopKit/dose-store-primes

ps2 · web-flow · commit 3e6bf0d56899 · 2017-05-14T09:51:36.000-05:00
Store primes in dosestore
diff --git a/Loop/Extensions/DoseStore.swift b/Loop/Extensions/DoseStore.swift
@@ -22,6 +22,7 @@ extension LoopDataManager {
 
         for event in pumpEvents {
             var dose: DoseEntry?
+            var eventType: InsulinKit.PumpEventType?
 
             switch event.pumpEvent {
             case let bolus as BolusNormalPumpEvent:
@@ -53,12 +54,14 @@ extension LoopDataManager {
                         unit: amount.unit
                     )
                 }
+            case is PrimePumpEvent:
+                eventType = .prime
             default:
                 break
             }
 
             title = String(describing: event.pumpEvent)
-            events.append(NewPumpEvent(date: event.date, dose: dose, isMutable: event.isMutable(), raw: event.pumpEvent.rawData, title: title))
+            events.append(NewPumpEvent(date: event.date, dose: dose, isMutable: event.isMutable(), raw: event.pumpEvent.rawData, title: title, type: eventType))
         }
 
         addPumpEvents(events, completion: completion)

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ extension LoopDataManager {`
`22`	`22`
`23`	`23`	`for event in pumpEvents {`
`24`	`24`	`var dose: DoseEntry?`
	`25`	`+ var eventType: InsulinKit.PumpEventType?`
`25`	`26`
`26`	`27`	`switch event.pumpEvent {`
`27`	`28`	`case let bolus as BolusNormalPumpEvent:`
`@@ -53,12 +54,14 @@ extension LoopDataManager {`
`53`	`54`	`unit: amount.unit`
`54`	`55`	`)`
`55`	`56`	`}`
	`57`	`+ case is PrimePumpEvent:`
	`58`	`+ eventType = .prime`
`56`	`59`	`default:`
`57`	`60`	`break`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	`title = String(describing: event.pumpEvent)`
`61`		`- events.append(NewPumpEvent(date: event.date, dose: dose, isMutable: event.isMutable(), raw: event.pumpEvent.rawData, title: title))`
	`64`	`+ events.append(NewPumpEvent(date: event.date, dose: dose, isMutable: event.isMutable(), raw: event.pumpEvent.rawData, title: title, type: eventType))`
`62`	`65`	`}`
`63`	`66`
`64`	`67`	`addPumpEvents(events, completion: completion)`