Change names. Remove unnecessary jsons from View. Remove some non working code.

FreeAPS/Sources/APS/APSManager.swift

@@ -764,6 +764,7 @@ final class BaseAPSManager: APSManager, Injectable {
         // Retrieve the loopStats data
         let lsData = storage.retrieve(OpenAPS.Monitor.loopStats, as: [LoopStats].self)?
             .sorted { $0.createdAt > $1.createdAt } ?? []
+
         var successRate: Double?
         var roundedMinutesBetweenLoops: Double?
 
@@ -782,7 +783,7 @@ final class BaseAPSManager: APSManager, Injectable {
             successRate = (successNR / Double(i)) * 100
 
             let loopDataTime = lsData[0].createdAt - lsData[Int(i) - 1].createdAt
-            let minutesBetweenLoops = (loopDataTime.timeInterval / Double(i)) / 60
+            let minutesBetweenLoops = (loopDataTime.timeInterval / Double(successNR)) / 60
             roundedMinutesBetweenLoops = round(minutesBetweenLoops * 10) / 10
         }
 
@@ -888,10 +889,10 @@ final class BaseAPSManager: APSManager, Injectable {
 
         let dailystat = DailyStats(
             createdAt: Date(),
-            FAX_Build_Version: version ?? "",
-            FAX_Build_Number: build ?? "1",
-            FAX_Branch: branch ?? "N/A",
-            FAX_Build_Date: buildDate,
+            Build_Version: version ?? "",
+            Build_Number: build ?? "1",
+            Branch: branch ?? "N/A",
+            Build_Date: buildDate,
             Algorithm: algo_,
             AdjustmentFactor: af,
             Pump: pump_,
@@ -906,21 +907,14 @@ final class BaseAPSManager: APSManager, Injectable {
             Loop_Cycles: "Success Rate : \(round(successRate ?? 0)) %. Average Time Between Loop Cycles: \(roundedMinutesBetweenLoops ?? 0) min."
         )
 
-        let savedDailyStas = storage.retrieve(OpenAPS.Monitor.dailyStats, as: [DailyStats].self)?
-            .sorted { $0.createdAt > $1.createdAt } ?? []
-        let lastDailyStatsEntry = savedDailyStas.count - 1
         var uniqeEvents: [DailyStats] = []
 
-        if lastDailyStatsEntry < 0 {
-            storage.save(dailystat, as: file)
-        } else if Date() > savedDailyStas[0].createdAt.addingTimeInterval(1.days.timeInterval) {
-            storage.transaction { storage in
-                storage.append(dailystat, to: file, uniqBy: \.createdAt)
-                uniqeEvents = storage.retrieve(file, as: [DailyStats].self)?
-                    .filter { $0.createdAt.addingTimeInterval(90.days.timeInterval) > Date() }
-                    .sorted { $0.createdAt > $1.createdAt } ?? []
-                storage.save(Array(uniqeEvents), as: file)
-            }
+        storage.transaction { storage in
+            storage.append(dailystat, to: file, uniqBy: \.createdAt)
+            uniqeEvents = storage.retrieve(file, as: [DailyStats].self)?
+                .filter { $0.createdAt.addingTimeInterval(24.hours.timeInterval) > Date() }
+                .sorted { $0.createdAt > $1.createdAt } ?? []
+            storage.save(Array(uniqeEvents), as: file)
         }
     }
 

FreeAPS/Sources/APS/OpenAPS/Constants.swift

@@ -57,7 +57,7 @@ extension OpenAPS {
         static let tdd = "monitor/tdd.json"
         static let tdd_averages = "monitor/tdd_averages.json"
         static let alertHistory = "monitor/alerthistory.json"
-        static let dailyStats = "monitor/dailyStats.json"
+        static let dailyStats = "monitor/statistics.json"
         static let tenDaysStats = "monitor/tenDaysStats.json"
         static let loopStats = "monitor/loopStats.json"
     }

FreeAPS/Sources/Models/DailyStats.swift

@@ -2,10 +2,10 @@ import Foundation
 
 struct DailyStats: JSON, Equatable {
     var createdAt: Date
-    var FAX_Build_Version: String
-    var FAX_Build_Number: String
-    var FAX_Branch: String
-    var FAX_Build_Date: Date
+    var Build_Version: String
+    var Build_Number: String
+    var Branch: String
+    var Build_Date: Date
     var Algorithm: String
     var AdjustmentFactor: Decimal
     var Pump: String
@@ -21,10 +21,10 @@ struct DailyStats: JSON, Equatable {
 
     init(
         createdAt: Date,
-        FAX_Build_Version: String,
-        FAX_Build_Number: String,
-        FAX_Branch: String,
-        FAX_Build_Date: Date,
+        Build_Version: String,
+        Build_Number: String,
+        Branch: String,
+        Build_Date: Date,
         Algorithm: String,
         AdjustmentFactor: Decimal,
         Pump: String,
@@ -39,10 +39,10 @@ struct DailyStats: JSON, Equatable {
         Loop_Cycles: String
     ) {
         self.createdAt = createdAt
-        self.FAX_Build_Version = FAX_Build_Version
-        self.FAX_Build_Number = FAX_Build_Number
-        self.FAX_Branch = FAX_Branch
-        self.FAX_Build_Date = FAX_Build_Date
+        self.Build_Version = Build_Version
+        self.Build_Number = Build_Number
+        self.Branch = Branch
+        self.Build_Date = Build_Date
         self.Algorithm = Algorithm
         self.AdjustmentFactor = AdjustmentFactor
         self.Pump = Pump
@@ -69,10 +69,10 @@ struct DailyStats: JSON, Equatable {
 extension DailyStats {
     private enum CodingKeys: String, CodingKey {
         case createdAt
-        case FAX_Build_Version
-        case FAX_Build_Number
-        case FAX_Branch
-        case FAX_Build_Date
+        case Build_Version
+        case Build_Number
+        case Branch
+        case Build_Date
         case Algorithm
         case AdjustmentFactor
         case Pump

FreeAPS/Sources/Modules/Settings/View/SettingsRootView.swift

@@ -112,12 +112,10 @@ extension Settings {
                                 .navigationLink(to: .configEditor(file: OpenAPS.Middleware.determineBasal), from: self)
                             Text("TDD")
                                 .navigationLink(to: .configEditor(file: OpenAPS.Monitor.tdd), from: self)
-                            Text("TDD Averages")
-                                .navigationLink(to: .configEditor(file: OpenAPS.Monitor.tdd_averages), from: self)
                             Text("Statistics")
                                 .navigationLink(to: .configEditor(file: OpenAPS.Monitor.dailyStats), from: self)
-                            Text("Ten Days Data")
-                                .navigationLink(to: .configEditor(file: OpenAPS.Monitor.tenDaysStats), from: self)
+                            Text("Loop Cycles")
+                                .navigationLink(to: .configEditor(file: OpenAPS.Monitor.loopStats), from: self)
                             Text("Edit settings json")
                                 .navigationLink(to: .configEditor(file: OpenAPS.FreeAPS.settings), from: self)
                         }