Merge branch 'main' of https://github.com/tekdi/shiksha-admin into co…

…hort_list
tekdi · Aug 1, 2024 · af4c40a · af4c40a
2 parents 4f3ffcb + 3397cfb
commit af4c40a
Show file tree

Hide file tree

Showing 7 changed files with 122 additions and 86 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -69,9 +69,9 @@
     "MAIN_COURSE": "Main Course"
   },
   "FACILITATORS": {
-    "ALL_STATES": "All States",
-    "ALL_DISTRICTS": "All Districts",
-    "ALL_BLOCKS": "All Blocks",
+    "ALL_STATES": "States",
+    "ALL_DISTRICTS": "Districts",
+    "ALL_BLOCKS": "Blocks",
     "NEW_FACILITATOR": "New Facilitator",
     "SEARCHBAR_PLACEHOLDER": "Search Facilitators..",
     "FACILITATOR_CREATED_SUCCESSFULLY": "Teacher has been Successfully Created",
@@ -89,7 +89,10 @@
   },
   "TEAM_LEADERS": {
     "SEARCHBAR_PLACEHOLDER": "Search Team leaders..",
-    "NEW_TEAM_LEADER": "New Team Leader"
+    "NEW_TEAM_LEADER": "New Team Leader",
+    "FIRST_SELECT_REQUIRED_FIELDS": "First select required fields",
+    "TEAM_LEADER_CREATED_SUCCESSFULLY": "Team Leader has been Successfully Created!",
+    "TEAM_LEADER_UPDATED_SUCCESSFULLY": "Team Leader has been Successfully Updated!"
   },
   "COHORTS": {
     "SEARCHBAR_PLACEHOLDER": "Search Center.."
@@ -207,7 +210,7 @@
     "ASSIGN_CENTERS": "Assign Centers",
     "TYPE_OF_COHORT": "Type Of Center",
     "UNIT_NAME": "Unit Name",
-    "SUBJECTS_I_TEACH": "Subject Teach",
+    "SUBJECTS_I_TEACH": "Subject I Teach",
     "MY_MAIN_SUBJECTS": "Main subjects",
     "NUMBER_OF_CLUSTERS_I_TEACH": "Number of cluster",
     "DESIGNATION": "Designation",

diff --git a/src/components/AddFacilitator.tsx b/src/components/AddFacilitator.tsx
@@ -87,9 +87,14 @@ const AddFacilitatorModal: React.FC<AddFacilitatorModalprops> = ({
           );
           console.log(centerOptionsList);
         }
-
+      console.log(response)
+
         if (response) {
-          const { schema, uiSchema, formValues } = GenerateSchemaAndUiSchema(response, t);
+          const newResponse={
+            ...response,
+            fields: response.fields.filter(field => field.name !== 'no_of_clusters')
+          }
+          const { schema, uiSchema, formValues } = GenerateSchemaAndUiSchema(newResponse, t);
           setFormvalue(formValues)
           setSchema(schema);
           setUiSchema(uiSchema);
@@ -107,20 +112,20 @@ const AddFacilitatorModal: React.FC<AddFacilitatorModalprops> = ({
   ) => {
     // setOpenModal(true);
     const target = event.target as HTMLFormElement;
-    const elementsArray = Array.from(target.elements);
+   // const elementsArray = Array.from(target.elements);
 
-    for (const element of elementsArray) {
-      if (
-        (element instanceof HTMLInputElement ||
-          element instanceof HTMLSelectElement ||
-          element instanceof HTMLTextAreaElement) &&
-        (element.value === "" ||
-          (Array.isArray(element.value) && element.value.length === 0))
-      ) {
-        element.focus();
-        return;
-      }
-    }
+    // for (const element of elementsArray) {
+    //   if (
+    //     (element instanceof HTMLInputElement ||
+    //       element instanceof HTMLSelectElement ||
+    //       element instanceof HTMLTextAreaElement) &&
+    //     (element.value === "" ||
+    //       (Array.isArray(element.value) && element.value.length === 0))
+    //   ) {
+    //     element.focus();
+    //     return;
+    //   }
+    // }
 
     const formData = data.formData;
     console.log("Form data submitted:", formData);
@@ -252,9 +257,9 @@ const AddFacilitatorModal: React.FC<AddFacilitatorModalprops> = ({
         showFooter={false}
         modalTitle={t("FACILITATORS.NEW_FACILITATOR")}
       >
-        {!dynamicForm && (
+        {/* {!dynamicForm && (
           <Typography>{t("LEARNERS.FIRST_SELECT_REQUIRED_FIELDS")} </Typography>
-        )}
+        )} */}
         <AreaSelection
           states={transformArray(states)}
           districts={transformArray(districts)}

diff --git a/src/components/AddLeanerModal.tsx b/src/components/AddLeanerModal.tsx
@@ -106,18 +106,20 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({
     const target = event.target as HTMLFormElement;
     const elementsArray = Array.from(target.elements);
 
-    for (const element of elementsArray) {
-      if (
-        (element instanceof HTMLInputElement ||
-          element instanceof HTMLSelectElement ||
-          element instanceof HTMLTextAreaElement) &&
-        (element.value === "" ||
-          (Array.isArray(element.value) && element.value.length === 0))
-      ) {
-        element.focus();
-        return;
-      }
-    }
+
+console.log("onsubmit", data);
+    // for (const element of elementsArray) {
+    //   if (
+    //     (element instanceof HTMLInputElement ||
+    //       element instanceof HTMLSelectElement ||
+    //       element instanceof HTMLTextAreaElement) &&
+    //     (element.value === "" ||
+    //       (Array.isArray(element.value) && element.value.length === 0))
+    //   ) {
+    //     element.focus();
+    //     return;
+    //   }
+    // }
     console.log("Form data submitted:", data.formData);
 
     const formData = data.formData;
@@ -311,11 +313,11 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({
               marginTop: "10px",
             }}
           >
-            {!dynamicForm && (
+            {/* {!dynamicForm && (
               <Typography>
                 {t("LEARNERS.FIRST_SELECT_REQUIRED_FIELDS")}{" "}
               </Typography>
-            )}
+            )} */}
             <AreaSelection
               states={transformArray(states)}
               districts={transformArray(districts)}

diff --git a/src/components/DynamicForm.tsx b/src/components/DynamicForm.tsx
@@ -48,6 +48,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
   const { t } = useTranslation();
 
   const handleError = (errors: any) => {
+    console.log('handle error', errors);
     if (errors.length > 0) {
       const property = errors[0].property?.replace(/^root\./, "");
       const errorField = document.querySelector(

diff --git a/src/components/KaTableComponent.tsx b/src/components/KaTableComponent.tsx
@@ -154,6 +154,14 @@ const KaTableComponent: React.FC<KaTableComponentProps> = ({
                     />
                   );
                 }
+                // if (props.column.key === "selection-cell") {
+                //   return (
+                //     <Checkbox
+                //       checked={selectedRowIds.includes(props.rowData.id)}
+                //       onChange={() => handleCheckboxChange(props.rowData.id)}
+                //     />
+                //   );
+                // }
                 return <div className="table-cell">{props.value}</div>;
               },
             },