Merge pull request #2089 from methodic-labs/develop

2024-02-28 release
methodic-labs · Feb 28, 2024 · 1f1be4a · 1f1be4a
2 parents 40cc9c4 + 0d822e5
commit 1f1be4a
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/containers/tud/schemas/ContextualSchema.js b/src/containers/tud/schemas/ContextualSchema.js
@@ -57,6 +57,7 @@ const createSchema = (
   const secondaryActivitySchema = SecondaryActivitySchema.createSchema(selectedActivity, translate, studySettings);
 
   const enableChangesForOSU = getEnableChangesForOhioStateUniversity(studySettings, activityDay);
+  const primaryActivities = translate(TranslationKeys.PRIMARY_ACTIVITIES, { returnObjects: true });
 
   let schema;
   if (enableChangesForOSU) {
@@ -104,6 +105,13 @@ const createSchema = (
       title: '',
       type: 'object',
     };
+    if (selectedActivity === primaryActivities.childcare || selectedActivity === primaryActivities.napping) {
+      delete schema.properties[psk].properties[COLLABORATOR];
+      schema.properties[psk].required = [
+        ...followupSchema.required,
+        ...secondaryActivitySchema.required,
+      ];
+    }
   }
   else {
     schema = {