Skip to content

Commit

Permalink
Revert "Merge branch 'main' into KaranSoin-Assessment-Changes"
Browse files Browse the repository at this point in the history 
This reverts commit e6ed961, reversing
changes made to 94b5185.
  • Loading branch information
@karansoin
karansoin committed Mar 2, 2024
1 parent e6ed961 commit b85340c
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 330 deletions.
43 changes: 6 additions & 37 deletions PICS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
22201EE82B9259B800E38F47 /* EQ5D5L.json in Resources */ = {isa = PBXBuildFile; fileRef = 22201EE52B9259B800E38F47 /* EQ5D5L.json */; };
22201EE92B9259B800E38F47 /* PHQ-4.json in Resources */ = {isa = PBXBuildFile; fileRef = 22201EE62B9259B800E38F47 /* PHQ-4.json */; };
22201EEA2B9259B800E38F47 /* Self-MNA.json in Resources */ = {isa = PBXBuildFile; fileRef = 22201EE72B9259B800E38F47 /* Self-MNA.json */; };
22306A2A2B7C4E8E000A8EC1 /* OnboardingQuestionnaire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22306A292B7C4E8E000A8EC1 /* OnboardingQuestionnaire.swift */; };
22306A3E2B8F0097000A8EC1 /* OnboardingSurveyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22306A3D2B8F0097000A8EC1 /* OnboardingSurveyView.swift */; };
22306A412B8F20C4000A8EC1 /* AccountQuestionnaire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22306A402B8F20C4000A8EC1 /* AccountQuestionnaire.swift */; };
22306A462B8FB173000A8EC1 /* OnboardingQuestionnaireDashboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22306A452B8FB173000A8EC1 /* OnboardingQuestionnaireDashboard.swift */; };
22365B782B902C9100C4528E /* Onboarding-Questionnaire.json in Resources */ = {isa = PBXBuildFile; fileRef = 22365B772B902C9100C4528E /* Onboarding-Questionnaire.json */; };
22306A2A2B7C4E8E000A8EC1 /* Onboarding_Questionnaire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22306A292B7C4E8E000A8EC1 /* Onboarding_Questionnaire.swift */; };
22306A2E2B8581C3000A8EC1 /* Onboarding-Questionnaire.json in Resources */ = {isa = PBXBuildFile; fileRef = 22306A2D2B8581C3000A8EC1 /* Onboarding-Questionnaire.json */; };
226C16F02B69DF3500FBA97D /* HeightKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 226C16EF2B69DF3500FBA97D /* HeightKey.swift */; };
226C16F22B6C820C00FBA97D /* WeightKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 226C16F12B6C820B00FBA97D /* WeightKey.swift */; };
27FA29902A388E9B009CAC45 /* ModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27FA298F2A388E9B009CAC45 /* ModalView.swift */; };
Expand Down Expand Up @@ -124,14 +118,8 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
22201EE52B9259B800E38F47 /* EQ5D5L.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = EQ5D5L.json; sourceTree = "<group>"; };
22201EE62B9259B800E38F47 /* PHQ-4.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "PHQ-4.json"; sourceTree = "<group>"; };
22201EE72B9259B800E38F47 /* Self-MNA.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "Self-MNA.json"; sourceTree = "<group>"; };
22306A292B7C4E8E000A8EC1 /* OnboardingQuestionnaire.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingQuestionnaire.swift; sourceTree = "<group>"; };
22306A3D2B8F0097000A8EC1 /* OnboardingSurveyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingSurveyView.swift; sourceTree = "<group>"; };
22306A402B8F20C4000A8EC1 /* AccountQuestionnaire.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountQuestionnaire.swift; sourceTree = "<group>"; };
22306A452B8FB173000A8EC1 /* OnboardingQuestionnaireDashboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingQuestionnaireDashboard.swift; sourceTree = "<group>"; };
22365B772B902C9100C4528E /* Onboarding-Questionnaire.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "Onboarding-Questionnaire.json"; sourceTree = "<group>"; };
22306A292B7C4E8E000A8EC1 /* Onboarding_Questionnaire.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Onboarding_Questionnaire.swift; sourceTree = "<group>"; };
22306A2D2B8581C3000A8EC1 /* Onboarding-Questionnaire.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "Onboarding-Questionnaire.json"; sourceTree = "<group>"; };
226C16EF2B69DF3500FBA97D /* HeightKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeightKey.swift; sourceTree = "<group>"; };
226C16F12B6C820B00FBA97D /* WeightKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeightKey.swift; sourceTree = "<group>"; };
27FA298F2A388E9B009CAC45 /* ModalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -297,8 +285,7 @@
2FE5DCAC29EE6107004B9AB4 /* AccountOnboarding.swift */,
2FE5DC2F29EDD7CA004B9AB4 /* Consent.swift */,
2FE5DC3029EDD7CA004B9AB4 /* HealthKitPermissions.swift */,
22306A292B7C4E8E000A8EC1 /* OnboardingQuestionnaire.swift */,
22306A402B8F20C4000A8EC1 /* AccountQuestionnaire.swift */,
22306A292B7C4E8E000A8EC1 /* Onboarding_Questionnaire.swift */,
);
path = Onboarding;
sourceTree = "<group>";
Expand All @@ -311,10 +298,6 @@
748117192B74BC5B00801A9A /* Self-MNA.json */,
748117152B74BC3E00801A9A /* EQ5D5L.json */,
748117162B74BC3E00801A9A /* EQ5D5L.json.license */,
22201EE52B9259B800E38F47 /* EQ5D5L.json */,
22201EE62B9259B800E38F47 /* PHQ-4.json */,
22201EE72B9259B800E38F47 /* Self-MNA.json */,
22365B772B902C9100C4528E /* Onboarding-Questionnaire.json */,
741110F12B5767DE00DFC79E /* PROM-Questionnaire.json */,
653A255428338800005D4D48 /* Assets.xcassets */,
2FA0BFEC2ACC977500E0EF83 /* Localizable.xcstrings */,
Expand All @@ -334,8 +317,6 @@
2FE5DC4C29EDD7FA004B9AB4 /* PICSScheduler.swift */,
2FE5DC4B29EDD7FA004B9AB4 /* PICSTaskContext.swift */,
27FA298F2A388E9B009CAC45 /* ModalView.swift */,
22306A3D2B8F0097000A8EC1 /* OnboardingSurveyView.swift */,
22306A452B8FB173000A8EC1 /* OnboardingQuestionnaireDashboard.swift */,
);
path = Schedule;
sourceTree = "<group>";
Expand Down Expand Up @@ -650,15 +631,6 @@
2FA0BFED2ACC977500E0EF83 /* Localizable.xcstrings in Resources */,
741110F22B5767DF00DFC79E /* PROM-Questionnaire.json in Resources */,
74C593972B720B5E002D0274 /* (null) in Resources */,
22201EEA2B9259B800E38F47 /* Self-MNA.json in Resources */,
2FC3439229EE634B002D773C /* ConsentDocument.md in Resources */,
653A255528338800005D4D48 /* Assets.xcassets in Resources */,
22201EE92B9259B800E38F47 /* PHQ-4.json in Resources */,
2FC3439029EE6346002D773C /* SocialSupportQuestionnaire.json in Resources */,
22201EE82B9259B800E38F47 /* EQ5D5L.json in Resources */,
22365B782B902C9100C4528E /* Onboarding-Questionnaire.json in Resources */,
2FA0BFED2ACC977500E0EF83 /* Localizable.xcstrings in Resources */,
741110F22B5767DF00DFC79E /* PROM-Questionnaire.json in Resources */,
2F6025CB29BBE70F0045459E /* GoogleService-Info.plist in Resources */,
7481171C2B74BC6D00801A9A /* PHQ-4.json in Resources */,
);
Expand Down Expand Up @@ -711,7 +683,7 @@
86400D192B7C4B6D009FEC10 /* ApptInfo.swift in Sources */,
2F4FC8D729EE69D300BFFE26 /* MockUpload.swift in Sources */,
2FE5DC3A29EDD7CA004B9AB4 /* Welcome.swift in Sources */,
22306A2A2B7C4E8E000A8EC1 /* OnboardingQuestionnaire.swift in Sources */,
22306A2A2B7C4E8E000A8EC1 /* Onboarding_Questionnaire.swift in Sources */,
2FE5DC3829EDD7CA004B9AB4 /* InterestingModules.swift in Sources */,
2FE5DC3529EDD7CA004B9AB4 /* Consent.swift in Sources */,
2FE5DC4529EDD7F2004B9AB4 /* Binding+Negate.swift in Sources */,
Expand Down Expand Up @@ -741,18 +713,15 @@
A480C7C42B6D721A00B29A07 /* HKVisualizationItem.swift in Sources */,
56F6F2A02AB441930022FE5A /* ContributionsList.swift in Sources */,
566155292AB8447C00209B80 /* Package+LicenseType.swift in Sources */,
22306A412B8F20C4000A8EC1 /* AccountQuestionnaire.swift in Sources */,
5680DD392AB8983D004E6D4A /* PackageCell.swift in Sources */,
74AE05882B918DAF00AB5287 /* StroopTest.swift in Sources */,
A480C7C02B6D5A3700B29A07 /* HKVisualization.swift in Sources */,
2F5E32BD297E05EA003432F8 /* PICSDelegate.swift in Sources */,
A459932C2B906C3B00A98C95 /* ResultsViz.swift in Sources */,
2FE5DC5229EDD7FA004B9AB4 /* PICSScheduler.swift in Sources */,
A9FE7AD02AA39BAB0077B045 /* AccountSheet.swift in Sources */,
22306A462B8FB173000A8EC1 /* OnboardingQuestionnaireDashboard.swift in Sources */,
653A2551283387FE005D4D48 /* PICS.swift in Sources */,
2FE5DC3629EDD7CA004B9AB4 /* HealthKitPermissions.swift in Sources */,
22306A3E2B8F0097000A8EC1 /* OnboardingSurveyView.swift in Sources */,
8644E6872B7204A7001218D0 /* AppointmentBlock.swift in Sources */,
5661552E2AB854C000209B80 /* PackageHelper.swift in Sources */,
27FA29902A388E9B009CAC45 /* ModalView.swift in Sources */,
Expand Down
73 changes: 0 additions & 73 deletions PICS/Onboarding/AccountQuestionnaire.swift
View file

