Bladeren bron

Remove more square brackets

Jon Mårtensson 3 jaren geleden
bovenliggende
commit
0edf9469ad
2 gewijzigde bestanden met toevoegingen van 7 en 7 verwijderingen
  1. 2 2
      FreeAPS/Sources/APS/APSManager.swift
  2. 5 5
      FreeAPS/Sources/Models/Statistics.swift

+ 2 - 2
FreeAPS/Sources/APS/APSManager.swift

@@ -1157,7 +1157,7 @@ final class BaseAPSManager: APSManager, Injectable {
             total: Decimal(totalDays_.hypers)
         )
 
-        let TimeInRange = TIRs(TIR: [tir], Hypos: [hypo], Hypers: [hyper])
+        let TimeInRange = TIRs(TIR: tir, Hypos: hypo, Hypers: hyper)
 
         let avgs = Average(
             day: roundDecimal(bg_1, 1),
@@ -1167,7 +1167,7 @@ final class BaseAPSManager: APSManager, Injectable {
             total: roundDecimal(bg_total, 1)
         )
 
-        let avg = Averages(Average: [avgs], Median: [median])
+        let avg = Averages(Average: avgs, Median: median)
 
         let suggestion = storage.retrieve(OpenAPS.Enact.suggested, as: Suggestion.self)
 

+ 5 - 5
FreeAPS/Sources/Models/Statistics.swift

@@ -99,8 +99,8 @@ struct LoopCycles: JSON, Equatable {
 }
 
 struct Averages: JSON, Equatable {
-    var Average: [Average]
-    var Median: [Median]
+    var Average: Average
+    var Median: Median
 }
 
 struct Average: JSON, Equatable {
@@ -128,9 +128,9 @@ struct Hbs: JSON, Equatable {
 }
 
 struct TIRs: JSON, Equatable {
-    var TIR: [TIR]
-    var Hypos: [Hypos]
-    var Hypers: [Hypers]
+    var TIR: TIR
+    var Hypos: Hypos
+    var Hypers: Hypers
 }
 
 struct TIR: JSON, Equatable {