Combine lab results and medications into one page with two tabs, fix bug, revise ui tests (#35)

dusixian · web-flow · commit ce5ab1bb35ab · 2025-03-10T19:29:05.000-07:00
# *Combine lab results and medications into one page with two tabs, fix bug, revise ui tests* ## ♻️ Current situation & Problem Currently, lab results and medications are on separate pages. Since we plan to add a dashboard and a connect page, we want to keep the total number of main pages to five. Given the functional similarities between lab results and medications, it makes sense to combine them into a single page with tabs for better organization and navigation. ## ⚙️ Release Notes 1. New Records Page: - Combined lab results and medications into a single page with two tabs. - Users can switch between lab results and medications without navigating to different pages. 2. UI Improvements: - Replaced swipe-to-edit/delete actions for medications with direct "Edit" and "Delete" buttons to avoid conflicts with tab gestures. - Added icons and spacing to make the new buttons more intuitive and clean. 3. Bug Fixes: - Found and Fixed sorting issue in `LabResultsManager` to ensure records are ordered chronologically. 4. Updated UI Tests: - Refactored tests for lab results and medication views to reflect the new tabbed interface. - Added checks for the presence of the new buttons and verified the tab-switching behavior. <img width="385" alt="image" src="https://github.com/user-attachments/assets/a77888a9-b0a5-4846-9b1c-883b2abd0eb7" /> ## 📚 Documentation *Please ensure that you properly document any additions in conformance to [Spezi Documentation Guide](https://github.com/StanfordSpezi/.github/blob/main/DOCUMENTATIONGUIDE.md).* *You can use this section to describe your solution, but we encourage contributors to document your reasoning and changes using in-line documentation.* ## ✅ Testing *Please ensure that the PR meets the testing requirements set by CodeCov and that new functionality is appropriately tested.* *This section describes important information about the tests and why some elements might not be testable.* ## 📝 Code of Conduct & Contributing Guidelines By submitting creating this pull request, you agree to follow our [Code of Conduct](https://github.com/CS342/.github/blob/main/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/CS342/.github/blob/main/CONTRIBUTING.md): - [x] I agree to follow the [Code of Conduct](https://github.com/CS342/.github/blob/main/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/CS342/.github/blob/main/CONTRIBUTING.md).
diff --git a/NeutroFeverGuard.xcodeproj/project.pbxproj b/NeutroFeverGuard.xcodeproj/project.pbxproj
@@ -80,6 +80,7 @@
 		C42C1C6B2D7A985B00EA417F /* MedicationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42C1C6A2D7A985B00EA417F /* MedicationManager.swift */; };
 		C42C1C712D7AB84300EA417F /* MedicationViewUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42C1C702D7AB84300EA417F /* MedicationViewUITests.swift */; };
 		C42D4DA52D5AC89900B2A169 /* LabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42D4DA42D5AC89500B2A169 /* LabView.swift */; };
+		C48838FA2D7F849E00D25764 /* RecordsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48838F92D7F849800D25764 /* RecordsView.swift */; };
 		C49EC8342D501C62005C3495 /* DataType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49EC8332D501C5C005C3495 /* DataType.swift */; };
 		C49EC8382D5026EE005C3495 /* DataTypeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49EC8372D5026EE005C3495 /* DataTypeTest.swift */; };
 		C49EC8402D5033F9005C3495 /* AddDataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49EC83F2D5033F9005C3495 /* AddDataView.swift */; };
@@ -160,6 +161,7 @@
 		C42C1C6A2D7A985B00EA417F /* MedicationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MedicationManager.swift; sourceTree = "<group>"; };
 		C42C1C702D7AB84300EA417F /* MedicationViewUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MedicationViewUITests.swift; sourceTree = "<group>"; };
 		C42D4DA42D5AC89500B2A169 /* LabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabView.swift; sourceTree = "<group>"; };
+		C48838F92D7F849800D25764 /* RecordsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecordsView.swift; sourceTree = "<group>"; };
 		C49EC8332D501C5C005C3495 /* DataType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataType.swift; sourceTree = "<group>"; };
 		C49EC8372D5026EE005C3495 /* DataTypeTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataTypeTest.swift; sourceTree = "<group>"; };
 		C49EC83F2D5033F9005C3495 /* AddDataView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddDataView.swift; sourceTree = "<group>"; };
@@ -338,6 +340,7 @@
 				EB7D47E02D51433200CEDC78 /* HealthKitVisualizations */,
 				F22393792D5D4092006C8EB4 /* DataError.swift */,
 				C42D4DA42D5AC89500B2A169 /* LabView.swift */,
