avniproject/avni-product#1652 | merge

avniproject · Sep 5, 2024 · 9116a8f · 9116a8f
2 parents 6c15e1a + 00edf3d
commit 9116a8f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/public/documentation/toolTip.json b/public/documentation/toolTip.json
@@ -196,5 +196,6 @@
   "ENABLE_MESSAGING_BUTTON": "Enable messaging through WhatsApp. Requires a Glific account",
   "APP_DESIGNER_MESSAGE_RULE_NAME": "Name",
   "APP_DESIGNER_SELECT_MESSAGE_TEMPLATE": "Choose the message template",
-  "APP_DESIGNER_SELECT_RECEIVER_TYPE": "Choose the receiver type"
+  "APP_DESIGNER_SELECT_RECEIVER_TYPE": "Choose the receiver type",
+  "IGNORE_SYNC_SETTINGS_IN_DEA": "Ignore the SubjectType sync settings restrictions in the Data Entry app."
 }
diff --git a/src/adminApp/user.js b/src/adminApp/user.js
@@ -210,6 +210,11 @@ export const UserDetail = ({ user, hasEditUserPrivilege, ...props }) => {
         </ArrayField>
         <FunctionField label="Operating Scope" render={user => formatOperatingScope(user.operatingIndividualScope)} />
         <LineBreak />
+        <h4>Sync Settings</h4>
+        <FunctionField
+          label="Below Subject type Sync settings are to be ignored in the Data Entry app: "
+          render={user => (user.ignoreSyncSettingsInDEA ? "Yes" : "No")}
+        />
         {map(syncAttributesData.subjectTypes, st => (
           <SubjectTypeSyncAttributeShow
             subjectType={st}
@@ -584,6 +589,12 @@ const UserForm = ({ edit, nameSuffix, organisation, ...props }) => {
                 Sync Settings
               </Typography>
             </ToolTipContainer>
+            <AvniBooleanInput
+              style={{ marginLeft: "10px", marginTop: "10px" }}
+              source="ignoreSyncSettingsInDEA"
+              label="Ignore below listed Sync settings in the Data Entry app"
+              toolTipKey={"IGNORE_SYNC_SETTINGS_IN_DEA"}
+            />
             {map(syncAttributesData.subjectTypes, st => (
               <SubjectTypeSyncAttributes subjectType={st} key={get(st, "name")} {...props} />
             ))}