Format Distribution

FreeAPS/Sources/APS/APSManager.swift

@@ -1119,7 +1119,7 @@ final class BaseAPSManager: APSManager, Injectable {
             let overrideHbA1cUnit = settingsManager.preferences.overrideHbA1cUnit
 
             // Override if users sets overrideHbA1cUnit: true
-            if !overrideHbA1cUnit {
+            if !overrideHbA1cUnit, units == .mmolL || overrideHbA1cUnit, units != .mmolL {
                 hbs = Durations(
                     day: roundDecimal(IFCCa1CStatisticValue, 1),
                     week: roundDecimal(IFCCa1CStatisticValue_7, 1),

FreeAPS/Sources/Localizations/Main/en.lproj/Localizable.strings

@@ -1278,7 +1278,7 @@ Enact a temp Basal or a temp target */
 "Override HbA1c unit" = "Override HbA1c unit";
 
 /* Description for Override HbA1c unit */
-"Display '%' as HbA1c unit, even when using mmol/l for glucose. StatPanel will be updated with new unit with next statistics.json update" = "Display '%' as HbA1c unit, even when using mmol/l for glucose. StatPanel will be updated with new unit with next statistics.json update";
+"Display '%' as HbA1c unit, even when using mmol/l for glucose. The unit in statPanel will be updateded with next statistics.json update" = "Display '%' as HbA1c unit, even when using mmol/l for glucose. StatPanel will be updated with new unit with next statistics.json update";
 
  /* --------------------------------------
 

FreeAPS/Sources/Localizations/Main/sv.lproj/Localizable.strings

@@ -1271,7 +1271,7 @@ Enact a temp Basal or a temp target */
 "Override HbA1c unit" = "Ändra HbA1c-enhet";
 
 /* Description for Override HbA1c unit */
-"Display '%' as HbA1c unit, even when using mmol/l for glucose. StatPanel will be updated with new unit with next statistics.json update" = "Visa '%' som HbA1c-enhet, även när du använder mmol/l för blodsocker. Statistiken kommer att uppdateras nästa gång filen statistics.json uppdateras";
+"Display '%' as HbA1c unit, even when using mmol/l for glucose. The unit in statPanel will be updateded with next statistics.json update" = "Visa '%' som HbA1c-enhet, även när du använder mmol/l för blodsocker. Enheten kommer att uppdateras nästa gång filen statistics.json uppdateras";
 
 /* --------------------------------------
 

FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -11,16 +11,6 @@ extension Home {
         @State var isStatusPopupPresented = false
         @State var selectedState: durationState
 
-        @State var hba1c_all: String
-        @State var average_: String
-        @State var median_: String
-        @State var tir_low: String
-        @State var tir_high: String
-        @State var tir_: String
-        @State var hba1c_: String
-        @State var sd_: String
-        @State var cv_: String
-
         private var numberFormatter: NumberFormatter {
             let formatter = NumberFormatter()
             formatter.numberStyle = .decimal
@@ -699,65 +689,5 @@ extension Home {
                 return .loopYellow
             }
         }
-
-        private func getString(_ stat: Decimal?, _ test: Bool) -> String {
-            var string: String = targetFormatter.string(from: (stat ?? 0) as NSNumber) ?? ""
-
-            if state.units != .mmolL, test == true {
-                string = tirFormatter.string(from: (stat ?? 0) as NSNumber) ?? ""
-            }
-            return string
-        }
-
-        private func updateStats() {
-            hba1c_all = getString(state.statistics?.Statistics.HbA1c.total, false)
-            switch selectedState {
-            case .day:
-                average_ = getString(state.statistics?.Statistics.Glucose.Average.day, true)
-                median_ = getString(state.statistics?.Statistics.Glucose.Median.day, true)
-                tir_low = getString(state.statistics?.Statistics.Distribution.Hypos.day, false)
-                tir_high = getString(state.statistics?.Statistics.Distribution.Hypers.day, false)
-                tir_ = getString(state.statistics?.Statistics.Distribution.TIR.day, false)
-                hba1c_ = getString(state.statistics?.Statistics.HbA1c.day, false)
-                sd_ = getString(state.statistics?.Statistics.Variance.SD.day, true)
-                cv_ = getString(state.statistics?.Statistics.Variance.CV.day, false)
-            case .week:
-                average_ = getString(state.statistics?.Statistics.Glucose.Average.week, true)
-                median_ = getString(state.statistics?.Statistics.Glucose.Median.week, true)
-                tir_low = getString(state.statistics?.Statistics.Distribution.Hypos.week, false)
-                tir_high = getString(state.statistics?.Statistics.Distribution.Hypers.week, false)
-                tir_ = getString(state.statistics?.Statistics.Distribution.TIR.week, false)
-                hba1c_ = getString(state.statistics?.Statistics.HbA1c.week, false)
-                sd_ = getString(state.statistics?.Statistics.Variance.SD.week, true)
-                cv_ = getString(state.statistics?.Statistics.Variance.CV.week, false)
-            case .month:
-                average_ = getString(state.statistics?.Statistics.Glucose.Average.month, true)
-                median_ = getString(state.statistics?.Statistics.Glucose.Median.month, true)
-                tir_low = getString(state.statistics?.Statistics.Distribution.Hypos.month, false)
-                tir_high = getString(state.statistics?.Statistics.Distribution.Hypers.month, false)
-                tir_ = getString(state.statistics?.Statistics.Distribution.TIR.month, false)
-                hba1c_ = getString(state.statistics?.Statistics.HbA1c.month, false)
-                sd_ = getString(state.statistics?.Statistics.Variance.SD.month, true)
-                cv_ = getString(state.statistics?.Statistics.Variance.CV.month, false)
-            case .ninetyDays:
-                average_ = getString(state.statistics?.Statistics.Glucose.Average.ninetyDays, true)
-                median_ = getString(state.statistics?.Statistics.Glucose.Median.ninetyDays, true)
-                tir_low = getString(state.statistics?.Statistics.Distribution.Hypos.ninetyDays, false)
-                tir_high = getString(state.statistics?.Statistics.Distribution.Hypers.ninetyDays, false)
-                tir_ = getString(state.statistics?.Statistics.Distribution.TIR.ninetyDays, false)
-                hba1c_ = getString(state.statistics?.Statistics.HbA1c.ninetyDays, false)
-                sd_ = getString(state.statistics?.Statistics.Variance.SD.ninetyDays, true)
-                cv_ = getString(state.statistics?.Statistics.Variance.CV.ninetyDays, false)
-            case .total:
-                average_ = getString(state.statistics?.Statistics.Glucose.Average.total, true)
-                median_ = getString(state.statistics?.Statistics.Glucose.Median.total, true)
-                tir_low = getString(state.statistics?.Statistics.Distribution.Hypos.total, false)
-                tir_high = getString(state.statistics?.Statistics.Distribution.Hypers.total, false)
-                tir_ = getString(state.statistics?.Statistics.Distribution.TIR.total, false)
-                hba1c_ = getString(state.statistics?.Statistics.HbA1c.total, false)
-                sd_ = getString(state.statistics?.Statistics.Variance.SD.total, true)
-                cv_ = getString(state.statistics?.Statistics.Variance.CV.total, false)
-            }
-        }
     }
 }

FreeAPS/Sources/Modules/PreferencesEditor/PreferencesEditorStateModel.swift

@@ -96,7 +96,7 @@ extension PreferencesEditor {
                     ),
                     type: .boolean(keypath: \.overrideHbA1cUnit),
                     infoText: NSLocalizedString(
-                        "Display '%' as HbA1c unit, even when using mmol/l for glucose. StatPanel will be updated with new unit with next statistics.json update",
+                        "Display '%' as HbA1c unit, even when using mmol/l for glucose. The unit in statPanel will be updateded with next statistics.json update",
                         comment: "Description for Override HbA1c unit"
                     ),
                     settable: self

FreeAPS/Sources/Views/TagCloudView.swift

@@ -57,13 +57,10 @@ struct TagCloudView: View {
             switch textTag {
             case textTag where textTag.contains("SMB Delivery Ratio:"):
                 return .uam
-            case textTag where textTag.contains("TDD:"),
-                 textTag where textTag.contains("Total insulin:"),
-                 textTag where textTag.contains("Bolus insulin:"),
-                 textTag where textTag.contains("Temp. basal insulin:"),
-                 textTag where textTag.contains("Scheduled"):
+            case textTag where textTag.contains("Bolus"):
                 return .green
-            case textTag where textTag.contains("tdd_factor"),
+            case textTag where textTag.contains("Total insulin:"),
+                 textTag where textTag.contains("tdd_factor"),
                  textTag where textTag.contains("Sigmoid function"),
                  textTag where textTag.contains("Logarithmic formula"),
                  textTag where textTag.contains("AF:"),