Scrollable pdf changes

Intake/Allergy Records/AddAllergy.swift

@@ -15,7 +15,6 @@
 import SpeziFHIR
 import SwiftUI
 
-
 struct EditAllergyView: View {
     @State private var index: Int
     @Environment(DataStore.self) private var data
@@ -27,25 +26,7 @@
                    TextField("Allergy Name", text: $data.allergyData[index].allergy)
                            .textFieldStyle(RoundedBorderTextFieldStyle())
                            .padding([.horizontal, .top])
-                   Form { // Use Form instead of List
-                        Section(header: headerTitle) {
-                            ForEach($data.allergyData[index].reaction) { $item in
-                                HStack {
-                                    TextField("Reactions", text: $item.reaction)
-                                }
-                            }
-                            .onDelete(perform: delete)
-                            Button(action: {
-                                data.allergyData[index].reaction.append(ReactionItem(reaction: ""))
-                            }) {
-                                HStack {
-                                    Image(systemName: "plus.circle.fill")
-                                        .accessibilityLabel(Text("ADD_REACTION"))
-                                    Text("Add Field")
-                                }
-                            }
-                        }
-                   }
+                   ReactionSectionView(index: index)
                    Spacer()
                    saveButton
                }
@@ -67,20 +48,46 @@
         .padding()
     }
 
