Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding Stroop Test + Revamp of Cognitive Assessments Page #40

Merged
merged 19 commits into from
Mar 2, 2024
Merged

Adding Stroop Test + Revamp of Cognitive Assessments Page #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7e74fc1
adding functional stroop test to assessment tasks
karansoin Mar 1, 2024
d8df194
removing commented out code
karansoin Mar 1, 2024
85902f0
adding correct titles for tests as global variables
karansoin Mar 1, 2024
d508e1f
changing more global variables for assessments
karansoin Mar 1, 2024
c366401
completely reformatted and cleaned up UI for assessments - including …
karansoin Mar 1, 2024
6e07e31
more major UI changes and refinement of assessments - updating UI bas…
karansoin Mar 1, 2024
fb8c65b
refininig questionnaire formatting and questionnaire descriptions
karansoin Mar 1, 2024
0ecbb22
removing commented out code
karansoin Mar 1, 2024
1d9142a
adding comments to explain all code logic
karansoin Mar 1, 2024
c0b2b19
version updates
karansoin Mar 1, 2024
7e208fe
Merge branch 'main' into KaranSoin-Assessment-Changes
karansoin Mar 1, 2024
9a6d3fc
Revert "version updates"
karansoin Mar 1, 2024
0a05b45
Revert "Merge branch 'main' into KaranSoin-Assessment-Changes"
karansoin Mar 1, 2024
dae4db6
adding licensing
karansoin Mar 1, 2024
3d027ed
fixing swiftLint error
karansoin Mar 1, 2024
c71f3f8
correction in assessment description logic
karansoin Mar 1, 2024
94b5185
fix skip onboarding settings
karansoin Mar 1, 2024
e6ed961
Merge branch 'main' into KaranSoin-Assessment-Changes
karansoin Mar 1, 2024
b85340c
Revert "Merge branch 'main' into KaranSoin-Assessment-Changes"
karansoin Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 34 additions & 32 deletions PICS.xcodeproj/project.pbxproj
View file
Open in desktop
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 @@ -76,6 +70,14 @@
653A255528338800005D4D48 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 653A255428338800005D4D48 /* Assets.xcassets */; };
653A256228338800005D4D48 /* PICSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 653A256128338800005D4D48 /* PICSTests.swift */; };
741110F22B5767DF00DFC79E /* PROM-Questionnaire.json in Resources */ = {isa = PBXBuildFile; fileRef = 741110F12B5767DE00DFC79E /* PROM-Questionnaire.json */; };
748117172B74BC3E00801A9A /* EQ5D5L.json in Resources */ = {isa = PBXBuildFile; fileRef = 748117152B74BC3E00801A9A /* EQ5D5L.json */; };
748117182B74BC3E00801A9A /* EQ5D5L.json.license in Resources */ = {isa = PBXBuildFile; fileRef = 748117162B74BC3E00801A9A /* EQ5D5L.json.license */; };
7481171A2B74BC5B00801A9A /* Self-MNA.json in Resources */ = {isa = PBXBuildFile; fileRef = 748117192B74BC5B00801A9A /* Self-MNA.json */; };
7481171C2B74BC6D00801A9A /* PHQ-4.json in Resources */ = {isa = PBXBuildFile; fileRef = 7481171B2B74BC6D00801A9A /* PHQ-4.json */; };
74AE05882B918DAF00AB5287 /* StroopTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74AE05872B918DAF00AB5287 /* StroopTest.swift */; };
74C593952B720781002D0274 /* (null) in Resources */ = {isa = PBXBuildFile; };
74C593972B720B5E002D0274 /* (null) in Resources */ = {isa = PBXBuildFile; };
74C5939A2B720F1B002D0274 /* (null) in Resources */ = {isa = PBXBuildFile; };
86400D192B7C4B6D009FEC10 /* ApptInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86400D182B7C4B6D009FEC10 /* ApptInfo.swift */; };
8644E6712B6C7243001218D0 /* AppointmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8644E6702B6C7243001218D0 /* AppointmentView.swift */; };
8644E67B2B6C75B1001218D0 /* MapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8644E67A2B6C75B1001218D0 /* MapView.swift */; };
Expand Down Expand Up @@ -116,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 @@ -170,6 +166,11 @@
653A256728338800005D4D48 /* PICSUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PICSUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
653A258928339462005D4D48 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
741110F12B5767DE00DFC79E /* PROM-Questionnaire.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "PROM-Questionnaire.json"; sourceTree = "<group>"; };
748117152B74BC3E00801A9A /* EQ5D5L.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = EQ5D5L.json; sourceTree = "<group>"; };
748117162B74BC3E00801A9A /* EQ5D5L.json.license */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EQ5D5L.json.license; sourceTree = "<group>"; };
748117192B74BC5B00801A9A /* Self-MNA.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "Self-MNA.json"; sourceTree = "<group>"; };
7481171B2B74BC6D00801A9A /* PHQ-4.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "PHQ-4.json"; sourceTree = "<group>"; };
74AE05872B918DAF00AB5287 /* StroopTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StroopTest.swift; sourceTree = "<group>"; };
86400D182B7C4B6D009FEC10 /* ApptInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApptInfo.swift; sourceTree = "<group>"; };
8644E6702B6C7243001218D0 /* AppointmentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppointmentView.swift; sourceTree = "<group>"; };
8644E67A2B6C75B1001218D0 /* MapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -284,19 +285,19 @@
2FE5DCAC29EE6107004B9AB4 /* AccountOnboarding.swift */,
2FE5DC2F29EDD7CA004B9AB4 /* Consent.swift */,
2FE5DC3029EDD7CA004B9AB4 /* HealthKitPermissions.swift */,
22306A292B7C4E8E000A8EC1 /* OnboardingQuestionnaire.swift */,
22306A402B8F20C4000A8EC1 /* AccountQuestionnaire.swift */,
22306A292B7C4E8E000A8EC1 /* Onboarding_Questionnaire.swift */,
);
path = Onboarding;
sourceTree = "<group>";
};
2FE5DC2D29EDD792004B9AB4 /* Resources */ = {
isa = PBXGroup;
children = (
22201EE52B9259B800E38F47 /* EQ5D5L.json */,
22201EE62B9259B800E38F47 /* PHQ-4.json */,
22201EE72B9259B800E38F47 /* Self-MNA.json */,
22365B772B902C9100C4528E /* Onboarding-Questionnaire.json */,
22306A2D2B8581C3000A8EC1 /* Onboarding-Questionnaire.json */,
7481171B2B74BC6D00801A9A /* PHQ-4.json */,
748117192B74BC5B00801A9A /* Self-MNA.json */,
748117152B74BC3E00801A9A /* EQ5D5L.json */,
748117162B74BC3E00801A9A /* EQ5D5L.json.license */,
741110F12B5767DE00DFC79E /* PROM-Questionnaire.json */,
653A255428338800005D4D48 /* Assets.xcassets */,
2FA0BFEC2ACC977500E0EF83 /* Localizable.xcstrings */,
Expand All @@ -316,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 @@ -443,6 +442,7 @@
A45993282B90544300A98C95 /* Assessments.swift */,
864909412B8AA1C300054C9A /* TrailMakingTest.swift */,
A459932B2B906C3B00A98C95 /* ResultsViz.swift */,
74AE05872B918DAF00AB5287 /* StroopTest.swift */,
);
path = Assessment;
sourceTree = "<group>";
Expand Down Expand Up @@ -619,16 +619,20 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
22201EEA2B9259B800E38F47 /* Self-MNA.json in Resources */,
7481171A2B74BC5B00801A9A /* Self-MNA.json in Resources */,
2FC3439229EE634B002D773C /* ConsentDocument.md in Resources */,
653A255528338800005D4D48 /* Assets.xcassets in Resources */,
22201EE92B9259B800E38F47 /* PHQ-4.json in Resources */,
74C5939A2B720F1B002D0274 /* (null) in Resources */,
748117172B74BC3E00801A9A /* EQ5D5L.json in Resources */,
2FC3439029EE6346002D773C /* SocialSupportQuestionnaire.json in Resources */,
22201EE82B9259B800E38F47 /* EQ5D5L.json in Resources */,
22365B782B902C9100C4528E /* Onboarding-Questionnaire.json in Resources */,
748117182B74BC3E00801A9A /* EQ5D5L.json.license in Resources */,
74C593952B720781002D0274 /* (null) in Resources */,
22306A2E2B8581C3000A8EC1 /* Onboarding-Questionnaire.json in Resources */,
2FA0BFED2ACC977500E0EF83 /* Localizable.xcstrings in Resources */,
741110F22B5767DF00DFC79E /* PROM-Questionnaire.json in Resources */,
74C593972B720B5E002D0274 /* (null) in Resources */,
2F6025CB29BBE70F0045459E /* GoogleService-Info.plist in Resources */,
7481171C2B74BC6D00801A9A /* PHQ-4.json in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -679,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 @@ -709,17 +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
8 changes: 4 additions & 4 deletions PICS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/StanfordSpezi/SpeziFoundation.git",
"state" : {
"revision" : "662f25d6010a94faf4fd996e184617fcb2bf13d4",
"version" : "1.0.3"
"revision" : "0346857e2f1d6fd4b1d950d271be6c82df97107f",
"version" : "1.0.2"
}
},
{
Expand Down Expand Up @@ -248,8 +248,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/StanfordSpezi/SpeziViews.git",
"state" : {
"revision" : "4d2a724d97c8f19ac7de7aa2c046b1cb3ef7b279",
"version" : "1.3.1"
"revision" : "d49f716e4a4d634604bb0dcd6d53df679b6c1358",
"version" : "1.3.0"
}
},
{
Expand Down
Loading
Loading