Merge branch 'main' into pdf-finalize

CS342 · Mar 11, 2024 · a330ed5 · a330ed5
2 parents 5f7d302 + 081ea98
commit a330ed5
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 8 deletions.
diff --git a/Intake.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Intake.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,4 +1,5 @@
 {
+  "originHash" : "cdbe60a3382a8a962c7fcc00210e56e13314cb3e246d0e01fe8e25a1268623d8",
   "pins" : [
     {
       "identity" : "abseil-cpp-binary",
@@ -379,5 +380,5 @@
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }
diff --git a/Intake/Medication View/IntakeMedicationViewModel.swift b/Intake/Medication View/IntakeMedicationViewModel.swift
@@ -69,7 +69,31 @@ class IntakeMedicationSettingsViewModel: Module, MedicationSettingsViewModel, Cu
             IntakeMedication(
                 localizedDescription: "NDA020800 0.3 ML Epinephrine 1 MG/ML Auto-Injector",
                 dosages: [
-                    IntakeDosage(localizedDescription: "0.3ML / 1 MG/ML")
+                    IntakeDosage(localizedDescription: "0.3 ML/1 MG/ML")
+                ]
+            ),
+            IntakeMedication(
+                localizedDescription: "Clopidogrel 75 MG Oral Tablet",
+                dosages: [
+                    IntakeDosage(localizedDescription: "75 MG")
+                ]
+            ),
+            IntakeMedication(
+                localizedDescription: "Verapamil Hydrochloride 40 MG",
+                dosages: [
+                    IntakeDosage(localizedDescription: "40 MG")
+                ]
+            ),
+            IntakeMedication(
+                localizedDescription: "Simvastatin 20 MG Oral Tablet",
+                dosages: [
+                    IntakeDosage(localizedDescription: "20 MG")
+                ]
+            ),
+            IntakeMedication(
+                localizedDescription: "amLODIPine 2.5 MG Oral Tablet",
+                dosages: [
+                    IntakeDosage(localizedDescription: "2.5 MG")
                 ]
             )
         ]

diff --git a/Intake/Medication View/MedicationContentView.swift b/Intake/Medication View/MedicationContentView.swift
@@ -32,7 +32,7 @@ struct MedicationContentView: View {
                     data.medicationData = medicationSettingsViewModel.medicationInstances
                     navigationPath.path.append(NavigationViews.allergies)
                 }
-                        .navigationTitle("Medication Settings")
+                        .navigationTitle("Medications")
                         .navigationBarItems(trailing: NavigationLink(destination: MedicationLLMAssistant(presentingAccount: .constant(false))) {
                             Text("Chat")
                         })

diff --git a/Intake/Resources/Localizable.xcstrings b/Intake/Resources/Localizable.xcstrings
@@ -12,6 +12,16 @@
     },
     "%.2f" : {
 
+    },
+    "%@ - %@" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "%1$@ - %2$@"
+          }
+        }
+      }
     },
     "%@ Reactions" : {
 
@@ -262,6 +272,9 @@
     },
     "Ex: Smoked for 10 years, quit 5 years ago..." : {
 
+    },
+    "Female" : {
+
     },
     "FHIR_RESOURCES_CHAT_CANCEL" : {
 
@@ -352,6 +365,12 @@
     },
     "Last Menstrural Period" : {
 
+    },
+    "John Doe" : {
+
+    },
+    "Last Menstrural Period" : {
+
     },
     "Last period's end date" : {
 
@@ -392,9 +411,6 @@
     },
     "Medical Intake Form" : {
 
-    },
-    "Medication Settings" : {
-
     },
     "Medications" : {
 

diff --git a/Intake/ScrollablePDF.swift b/Intake/ScrollablePDF.swift
@@ -94,9 +94,17 @@ struct ScrollablePDF: View {
         @Environment(NavigationPathWrapper.self) private var navigationPath
 
         var body: some View {
+            let medicationData = data.medicationData
             Section(header: HeaderTitle(title: "Medications", nextView: NavigationViews.medication)) {
-                VStack(alignment: .leading) {
-                    Text("fix medication")
+                ForEach(Array(medicationData), id: \.self) { medicationInstance in
+                    List {
+                        VStack(alignment: .leading, spacing: 0) {
+                            Text(medicationInstance.type.localizedDescription)
+                                .font(.headline)
+                            Text("\(medicationInstance.dosage.localizedDescription) - \(medicationInstance.schedule.frequency.description)")
+                                .font(.subheadline)
+                        }
+                    }
                 }
             }
         }