lms-sync 1.0.15 → 1.0.17

package/apiConnections/apiConnects.js

@@ -137,17 +137,6 @@ const Apis = {
             //fetch the access token from the login
             const { login, apis } = await this.Login();
 
-            //get the current date
-            // let defaultDate = new Date()
-
-            // //get the current year
-            // let currentYear = defaultDate.getFullYear()
-
-            // //get the current year and minus it to 1 for the previous year
-            // let previousYear = currentYear - 1
-
-            // let fromPrompts = await semesterPick.Picked()
-
             let fromPrompts = await Picked()
 
             let semester = fromPrompts.semester
@@ -178,12 +167,15 @@ const Apis = {
     async Subject(){
         try {
             const { login, apis } = await this.Login();
-            const subjectResult = await apis.instance.get('/subjects?academic_year_id=6124', {
+            const {currentSchoolYear, semester, acadYearResult} = await this.AcademicYear()
+
+            let foundAcadYear = acadYearResult.find(ay => ay.year === currentSchoolYear && ay.term === semester);
+            
+            const subjectResult = await apis.instance.get(`/subjects?academic_year_id=${foundAcadYear.id}`, {
                 headers: {
                    'Authorization': `Bearer ${login}`
                 }
             });
-            // console.log('subjectResult.data :>> ', subjectResult.data);
             return subjectResult.data
         } catch (error) {
             console.error('Instructor Api Error:', error);
@@ -195,8 +187,10 @@ const Apis = {
         try {
             //fetch the access token from the login
             const { login, apis } = await this.Login();
+            const {currentSchoolYear, semester, acadYearResult} = await this.AcademicYear()
+            let foundAcadYear = acadYearResult.find(ay => ay.year === currentSchoolYear && ay.term === semester);
 
-            const schedule = await apis.instance.get('/subjects?academic_year_id=6124',
+            const schedule = await apis.instance.get(`/subjects?academic_year_id=${foundAcadYear.id}`,
             {
                 headers: {
                     'Authorization': `Bearer ${login}`