ANC Visualization

NeutroFeverGuard.xcodeproj/project.pbxproj

@@ -107,7 +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 */; };
@@ -718,7 +717,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 */,

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 HKData: Identifiable {
 }
 
 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 @@ struct HKVisualization: View {
                         data: heartRateData,
                         xName: "Time",
                         yName: "Heart Rate (bpm)",
-                        title: "Heart Rate Over Time",
+                        title: "Heart Rate",
                         threshold: 100,
                         scatterData: heartRateScatterData
                     )
@@ -121,7 +123,7 @@ struct HKVisualization: View {
                         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 @@ struct HKVisualization: View {
                         data: oxygenSaturationData,
                         xName: "Time",
                         yName: "Oxygen Saturation (%)",
-                        title: "Oxygen Saturation Over Time",
+                        title: "Oxygen Saturation",
                         threshold: 94.0,
                         scatterData: oxygenSaturationScatterData
                     )
@@ -145,7 +147,21 @@ struct HKVisualization: View {
                         .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)
+                }
+            }        }
     }
 
     @Environment(Account.self) private var account: Account?
@@ -164,6 +180,8 @@ struct HKVisualization: View {
             .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 @@ struct HKVisualization: View {
         }
     }
 
+    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()
@@ -352,8 +413,24 @@ struct HKVisualization: View {
             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: 5000, neutrophils: 50),
+                (date: yesterday, wbc: 4800, neutrophils: 48),
+                (date: twoDaysAgo, wbc: 5100, neutrophils: 52)
+        ]
+
+        self.neutrophilData = 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? {

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))
     }
 }

NeutroFeverGuardUITests/HKVisualizationTests.swift