+				C48838F92D7F849800D25764 /* RecordsView.swift */,
 				B0C95E382D78D5F2007A4CA6 /* FeverMonitoring.swift */,
 				C42C1B302D782A7100EA417F /* MedicationView.swift */,
 				C4C0A78E2D518DB500F37EEC /* HelperFunc.swift */,
@@ -640,6 +643,7 @@
 				C49EC8402D5033F9005C3495 /* AddDataView.swift in Sources */,
 				C42D4DA52D5AC89900B2A169 /* LabView.swift in Sources */,
 				F2E6898F2D52ED8600869C4F /* HealthKitService.swift in Sources */,
+				C48838FA2D7F849E00D25764 /* RecordsView.swift in Sources */,
 				C49EC8342D501C62005C3495 /* DataType.swift in Sources */,
 				2FE5DC5329EDD7FA004B9AB4 /* Bundle+Questionnaire.swift in Sources */,
 				2F5E32BD297E05EA003432F8 /* NeutroFeverGuardDelegate.swift in Sources */,
diff --git a/NeutroFeverGuard.xcodeproj/xcshareddata/xcschemes/NeutroFeverGuard.xcscheme b/NeutroFeverGuard.xcodeproj/xcshareddata/xcschemes/NeutroFeverGuard.xcscheme
@@ -83,7 +83,7 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--showOnboarding"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--skipOnboarding"
diff --git a/NeutroFeverGuard/HomeView.swift b/NeutroFeverGuard/HomeView.swift
@@ -14,8 +14,9 @@ struct HomeView: View {
     enum Tabs: String {
 //        case dashboard
         case addData
-        case labResult
-        case medication
+//        case labResult
+//        case medication
+        case records
 //        case schedule
         case contact
     }
@@ -41,19 +42,12 @@ struct HomeView: View {
             .customizationID("home.addData")
             .accessibilityIdentifier("Add Data")
             
-            // Lab tab
-            Tab("Lab", systemImage: "flask", value: .labResult) {
-                LabView(presentingAccount: $presentingAccount)
+            // Record tab
+            Tab("Records", systemImage: "list.clipboard", value: .records) {
+                RecordsView(presentingAccount: $presentingAccount)
             }
-            .customizationID("home.lab")
-            .accessibilityIdentifier("Lab")
-            
-            // Medication tab
-            Tab("Medication", systemImage: "pills", value: .medication) {
-                MedicationView(presentingAccount: $presentingAccount)
-            }
-            .customizationID("home.medication")
-            .accessibilityIdentifier("Medication")
+            .customizationID("home.records")
+            .accessibilityIdentifier("Records")
             
             // Schedule tab
 //            Tab("Schedule", systemImage: "list.clipboard", value: .schedule) {
diff --git a/NeutroFeverGuard/LabResultsManager.swift b/NeutroFeverGuard/LabResultsManager.swift
@@ -57,6 +57,7 @@ class LabResultsManager: Module, EnvironmentAccessible {
             results = []
         }
         
+        results.sort { $0.date > $1.date }
         self.labRecords = results
         if let latestRecord = results.first {
             latestRecordedTime = formatDate(latestRecord.date)
diff --git a/NeutroFeverGuard/LabView.swift b/NeutroFeverGuard/LabView.swift
@@ -6,7 +6,6 @@
 // SPDX-License-Identifier: MIT
 //
 
-import SpeziAccount
 import SpeziLocalStorage
 import SwiftUI
 
@@ -122,24 +121,19 @@ struct LabResultDetailView: View {
 
 struct LabView: View {
     @Environment(LabResultsManager.self) private var labResultsManager
-    @Environment(Account.self) private var account: Account?
-    @Binding var presentingAccount: Bool
 //    @Environment(NeutroFeverGuardScheduler.self) private var scheduler
 
     var body: some View {
-        NavigationView {
-            List {
-                ancSection()
-                labHistorySection()
-            }
-            .listStyle(.insetGrouped)
-            .navigationTitle("Lab Results")
-            .background(Color(.systemGray6))
-            .toolbar { toolbarContent() }
-            .onAppear {
-                labResultsManager.refresh()
+        List {
+            ancSection()
+            labHistorySection()
+        }
+        .listStyle(.insetGrouped)
+        .navigationTitle("Lab Results")
+        .background(Color(.systemGray6))
+        .onAppear {
+            labResultsManager.refresh()
 //                scheduler.printUpcomingLabResultEvents()
-            }
         }
     }
     
@@ -170,16 +164,8 @@ struct LabView: View {
             }
         }
     }
-
-    private func toolbarContent() -> some ToolbarContent {
-        ToolbarItem {
-            if account != nil {
-                AccountButton(isPresented: $presentingAccount)
-            }
-        }
-    }
 }
 
 #Preview {
-    LabView(presentingAccount: .constant(false))
+    LabView()
 }
diff --git a/NeutroFeverGuard/MedicationManager.swift b/NeutroFeverGuard/MedicationManager.swift
@@ -58,8 +58,10 @@ class MedicationManager: Module, EnvironmentAccessible {
         saveMedResults()
     }
     
-    func deleteMedEntry(at offsets: IndexSet) {
-        medications.remove(atOffsets: offsets)
+    func deleteMedEntry(at index: Int) {
+        guard medications.indices.contains(index)
+            else { return }
+        medications.remove(at: index)
         saveMedResults()
     }
 
diff --git a/NeutroFeverGuard/MedicationView.swift b/NeutroFeverGuard/MedicationView.swift
@@ -110,47 +110,64 @@ struct MedicationEditForm: View {
 
 struct MedicationView: View {
     @Environment(MedicationManager.self) private var medicationManager
-    @Environment(Account.self) private var account: Account?
     @State private var isEditing = false
     @State private var editingMedicationIndex: Int = 0
-    @Binding var presentingAccount: Bool
+    @State private var deleteMedicationIndex: Int = 0
+    @State private var showDeleteAlert = false
 
     var body: some View {
-        NavigationView {
-            List {
-                if medicationManager.medications.isEmpty {
-                    Text("No medications recorded").foregroundColor(.gray)
-                } else {
-                    ForEach(Array(medicationManager.medications.enumerated()), id: \.element.date) { index, medication in
+        List {
+            if medicationManager.medications.isEmpty {
+                Text("No medications recorded").foregroundColor(.gray)
+            } else {
+                ForEach(Array(medicationManager.medications.enumerated()), id: \.element.date) { index, medication in
+                    HStack {
                         MedicationRow(medication: medication)
-                            .swipeActions(edge: .leading) {
-                                Button("Edit") {
-                                    editingMedicationIndex = index
-                                    isEditing = true
-                                }.tint(.blue)
+                        Spacer()
+                        VStack {
+                            Button("Edit") {
+                                editingMedicationIndex = index
+                                isEditing = true
                             }
+                            .buttonStyle(.plain)
+                            .foregroundColor(.blue)
+                            .padding(.bottom, 4)
+                            
+                            Button("Delete") {
+                                deleteMedicationIndex = index
+                                showDeleteAlert = true
+                            }
+                            .buttonStyle(.plain)
+                            .foregroundColor(.red)
+                        }
                     }
-                    .onDelete { offsets in medicationManager.deleteMedEntry(at: offsets) }
                 }
             }
-            .navigationTitle("Medication List")
-            .onAppear { medicationManager.refresh() }
-            .listStyle(.insetGrouped)
-            .background(Color(.systemGray6))
-            .toolbar { if account != nil { AccountButton(isPresented: $presentingAccount) } }
-            .sheet(isPresented: $isEditing) {
-                let index = editingMedicationIndex
-                MedicationEditForm(
-                    medication: medicationManager.medications[index],
-                    onSave: {updatedMedication in
-                        medicationManager.updateMedEntry(at: index, with: updatedMedication)
-                        isEditing = false
-                    },
-                    onCancel: {
-                        isEditing = false
-                    }
-                )
-            }
+        }
+        .navigationTitle("Medication List")
+        .onAppear { medicationManager.refresh() }
+        .listStyle(.insetGrouped)
+        .background(Color(.systemGray6))
+        .sheet(isPresented: $isEditing) {
+            let index = editingMedicationIndex
+            MedicationEditForm(
+                medication: medicationManager.medications[index],
+                onSave: {updatedMedication in
+                    medicationManager.updateMedEntry(at: index, with: updatedMedication)
+                    isEditing = false
+                },
+                onCancel: {
+                    isEditing = false
+                }
+            )
+        }
+        .alert("Delete Medication", isPresented: $showDeleteAlert) {
+                Button("Delete", role: .destructive) {
+                    medicationManager.deleteMedEntry(at: deleteMedicationIndex)
+                }.accessibilityIdentifier("MedDeleteAlertButton")
+                Button("Cancel", role: .cancel) {}
+        } message: {
+            Text("Are you sure you want to delete this medication record? This action cannot be undone.")
         }
     }
 }
diff --git a/NeutroFeverGuard/RecordsView.swift b/NeutroFeverGuard/RecordsView.swift
@@ -0,0 +1,55 @@
+//
+// This source file is part of the NeutroFeverGuard based on the Stanford Spezi Template Application project
+//
+// SPDX-FileCopyrightText: 2025 Stanford University
+//
+// SPDX-License-Identifier: MIT
+//
+
+import SpeziAccount
+import SpeziLocalStorage
+import SwiftUI
+
+enum HealthSection {
+    case labResults
+    case medications
+}
+
+struct RecordsView: View {
+    @Environment(Account.self) private var account: Account?
+    @Binding var presentingAccount: Bool
+    
+    @State private var selectedSection: HealthSection = .labResults
+    
+    var body: some View {
+        NavigationView {
+            VStack {
+                Picker("Select Section", selection: $selectedSection) {
+                    Text("Lab Results").tag(HealthSection.labResults)
+                    Text("Medications").tag(HealthSection.medications)
+                }
+                .pickerStyle(SegmentedPickerStyle())
+                .padding()
+
+                TabView(selection: $selectedSection) {
+                    LabView()
+                        .tag(HealthSection.labResults)
+                    MedicationView()
+                        .tag(HealthSection.medications)
+                }
+                .tabViewStyle(PageTabViewStyle(indexDisplayMode: .never))
+            }
+            .navigationTitle("Health Data")
+            .toolbar { toolbarContent() }
+            .background(Color(.systemGray6))
+        }
+    }
+    
+    private func toolbarContent() -> some ToolbarContent {
+        ToolbarItem {
+            if account != nil {
+                AccountButton(isPresented: $presentingAccount)
+            }
+        }
+    }
+}
diff --git a/NeutroFeverGuard/Resources/Localizable.xcstrings b/NeutroFeverGuard/Resources/Localizable.xcstrings
@@ -132,6 +132,9 @@
     },
     "Are you sure you want to delete this lab record? This action cannot be undone." : {
 
+    },
+    "Are you sure you want to delete this medication record? This action cannot be undone." : {
+
     },
     "Body Temperature (°F)" : {
       "localizations" : {
@@ -222,6 +225,9 @@
     },
     "Delete Lab Record" : {
 
+    },
+    "Delete Medication" : {
+
     },
     "Diastolic (mmHg)" : {
       "localizations" : {
@@ -277,6 +283,9 @@
           }
         }
       }
+    },
+    "Health Data" : {
+
     },
     "Health Data Access" : {
 
@@ -475,6 +484,7 @@
       }
     },
     "Lab" : {
+      "extractionState" : "stale",
       "localizations" : {
         "en" : {
           "stringUnit" : {
@@ -558,15 +568,15 @@
           }
         }
       }
-    },
-    "Medication" : {
-
     },
     "Medication List" : {
 
     },
     "Medication Name" : {
 
+    },
+    "Medications" : {
+
     },
     "Name" : {
 
@@ -731,6 +741,9 @@
     },
     "Record & Track Symptoms" : {
 
+    },
+    "Records" : {
+
     },
     "Save" : {
 
@@ -745,6 +758,9 @@
           }
         }
       }
+    },
+    "Select Section" : {
+
     },
     "Sign the Consent Form" : {
 
diff --git a/NeutroFeverGuardUITests/LabViewUITests.swift b/NeutroFeverGuardUITests/LabViewUITests.swift
diff --git a/NeutroFeverGuardUITests/MedicationViewUITests.swift b/NeutroFeverGuardUITests/MedicationViewUITests.swift

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ class LabResultsManager: Module, EnvironmentAccessible {`
`57`	`57`	`results = []`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ results.sort { $0.date > $1.date }`
`60`	`61`	`self.labRecords = results`
`61`	`62`	`if let latestRecord = results.first {`
`62`	`63`	`latestRecordedTime = formatDate(latestRecord.date)`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,10 @@ class MedicationManager: Module, EnvironmentAccessible {`
`58`	`58`	`saveMedResults()`
`59`	`59`	`}`
`60`	`60`
`61`		`- func deleteMedEntry(at offsets: IndexSet) {`
`62`		`- medications.remove(atOffsets: offsets)`
	`61`	`+ func deleteMedEntry(at index: Int) {`
	`62`	`+ guard medications.indices.contains(index)`
	`63`	`+ else { return }`
	`64`	`+ medications.remove(at: index)`
`63`	`65`	`saveMedResults()`
`64`	`66`	`}`
`65`	`67`