+    init(index: Int, showingReaction: Binding<Bool>) {
+        self._index = State(initialValue: index)
+        self._showingReaction = showingReaction
+    }
+}
+
+struct ReactionSectionView: View {
+    @Environment(DataStore.self) private var data
+    var index: Int
+
+    var body: some View {
+            Form { // Use Form instead of List
+                Section(header: headerTitle) {
+                    @Bindable var data = data
+                    ForEach($data.allergyData[index].reaction) { $item in
+                        HStack {
+                            TextField("Reactions", text: $item.reaction)
+                        }
+                    }
+                    .onDelete(perform: delete)
+                    Button(action: {
+                        data.allergyData[index].reaction.append(ReactionItem(reaction: ""))
+                    }) {
+                        HStack {
+                            Image(systemName: "plus.circle.fill")
+                                .accessibilityLabel(Text("ADD_REACTION"))
+                            Text("Add Field")
+                        }
+                    }
+                }
+            }
+        }
+
     private var headerTitle: some View {
         HStack {
             Text("Reactions")
             Spacer()
             EditButton()
         }
     }
-
-
-    init(index: Int, showingReaction: Binding<Bool>) {
-        self._index = State(initialValue: index)
-        self._showingReaction = showingReaction
-    }
-
     func delete(at offsets: IndexSet) {
         data.allergyData[index].reaction.remove(atOffsets: offsets)
     }

Intake/Allergy Records/ReactionPDF.swift

@@ -22,16 +22,17 @@
     @Binding private var showingReaction: Bool
     var body: some View {
         NavigationView {
-            VStack {
-                Form {
-                    ForEach(data.allergyData[index].reaction) { item in
-                        Text(item.reaction)
-                    }
-                }
+            ReactionSectionView(index: index)
+//            VStack {
+//                Form {
+//                    ForEach(data.allergyData[index].reaction) { item in
+//                        Text(item.reaction)
+//                    }
+//                }
 //                .navigationTitle("Medical History")
 ////                .navigationTitle("\(data.allergyData[index].allergy) Reactions")
 //                .navigationBarItems(trailing: EditButton())
-            }
+//            }
             .toolbar {
                 ToolbarItem(placement: .navigationBarLeading) {
                     HStack {

Intake/ChiefComplaint/LLMInteraction.swift

@@ -158,20 +158,22 @@
             var firstName: String = ""
             var dob: String = ""
             var gender: String = ""
-
             if let patient = fhirStore.patient {
                 fullName = getInfo(patient: patient, field: "name").filter { !$0.isNumber }
                 dob = getInfo(patient: patient, field: "birthDate")
                 gender = getInfo(patient: patient, field: "gender")
-                
+
                 let age = calculateAge(from: dob)
                 let nameString = fullName.components(separatedBy: " ")
 
-                if let firstNameValue = nameString.first {
-                    firstName = firstNameValue
-                } else {
-                    print("First Name is empty")
-                }
+                data.generalData.name = fullName
+                data.generalData.birthdate = dob
+                data.generalData.sex = gender
+                data.generalData.age = age
+
+                firstName = nameString.first ?? "First Name is empty"
+                print(firstName == "First Name is empty" ? "First Name is empty" : "")
+
 
                 let systemMessage = """
                     The first name of the patient is \(String(describing: firstName)) and the patient is \(String(describing: age))\

Intake/Intake.swift

@@ -30,7 +30,7 @@ class DataStore {
     var surgeries: [SurgeryItem] = []
     var surgeriesLoaded = false
     var chiefComplaint: String = ""
-    var generalData = PatientData(name: "Akash", birthdate: "01/08/2003", age: "21", sex: "Male")
+    var generalData = PatientData(name: "", birthdate: "", age: "", sex: "")
 }
 
 @Observable

Intake/Resources/Localizable.xcstrings

@@ -78,6 +78,9 @@
     },
     "Additional Details" : {
 
+    },
+    "Additional Details:  " : {
+
     },
     "Additional Symptoms" : {
 
@@ -214,6 +217,9 @@
     },
     "DELETE_REACTION" : {
 
+    },
+    "details" : {
+
     },
     "DETAILS" : {
 
@@ -229,17 +235,23 @@
     },
     "Edit Surgery" : {
 
+    },
+    "End" : {
+
+    },
+    "end date" : {
+
     },
     "Ex: Heavy bleeding on second day, fatigue..." : {
 
     },
     "Ex: Smoked for 10 years, quit 5 years ago..." : {
 
     },
-    "Export to PDF" : {
+    "FHIR_RESOURCES_CHAT_CANCEL" : {
 
     },
-    "FHIR_RESOURCES_CHAT_CANCEL" : {
+    "fix medication" : {
 
     },
     "Get Started" : {
@@ -497,6 +509,9 @@
     },
     "Other important questions." : {
 
+    },
+    "Pack Years:" : {
+
     },
     "Pack years: %.2f" : {
 
@@ -610,6 +625,9 @@
     },
     "Sex" : {
 
+    },
+    "Share" : {
+
     },
     "Share with provider of your choice." : {
 
@@ -625,9 +643,18 @@
     },
     "Start" : {
 
+    },
+    "start date" : {
+
+    },
+    "Start:" : {
+
     },
     "Status" : {
 
+    },
+    "Submit" : {
+
     },
     "Submit your Form" : {
 
@@ -715,7 +742,10 @@
 
     },
     "Yes" : {
-
+
+    },
+    "YYYY-MM-DD" : {
+
     }
   },
   "version" : "1.0"

Intake/ScrollablePDF.swift

@@ -62,7 +62,7 @@
         var body: some View {
             Button(action: {
             }) {
-                Text("Export to PDF")
+                Text("Share")
                     .foregroundColor(.white)
                     .padding()
                     .frame(maxWidth: .infinity)
@@ -82,28 +82,75 @@
                     HStack {
                     Text(item.surgeryName)
                     Spacer()
-                    Text(item.date ?? "")
+                        Text(item.date)
                         .foregroundColor(.secondary)
                     }
                 }
             }
         }
     }
 
+    private struct MenstrualSection: View {
+        @Environment(DataStore.self) private var data
+        @Environment(NavigationPathWrapper.self) private var navigationPath
+
+        var body: some View {
+            Section(header: HeaderTitle(title: "Menstrual Cycle", nextView: NavigationViews.menstrual)) {
+                List {
+                    HStack {
+                        Text("Start:")
+                        Spacer()
+                        Text("start date")
+                            .foregroundColor(.secondary)
+                    }
+                    HStack {
+                        Text("End")
+                        Spacer()
+                        Text("end date")
+                            .foregroundColor(.secondary)
+                    }
+                    HStack {
+                        Text("Additional Details:  ")
+                        Text("details")
+                            .foregroundColor(.secondary)
+                    }
+                }
+            }
+        }
+    }
+
+    private struct SmokingSection: View {
+        @Environment(DataStore.self) private var data
+        @Environment(NavigationPathWrapper.self) private var navigationPath
+
+        var body: some View {
+            Section(header: HeaderTitle(title: "Smoking", nextView: NavigationViews.smoking)) {
+                List {
+                    HStack {
+                        Text("Pack Years:")
+                        Spacer()
+                        Text("start date")
+                            .foregroundColor(.secondary)
+                    }
+                    HStack {
+                        Text("Additional Details:  ")
+                        Text("details")
+                            .foregroundColor(.secondary)
+                    }
+                }
+            }
+        }
+    }
+
+
     private struct MedicationSection: View {
         @Environment(DataStore.self) private var data
         @Environment(NavigationPathWrapper.self) private var navigationPath
 
         var body: some View {
             Section(header: HeaderTitle(title: "Medications", nextView: NavigationViews.medication)) {
                 VStack(alignment: .leading) {
-                    ForEach(Array(data.medicationData)) { item in
-                        HStack {
-                            Text(item.type.localizedDescription)
-                                .padding(.leading)
-                            Spacer()
-                        }
-                    }
+                    Text("fix medication")
                 }
             }
         }
@@ -191,11 +238,9 @@
         }
     }
 
-
     @Environment(DataStore.self) private var data
     @Environment(NavigationPathWrapper.self) private var navigationPath
     @Environment(ReachedEndWrapper.self) private var end
-
 
     var body: some View {
         VStack {
@@ -206,6 +251,8 @@
                 SurgerySection()
                 MedicationSection()
                 Allergy()
+                MenstrualSection()
+                SmokingSection()
             }
             .navigationTitle("Patient Form")
             .onAppear(perform: {

Intake/SocialHistory/SmokingHistory.swift

@@ -101,7 +101,21 @@
                         Text("Pack years: \(packYears, specifier: "%.2f")")
                     }
                 }
+
+                // The Submit button can remain for explicit submission, if required
+                Button("Submit") {
+                    calculatePackYears()
+                }
+                SubmitButton(nextView: NavigationViews.pdfs)
+                .foregroundColor(.white)
+                .padding()
+                .frame(maxWidth: .infinity)
+                .background(Color.blue)
+                .cornerRadius(8)
+                .padding(.horizontal)
+                .padding(.bottom)
             }
+            .navigationTitle("Social History")
         }
     }
 

Intake/Surgery/SurgeryView.swift

@@ -292,7 +292,7 @@
         let LLMResponse = try await self.queryLLM(surgeryNames: surgeryNames)
 
         let filteredNames = LLMResponse.components(separatedBy: ", ")
-        var filteredSurgeries = surgeries.filter { self.containsAnyWords(item: $0.surgeryName, words: filteredNames) }
+        let filteredSurgeries = surgeries.filter { self.containsAnyWords(item: $0.surgeryName, words: filteredNames) }
 
         return self.cleanSurgeryNames(surgeries: filteredSurgeries, filteredNames: filteredNames)
     }