Updated dashboard

CS342 · Feb 22, 2025 · bbe9e7c · bbe9e7c
1 parent d093542
commit bbe9e7c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 21 deletions.
diff --git a/NeutroFeverGuard.xcodeproj/xcshareddata/xcschemes/NeutroFeverGuard.xcscheme b/NeutroFeverGuard.xcodeproj/xcshareddata/xcschemes/NeutroFeverGuard.xcscheme
@@ -87,7 +87,7 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--skipOnboarding"
-            isEnabled = "NO">
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--testSchedule"

diff --git a/NeutroFeverGuard/HealthKitVisualizations/HKVisualization.swift b/NeutroFeverGuard/HealthKitVisualizations/HKVisualization.swift
@@ -28,7 +28,7 @@ struct HKVisualization: View {
     @State var oxygenSaturationScatterData: [HKData] = []
     @State var bodyTemperatureScatterData: [HKData] = []
 
-    var public body: some View {
+    var body: some View {
         // swiftlint:disable closure_body_length
         NavigationStack {
             List {
@@ -40,7 +40,7 @@ struct HKVisualization: View {
                             yName: "Heart Rate (bpm)",
                             title: "Heart Rate Over Time",
                             threshold: 100,
-                            scatterData: heartRateData
+                            scatterData: heartRateScatterData
                         )
                     } else {
                         Text("No heart rate data available.")
@@ -53,9 +53,9 @@ struct HKVisualization: View {
                             data: bodyTemperatureData,
                             xName: "Time",
                             yName: "Body Temperature (°F)",
-                            title: "Basal Body Temperature Over Time",
+                            title: "Body Temperature Over Time",
                             threshold: 99.0,
-                            scatterData: bodyTemperatureData
+                            scatterData: bodyTemperatureScatterData
                         )
                     } else {
                         Text("No body temperature data available.")
@@ -70,7 +70,7 @@ struct HKVisualization: View {
                             yName: "Oxygen Saturation (%)",
                             title: "Oxygen Saturation Over Time",
                             threshold: 94.0,
-                            scatterData: oxygenSaturationData
+                            scatterData: oxygenSaturationScatterData
                         )
                     } else {
                         Text("No oxygen saturation data available.")
@@ -233,7 +233,7 @@ struct HKVisualization: View {
                      if quantityTypeIDF == HKQuantityTypeIdentifier.oxygenSaturation {
                          self.oxygenSaturationScatterData = collectedData
                      } else if quantityTypeIDF == HKQuantityTypeIdentifier.heartRate {
-                        self.heartRateData = collectedData
+                        self.heartRateScatterData = collectedData
                      } else if quantityTypeIDF == HKQuantityTypeIdentifier.bodyTemperature {
                          self.bodyTemperatureScatterData = collectedData
                      }

diff --git a/NeutroFeverGuard/HealthKitVisualizations/HKVisualizationItem.swift b/NeutroFeverGuard/HealthKitVisualizations/HKVisualizationItem.swift
@@ -43,16 +43,16 @@ struct HKVisualizationItem: View {
         // Helper text to show data when clicked.
         if let elm = selectedElement, elm.sumValue == 0 {
             let details = (
-                String(localized: "HKVIZ_SUMMARY", locale: locale) +
+                String(localized: "HKVIZ_SUMMARY: ", locale: locale) +
                 String(elm.date.formatted(.dateTime.year().month().day())) +
                 ":\n" +
-                String(localized: "HKVIZ_AVERAGE_STRING", locale: locale) +
+                String(localized: "HKVIZ_AVERAGE_STRING: ", locale: locale) +
                 String(round(elm.avgValue * 10) / 10) +
                 ", " +
-                String(localized: "HKVIZ_MAX_STRING", locale: locale) +
+                String(localized: "HKVIZ_MAX_STRING: ", locale: locale) +
                 String(Int(round(elm.maxValue))) +
                 ", " +
-                String(localized: "HKVIZ_MIN_STRING", locale: locale) +
+                String(localized: "HKVIZ_MIN_STRING: ", locale: locale) +
                 String(Int(round(elm.minValue)))
             )
             Text(details)
@@ -147,7 +147,7 @@ struct HKVisualizationItem: View {
         xName: LocalizedStringResource,
         yName: LocalizedStringResource,
         title: LocalizedStringResource,
-        threshold: Double = -1.0,
+        threshold: Double = 25,
         helperText: LocalizedStringResource? = nil,
         scatterData: [HKData] = []
     ) {

diff --git a/NeutroFeverGuard/NeutroFeverGuard.swift b/NeutroFeverGuard/NeutroFeverGuard.swift
@@ -22,9 +22,7 @@ struct NeutroFeverGuard: App {
         WindowGroup {
             ZStack {
                 if completedOnboardingFlow {
-                     // HKVisualization()
                       HomeView()
-                     // HKVisualizationItem(data: [], xName: "Preview x axis", yName: "Preview y axis", title: "Preview Title")
                 } else {
                     EmptyView()
                 }

diff --git a/NeutroFeverGuard/Resources/Localizable.xcstrings b/NeutroFeverGuard/Resources/Localizable.xcstrings
@@ -78,10 +78,10 @@
         }
       }
     },
-    "Basal Body Temperature Over Time" : {
+    "Body Temperature (°F)" : {
 
     },
-    "Body Temperature (°F)" : {
+    "Body Temperature Over Time" : {
 
     },
     "Cancel" : {
@@ -195,16 +195,16 @@
     "Heart Rate Over Time" : {
 
     },
-    "HKVIZ_AVERAGE_STRING" : {
+    "HKVIZ_AVERAGE_STRING: " : {
 
     },
-    "HKVIZ_MAX_STRING" : {
+    "HKVIZ_MAX_STRING: " : {
 
     },
-    "HKVIZ_MIN_STRING" : {
+    "HKVIZ_MIN_STRING: " : {
 
     },
-    "HKVIZ_SUMMARY" : {
+    "HKVIZ_SUMMARY: " : {
 
     },
     "HL7 FHIR" : {
@@ -342,7 +342,7 @@
         }
       }
     },
-    "No basal body temperature data available." : {
+    "No body temperature data available." : {
 
     },
     "No heart rate data available." : {