Merge pull request #640 from AkshataKatwal16/reassign-cohorts

Issue feat: PS-3578 suggest Username with combination of firstname+lastname
tekdi · Jan 23, 2025 · 72387ab · 72387ab
2 parents ea77751 + 7857ae7
commit 72387ab
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/src/components/AddLeanerModal.tsx b/src/components/AddLeanerModal.tsx
@@ -54,6 +54,8 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({
 }) => {
   const [schema, setSchema] = React.useState<any>();
   const [uiSchema, setUiSchema] = React.useState<any>();
+  const [customFormData, setCustomFormData] = React.useState<any>(formData);
+
   const [reloadProfile, setReloadProfile] = React.useState(false);
   const [openModal, setOpenModal] = React.useState(false);
   const [learnerFormData, setLearnerFormData] = React.useState<any>();
@@ -305,9 +307,22 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({
     }
   };
 
+
   const handleChange = (event: IChangeEvent<any>) => {
-    console.log('Form data changed:', event.formData);
+    if (!isEditModal) {
+      const { firstName, lastName } = event.formData;
+
+      if (firstName && lastName) {
+        event.formData.username = firstName + lastName;
+      } else {
+        event.formData.username = "";
+      }
+      setCustomFormData({ ...event.formData });
+
+    }
+
   };
+
 
   const handleError = (errors: any) => {
     console.log('Form errors:', errors);
@@ -355,7 +370,7 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({
             widgets={{}}
             showErrorList={true}
             customFields={customFields}
-            formData={formData ?? undefined}
+            formData={customFormData ?? undefined}
           >
             <FormButtons
               formData={formData ?? learnerFormData}

diff --git a/src/pages/assessments/user/[userId]/index.tsx b/src/pages/assessments/user/[userId]/index.tsx
@@ -63,6 +63,8 @@ function AssessmentsDetails() {
   );
   const [assessmentList, setAssessmentList] = useState([]);
   const [subject, setSubject] = useState<any>([]);
+  const [fullName, setFullName] = useState<any>("");
+
   const [assessmentInfo, setAssessmentInfo] = useState<any>();
   const [isLoading, setIsLoading] = useState(false);
   const [userDetails, setUserDetails] = useState<any>({});
@@ -229,6 +231,20 @@ function AssessmentsDetails() {
         });
         if (response?.result?.userData) {
           setUserDetails(response?.result?.userData);
+          let fullName = "";
+
+              if (response?.result?.userData?.firstName) {
+                fullName += toPascalCase(response?.result?.userData.firstName);
+              }
+
+              if (response?.result?.userData?.middleName) {
+                fullName += (fullName ? " " : "") + toPascalCase(response?.result?.userData.middleName);
+              }
+
+              if (response?.result?.userData?.lastName) {
+                fullName += (fullName ? " " : "") + toPascalCase(response?.result?.userData.lastName);
+              }
+              setFullName(fullName);
         }
       } catch (error) {
         showToastMessage(t('COMMON.SOMETHING_WENT_WRONG'), 'error');
@@ -316,7 +332,7 @@ function AssessmentsDetails() {
           }}
         />
         <Typography fontSize={'22px'} m={'1rem'}>
-          {toPascalCase(userDetails?.name)}
+          {fullName}
         </Typography>
       </Box>