Merge pull request #96 from transform1234/develop

Develop to PROD

Author: ankush-maherwal

packages/admin/src/assets/images/FinalStudent.csv

@@ -1,2 +1,2 @@
-name,username,email,mobile,gender,dateOfBirth,board,password,status,className,religion,school_udise,caste,annual_income,mother_education,father_education,mother_occupation,father_occupation,No_of_siblings,promotion,state,district,block,promotion
-Ankushkumar Maherwal,696969696969,,9999999999,Male,1991-11-02,West Bengal,696969696969 ,True,Class 7,Hindu,12345678,General,668,,,,,,,Maharashtra,Pune,Pune,,
+name,username,email,mobile,gender,dateOfBirth,board,password,status,className,religion,school_udise,caste,annual_income,mother_education,father_education,mother_occupation,father_occupation,No_of_siblings,promotion,state,district,block,promotion,academicYear
+Ankushkumar Maherwal,696969696969,,9999999999,Male,1991-11-02,West Bengal,696969696969 ,True,Class 7,Hindu,12345678,General,668,,,,,,,Maharashtra,Pune,Pune,,,

packages/admin/src/assets/images/FinalTeacher.csv

@@ -1,2 +1,2 @@
-Name,Email Id,Mobile,Gender,DoB,board,Status,Classes taught,School Udise,Educational Qualification,Current role,Nature of appointment,Appointed Postname,Total Experience in teaching,Total experience as Head Teacher,Core subject taught,Attended In service teacher training,Last training attended (Topic),Last training attended (Year),Trained in use of computer & digital teaching
-Ankushkumar Maherwal,,9878767678,Male,1992-05-12,Maharashtra,True,Secondary,123456789,Graduation,Teacher,Regular,TGTCBZ,2_5yrs,2_5yrs,Science,,,,
+Name,Email Id,Mobile,Gender,DoB,board,Status,Classes taught,School Udise,Educational Qualification,Current role,Nature of appointment,Appointed Postname,Total Experience in teaching,Total experience as Head Teacher,Core subject taught,Attended In service teacher training,Last training attended (Topic),Last training attended (Year),Trained in use of computer & digital teaching,academicYear
+Ankushkumar Maherwal,,9878767678,Male,1992-05-12,Maharashtra,True,Secondary,123456789,Graduation,Teacher,Regular,TGTCBZ,2_5yrs,2_5yrs,Science,,,,,,

packages/admin/src/components/StudentCSV.jsx

@@ -82,6 +82,7 @@ function CSVImportForm() {
           fatherOccupation: studentData["father_occupation"] || null,
           noOfSiblings: studentData["No_of_siblings"] || 0,
           promotion: studentData["promotion"] || "",
+          academicYear: studentData["academicYear"] || null,
         };
 
         requestData.students.push(studentObject);

packages/admin/src/components/TeacherCSV.jsx

@@ -79,41 +79,44 @@ function CSVImportForm() {
     for (let i = startIndex; i < endIndex; i++) {
       const teacherData = csvData[i];
       if (teacherData["Name"] && teacherData["Name"].trim() !== "") {
-      const teacherObject = {
-        name: teacherData["Name"] || null,
-        username: teacherData["username"] || "",
-        email: teacherData["Email Id"] || null,
-        mobile: teacherData["Mobile"] || "",
-        gender: teacherData["Gender"] || "",
-        dateOfBirth: teacherData["DoB"] || "",
-        board: teacherData["board"] || "",
-        password: null,
-        status: teacherData["Status"] || null,
-        groups: [],
-        educationalQualification:
-          teacherData["Educational Qualification"] || null,
-        schoolUdise: teacherData["School Udise"] || "",
-        currentRole: teacherData["Current role"] || null,
-        natureOfAppointment: teacherData["Nature of appointment"] || null,
-        appointedPost: teacherData["Appointed Postname"] || null,
-        totalTeachingExperience:
-          teacherData["Total Experience in teaching"] || null,
-        totalHeadteacherExperience:
-          teacherData["Total experience as Head Teacher"] || null,
-        classesTaught: teacherData["Classes taught"] || null,
-        coreSubjectTaught: teacherData["Core subject taught"].replace("|", ",") || null,
-        attendedInserviceTraining:
-          teacherData["Attended In service teacher training"] || null,
-        lastTrainingAttendedTopic:
-          teacherData["Last training attended (Topic)"] || null,
-        lastTrainingAttendedYear:
-          teacherData["Last training attended (Year)"] || null,
-        trainedInComputerDigitalteaching:
-          teacherData["Trained in use of computer & digital teaching"] || null,
-      };
-
-      requestData.teachers.push(teacherObject);
-    }
+        const teacherObject = {
+          name: teacherData["Name"] || null,
+          username: teacherData["username"] || "",
+          email: teacherData["Email Id"] || null,
+          mobile: teacherData["Mobile"] || "",
+          gender: teacherData["Gender"] || "",
+          dateOfBirth: teacherData["DoB"] || "",
+          board: teacherData["board"] || "",
+          password: null,
+          status: teacherData["Status"] || null,
+          groups: [],
+          educationalQualification:
+            teacherData["Educational Qualification"] || null,
+          schoolUdise: teacherData["School Udise"] || "",
+          currentRole: teacherData["Current role"] || null,
+          natureOfAppointment: teacherData["Nature of appointment"] || null,
+          appointedPost: teacherData["Appointed Postname"] || null,
+          totalTeachingExperience:
+            teacherData["Total Experience in teaching"] || null,
+          totalHeadteacherExperience:
+            teacherData["Total experience as Head Teacher"] || null,
+          classesTaught: teacherData["Classes taught"] || null,
+          coreSubjectTaught:
+            teacherData["Core subject taught"].replace("|", ",") || null,
+          attendedInserviceTraining:
+            teacherData["Attended In service teacher training"] || null,
+          lastTrainingAttendedTopic:
+            teacherData["Last training attended (Topic)"] || null,
+          lastTrainingAttendedYear:
+            teacherData["Last training attended (Year)"] || null,
+          trainedInComputerDigitalteaching:
+            teacherData["Trained in use of computer & digital teaching"] ||
+            null,
+          academicYear: teacherData["academicYear"] || null,
+        };
+
+        requestData.teachers.push(teacherObject);
+      }
     }
 
     try {