Google sheet sync (#36)

* google sheet sync fixed

* indentation fix

* indentaion fix

Author: Diwakar-Gupta

attendance/models.py

@@ -369,23 +369,6 @@ def parse_slug_super_batch(self):
         self.super_batch_id = int(self.scaler_class_url.split("/")[5])
         self.class_topic_slug = self.scaler_class_url.split("/")[7]
 
-    def get_all_students_attendance_status(self):
-        allClassAttendance = self.get_all_attendance()
-
-        json_attendance = []
-        mail_set = set()
-        for attendance in allClassAttendance:
-            json_attendance.append((attendance.student, attendance.attendance_status))
-            mail_set.add(attendance.student.mail)
-
-        all_students = Student.get_all_students()
-
-        for student in all_students:
-            if student.mail not in mail_set:
-                json_attendance.append((student, AttendanceStatus.Absent))
-
-        return json_attendance
-
     @classmethod
     def get_current_class(cls):
         cache_key = "get_current_class"

attendance/views.py

@@ -251,10 +251,10 @@ def fetchLatestAttendances(
     details["attendance_start_time"] = current_class.attendance_start_time
     details["attendance_end_time"] = current_class.attendance_end_time
 
-    all_attendance = current_class.get_all_attendance()
+    students = current_class.get_all_attendance()
     json_attendance = []
 
-    for student in all_attendance:
+    for student in students:
         attendance = student.attendance
         json_attendance.append(
             {

utils/push_to_google_sheet.py

@@ -66,11 +66,14 @@ def get_col_for_subject_class(sheet, subject_class):
 
 
 def get_attendance_mapping(mails, subject_class):
-    attendances = subject_class.get_all_attendance()
+    students = subject_class.get_all_attendance()
     status_map = {}
-    for att in attendances:
-        status_map[att.student.mail] = (
-            1 if AttendanceStatus.Present == att.attendance_status else 0
+    for student in students:
+        status_map[student.mail] = (
+            1
+            if student.attendance
+            and (AttendanceStatus.Present == student.attendance.attendance_status)
+            else 0
         )
 
     return_status = []