@@ -41,12 +41,12 @@ class HKVisualizationTests: XCTestCase {
         try app.handleHealthKitAuthorization()
 
         // Verify Plot Titles Exists
-        XCTAssertTrue(app.staticTexts["Oxygen Saturation Over Time"].exists)
-        XCTAssertTrue(app.staticTexts["Body Temperature Over Time"].exists)
-        XCTAssertTrue(app.staticTexts["Heart Rate Over Time"].exists)
+        XCTAssertTrue(app.staticTexts["Oxygen Saturation"].exists)
+        XCTAssertTrue(app.staticTexts["Body Temperature"].exists)
+        XCTAssertTrue(app.staticTexts["Heart Rate"].exists)
 
         // Wait for chart to appear
-        let chartTitle = app.staticTexts["Oxygen Saturation Over Time"]
+        let chartTitle = app.staticTexts["Oxygen Saturation"]
         XCTAssertTrue(chartTitle.waitForExistence(timeout: 5))
 
         // Get the frame of the chart title
@@ -93,7 +93,7 @@ class HKVisualizationTests: XCTestCase {
         try app.handleHealthKitAuthorization()
 
         // Check for Heart Rate Chart
-        let heartRateChartTitle = app.staticTexts["Heart Rate Over Time"]
+        let heartRateChartTitle = app.staticTexts["Heart Rate"]
         XCTAssertTrue(heartRateChartTitle.waitForExistence(timeout: 5), "Heart Rate chart title should exist")
 
         let heartRateThreshold = app.otherElements["Threshold"]
@@ -111,7 +111,7 @@ class HKVisualizationTests: XCTestCase {
         try app.handleHealthKitAuthorization()
 
         // Wait for chart to appear
-        let chartTitle = app.staticTexts["Body Temperature Over Time"]
+        let chartTitle = app.staticTexts["Body Temperature"]
         XCTAssertTrue(chartTitle.waitForExistence(timeout: 5))
 
         // Get the frame of the chart title
@@ -158,7 +158,7 @@ class HKVisualizationTests: XCTestCase {
         try app.handleHealthKitAuthorization()
 
         // Wait for chart to appear
-        let chartTitle = app.staticTexts["Heart Rate Over Time"]
+        let chartTitle = app.staticTexts["Heart Rate"]
         XCTAssertTrue(chartTitle.waitForExistence(timeout: 5))
 
         // Get the frame of the chart title
@@ -205,24 +205,87 @@ class HKVisualizationTests: XCTestCase {
         try app.handleHealthKitAuthorization()
 
         // Check for Heart Rate Chart
-        let heartRateChartTitle = app.staticTexts["Heart Rate Over Time"]
+        let heartRateChartTitle = app.staticTexts["Heart Rate"]
         XCTAssertTrue(heartRateChartTitle.waitForExistence(timeout: 5), "Heart Rate chart title should exist")
 
         let heartRateThreshold = app.otherElements["Threshold"]
         XCTAssertTrue(heartRateThreshold.waitForExistence(timeout: 2), "Heart Rate threshold line should be visible.")
 
         // Check for Body Temperature Chart
-        let bodyTempChartTitle = app.staticTexts["Body Temperature Over Time"]
+        let bodyTempChartTitle = app.staticTexts["Body Temperature"]
         XCTAssertTrue(bodyTempChartTitle.waitForExistence(timeout: 5), "Body Temperature chart title should exist")
 
         let bodyTempThreshold = app.otherElements["Threshold"]
         XCTAssertTrue(bodyTempThreshold.waitForExistence(timeout: 2), "Body Temperature threshold line should be visible.")
 
         // Check for Oxygen Saturation Chart
-        let oxygenSatChartTitle = app.staticTexts["Oxygen Saturation Over Time"]
+        let oxygenSatChartTitle = app.staticTexts["Oxygen Saturation"]
         XCTAssertTrue(oxygenSatChartTitle.waitForExistence(timeout: 5), "Oxygen Saturation chart title should exist")
 
         let oxygenSatThreshold = app.otherElements["Threshold"]
         XCTAssertTrue(oxygenSatThreshold.waitForExistence(timeout: 2), "Oxygen Saturation threshold line should be visible.")
     }
+
+    @MainActor
+    func testHealthDashboardNeutrophils() throws {
+        let app = XCUIApplication()
+
+        XCTAssertTrue(app.wait(for: .runningForeground, timeout: 2.0))
+
+        XCTAssertTrue(app.tabBars["Tab Bar"].buttons["Dashboard"].waitForExistence(timeout: 2))
+        app.tabBars["Tab Bar"].buttons["Dashboard"].tap()
+        try app.handleHealthKitAuthorization()
+
+        // ✅ Check if "Neutrophil Count Over Past Week" chart exists
+        let chartTitle = app.staticTexts["Absolute Neutrophil Count"]
+        XCTAssertTrue(chartTitle.waitForExistence(timeout: 5), "Neutrophil chart title should exist")
+
+        // ✅ Tap on the chart to bring up the summary view
+        let frame = chartTitle.frame
+        let tapPoint = CGPoint(x: frame.maxX - 50, y: frame.maxY + 100)
+        app.coordinate(withNormalizedOffset: .zero).withOffset(CGVector(dx: tapPoint.x, dy: tapPoint.y)).tap()
+
+        // ✅ Verify summary date (should be today's date)
+        let today = Date()
+        let formatter = DateFormatter()
+        formatter.dateStyle = .medium
+        formatter.timeStyle = .none
+        let dateStr = formatter.string(from: today)
+
+        let summaryDate = app.staticTexts["Summary_Date"]
+        XCTAssertTrue(summaryDate.exists, "Summary date label should exist")
+        XCTAssertEqual(summaryDate.label, "Summary: \(dateStr)")
+
+        // ✅ Check the summary ANC values
+        let summaryAverage = app.staticTexts["Summary_Average"]
+        XCTAssertTrue(summaryAverage.exists, "Average ANC value should exist")
+        XCTAssertEqual(summaryAverage.label, "Average: 2500.0")  // ✅ Adjusted to mock value
+
+        let summaryMax = app.staticTexts["Summary_Max"]
+        XCTAssertTrue(summaryMax.exists, "Max ANC value should exist")
+        XCTAssertEqual(summaryMax.label, "Max value: 2652")  // ✅ Adjusted to mock value
+
+        let summaryMin = app.staticTexts["Summary_Min"]
+        XCTAssertTrue(summaryMin.exists, "Min ANC value should exist")
+        XCTAssertEqual(summaryMin.label, "Min value: 2304")  // ✅ Adjusted to mock value
+    }
+
+    @MainActor
+    func testThresholdNeutrophils() throws {
+        let app = XCUIApplication()
+
+        XCTAssertTrue(app.wait(for: .runningForeground, timeout: 2.0))
+
+        XCTAssertTrue(app.tabBars["Tab Bar"].buttons["Dashboard"].waitForExistence(timeout: 2))
+        app.tabBars["Tab Bar"].buttons["Dashboard"].tap()
+        try app.handleHealthKitAuthorization()
+
+        // ✅ Check if "Neutrophil Count Over Past Week" chart exists
+        let chartTitle = app.staticTexts["Absolute Neutrophil Count"]
+        XCTAssertTrue(chartTitle.waitForExistence(timeout: 5), "Neutrophil chart title should exist")
+
+        // ✅ Verify threshold line exists (should be around **500 ANC**)
+        let neutrophilThreshold = app.otherElements["Threshold"]
+        XCTAssertTrue(neutrophilThreshold.waitForExistence(timeout: 2), "Neutrophil threshold line should be visible.")
+    }
 }