lms-sync 1.0.72 → 1.0.74

package/apiConnections/mapping.js

@@ -2013,7 +2013,8 @@ const server = {
                     let _course = courseSeq.find(b => b.name === _student?.course)
                     let _college = collegeSeq.find(c => c.name === _student?.college)
 
-                    let _year = acadYearSeq.find(y => y.from ===  (_student?.admitted_year_id? _student?.admitted_year_id : null) )
+                    let _year = acadYearSeq.find(y => y.from ===  (_student?.admitted_year? _student?.admitted_year : null))
+                    let _sem = semesterSeq.find(s => s.code === (_student?.semester? _student?.semester : null ))
 
                     let modifiedById = userMail?._id
                     let createdById = userMail?._id
@@ -2125,8 +2126,8 @@ const server = {
                             courseId: _course?._id??courseDefault?._id,
                             campusId: _campus?._id??campusDefault?._id,
                             collegeId: _college?._id??collegeDefault?._id,
-                            admittedYearId: defYear,
-                            admittedSemId: defSem,
+                            admittedYearId: defYear??_year?._id??null,
+                            admittedSemId: defSem??_sem?._id??null,
                             modifiedById,
                             createdById,
                             migratedAt,
@@ -2276,6 +2277,12 @@ const server = {
                     let _campus = campusSeq.find(cam => cam.name === _sec?.campus)
                     let _section = student[i].subjects_enrolled;
 
+                    let defSem = semeDefault?._id
+                    let defYear = yearDefault?._id
+
+                    let _year = acadYearSeq.find(y => y.from ===  (_sec?.admitted_year? _sec?.admitted_year : null))
+                    let _sem = semesterSeq.find(s => s.code === (_sec?.semester? _sec?.semester : null ))
+
     
                     for (let j = 0; j < _section.length; j++) {
                         let sections = _section[j].section_name
@@ -2315,8 +2322,7 @@ const server = {
                         let _semester = semesterSeq.find(sem => sem.code === semester)
                         let _acadYear = acadYearSeq.find(yr => yr.from === parseInt(yearsFrom) && yr.to === parseInt(yearsTo))
 
-                        let defSem = semeDefault?._id
-                        let defYear = yearDefault?._id
+
 
                         let modifiedById = userMail?._id;
                         let createdById = userMail?._id;
@@ -2371,8 +2377,8 @@ const server = {
                                 subjectId: _subjects?._id??null,
                                 instructorId: _instructors?._id??null,
                                 classType,
-                                semesterId: _semester?._id??null,
-                                academicYearId: _acadYear?._id??null,
+                                semesterId: defSem??_sem?._id??null,
+                                academicYearId: defYear??_year?._id??null,
                                 courseId: _course?._id??null,
                                 campusId: _campus?._id??null,
                                 departmentId: _insdepartment?._id??null,
@@ -2513,6 +2519,9 @@ const server = {
                     let defSem = semeDefault?._id
                     let defYear = yearDefault?._id
 
+                    let _year = acadYearSeq.find(y => y.from ===  (_sec?.admitted_year? _sec?.admitted_year : null))
+                    let _sem = semesterSeq.find(s => s.code === (_sec?.semester? _sec?.semester : null ))
+
 
                     let modifiedById = userMail?._id;
                     let createdById = userMail?._id;
@@ -2616,8 +2625,8 @@ const server = {
                                 instructorId: _instructor?._id??null,
                                 sectionId: _section?._id??null,
                                 campusId: campus?._id,
-                                academicYearId: defYear,
-                                semesterId: defSem,
+                                academicYearId: defYear??_year?._id??null,
+                                semesterId: defSem??_sem?._id??null,
                                 finalGrade: finalG,
                                 graded,
                                 remarks,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lms-sync",
-  "version": "1.0.72",
+  "version": "1.0.74",
   "description": "Migration App for MSC LMS",
   "main": "index.js",
   "scripts": {