UI/notifications

ENGAGEHF.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -159,17 +159,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/StanfordBDHG/ResearchKit",
       "state" : {
-        "revision" : "3f70adf898b5985ba15e25d5074d86a9c657d305",
-        "version" : "2.2.30"
+        "revision" : "cf7ad893f0778b2d9b8af2d7e769ed84bbd45cbc",
+        "version" : "3.0.1"
       }
     },
     {
       "identity" : "researchkitonfhir",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/StanfordBDHG/ResearchKitOnFHIR",
       "state" : {
-        "revision" : "cdb24dd5607d5a63aaf3a3597c98122189cb548e",
-        "version" : "1.3.0"
+        "revision" : "dcd5f95522ed02a873b03c9638dbf397b99c74e0",
+        "version" : "1.4.0"
       }
     },
     {
@@ -204,8 +204,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/StanfordSpezi/SpeziBluetooth.git",
       "state" : {
-        "revision" : "8e94fc71720ef3fcf7f5d9dba9eef603c5151d7a",
-        "version" : "1.3.0"
+        "revision" : "68966242caa49834a352953225b8b1d234481d77",
+        "version" : "1.4.0"
       }
     },
     {
@@ -238,7 +238,7 @@
     {
       "identity" : "spezifoundation",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/StanfordSpezi/SpeziFoundation",
+      "location" : "https://github.com/StanfordSpezi/SpeziFoundation.git",
       "state" : {
         "revision" : "01af5b91a54f30ddd121258e81aff2ddc2a99ff9",
         "version" : "1.0.4"
@@ -276,8 +276,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/StanfordSpezi/SpeziQuestionnaire.git",
       "state" : {
-        "revision" : "f9d9b6d99bb1e00bda2974b440dca8367733d591",
-        "version" : "1.1.0"
+        "revision" : "d8700fb02f0608cc7852d695b2c776185feeb34f",
+        "version" : "1.2.0"
       }
     },
     {
@@ -303,8 +303,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-argument-parser",
       "state" : {
-        "revision" : "46989693916f56d1186bd59ac15124caef896560",
-        "version" : "1.3.1"
+        "revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b",
+        "version" : "1.4.0"
       }
     },
     {

ENGAGEHF/Bluetooth/MeasurementManager.swift

@@ -53,7 +53,7 @@ class MeasurementManager: Module, EnvironmentAccessible {
     var deviceName: String?
 
     var newMeasurement: HKQuantitySample?
-    
+
 
     init() {
         MeasurementManager._manager = self

ENGAGEHF/Bluetooth/Views/ViewElements.swift

@@ -17,12 +17,15 @@ struct CloseButtonLayer: View {
 
     var body: some View {
         HStack {
-            Button(action: {
-                dismiss()
-            }) {
-                Text(NSLocalizedString("Close", comment: "For closing sheets."))
-                    .foregroundStyle(Color.accentColor)
-            }
+            Button(
+                action: {
+                    dismiss()
+                },
+                label: {
+                    Text(NSLocalizedString("Close", comment: "For closing sheets."))
+                        .foregroundStyle(Color.accentColor)
+                }
+            )
                 .buttonStyle(PlainButtonStyle())
                 .disabled(viewState != .idle)
 

ENGAGEHF/Dashboard/Dashboard.swift

@@ -11,25 +11,45 @@ import SwiftUI
 
 struct Dashboard: View {
     @Binding var presentingAccount: Bool
+    @State var showSurvey = false
 
 
     var body: some View {
         NavigationStack {
-            VStack {
-                Greeting()
-                Spacer()
+            List {
+                // Notifications
+                 NotificationSection()
+
+                // To-do
+                ToDoSection()
+
+                // Most recent vitals
+                RecentVitalsSection()
+
+                // Survey, if available
+                SurveySection(showFullSurvey: $showSurvey)
             }
-                .navigationTitle("Home")
-                .toolbar {
-                    if AccountButton.shouldDisplay {
-                        AccountButton(isPresented: $presentingAccount)
-                    }
+
+            .studyApplicationList()
+
+            .sheet(isPresented: $showSurvey, content: {
+                FullSurveyView()
+            })
+
+            .navigationTitle("Home")
+            .toolbar {
+                if AccountButton.shouldDisplay {
+                    AccountButton(isPresented: $presentingAccount)
                 }
+            }
         }
     }
 }
 
 
 #Preview {
     Dashboard(presentingAccount: .constant(false))
+        .previewWith(standard: ENGAGEHFStandard()) {
+            NotificationManager()
+        }
 }

ENGAGEHF/Dashboard/FetchingError.swift

@@ -0,0 +1,24 @@
+//
+// This source file is part of the ENGAGE-HF project based on the Stanford Spezi Template Application project
+//
+// SPDX-FileCopyrightText: 2023 Stanford University
+//
+// SPDX-License-Identifier: MIT
+//
+
+import Foundation
+
+
+enum FetchingError: LocalizedError {
+    case invalidTimestamp
+    case userNotAuthenticated
+
+    var errorDescription: String? {
+        switch self {
+        case .invalidTimestamp:
+            String(localized: "Unable to get notification timestamp.", comment: "Invalid Timestamp")
+        case .userNotAuthenticated:
+            String(localized: "User not authenticated. Please sign in an try again.", comment: "User Not Authenticated")
+        }
+    }
+}

ENGAGEHF/Dashboard/Notifications/Notification.swift

@@ -0,0 +1,32 @@
+//
+// This source file is part of the ENGAGE-HF project based on the Stanford Spezi Template Application project
+//
+// SPDX-FileCopyrightText: 2023 Stanford University
+//
+// SPDX-License-Identifier: MIT
+//
+
+import Foundation
+
+
+// A notification
+//
+// Mirrors the representation of a notification in firestore
+// When assigned to a patient, the title will be displayed
+// and the description will be displayed in a drop-down field
+//
+// Title and Descprition may be markdown text
+struct Notification: Identifiable, Equatable {
+    var id: String
+
+    var type: String
+    var title: String
+    var description: String
+
+    init(type: String, title: String, description: String, id: String) {
+        self.id = id
+        self.type = type
+        self.title = title
+        self.description = description
+    }
+}

ENGAGEHF/Dashboard/Notifications/NotificationManager.swift

@@ -0,0 +1,158 @@
+//
+// This source file is part of the ENGAGE-HF project based on the Stanford Spezi Template Application project
+//
+// SPDX-FileCopyrightText: 2023 Stanford University
+//
+// SPDX-License-Identifier: MIT
+//
+
+import FirebaseAuth
+import FirebaseFirestore
+import Foundation
+import OSLog
+import Spezi
+import SpeziFirebaseConfiguration
+
+
+//
+// Notification manager
+//
+// Maintains a list of Notifications associated with the current user in firebase
+//
+// Includes functionality for adding notifications and marking them complete
+// On configuration of the app, adds a snapshot listener to the user's notification collection
+//
+@Observable
+class NotificationManager: Module, EnvironmentAccessible {
+    @ObservationIgnored @Dependency private var configureFirebaseApp: ConfigureFirebaseApp
+    @ObservationIgnored @StandardActor var standard: ENGAGEHFStandard
+
+    private var authStateDidChangeListenerHandle: AuthStateDidChangeListenerHandle?
+    private var snapshotListener: ListenerRegistration?
+
+    private let logger = Logger(subsystem: "ENGAGEHF", category: "NotificationManager")
+
+    private let expirationDate = 10
+
+    var notifications: [Notification] = []
+
+
+    func configure() {
+        if ProcessInfo.processInfo.isPreviewSimulator {
+            let dummyNotification = Notification(
+                type: "Mock Notification",
+                title: "Weight Recorded",
+                description: "A weight measurement has been recorded.",
+                id: String(describing: UUID())
+            )
+            notifications.append(dummyNotification)
+            return
+        }
+
+        authStateDidChangeListenerHandle = Auth.auth().addStateDidChangeListener { [weak self] _, user in
+            self?.registerSnapshotListener(user: user)
+        }
+        self.registerSnapshotListener(user: Auth.auth().currentUser)
+    }
+
+    // Call on initialization
+    //
+    // Creates a snapshot listener to save new notifications to the manager
+    // as they are added to the user's directory in Firebase
+    func registerSnapshotListener(user: User?) {
+        logger.info("Initializing notifiation snapshot listener...")
+
+        // Remove previous snapshot listener for the user before creating new one
+        snapshotListener?.remove()
+        guard let uid = user?.uid else {
+            return
+        }
+
+        let db = Firestore.firestore()
+
+        // Ignore notifications older than expirationDate
+        guard let thresholdDate = Calendar.current.date(byAdding: .day, value: -expirationDate, to: .now) else {
+            logger.error("Unable to get threshold date: \(FetchingError.invalidTimestamp)")
+            return
+        }
+
+        let thesholdTimeStamp = Timestamp(date: thresholdDate)
+
+        // Set a snapshot listener on the query for valid notifications
+        db.collection("users").document(uid).collection("notifications")
+            .whereField("created", isGreaterThan: thesholdTimeStamp)
+            .addSnapshotListener { querySnapshot, error in
+                guard let documents = querySnapshot?.documents else {
+                    self.logger.error("Error fetching documents: \(error!)")
+                    return
+                }
+
+                self.notifications = documents.compactMap {
+                    if $0.get("completed") == nil {
+                        return Notification(
+                            type: String(describing: $0["type"] ?? "Unknown"),
+                            title: String(describing: $0["title"] ?? "Unknown"),
+                            description: String(describing: $0["description"] ?? "Unknown"),
+                            id: $0.documentID
+                        )
+                    }
+                    return nil
+                }
+
+                self.logger.debug("Notifications updated")
+            }
+    }
+
+    func add(_ notification: Notification) async {
+        await standard.add(notification: notification)
+    }
+
+    func markComplete(at offsets: IndexSet) async {
+        if ProcessInfo.processInfo.isPreviewSimulator {
+            notifications.remove(atOffsets: offsets)
+            return
+        }
+
+        logger.debug("Marking notifications complete at the following offsets: \(offsets)")
+
+        let db = Firestore.firestore()
+
+        guard let user = Auth.auth().currentUser else {
+            logger.error("Unable to mark notitificaitons complete: \(FetchingError.userNotAuthenticated)")
+            return
+        }
+
+        // Mark the notifications as completed in the Firestore
+        let timestamp = Timestamp(date: .now)
+        for offset in offsets {
+            let docID = notifications[offset].id
+
+            let docRef = db.collection("users").document(user.uid).collection("notifications")
+                .document(docID)
+
+            do {
+                try await docRef.updateData([
+                    "completed": timestamp
+                ])
+            } catch {
+                logger.error("Unable to update notification at offset \(offset): \(error)")
+            }
+        }
+
+        logger.info("Successfully marked notifications complete!")
+    }
+}
+
+
+extension NotificationManager {
+    // Function for adding a mock notification for the preview simulator
+    func addMock() {
+        let dummyNotification = Notification(
+            type: "Medication Change",
+            title: "Your dose of XXX was changed.",
+            description: "Your dose of XXX was changed. You can review medication information in the Education Page.",
+            id: String(describing: UUID())
+        )
+        notifications.append(dummyNotification)
+    }
+}