Added ANC Visualization

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

@@ -89,13 +89,15 @@
 }
 
 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()
@@ -145,7 +147,21 @@
                         .foregroundColor(.gray)
                 }
             }
-        }
+            Section {
+                if !neutrophilData.isEmpty {
+                    HKVisualizationItem(
+                        data: neutrophilData,
+                        xName: "Date",
+                        yName: "Neutrophil Count",
+                        title: "Neutrophil Count Over Past Week",
+                        threshold: 500, // Adjust the threshold if necessary
+                        scatterData: neutrophilScatterData
+                    )
+                } else {
+                    Text("No neutrophil count data available.")
+                        .foregroundColor(.gray)
+                }
+            }        }
     }
 
     @Environment(Account.self) private var account: Account?
@@ -164,6 +180,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 +191,49 @@
         }
     }
 
+    private func loadNeutrophilData() {
+        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)")
+    }
+
+    private func getNeutrophilCountsForPastWeek() -> [(date: Date, ancValue: Double)] {
+        let oneWeekAgo = Calendar.current.date(byAdding: .day, value: -7, to: Date()) ?? Date()
+        let allValues = labResultsManager.getAllAncValues()
+
+        print("🔍 All ANC Values: \(allValues)")
+
+        let filteredValues = allValues.filter { $0.date >= oneWeekAgo }
+        print("✅ Filtered ANC Values: \(filteredValues)")
+
+        return filteredValues
+    }
+
     func readAllHKData(ensureUpdate: Bool = false) {
         if FeatureFlags.mockVizData {
             loadMockDataNew()

NeutroFeverGuard/LabResultsManager.swift

@@ -42,7 +42,7 @@ class LabResultsManager: Module, EnvironmentAccessible {
         loadLabResults()  // Refresh lab results
     }
 
-    private func loadLabResults() {
+    func loadLabResults() {
         var results: [LabEntry] = []
 
         do {
@@ -120,6 +120,20 @@ class LabResultsManager: Module, EnvironmentAccessible {
         }
         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

@@ -639,6 +639,12 @@
           }
         }
       }
+    },
+    "Neutrophil Count" : {
+
+    },
+    "Neutrophil Count Over Past Week" : {
+
     },
     "Next" : {
       "localizations" : {
@@ -691,6 +697,9 @@
     },
     "No medications recorded" : {
 
+    },
+    "No neutrophil count data available." : {
+
     },
     "No oxygen saturation data available." : {
       "localizations" : {

NeutroFeverGuardUITests/HKVisualizationHKTests.swift

@@ -32,5 +32,6 @@ class HKVisualizationHKTests: XCTestCase {
         XCTAssertTrue(app.staticTexts["No heart rate data available."].waitForExistence(timeout: 2))
         XCTAssertTrue(app.staticTexts["No body temperature data available."].waitForExistence(timeout: 2))
         XCTAssertTrue(app.staticTexts["No oxygen saturation data available."].waitForExistence(timeout: 2))
+        XCTAssertTrue(app.staticTexts["No neutrophil count data available."].waitForExistence(timeout: 2))
     }
 }