@itutoring/itutoring_application_js_api 1.4.1 → 1.4.3

package/apiController.js

@@ -91,6 +91,11 @@ class APIController
                     var json = JSON.parse(request.responseText);
                     if (json.code ==200)
                     {
+                        // check for redirect
+                        if (json.data == "redirect" && json.url != undefined)
+                        {
+                            window.location.href = json.url;
+                        }
                         resolve(json.data);
                     }
                     if (json.code == 400)
@@ -150,6 +155,11 @@ class APIController
                     var json = JSON.parse(request.responseText);
                     if (json.code ==200)
                     {
+                        // check for redirect
+                        if (json.data == "redirect" && json.url != undefined)
+                        {
+                            window.location.href = json.url;
+                        }
                         resolve(json.data);
                     }
                     if (json.code == 400)

package/modules/AttendanceManager.js

@@ -14,8 +14,6 @@ class AttendanceManager
     {
         var data = await APIController.Get(this.#MODULE, this.#RETRIVE_ALL_EVENTS);
 
-        this.CheckForError(data);
-
         data = JSON.parse(data);
         var events = [];
         for (const [key, value] of Object.entries(data))
@@ -44,14 +42,11 @@ class AttendanceManager
         var data = await APIController.Post(this.#MODULE, this.#UPDATE_EVENT, {
             'event': JSON.stringify(event),
         });
-
-        this.CheckForError(data);
     }
 
     static async GetEvents()
     {
         var data = await APIController.Get(this.#MODULE, this.#GET_EVENTS);
-        this.CheckForError(data);
 
         data = JSON.parse(data);
         var atEvents = [];
@@ -70,7 +65,6 @@ class AttendanceManager
         var data = await APIController.Get(this.#MODULE, this.#GET_ATTENDANCE_FROM_EVENT, {
             "id": id,
         });
-        this.CheckForError(data);
 
         data = JSON.parse(data);
         var atEvents = []
@@ -89,15 +83,6 @@ class AttendanceManager
 
         return atEvents;
     }
-
-    static async CheckForError(data)
-    {
-        if (data.includes("error: "))
-        {
-            data = data.replace("error: ", "");
-            location.href = data
-        }
-    }
 }
 
 export default AttendanceManager;

package/modules/LessonManager.js

@@ -24,7 +24,6 @@ class LessonManager
             "filterOp": filterOp,
         });
 
-        this.CheckForError(events);
 
         var eventObjs = [];
         var eventsJson = JSON.parse(events)
@@ -44,8 +43,6 @@ class LessonManager
             "search_param": searchParam,
         });
 
-        this.CheckForError(events);
-
         var eventObjs = [];
         var eventsJson = JSON.parse(events)
         for (const [key, value] of Object.entries(eventsJson))
@@ -64,7 +61,6 @@ class LessonManager
             "id": eventId,
         });
 
-        this.CheckForError(data);
     }
 
     static async UpdateEvent(event)
@@ -74,7 +70,6 @@ class LessonManager
             "event": eventJson,
         });
 
-        this.CheckForError(data);
     }
 
     /**
@@ -86,16 +81,6 @@ class LessonManager
             'def_time': defaultTimeUnix,
         });
 
-        this.CheckForError(data);
-    }
-
-    static async CheckForError(data)
-    {
-        if (data.includes("error: "))
-        {
-            data = data.replace("error: ", "");
-            location.href = data;
-        }
     }
 }
 

package/modules/TeacherPortal.js

@@ -128,20 +128,11 @@ class TeacherPortal
         var teacherArray = JSON.parse(data);
 
         var teacher = new Teacher();
-        teacher.Email = teacherArray['Email'];
-        teacher.Name = teacherArray['Name'];
-        teacher.ZoomMeeting = teacherArray['ZoomMeeting'];
-        teacher.ID = teacherArray['ID'];
-        teacher.TeachedLessons = teacherArray['TeachedLessons'];
-        teacher.Admin = teacherArray['Admin'];
-        teacher.BitmojiURL = decodeURIComponent(teacherArray['BitmojiURL']);
-
-        var teacherProfile = new TeacherProfile();
-        teacherProfile.Bio = teacherArray['Profile']['Bio'];
-        teacherProfile.Name = teacherArray['Profile']['Name'];
-        teacherProfile.PhotoPath = teacherArray['Profile']['PhotoPath'];
-
-        teacher.TeacherProfile = teacherProfile;
+        teacher.Email = teacherArray['email'];
+        teacher.Name = teacherArray['name'];
+        teacher.ZoomMeeting = teacherArray['zoomMeeting'];
+        teacher.ID = teacherArray['id'];
+        teacher.TeachedLessons = teacherArray['taughtLessons'];
 
         return teacher;
     }

package/objects/Teacher.js

@@ -5,9 +5,6 @@ class Teacher
    ZoomMeeting;
    ID;
    TeachedLessons;
-   Admin;
-   BitmojiURL;
-   TeacherProfile;
 }
 
 export default Teacher;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itutoring/itutoring_application_js_api",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "Javascript API for iTutoring Application",
   "main": "index.js",
   "types": "index.d.ts",