Merge pull request #63 from AkshataKatwal16/admin

Issue feat: Integrate update learner API

public/locales/en/common.json

@@ -58,7 +58,9 @@
     "ALL_BLOCKS": "All Blocks",
     "NEW_FACILITATOR": "New Facilitator",
     "SEARCHBAR_PLACEHOLDER": "Search Facilitators..",
-    "FACILITATOR_CREATED_SUCCESSFULLY": "Teacher has been Successfully Created"
+    "FACILITATOR_CREATED_SUCCESSFULLY": "Teacher has been Successfully Created",
+    "FACILITATOR_UPDATED_SUCCESSFULLY": "Teacher has been Successfully Updated!"
+
   },
   "NAVBAR": {
     "SEARCHBAR_PLACEHOLDER": "Search course, topic, student, pdf etc.."
@@ -67,7 +69,9 @@
     "SEARCHBAR_PLACEHOLDER": "Search Learners..",
     "NEW_LEARNER": "New Learner",
     "FIRST_SELECT_REQUIRED_FIELDS": "First select required fields",
-    "LEARNER_CREATED_SUCCESSFULLY": "Leaner has been Successfully Created!"
+    "LEARNER_CREATED_SUCCESSFULLY": "Leaner has been Successfully Created!",
+    "LEARNER_UPDATED_SUCCESSFULLY": "Leaner has been Successfully Updated!"
+
   },
   "TEAM_LEADERS": {
     "SEARCHBAR_PLACEHOLDER": "Search Team leaders.."

src/components/ActionIcon.tsx

@@ -7,7 +7,7 @@ import React from "react";
 import MoreVertIcon from "@mui/icons-material/MoreVert";
 import { useTranslation } from "next-i18next";
 import { Box, Typography, Tooltip } from "@mui/material";
-import EditIcon from "@mui/icons-material/Edit";
+import EditIcon from '@mui/icons-material/Edit';
 import DeleteIcon from "@mui/icons-material/Delete";
 
 interface ActionCellProps {
@@ -41,11 +41,11 @@ const ActionIcon: React.FC<ActionCellProps> = ({
             flexDirection: "column",
             alignItems: "center",
             cursor: "pointer",
-            opacity: 0.5, // Reduced opacity to make it appear disabled
+        //    opacity: 0.5, // Reduced opacity to make it appear disabled
             pointerEvents: "auto", // Enable pointer events to allow click
           }}
         >
-          <EditIcon sx={{ color: "rgba(0, 0, 0, 0.5)" }} />
+          <EditIcon/>
           <Typography variant="body2">Edit</Typography>
         </Box>
       </Tooltip>

src/components/AddFacilitator.tsx

@@ -7,11 +7,11 @@ import {
   GenerateSchemaAndUiSchema,
   customFields,
 } from "@/components/GeneratedSchemas";
-import { FormContext, FormContextType } from "@/utils/app.constant";
+import { FormContext, FormContextType, Role } from "@/utils/app.constant";
 import DynamicForm from "@/components/DynamicForm";
 import SendCredentialModal from "@/components/SendCredentialModal";
 import SimpleModal from "@/components/SimpleModal";
-import { createUser, getFormRead } from "@/services/CreateUserService";
+import { createUser, getFormRead, updateUser } from "@/services/CreateUserService";
 import { generateUsernameAndPassword } from "@/utils/Helper";
 import { FormData } from "@/utils/Interfaces";
 import { RoleId } from "@/utils/app.constant";
@@ -23,10 +23,16 @@ import { useLocationState } from "@/utils/useLocationState";
 interface AddFacilitatorModalprops {
   open: boolean;
   onClose: () => void;
+  formData?:object;
+  isEditModal?:boolean;
+  userId?:string
 }
 
 const AddFacilitatorModal: React.FC<AddFacilitatorModalprops> = ({
   open,
+  formData,
+  isEditModal=false,
+  userId,
   onClose,
 }) => {
   const { t } = useTranslation();
@@ -98,7 +104,7 @@ const AddFacilitatorModal: React.FC<AddFacilitatorModalprops> = ({
     console.log("Form data submitted:", formData);
     const schemaProperties = schema.properties;
 
-    const { username, password } = generateUsernameAndPassword("MH", "F");
+    const { username, password } = generateUsernameAndPassword(selectedStateCode,Role.TEACHER);
 
     let apiBody: any = {
       username: username,
@@ -143,10 +149,45 @@ const AddFacilitatorModal: React.FC<AddFacilitatorModalprops> = ({
     });
 
     console.log(apiBody);
+    if(!isEditModal)
+    {
+     apiBody.customFields.push({
+       fieldId: "a717bb68-5c8a-45cb-b6dd-376caa605736",
+       value: [selectedBlockCode],
+     });
+     apiBody.customFields.push({
+       fieldId: "61b5909a-0b45-4282-8721-e614fd36d7bd",
+       value: [selectedStateCode],
+     });
+     apiBody.customFields.push({
+       fieldId: "aecb84c9-fe4c-4960-817f-3d228c0c7300",
+       value: [selectedDistrictCode],
+     });
+    }
 try{
-  const response = await createUser(apiBody);
+  if(isEditModal && userId)
+  {
+    const userData={
+      "name":apiBody.name,
+      "mobile": apiBody.mobile,
+
+     };
+     const customFields=apiBody.customFields;
+     console.log(customFields)
+     const object=
+     {
+       "userData":userData,
+       "customFields":customFields
+     }
+     const response = await updateUser(userId,object)
+     showToastMessage(t("LEARNERS.LEARNER_UPDATED_SUCCESSFULLY"), "success");
+  }else{
+    const response = await createUser(apiBody);
+    showToastMessage(t('FACILITATORS.FACILITATOR_CREATED_SUCCESSFULLY'), 'success');
+  }
   onClose();
-  showToastMessage(t('FACILITATORS.FACILITATOR_CREATED_SUCCESSFULLY'), 'success');
+
+
 }
 catch(error)
 {
@@ -197,7 +238,9 @@ catch(error)
           selectedCenter={selectedCenter}
           handleCenterChangeWrapper={handleCenterChangeWrapper}
         />
-        {dynamicForm && schema && uiSchema && (
+
+
+{formData ? ( schema && uiSchema && (
           <DynamicForm
             schema={schema}
             uiSchema={uiSchema}
@@ -207,8 +250,24 @@ catch(error)
             widgets={{}}
             showErrorList={true}
             customFields={customFields}
-          />
-        )}
+            formData={formData}
+          >
+            {/* <CustomSubmitButton onClose={primaryActionHandler} /> */}
+          </DynamicForm>
+        )) :( dynamicForm && schema && uiSchema && (
+          <DynamicForm
+            schema={schema}
+            uiSchema={uiSchema}
+            onSubmit={handleSubmit}
+            onChange={handleChange}
+            onError={handleError}
+            widgets={{}}
+            showErrorList={true}
+            customFields={customFields}
+          >
+            {/* <CustomSubmitButton onClose={primaryActionHandler} /> */}
+          </DynamicForm>
+        ))}
       </SimpleModal>
       <SendCredentialModal open={openModal} onClose={onCloseModal} />
     </>

src/components/AddLeanerModal.tsx

@@ -4,7 +4,7 @@ import {
   customFields,
 } from "@/components/GeneratedSchemas";
 import SimpleModal from "@/components/SimpleModal";
-import { createUser, getFormRead } from "@/services/CreateUserService";
+import { createUser, getFormRead , updateUser} from "@/services/CreateUserService";
 import { generateUsernameAndPassword } from "@/utils/Helper";
 import { FormData } from "@/utils/Interfaces";
 import {
@@ -31,12 +31,15 @@ import { showToastMessage } from "./Toastify";
 interface AddLearnerModalProps {
   open: boolean;
   onClose: () => void;
+  formData?:object;
+  isEditModal?:boolean;
+  userId?:string
 }
 interface FieldProp {
   value: string;
   label: string;
 }
-const AddLearnerModal: React.FC<AddLearnerModalProps> = ({ open, onClose }) => {
+const AddLearnerModal: React.FC<AddLearnerModalProps> = ({ open, onClose, formData , isEditModal=false, userId}) => {
   const [schema, setSchema] = React.useState<any>();
   const [uiSchema, setUiSchema] = React.useState<any>();
 
@@ -80,6 +83,7 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({ open, onClose }) => {
         if (response) {
           const { schema, uiSchema } = GenerateSchemaAndUiSchema(response, t);
           setSchema(schema);
+          console.log(schema)
           setUiSchema(uiSchema);
         }
       } catch (error) {
@@ -143,6 +147,7 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({ open, onClose }) => {
       console.log(
         `FieldID: ${fieldId}, FieldValue: ${fieldValue}, type: ${typeof fieldValue}`
       );
+
 
       if (fieldId === null || fieldId === "null") {
         if (typeof fieldValue !== "object") {
@@ -164,8 +169,11 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({ open, onClose }) => {
           });
         }
       }
-    });
 
+
+    });
+   if(!isEditModal)
+   {
     apiBody.customFields.push({
       fieldId: "a717bb68-5c8a-45cb-b6dd-376caa605736",
       value: [selectedBlockCode],
@@ -178,10 +186,36 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({ open, onClose }) => {
       fieldId: "aecb84c9-fe4c-4960-817f-3d228c0c7300",
       value: [selectedDistrictCode],
     });
+   }
+
     try {
-      const response = await createUser(apiBody);
+      if(isEditModal && userId)
+      {
+        console.log(apiBody)
+        const userData={
+         "name":apiBody.name,
+         "mobile": apiBody.mobile,
+         "father_name":apiBody.father_name
+
+        };
+        const customFields=apiBody.customFields;
+        console.log(customFields)
+        const object=
+        {
+          "userData":userData,
+          "customFields":customFields
+        }
+        const response = await updateUser(userId,object)
+        showToastMessage(t("LEARNERS.LEARNER_UPDATED_SUCCESSFULLY"), "success");
+
+
+      }
+      else{  
+        const response = await createUser(apiBody);
+        showToastMessage(t("LEARNERS.LEARNER_CREATED_SUCCESSFULLY"), "success");
+
+      }
       onClose();
-      showToastMessage(t("LEARNERS.LEARNER_CREATED_SUCCESSFULLY"), "success");
     } catch (error) {
       onClose();
       console.log(error);
@@ -307,7 +341,23 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({ open, onClose }) => {
             />
           </Box>
         </>
-        {dynamicForm && schema && uiSchema && (
+
+
+        {formData ? ( schema && uiSchema && (
+          <DynamicForm
+            schema={schema}
+            uiSchema={uiSchema}
+            onSubmit={handleSubmit}
+            onChange={handleChange}
+            onError={handleError}
+            widgets={{}}
+            showErrorList={true}
+            customFields={customFields}
+            formData={formData}
+          >
+            {/* <CustomSubmitButton onClose={primaryActionHandler} /> */}
+          </DynamicForm>
+        )) :( dynamicForm && schema && uiSchema && (
           <DynamicForm
             schema={schema}
             uiSchema={uiSchema}
@@ -320,7 +370,8 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({ open, onClose }) => {
           >
             {/* <CustomSubmitButton onClose={primaryActionHandler} /> */}
           </DynamicForm>
-        )}
+        ))}
+
       </SimpleModal>
     </>
   );

src/components/DynamicForm.tsx

@@ -20,6 +20,8 @@ interface DynamicFormProps {
   onChange: (event: IChangeEvent<any>) => void;
   onError: (errors: any) => void;
   showErrorList: boolean;
+
+
   widgets: {
     [key: string]: React.FC<WidgetProps<any, RJSFSchema, any>>;
   };
@@ -39,6 +41,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
   customFields,
   children,
 }) => {
+  console.log(formData)
   const widgets = {
     MultiSelectCheckboxes: MultiSelectCheckboxes,
     CustomRadioWidget: CustomRadioWidget,
@@ -113,7 +116,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
   }
 
   function handleChange(event: any) {
-    console.log('Form data event:', event);
+    console.log('Form data changed:', event.formData);
     onChange(event);
   }
 
@@ -123,7 +126,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
       <FormWithMaterialUI
         schema={schema}
         uiSchema={uiSchema}
-        formData={formData}
+      formData={formData}
         onChange={handleChange}
         onSubmit={onSubmit}
         validator={validator}

src/components/KaTableComponent.tsx

@@ -28,6 +28,7 @@ interface KaTableComponentProps {
   }[];
   paginationEnable?: boolean;
   showIcons?: boolean;
+  pagination?: boolean;
 }
 
 const KaTableComponent: React.FC<KaTableComponentProps> = ({
@@ -43,6 +44,7 @@ const KaTableComponent: React.FC<KaTableComponentProps> = ({
   onDelete,
   showIcons,
   pageSizes,
+  pagination = true,
 }) => {
   const [selectedRowIds, setSelectedRowIds] = useState<number[]>([]);
 
@@ -59,20 +61,22 @@ const KaTableComponent: React.FC<KaTableComponentProps> = ({
     data,
     rowKeyField: "id",
     sortingMode: SortingMode.Single,
+    ...(pagination && {
+      paging: {
+        enabled: paginationEnable,
+        pageIndex: 0,
+        pageSize: limit,
+        pageSizes: pageSizes,
+        position: PagingPosition.Bottom,
+      },
+    }),
   };
 
   return (
     <Paper>
       <div className="ka-table-wrapper">
         <Table
           {...tableProps}
-          paging={{
-            enabled: paginationEnable,
-            pageIndex: 0,
-            pageSize: limit,
-            pageSizes: pageSizes,
-            position: PagingPosition.Bottom,
-          }}
           childComponents={{
             pagingSizes: {
               content: (props) => <PageSizeSelector {...props} />,