ANC Visualization

NeutroFeverGuard.xcodeproj/project.pbxproj

@@ -107,8 +107,6 @@
 		EB5D7CF92D8108BC0046BF8E /* AccountButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9DFE8A82ABE551400428242 /* AccountButton.swift */; };
 		EB6FDBCE2D80133A008E9F90 /* HKVisualization.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB6FDBCB2D80133A008E9F90 /* HKVisualization.swift */; };
 		EB6FDBCF2D80133A008E9F90 /* HKVisualizationItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB6FDBCC2D80133A008E9F90 /* HKVisualizationItem.swift */; };
-		EB6FDBD02D80133A008E9F90 /* HKVisualization.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB6FDBCB2D80133A008E9F90 /* HKVisualization.swift */; };
-		EB6FDBD12D80133A008E9F90 /* HKVisualizationItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB6FDBCC2D80133A008E9F90 /* HKVisualizationItem.swift */; };
 		EBFA80652D81FBE600596C3C /* FeatureFlags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC3E29EDD7ED004B9AB4 /* FeatureFlags.swift */; };
 		F223937A2D5D4095006C8EB4 /* DataError.swift in Sources */ = {isa = PBXBuildFile; fileRef = F22393792D5D4092006C8EB4 /* DataError.swift */; };
 		F268C4562D7F928C0020026F /* SymptomManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F268C4552D7F928B0020026F /* SymptomManager.swift */; };
@@ -718,8 +716,6 @@
 				EB02C6612D5D52E90035AA89 /* NeutroFeverGuardTests.swift in Sources */,
 				B0DF8DFD2D7C123200581A00 /* HealthDataFetchable.swift in Sources */,
 				B0DF8DF72D7BFEFB00581A00 /* FeverMonitorTests.swift in Sources */,
-				EB6FDBD02D80133A008E9F90 /* HKVisualization.swift in Sources */,
-				EB6FDBD12D80133A008E9F90 /* HKVisualizationItem.swift in Sources */,
 				B03D0E482D7D24AA0024F2CA /* DataError.swift in Sources */,
 				EBFA80652D81FBE600596C3C /* FeatureFlags.swift in Sources */,
 				C4C8A3B32D71204200F313AE /* HelperFuncTests.swift in Sources */,

NeutroFeverGuard/DataType.swift

@@ -132,7 +132,7 @@ struct BloodPressureEntry {
  - Lab values: include the number associated with the lab name above
  */
 
-struct LabEntry: Codable {
+struct LabEntry: Codable, Equatable {
     var date: Date
     var values: [LabTestType: Double]
 

NeutroFeverGuard/HKVisualization.swift

@@ -1,5 +1,5 @@
-// periphery:ignore all
 // swiftlint:disable all
+// periphery:ignore all
 // This source file is part of the NeutroFeverGuard based on the Stanford Spezi Template Application project
 //
 // SPDX-FileCopyrightText: 2025 Stanford University
@@ -12,7 +12,16 @@
 import SpeziAccount
 import SwiftUI
 
-// Parses the raw HealthKit data.
+
+struct HKData: Identifiable, Codable {
+    var id = UUID()
+    var date: Date
+    var sumValue: Double
+    var avgValue: Double
+    var minValue: Double
+    var maxValue: Double
+}
+
 func parseSampleQueryData(results: [HKSample], quantityTypeIDF: HKQuantityTypeIdentifier) -> [HKData] {
     // Retrieve quantity value and time for each data point.
 
@@ -79,23 +88,16 @@
     }
 }
 
-struct HKData: Identifiable {
-    var date: Date
-    var id = UUID()
-    var sumValue: Double
-    var avgValue: Double
-    var minValue: Double
-    var maxValue: Double
-}
-
 struct HKVisualization: View {
-    // swiftlint:disable closure_body_length
+    @Environment(LabResultsManager.self) private var labResultsManager
     @State var bodyTemperatureData: [HKData] = []
     @State var heartRateData: [HKData] = []
     @State var oxygenSaturationData: [HKData] = []
     @State var heartRateScatterData: [HKData] = []
     @State var oxygenSaturationScatterData: [HKData] = []
     @State var bodyTemperatureScatterData: [HKData] = []
+    @State var neutrophilData: [HKData] = []
+    @State var neutrophilScatterData: [HKData] = []
 
     var vizList: some View {
         self.readAllHKData()
@@ -106,7 +108,7 @@
                         data: heartRateData,
                         xName: "Time",
                         yName: "Heart Rate (bpm)",
-                        title: "Heart Rate Over Time",
+                        title: "Heart Rate",
                         threshold: 100,
                         scatterData: heartRateScatterData
                     )
@@ -121,7 +123,7 @@
                         data: bodyTemperatureData,
                         xName: "Time",
                         yName: "Body Temperature (°F)",
-                        title: "Body Temperature Over Time",
+                        title: "Body Temperature",
                         threshold: 99.0,
                         scatterData: bodyTemperatureScatterData
                     )
@@ -136,7 +138,7 @@
                         data: oxygenSaturationData,
                         xName: "Time",
                         yName: "Oxygen Saturation (%)",
-                        title: "Oxygen Saturation Over Time",
+                        title: "Oxygen Saturation",
                         threshold: 94.0,
                         scatterData: oxygenSaturationScatterData
                     )
@@ -145,6 +147,21 @@
                         .foregroundColor(.gray)
                 }
             }
