Merge branch 'main' into Update-ReactionTimeTest

CS342 · Mar 8, 2024 · abcdbc9 · abcdbc9
2 parents 4e26702 + 380ea88
commit abcdbc9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/PICS/Appointment/AppointmentBlock.swift b/PICS/Appointment/AppointmentBlock.swift
@@ -55,13 +55,6 @@ struct AppointmentBlock: View {
                             }
                             .buttonStyle(.bordered)
                         }
-                        HStack {
-                            Spacer()
-                            Button(String(localized: "REQUIRED_ITEMS_HEADING")) {
-                                showingSheet.toggle()
-                            }
-                            .buttonStyle(.bordered)
-                        }
                         Spacer()
                     }
                     .padding()

diff --git a/PICS/Appointment/AppointmentInformation.swift b/PICS/Appointment/AppointmentInformation.swift
@@ -98,17 +98,17 @@ class AppointmentInformation {
         content.title = String(localized: "APPT_REMINDER")
         content.body = String(localized: "NOTIF_CONTENT") + appointmentDateString + String(localized: "PERIOD")
 
-        let monthBeforeId = scheduleNotification(for: date, with: DateComponents(month: -1), content: content, notificationCenter: notificationCenter)
+        _ = scheduleNotification(for: date, with: DateComponents(month: -1), content: content, notificationCenter: notificationCenter)
 
-        let weekBeforeId = scheduleNotification(for: date, with: DateComponents(day: -7), content: content, notificationCenter: notificationCenter)
+        _ = scheduleNotification(for: date, with: DateComponents(day: -7), content: content, notificationCenter: notificationCenter)
 
-        let daysBeforeId = scheduleNotification(for: date, with: DateComponents(day: -3), content: content, notificationCenter: notificationCenter)
+        _ = scheduleNotification(for: date, with: DateComponents(day: -3), content: content, notificationCenter: notificationCenter)
 
-        let dayBeforeId = scheduleNotification(for: date, with: DateComponents(day: -1), content: content, notificationCenter: notificationCenter)
+        _ = scheduleNotification(for: date, with: DateComponents(day: -1), content: content, notificationCenter: notificationCenter)
 
-        let minBeforeId = scheduleNotification(for: date, with: DateComponents(minute: -30), content: content, notificationCenter: notificationCenter)
+        _ = scheduleNotification(for: date, with: DateComponents(minute: -30), content: content, notificationCenter: notificationCenter)
 
-        let appointmentId = scheduleNotification(for: date, with: nil, content: content, notificationCenter: notificationCenter)
+        _ = scheduleNotification(for: date, with: nil, content: content, notificationCenter: notificationCenter)
     }
 
 
@@ -122,9 +122,9 @@ class AppointmentInformation {
         if let components = components, let scheduledDate = Calendar.current.date(byAdding: components, to: date) {
             notificationDate = scheduledDate
         }
-        
+
         let trigger: UNNotificationTrigger
-        if let components = components {
+        if components != nil {
             trigger = UNCalendarNotificationTrigger(
                 dateMatching: Calendar.current.dateComponents([.year, .month, .day, .hour, .minute], from: notificationDate),
                 repeats: false

diff --git a/PICS/Resources/Localizable.xcstrings b/PICS/Resources/Localizable.xcstrings
@@ -842,7 +842,7 @@
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "The app will send you notifications to remind you about your upcoming appointments."
+            "value" : "The app will send you notifications to remind you about your upcoming appointments and scheduled questionnaires."
           }
         }
       }