Merge pull request #500 from WildMeOrg/cdx-26-patch2

cdx-26-patch-2
WildMeOrg · Jul 14, 2023 · a5dd4bc · a5dd4bc
2 parents fe0227c + ece11f0
commit a5dd4bc
Showing 1 changed file with 19 additions and 13 deletions.
diff --git a/src/pages/reportSighting/ReportForm.jsx b/src/pages/reportSighting/ReportForm.jsx
@@ -178,7 +178,7 @@ export default function ReportForm({
     .map(data => ({ ...data, labelId: data.label }));  
     const encountersRequired = encounterFieldSchemas
     .filter(
-      schema => schema.customField && schema.required && !customEncounterFormValues[schema.name],
+      schema => sightingType === 'one' && schema.customField && schema.required && !customEncounterFormValues[schema.name],
       )
     .map(data => ({ ...data, labelId: data.label })); 
     const requiredCustomFields = sightingsRequired.concat(encountersRequired);
@@ -368,20 +368,26 @@ export default function ReportForm({
             categories={customSightingCategories}
             fieldSchema={requiredCustomSightingSchemas}
           />
-          <FieldCollections
-            formValues={encounterFormValues}
-            setFormValues={setEncounterFormValues}
-            categories={defaultEncounterCategories}
-            fieldSchema={requiredDefaultEncounterFieldSchemas}
-          />
-          <FieldCollections
-            formValues={customEncounterFormValues}
-            setFormValues={setCustomEncounterFormValues}
-            categories={customEncounterCategories}
-            fieldSchema={requiredCustomEncounterFieldSchemas}
-          />
         </>
       )}
+      {
+        !optional && sightingType === 'one' && (
+          <>            
+            <FieldCollections
+              formValues={encounterFormValues}
+              setFormValues={setEncounterFormValues}
+              categories={defaultEncounterCategories}
+              fieldSchema={requiredDefaultEncounterFieldSchemas}
+            />
+            <FieldCollections
+              formValues={customEncounterFormValues}
+              setFormValues={setCustomEncounterFormValues}
+              categories={customEncounterCategories}
+              fieldSchema={requiredCustomEncounterFieldSchemas}
+            />
+          </>
+        )
+      }
 
       {optional && (
               <>