+            Section {
+                if !neutrophilData.isEmpty {
+                    HKVisualizationItem(
+                        data: neutrophilData,
+                        xName: "Date",
+                        yName: "Neutrophil Count",
+                        title: "Absolute Neutrophil Count",
+                        threshold: 500, // Adjust the threshold if necessary
+                        scatterData: neutrophilScatterData
+                    )
+                } else {
+                    Text("No neutrophil count data available.")
+                        .foregroundColor(.gray)
+                }
+            }
         }
     }
 
@@ -164,6 +181,8 @@
             .onAppear {
                 // Ensure that data up-to-date when the view is activated.
                 self.readAllHKData(ensureUpdate: true)
+                labResultsManager.loadLabResults()
+                loadNeutrophilData() // Ensure this is called
             }
             .toolbar {
                 if account != nil {
@@ -173,6 +192,41 @@
         }
     }
 
+    private func loadNeutrophilData() {
+        if FeatureFlags.mockVizData {
+            loadMockDataNew()
+            return
+        }
+        let rawData = labResultsManager.getAllAncValues().filter {
+            $0.date >= Calendar.current.date(byAdding: .day, value: -7, to: Date()) ?? Date()
+        }
+
+        // Convert to HKData for bar plot
+        neutrophilData = rawData.map { record in
+            HKData(
+                date: record.date,
+                sumValue: record.ancValue,
+                avgValue: record.ancValue,
+                minValue: record.ancValue,
+                maxValue: record.ancValue
+            )
+        }
+
+        // Create scatter data (with some random variation to separate points)
+        neutrophilScatterData = rawData.map { record in
+            HKData(
+                date: record.date,
+                sumValue: record.ancValue + Double.random(in: -0.5...0.5), // Add slight variation for visualization
+                avgValue: -1.0,
+                minValue: -1.0,
+                maxValue: -1.0
+            )
+        }
+
+        print("✅ Converted neutrophil data: \(neutrophilData)")
+        print("✅ Scatter neutrophil data: \(neutrophilScatterData)")
+    }
+
     func readAllHKData(ensureUpdate: Bool = false) {
         if FeatureFlags.mockVizData {
             loadMockDataNew()
@@ -331,7 +385,8 @@
         self.heartRateData = minMaxAvgStatData
         self.bodyTemperatureData = minMaxAvgStatData
         self.oxygenSaturationData = minMaxAvgStatData
-
+        self.neutrophilData = [HKData(date: today, sumValue: 0, avgValue: 500, minValue: 1, maxValue: 1000)]
+
         // ✅ Heart Rate Scatter Data (60-100 bpm normal range)
         self.heartRateScatterData = [
             HKData(date: today, sumValue: 75, avgValue: 75, minValue: 75, maxValue: 75),
@@ -352,8 +407,24 @@
             HKData(date: yesterday, sumValue: 97, avgValue: 97, minValue: 97, maxValue: 97),
             HKData(date: twoDaysAgo, sumValue: 96, avgValue: 96, minValue: 96, maxValue: 96)
         ]
+
+        let mockNeutrophilData = [
+                (date: today, wbc: 1000, neutrophils: 50),
+                (date: yesterday, wbc: 1000, neutrophils: 5),
+                (date: twoDaysAgo, wbc: 1200, neutrophils: 20)
+        ]
+
+        self.neutrophilScatterData = mockNeutrophilData.map { record in
+            let ancValue = (Double(record.neutrophils) / 100.0) * Double(record.wbc)
+            return HKData(
+                date: record.date,
+                sumValue: ancValue,
+                avgValue: ancValue,
+                minValue: ancValue,
+                maxValue: ancValue
+            )
+        }
     }
-    // swiftlint:enable closure_body_length
 }
 
 func parseStat(statistics: HKStatistics, quantityTypeIDF: HKQuantityTypeIdentifier) -> HKData? {
@@ -392,7 +463,3 @@
         return -1.0
     }
 }
