Formatting

FreeAPS/Resources/json/defaults/monitor/statistics.json

@@ -21,7 +21,7 @@
         {
           "TIR" : [
             {
-              "oneDay" : 0,
+              "day" : 0,
               "sevenDays" : 0,
               "thirtyDays" : 0,
               "ninetyDays" : 0,
@@ -30,7 +30,7 @@
           ],
           "Hypos" : [
             {
-              "oneDay" : 0,
+              "day" : 0,
               "sevenDays" : 0,
               "thirtyDays" : 0,
               "ninetyDays" : 0,
@@ -39,7 +39,7 @@
           ],
           "Hypers" : [
             {
-              "oneDay" : 0,
+              "day" : 0,
               "sevenDays" : 0,
               "thirtyDays" : 0,
               "ninetyDays" : 0,
@@ -53,7 +53,7 @@
           "Average" : [
             {
               "oneDay_mmol" : 0,
-              "oneDay" : 0,
+              "day" : 0,
               "sevenDays_mmol" : 0,
               "sevenDays" : 0,
               "thirtyDays_mmol" : 0,
@@ -67,7 +67,7 @@
           "Median" : [
             {
               "oneDay_mmol" : 0,
-              "oneDay" : 0,
+              "day" : 0,
               "sevenDays_mmol" : 0,
               "sevenDays" : 0,
               "thirtyDays_mmol":  0,
@@ -83,7 +83,7 @@
       "HbA1c" : [
         {
           "oneDay_mmolMol" : 0,
-          "oneDay" : 0,
+          "day" : 0,
           "sevenDays_mmolMol" : 0,
           "sevenDays" : 0,
           "thirtyDays_mmolMol" : 0,

FreeAPS/Sources/APS/APSManager.swift

@@ -1052,7 +1052,7 @@ final class BaseAPSManager: APSManager, Injectable {
         }
 
         var median = Median(
-            oneDay: roundDecimal(Decimal(medianCalculation(array: bgArray_1.map(\.bg_))), 1),
+            day: roundDecimal(Decimal(medianCalculation(array: bgArray_1.map(\.bg_))), 1),
             week: roundDecimal(Decimal(medianCalculation(array: bgArray_7.map(\.bg_))), 1),
             month: roundDecimal(Decimal(medianCalculation(array: bgArray_30.map(\.bg_))), 1),
             ninetyDays: roundDecimal(Decimal(medianCalculation(array: bgArray_90.map(\.bg_))), 1),
@@ -1060,7 +1060,7 @@ final class BaseAPSManager: APSManager, Injectable {
         )
 
         var hbs = Hbs(
-            oneDay: roundDecimal(NGSPa1CStatisticValue, 1),
+            day: roundDecimal(NGSPa1CStatisticValue, 1),
             week: roundDecimal(NGSPa1CStatisticValue_7, 1),
             month: roundDecimal(NGSPa1CStatisticValue_30, 1),
             ninetyDays: roundDecimal(NGSPa1CStatisticValue_90, 1),
@@ -1076,7 +1076,7 @@ final class BaseAPSManager: APSManager, Injectable {
             bg_total = bg_total.asMmolL
 
             median = Median(
-                oneDay: roundDecimal(Decimal(medianCalculation(array: bgArray_1.map(\.bg_))).asMmolL, 1),
+                day: roundDecimal(Decimal(medianCalculation(array: bgArray_1.map(\.bg_))).asMmolL, 1),
                 week: roundDecimal(Decimal(medianCalculation(array: bgArray_7.map(\.bg_))).asMmolL, 1),
                 month: roundDecimal(Decimal(medianCalculation(array: bgArray_30.map(\.bg_))).asMmolL, 1),
                 ninetyDays: roundDecimal(Decimal(medianCalculation(array: bgArray_90.map(\.bg_))).asMmolL, 1),
@@ -1084,7 +1084,7 @@ final class BaseAPSManager: APSManager, Injectable {
             )
 
             hbs = Hbs(
-                oneDay: roundDecimal(IFCCa1CStatisticValue, 1),
+                day: roundDecimal(IFCCa1CStatisticValue, 1),
                 week: roundDecimal(IFCCa1CStatisticValue_7, 1),
                 month: roundDecimal(IFCCa1CStatisticValue_30, 1),
                 ninetyDays: roundDecimal(IFCCa1CStatisticValue_90, 1),
@@ -1135,7 +1135,7 @@ final class BaseAPSManager: APSManager, Injectable {
         }
 
         let tir = TIR(
-            oneDay: roundDecimal(Decimal(oneDay_.TIR), 1),
+            day: roundDecimal(Decimal(oneDay_.TIR), 1),
             week: roundDecimal(Decimal(sevenDays_.TIR), 1),
             month: roundDecimal(Decimal(thirtyDays_.TIR), 1),
             ninetyDays: roundDecimal(Decimal(ninetyDays_.TIR), 1),
@@ -1143,7 +1143,7 @@ final class BaseAPSManager: APSManager, Injectable {
         )
 
         let hypo = Hypos(
-            oneDay: Decimal(oneDay_.hypos),
+            day: Decimal(oneDay_.hypos),
             week: Decimal(sevenDays_.hypos),
             month: Decimal(thirtyDays_.hypos),
             ninetyDays: Decimal(ninetyDays_.hypos),
@@ -1151,7 +1151,7 @@ final class BaseAPSManager: APSManager, Injectable {
         )
 
         let hyper = Hypers(
-            oneDay: Decimal(oneDay_.hypers),
+            day: Decimal(oneDay_.hypers),
             week: Decimal(sevenDays_.hypers),
             month: Decimal(thirtyDays_.hypers),
             ninetyDays: Decimal(ninetyDays_.hypers),
@@ -1161,7 +1161,7 @@ final class BaseAPSManager: APSManager, Injectable {
         let TimeInRange = TIRs(TIR: [tir], Hypos: [hypo], Hypers: [hyper])
 
         let avgs = Average(
-            oneDay: roundDecimal(bg_1, 1),
+            day: roundDecimal(bg_1, 1),
             week: roundDecimal(bg_7, 1),
             month: roundDecimal(bg_30, 1),
             ninetyDays: roundDecimal(bg_90, 1),

FreeAPS/Sources/Models/Statistics.swift

@@ -108,7 +108,7 @@ struct Averages: JSON, Equatable {
 }
 
 struct Average: JSON, Equatable {
-    var oneDay: Decimal
+    var day: Decimal
     var week: Decimal
     var month: Decimal
     var ninetyDays: Decimal
@@ -116,7 +116,7 @@ struct Average: JSON, Equatable {
 }
 
 struct Median: JSON, Equatable {
-    var oneDay: Decimal
+    var day: Decimal
     var week: Decimal
     var month: Decimal
     var ninetyDays: Decimal
@@ -124,7 +124,7 @@ struct Median: JSON, Equatable {
 }
 
 struct Hbs: JSON, Equatable {
-    var oneDay: Decimal
+    var day: Decimal
     var week: Decimal
     var month: Decimal
     var ninetyDays: Decimal
@@ -138,7 +138,7 @@ struct TIRs: JSON, Equatable {
 }
 
 struct TIR: JSON, Equatable {
-    var oneDay: Decimal
+    var day: Decimal
     var week: Decimal
     var month: Decimal
     var ninetyDays: Decimal
@@ -146,7 +146,7 @@ struct TIR: JSON, Equatable {
 }
 
 struct Hypos: JSON, Equatable {
-    var oneDay: Decimal
+    var day: Decimal
     var week: Decimal
     var month: Decimal
     var ninetyDays: Decimal
@@ -154,7 +154,7 @@ struct Hypos: JSON, Equatable {
 }
 
 struct Hypers: JSON, Equatable {
-    var oneDay: Decimal
+    var day: Decimal
     var week: Decimal
     var month: Decimal
     var ninetyDays: Decimal
@@ -193,7 +193,7 @@ extension Averages {
 
 extension Average {
     private enum CodingKeys: String, CodingKey {
-        case oneDay
+        case day
         case week
         case month
         case ninetyDays
@@ -203,7 +203,7 @@ extension Average {
 
 extension Median {
     private enum CodingKeys: String, CodingKey {
-        case oneDay
+        case day
         case week
         case month
         case ninetyDays
@@ -213,7 +213,7 @@ extension Median {
 
 extension Hbs {
     private enum CodingKeys: String, CodingKey {
-        case oneDay
+        case day
         case week
         case month
         case ninetyDays
@@ -231,7 +231,7 @@ extension TIRs {
 
 extension Hypos {
     private enum CodingKeys: String, CodingKey {
-        case oneDay
+        case day
         case week
         case month
         case ninetyDays
@@ -241,7 +241,7 @@ extension Hypos {
 
 extension Hypers {
     private enum CodingKeys: String, CodingKey {
-        case oneDay
+        case day
         case week
         case month
         case ninetyDays