Parcourir la source

round TT in Data table using 1 fraction digit
Typo fix

(cherry picked from commit 31c0b98fbc79cd3e0e97f971a78db2b90e0f6810)

Jon Mårtensson il y a 3 ans
Parent
commit
def7c95797

+ 8 - 1
FreeAPS/Sources/Modules/DataTable/DataTableDataFlow.swift

@@ -73,6 +73,13 @@ enum DataTable {
             return formatter
         }
 
+        private var tempTargetFormater: NumberFormatter {
+            let formatter = NumberFormatter()
+            formatter.numberStyle = .decimal
+            formatter.maximumFractionDigits = 1
+            return formatter
+        }
+
         init(
             units: GlucoseUnits,
             type: DataType,
@@ -138,7 +145,7 @@ enum DataTable {
                     secondAmount = secondAmount.asMmolL
                 }
 
-                return numberFormater.string(from: converted as NSNumber)! + " - " + numberFormater
+                return tempTargetFormater.string(from: converted as NSNumber)! + " - " + tempTargetFormater
                     .string(from: secondAmount as NSNumber)! + " \(units.rawValue)"
             case .resume,
                  .suspend:

+ 2 - 2
FreeAPS/Sources/Modules/DataTable/View/DataTableRootView.swift

@@ -67,7 +67,7 @@ extension DataTable {
         private var glucoseList: some View {
             List {
                 ForEach(state.glucose) { item in
-                    gluciseView(item)
+                    glucoseView(item)
                 }.onDelete(perform: deleteGlucose)
             }
         }
@@ -151,7 +151,7 @@ extension DataTable {
             }
         }
 
-        @ViewBuilder private func gluciseView(_ item: Glucose) -> some View {
+        @ViewBuilder private func glucoseView(_ item: Glucose) -> some View {
             VStack(alignment: .leading, spacing: 4) {
                 HStack {
                     Text(dateFormatter.string(from: item.glucose.dateString))