new changes before pulling 9813187

avniproject · Dec 11, 2024 · 12cafb8 · 12cafb8
2 parents 9813187 + 892d9ac
commit 12cafb8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/src/adminApp/IdentifierUserAssignment.js b/src/adminApp/IdentifierUserAssignment.js
@@ -59,9 +59,7 @@ export const IdentifierUserAssignmentDetail = props => {
 };
 
 export const UserSelectInput = props => {
-  const choices = props.choices.filter(
-    choice => choice.name != null && choice.organisationId != null
-  );
+  const choices = props.choices.filter(choice => choice.name != null && choice.organisationId != null);
   return <AutocompleteInput {...props} choices={choices} optionText="name" />;
 };
 
@@ -71,6 +69,7 @@ const IdentifierUserAssignmentForm = props => (
       {({ formData, dispatch, ...rest }) => (
         <Fragment>
           <ReferenceInput
+            perPage={10}
             source="userId"
             reference="user"
             label="Which user?"
@@ -104,11 +103,7 @@ const IdentifierUserAssignmentForm = props => (
         </Fragment>
       )}
     </AvniFormDataConsumer>
-    <AvniTextInput
-      source="identifierStart"
-      required
-      toolTipKey={"ADMIN_IDENTIFIER_ASSIGNMENT_START"}
-    />
+    <AvniTextInput source="identifierStart" required toolTipKey={"ADMIN_IDENTIFIER_ASSIGNMENT_START"} />
     <AvniTextInput source="identifierEnd" required toolTipKey={"ADMIN_IDENTIFIER_ASSIGNMENT_END"} />
   </SimpleForm>
 );

diff --git a/src/adminApp/Organisation.js b/src/adminApp/Organisation.js
@@ -253,10 +253,16 @@ export const OrganisationCreate = props => {
         if (errorData.includes("organisation_db_user_key")) {
           backendError["dbUser"] = `${data.dbUser} is already exist please use other name`;
         }
-      }
-      if (Object.keys(backendError).length !== 0) {
-        setErrors(backendError);
-        return;
+        if (errorData.includes("organisation_media_directory_key")) {
+          backendError["mediaDirectory"] = `${data.mediaDirectory} is already exist please use other name`;
+        }
+        if (Object.keys(backendError).length !== 0) {
+          setErrors(backendError);
+          return;
+        } else {
+          backendError["other"] = errorData;
+          setErrors(backendError);
+        }
       }
     }
   };
@@ -381,7 +387,9 @@ export const OrganisationCreate = props => {
             />
             {errors.statusId && <FormHelperText error>{errors.statusId}</FormHelperText>}
           </Grid>
-
+          <Grid item xs={6}>
+            {errors.other && <FormHelperText error>{errors.other}</FormHelperText>}
+          </Grid>
           <Grid container item sm={12}>
             <Grid item sm={2}>
               <SaveComponent name="save" onSubmit={handleSubmit} styleClass={{ marginTop: "10px" }} />

diff --git a/src/adminApp/SubjectType/AdvancedSettings.js b/src/adminApp/SubjectType/AdvancedSettings.js
@@ -44,6 +44,11 @@ export const AdvancedSettings = ({ subjectType, dispatch, locationTypes, formMap
   const onSyncConceptChange = (name, value) => {
     const syncAttributeChangeMessage =
       "Changing sync attributes will ask the users to reset their sync. This might take time depending on the data.";
+    const decisionConceptSyncAttributeAlert =
+      "Make sure to set the value of the selected decision concept to sync the subject to mobile app.";
+    if (includes(syncAttributes.filter(concept => concept.isDecisionConcept).map(concept => concept.value), value)) {
+      window.confirm(decisionConceptSyncAttributeAlert);
+    }
     if (!isEdit) {
       changeSyncAttribute(name, value);
     } else if (window.confirm(syncAttributeChangeMessage)) {
@@ -64,6 +69,11 @@ export const AdvancedSettings = ({ subjectType, dispatch, locationTypes, formMap
             }
           });
         });
+        forEach(form.decisionConcepts, concept => {
+          if (includes(syncAttributeDataTypes, concept.dataType)) {
+            syncAttributes.push({ label: concept.name, value: concept.uuid, isDecisionConcept: true });
+          }
+        });
         setSyncAttributes(syncAttributes);
       });
     }