|
@@ -494,7 +494,6 @@ extension OverrideConfig {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@ViewBuilder private func overridesView(for preset: OverrideStored) -> some View {
|
|
@ViewBuilder private func overridesView(for preset: OverrideStored) -> some View {
|
|
|
- let target = (state.units == .mgdL ? preset.target : preset.target?.decimalValue.asMmolL as NSDecimalNumber?) ?? 0
|
|
|
|
|
let duration = (preset.duration ?? 0) as Decimal
|
|
let duration = (preset.duration ?? 0) as Decimal
|
|
|
let name = preset.name ?? ""
|
|
let name = preset.name ?? ""
|
|
|
let percentage = preset.percentage
|
|
let percentage = preset.percentage
|
|
@@ -504,7 +503,10 @@ extension OverrideConfig {
|
|
|
? " \(formatTimeRange(start: preset.start?.stringValue, end: preset.end?.stringValue))"
|
|
? " \(formatTimeRange(start: preset.start?.stringValue, end: preset.end?.stringValue))"
|
|
|
: ""
|
|
: ""
|
|
|
let smbString = (preset.smbIsOff || preset.smbIsScheduledOff) ? "SMBs Off\(scheduledSMBstring)" : ""
|
|
let smbString = (preset.smbIsOff || preset.smbIsScheduledOff) ? "SMBs Off\(scheduledSMBstring)" : ""
|
|
|
- let targetString = target != 0 ? "\(target.description) \(state.units.rawValue)" : ""
|
|
|
|
|
|
|
+ let targetValue = (preset.target == 0 || preset.target == nil) ? "" :
|
|
|
|
|
+ (state.units == .mgdL ? preset.target?.description ?? "" : preset.target?.decimalValue.formattedAsMmolL)
|
|
|
|
|
+
|
|
|
|
|
+ let targetString = (targetValue?.isEmpty ?? true) ? "" : "\(targetValue!) \(state.units.rawValue)"
|
|
|
let maxMinutesSMB = (preset.smbMinutes as Decimal?) != nil ? (preset.smbMinutes ?? 0) as Decimal : 0
|
|
let maxMinutesSMB = (preset.smbMinutes as Decimal?) != nil ? (preset.smbMinutes ?? 0) as Decimal : 0
|
|
|
let maxMinutesUAM = (preset.uamMinutes as Decimal?) != nil ? (preset.uamMinutes ?? 0) as Decimal : 0
|
|
let maxMinutesUAM = (preset.uamMinutes as Decimal?) != nil ? (preset.uamMinutes ?? 0) as Decimal : 0
|
|
|
let maxSmbMinsString = (
|
|
let maxSmbMinsString = (
|