This file was deleted.

2 changes: 1 addition & 1 deletion PICS/Onboarding/OnboardingFlow.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct OnboardingFlow: View {
if !FeatureFlags.disableFirebase {
AccountOnboarding()
}
AccountQuestionnaire()
OnboardingQuestionnaire()
#if !(targetEnvironment(simulator) && (arch(i386) || arch(x86_64)))
Consent()
#endif
Expand Down
13 changes: 2 additions & 11 deletions .../Onboarding/OnboardingQuestionnaire.swift → ...Onboarding/Onboarding_Questionnaire.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,21 @@ import SpeziQuestionnaire
import SwiftUI
struct OnboardingQuestionnaire: View {
@Environment(OnboardingNavigationPath.self) private var onboardingNavigationPath
@Environment(PICSStandard.self) private var standard
@AppStorage("isSurveyCompleted") var isSurveyCompleted = false
@Binding var isSheetPresented: Bool

var body: some View {
QuestionnaireView(
questionnaire: Bundle.main.questionnaire(withName: "Onboarding-Questionnaire")
) { result in
guard case let .completed(response) = result else {
isSheetPresented = false
onboardingNavigationPath.nextStep()
return // user cancelled
}
isSurveyCompleted = true
isSheetPresented = false
await standard.add(response: response)
onboardingNavigationPath.nextStep()
// ... save the FHIR response to your data store

Check warning on line 21 in PICS/Onboarding/Onboarding_Questionnaire.swift

View check run for this annotation

Codecov / codecov/patch

PICS/Onboarding/Onboarding_Questionnaire.swift#L21 

Added line #L21 was not covered by tests
}
}
}

#Preview {
OnboardingStack {
OnboardingQuestionnaire(isSheetPresented: .constant(true))
OnboardingQuestionnaire()
}
.previewWith(standard: PICSStandard()) {}
}
68 changes: 2 additions & 66 deletions PICS/Resources/Localizable.xcstrings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -660,9 +660,6 @@
}
}
},
"Key" : {
"extractionState" : "manual"
},
"LELAND_STANFORD_BIO" : {
"extractionState" : "stale",
"localizations" : {
Expand Down Expand Up @@ -728,66 +725,13 @@
}
}
},
"Now" : {

},
"Onboarding Questionnaire" : {

},
"Onboarding Task" : {

},
"ONBOARDING_CAPTION" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Please complete the Onboarding questionnaire before your first appointment."
}
}
}
},
"ONBOARDING_DESCRIPTION" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Please fill out the Onboarding Questionnaire to collect some basic information before your first appointment."
}
}
}
},
"ONBOARDING_INSTRUCTION" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "You may skip this step during the onboarding and fill it out before your first appointment."
}
}
}
},
"ONBOARDING_SUBTITLE" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Please fill out this onboarding survey to collect your basic information."
}
}
}
},
"ONBOARDING_TITLE" : {
"ONBOARDING_QUESTIONNAIRE" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Onboarding Questionnaire"
"value" : "Static information on basic profile info"
}
}
}
Expand Down Expand Up @@ -887,12 +831,6 @@
}
}
}
},
"Skip" : {

},
"Start Questionnaire" : {

},
"STREET_ADDRESS" : {
"extractionState" : "manual",
Expand Down Expand Up @@ -924,8 +862,6 @@
}
}
}
"Take Questionnaire" : {

},
"TASK_CONTEXT_ACTION_QUESTIONNAIRE" : {
"localizations" : {
Expand Down
Loading

0 comments on commit b85340c

Please sign in to comment.