-
-#Preview {
-
-}

NeutroFeverGuard/HKVisualizationItem.swift

@@ -1,5 +1,3 @@
-// swiftlint:disable all
-// periphery:ignore all
 // This source file is part of the NeutroFeverGuard based on the Stanford Spezi Template Application project
 //
 // SPDX-FileCopyrightText: 2025 Stanford University
@@ -12,8 +10,6 @@ import Foundation
 import SwiftUI
 
 struct HKVisualizationItem: View {
-    // periphery:ignore
-    let id = UUID()
     let data: [HKData]
     let xName: LocalizedStringResource
     let yName: LocalizedStringResource

NeutroFeverGuard/LabResultsManager.swift

@@ -42,7 +42,7 @@
         loadLabResults()  // Refresh lab results
     }
 
-    private func loadLabResults() {
+    func loadLabResults() {
         var results: [LabEntry] = []
 
         do {
@@ -120,6 +120,20 @@
         }
         return (neutrophils / 100.0) * wbc
     }
+
+    func getAllAncValues() -> [(date: Date, ancValue: Double)] {
+        var ancValues: [(date: Date, ancValue: Double)] = []
+
+        for record in labRecords {
+            if let neutrophils = record.values[.neutrophils],
+               let wbc = record.values[.whiteBloodCell] {
+                let ancValue = (neutrophils / 100.0) * wbc
+                ancValues.append((date: record.date, ancValue: ancValue))
+            }
+        }
+
+        return ancValues
+    }
 
     func getANCStatus() -> (text: String, color: Color) {
         guard let ancValue = getAncValue() else {

NeutroFeverGuard/Resources/Localizable.xcstrings

@@ -59,6 +59,9 @@
     },
     "1-10" : {
 
+    },
+    "Absolute Neutrophil Count" : {
+
     },
     "Absolute Neutrophil Counts" : {
       "localizations" : {
@@ -154,6 +157,9 @@
     },
     "Bluetooth Devices" : {
 
+    },
+    "Body Temperature" : {
+
     },
     "Body Temperature (°F)" : {
       "localizations" : {
@@ -166,6 +172,7 @@
       }
     },
     "Body Temperature Over Time" : {
+      "extractionState" : "stale",
       "localizations" : {
         "en" : {
           "stringUnit" : {
@@ -371,6 +378,9 @@
           }
         }
       }
+    },
+    "Heart Rate" : {
+
     },
     "Heart Rate (bpm)" : {
       "localizations" : {
@@ -383,6 +393,7 @@
       }
     },
     "Heart Rate Over Time" : {
+      "extractionState" : "stale",
       "localizations" : {
         "en" : {
           "stringUnit" : {
@@ -639,6 +650,9 @@
           }
         }
       }
+    },
+    "Neutrophil Count" : {
+
     },
     "Next" : {
       "localizations" : {
@@ -691,6 +705,9 @@
     },
     "No medications recorded" : {
 
+    },
+    "No neutrophil count data available." : {
+
     },
     "No oxygen saturation data available." : {
       "localizations" : {
@@ -748,6 +765,9 @@
     },
     "Other factors" : {
 
+    },
+    "Oxygen Saturation" : {
+
     },
     "Oxygen Saturation (%)" : {
       "localizations" : {
@@ -760,6 +780,7 @@
       }
     },
     "Oxygen Saturation Over Time" : {
+      "extractionState" : "stale",
       "localizations" : {
         "en" : {
           "stringUnit" : {