Merge pull request #158 from AvaCodeSolutions/fix/157/quiz-submission-events-bug

fix: #157 fix quiz submission event for seconds attempt

Author: payamnj

django_email_learning/platform/api/serializers.py

@@ -471,8 +471,13 @@ def from_django_model(enrollment: Enrollment) -> "EnrollmentResponse":
                     quiz_attempts = delivery.quiz_submissions.all().order_by(
                         "submitted_at"
                     )
-                    for attempt in quiz_attempts:
-                        attempt_number += 1
+                    if not schedule.failed_attempts:
+                        attempt = quiz_attempts.first()
+                        attempt_number = 1
+                    else:
+                        attempt_number = schedule.failed_attempts + 1
+                        attempt = quiz_attempts[attempt_number - 1 : 1].first()
+                    if attempt:
                         events.append(
                             Event(
                                 type=EventType.QUIZ_SUBMITED,

frontend/package-lock.json

@@ -119,6 +119,9 @@ function Learners(initialQs="") {
                 { event.type === "content_sent" && <>
                   <Box><Typography>{event.event_data.course_content_title}</Typography></Box>
                 </>}
+                { event.type === "deactivated" && <>
+                  <Box><Typography>Reason: {event.event_data.reason}</Typography></Box>
+                </>}
               </TimelineContent>
             </TimelineItem>
             ))}