Issue feat PS-3574:Add firstname , lastname gender changes of learner and facilitator

src/components/AddFacilitator.tsx

@@ -9,6 +9,7 @@ import {
   RoleId,
   Status,
   Telemetry,
+  fieldKeys,
 } from '@/utils/app.constant';
 import React, { useEffect } from 'react';
 import ReactGA from 'react-ga4';
@@ -221,7 +222,7 @@ const AddFacilitatorModal: React.FC<AddFacilitatorModalprops> = ({
         const fieldSchema = schemaProperties[fieldKey];
         const fieldId = fieldSchema?.fieldId;
 
-        if (fieldId === null || fieldId === 'null') {
+        if (fieldId === null || fieldId === 'null' || fieldKey===fieldKeys.GENDER) {
           if (typeof fieldValue !== 'object') {
             apiBody[fieldKey] = fieldValue;
             if (fieldKey === 'name') {
@@ -355,7 +356,7 @@ const AddFacilitatorModal: React.FC<AddFacilitatorModalprops> = ({
                   telemetryFactory.interact(telemetryInteract);
 
                   await sendEmail(
-                    apiBody['name'],
+                    apiBody['firstName'],
                     formData?.email,
                     password,
                     formData?.email

src/components/AddLeanerModal.tsx

@@ -258,16 +258,19 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({
                 username,
                 password,
                 userEmail,
-                apiBody['name']
+                apiBody['firstName']
               );
             } else {
               showToastMessage(t('COMMON.SOMETHING_WENT_WRONG'), 'error');
             }
           }
         }
       } catch (error: any) {
-        if (error?.response?.data?.params?.err === 'User already exist.') {
-          showToastMessage(error?.response?.data?.params?.err, 'error');
+        if (error?.response?.data?.params?.err === "User already exist.") {
+          showToastMessage(error?.response?.data?.params?.err, "error");
+        } 
+        else if (error?.response?.data?.params?.errmsg === "Email already exists") {
+          showToastMessage(error?.response?.data?.params?.errmsg, "error");
         } else {
           showToastMessage(t('COMMON.SOMETHING_WENT_WRONG'), 'error');
         }

src/components/CohortFacilitatorList.tsx

@@ -77,7 +77,7 @@ const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
                 (field: { label: string }) => field.label === 'AGE'
               );
               return {
-                name: toPascalCase(user?.name),
+                name: toPascalCase(user?.firstName || '') + ' ' + (user?.lastName ? toPascalCase(user.lastName) : ""),
                 userId: user?.userId,
                 memberStatus: user?.status,
                 statusReason: user?.statusReason,

src/components/CohortLearnerList.tsx

@@ -67,7 +67,7 @@ const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
                 (field: { label: string }) => field.label === 'AGE'
               );
               return {
-                name: toPascalCase(user?.name),
+                name: toPascalCase(user?.firstName || '') + ' ' + (user?.lastName ? toPascalCase(user.lastName) : ""),
                 userId: user?.userId,
                 memberStatus: user?.status,
                 statusReason: user?.statusReason,

src/components/GeneratedSchemas.ts

@@ -115,6 +115,11 @@ export const GenerateSchemaAndUiSchema = (
         }));
         fieldUiSchema['ui:widget'] = 'CustomRadioWidget';
         break;
+        case 'date':
+          fieldSchema.type = 'string';
+          fieldSchema.format = 'date';
+          fieldUiSchema['ui:widget'] = 'date';
+          break;
       default:
         break;
     }

src/components/LearnersListItem.tsx

@@ -408,15 +408,15 @@ const LearnersListItem: React.FC<LearnerListProps> = ({
   const stringAvatar = (name: string) => {
     if (name) {
       const nameParts = name.split(' ');
-
+  
       return {
         children:
           nameParts.length === 1
             ? nameParts[0][0]
-            : `${nameParts[0][0]}${nameParts[1][0]}`,
+            : `${nameParts[0][0]}${nameParts[1]?.[0] || ''}`, 
       };
     }
-
+  
     return '';
   };
 

src/pages/assessments/index.tsx

@@ -117,8 +117,7 @@ const Assessments = () => {
         if (resp) {
           const userDetails = resp.map((user: any) => ({
             ...user,
-            name: toPascalCase(user.name),
-            userId: user.userId,
+            name: toPascalCase(user?.firstName || '') + ' ' + (user?.lastName ? toPascalCase(user.lastName) : ""),            userId: user.userId,
           }));
           setCohortMembers(userDetails);
         }

src/pages/attendance-history.tsx

@@ -241,7 +241,7 @@ const UserAttendanceHistory = () => {
           const nameUserIdArray = resp
               ?.map((entry: any) => ({
                 userId: entry.userId,
-                name: toPascalCase(entry.name),
+                name: toPascalCase(entry?.firstName || '') + ' ' + (entry?.lastName ? toPascalCase(entry.lastName) : ""),
                 memberStatus: entry.status,
                 createdAt: entry.createdAt,
                 updatedAt: entry.updatedAt,

src/pages/attendance-overview.tsx

@@ -213,7 +213,8 @@ const AttendanceOverview: React.FC<AttendanceOverviewProps> = () => {
         if (resp) {
           const nameUserIdArray = resp?.map((entry: any) => ({
             userId: entry.userId,
-            name: toPascalCase(entry.name),
+            name: toPascalCase(entry?.firstName || '') + ' ' + (entry?.lastName ? toPascalCase(entry.lastName) : ""),
+
             memberStatus: entry.status,
           }));
           if (nameUserIdArray) {

src/pages/board-enrollment/index.tsx

@@ -237,7 +237,9 @@ const BoardEnrollment = () => {
     return members.map((entry: any) => ({
       userId: entry.userId,
       cohortMembershipId: entry.cohortMembershipId,
-      name: toPascalCase(entry.name),
+      name: toPascalCase(entry?.firstName || '') + ' ' + (entry?.lastName ? toPascalCase(entry.lastName) : ""),
+
+
       memberStatus: entry.status,
       statusReason: entry.statusReason,
       customField: entry.customField,

src/pages/observation/[observationId]/index.tsx

@@ -313,7 +313,7 @@ setFilteredEntityData(result)
         const filters = {
           cohortId: selectedCohort,
         } as CohortMemberList['filters'];
-        if (searchInput !== '') filters.name = searchInput;
+        if (searchInput !== '') filters.firstName = searchInput;
         //const limit=limit;
         let response;
         if (entity === ObservationEntityType?.LEARNER) {
@@ -338,7 +338,7 @@ setFilteredEntityData(result)
               (field: { label: string }) => field.label === 'AGE'
             );
             return {
-              name: toPascalCase(user?.name),
+              name: toPascalCase(user?.firstName || '') + ' ' + (user?.lastName ? toPascalCase(user.lastName) : ""),
               userId: user?.userId,
               memberStatus: user?.status,
               statusReason: user?.statusReason,

src/utils/Interfaces.ts

@@ -96,6 +96,7 @@ export interface CohortMemberList {
     role?: string;
     status?: string[];
     name?: string | undefined;
+    firstName?:string
   };
   includeArchived?: boolean;
 }
@@ -432,7 +433,7 @@ export interface FieldOption {
 
 export interface Field {
   name: string;
-  type: 'text' | 'numeric' | 'drop_down' | 'checkbox' | 'radio' | 'email';
+  type: 'text' | 'numeric' | 'drop_down' | 'checkbox' | 'radio' | 'email' | 'date';
   label: string;
   order: string;
   coreField: number;

src/utils/app.constant.ts

@@ -255,3 +255,6 @@ export enum sessionType {
   PLANNED = 'planned',
   EXTRA = 'extra',
 }
+export enum fieldKeys {
+  GENDER="gender"
+}