trying again

CS342 · Mar 12, 2024 · 38ee20c · 38ee20c
1 parent 08079fc
commit 38ee20c
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 59 deletions.
diff --git a/Intake/ScrollablePDF.swift b/Intake/ScrollablePDF.swift
@@ -239,62 +239,62 @@ struct ScrollablePDF: View {
     }
 
     private struct MenstrualSection: View {
-        @Environment(DataStore.self) private var data
+           @Environment(DataStore.self) private var data
 
-        var body: some View {
-            Section(header: Text("Menstrual History")) {
-                VStack(alignment: .leading) {
-                    HStack {
-                        Text("Start Date:")
-                        Spacer()
-                        Text(data.menstrualHistory.startDate, style: .date)
-                            .foregroundColor(.secondary)
-                    }
-                    HStack {
-                        Text("End Date:")
-                        Spacer()
-                        Text(data.menstrualHistory.endDate, style: .date)
-                            .foregroundColor(.secondary)
-                    }
-                    HStack {
-                        Text("Additional Details:")
-                        Spacer()
-                        Text(data.menstrualHistory.additionalDetails)
-                            .foregroundColor(.secondary)
-                    }
-                }
-            }
-        }
-    }
+           var body: some View {
+               Section(header: Text("Menstrual History")) {
+                   VStack(alignment: .leading) {
+                       HStack {
+                           Text("Start Date:")
+                           Spacer()
+                           Text(data.menstrualHistory.startDate, style: .date)
+                               .foregroundColor(.secondary)
+                       }
+                       HStack {
+                           Text("End Date:")
+                           Spacer()
+                           Text(data.menstrualHistory.endDate, style: .date)
+                               .foregroundColor(.secondary)
+                       }
+                       HStack {
+                           Text("Additional Details:")
+                           Spacer()
+                           Text(data.menstrualHistory.additionalDetails)
+                               .foregroundColor(.secondary)
+                       }
+                   }
+               }
+           }
+       }
 
-    private struct SmokingSection: View {
-        @Environment(DataStore.self) private var data
+       private struct SmokingSection: View {
+           @Environment(DataStore.self) private var data
 
-        var body: some View {
-            Section(header: Text("Smoking History")) {
-                VStack(alignment: .leading) {
-                    HStack {
-                        Text("Currently Smoking:")
-                        Spacer()
-                        Text(data.smokingHistory.currentlySmoking ? "Yes" : "No")
-                            .foregroundColor(.secondary)
-                    }
-                    HStack {
-                        Text("Smoked in the Past:")
-                        Spacer()
-                        Text(data.smokingHistory.smokedInThePast ? "Yes" : "No")
-                            .foregroundColor(.secondary)
-                    }
-                    HStack {
-                        Text("Additional Details:")
-                        Spacer()
-                        Text(data.smokingHistory.additionalDetails)
-                            .foregroundColor(.secondary)
-                    }
-                }
-            }
-        }
-    }
+           var body: some View {
+               Section(header: Text("Smoking History")) {
+                   VStack(alignment: .leading) {
+                       HStack {
+                           Text("Currently Smoking:")
+                           Spacer()
+                           Text(data.smokingHistory.currentlySmoking ? "Yes" : "No")
+                               .foregroundColor(.secondary)
+                       }
+                       HStack {
+                           Text("Smoked in the Past:")
+                           Spacer()
+                           Text(data.smokingHistory.smokedInThePast ? "Yes" : "No")
+                               .foregroundColor(.secondary)
+                       }
+                       HStack {
+                           Text("Additional Details:")
+                           Spacer()
+                           Text(data.smokingHistory.additionalDetails)
+                               .foregroundColor(.secondary)
+                       }
+                   }
+               }
+           }
+       }
 
     @Environment(DataStore.self) private var data
     @Environment(NavigationPathWrapper.self) private var navigationPath

diff --git a/Intake/SocialHistory/SmokingHistory.swift b/Intake/SocialHistory/SmokingHistory.swift
@@ -13,9 +13,9 @@
 import SwiftUI
 
 struct SmokingHistoryView: View {
-    @State private var hasSmokedOrSmoking: Bool = false
-    @State private var currentlySmoking: Bool = false
-    @State private var smokedInThePast: Bool = false
+    @State private var hasSmokedOrSmoking = false
+    @State private var currentlySmoking = false
+    @State private var smokedInThePast = false
     @State private var additionalDetails: String = ""
     @Environment(DataStore.self) private var data
     @Environment(NavigationPathWrapper.self) private var navigationPath // Ensure you have this environment object
@@ -36,16 +36,15 @@ struct SmokingHistoryView: View {
                 .onDisappear {
                     storeSmokingHistory()
                 }
-                // Placing SubmitButton here ensures it appears at the bottom
-                SubmitButton(nextView: NavigationViews.pdfs)
+                SubmitButton(nextView: NavigationViews.chat)
                     .padding()
             }
         }
     }
 
     private var initialSmokingQuestionSection: some View {
         Section(header: Text("Smoking Status").foregroundColor(.gray)) {
-            Toggle("Have you smoked or are you currently smoking?", isOn: $hasSmokedOrSmoking)
+            Toggle("Are you currently smoking or have you smoked in the past?", isOn: $hasSmokedOrSmoking)
         }
     }