Fix learners events for assignments

Author: payamnj

django_email_learning/migrations/0026_alter_assignmentsubmission_delivery.py

@@ -0,0 +1,22 @@
+# Generated by Django 6.0.4 on 2026-05-05 07:37
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("django_email_learning", "0025_alter_assignmentsubmission_status"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="assignmentsubmission",
+            name="delivery",
+            field=models.OneToOneField(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="assignment_submission",
+                to="django_email_learning.contentdelivery",
+            ),
+        ),
+    ]

django_email_learning/models.py

@@ -1110,7 +1110,7 @@ class SubmissionStatus(models.TextChoices):
     delivery = models.OneToOneField(
         ContentDelivery,
         on_delete=models.CASCADE,
-        related_name="assignment_submissions",
+        related_name="assignment_submission",
         unique=True,
     )
     text_submission = models.TextField(null=True, blank=True)

django_email_learning/platform/api/serializers.py

@@ -12,6 +12,7 @@
 from django.urls import reverse
 from django_email_learning.models import (
     ApiKey,
+    AssignmentSubmission,
     ContentDelivery,
     CourseInstructor,
     DeliveryStatus,
@@ -792,11 +793,19 @@ class EventType(enum.StrEnum):
     VERIFIED = "verified"
     DEACTIVATED = "deactivated"
     QUIZ_SUBMITED = "quiz_submitted"
+    ASSIGNMENT_SUBMITTED = "assignment_submitted"
+    ASSIGNMENT_REVIEWED = "assignment_reviewed"
     CONTENT_SENT = "content_sent"
     REMINDER_SENT = "reminder_sent"
     COURSE_COMPLETED = "course_completed"
 
 
+class ReviewResult(enum.StrEnum):
+    APPROVED = "approved"
+    REJECTED = "rejected"
+    REQUESTING_CHANGES = "requesting_changes"
+
+
 class DeactivatedEvent(BaseModel):
     type: Literal[EventType.DEACTIVATED] = Field(
         default=EventType.DEACTIVATED, exclude=True
@@ -816,6 +825,24 @@ class QuizSubmitedEvent(BaseModel):
     is_practice: bool
 
 
+class AssignmentSubmitedEvent(BaseModel):
+    type: Literal[EventType.ASSIGNMENT_SUBMITTED] = Field(
+        default=EventType.ASSIGNMENT_SUBMITTED, exclude=True
+    )
+    assignment_id: int
+    assignment_title: str
+
+
+class AssignmentReviewdEvent(BaseModel):
+    type: Literal[EventType.ASSIGNMENT_REVIEWED] = Field(
+        default=EventType.ASSIGNMENT_REVIEWED, exclude=True
+    )
+    assignment_id: int
+    assignment_title: str
+    review_result: ReviewResult
+    reviewed_by: str
+
+
 class ReminderSentEvent(BaseModel):
     type: Literal[EventType.REMINDER_SENT] = Field(
         default=EventType.REMINDER_SENT, exclude=True
@@ -836,7 +863,7 @@ class ContentSentEvent(BaseModel):
 class Event(BaseModel):
     type: EventType
     timestamp: datetime
-    event_data: DeactivatedEvent | QuizSubmitedEvent | ContentSentEvent | ReminderSentEvent | None = Field(
+    event_data: DeactivatedEvent | QuizSubmitedEvent | ContentSentEvent | AssignmentSubmitedEvent | AssignmentReviewdEvent | ReminderSentEvent | None = Field(
         discriminator="type"
     )  # REGISTERED, VERIFIED, COURSE_COMPLETED have no additional data
 
@@ -897,6 +924,35 @@ def from_django_model(enrollment: Enrollment) -> "EnrollmentResponse":
                                 ),
                             )
                         )
+                    submission = delivery.assignment_submission  # type: ignore[attr-defined]
+                    if submission:
+                        events.append(
+                            Event(
+                                type=EventType.ASSIGNMENT_SUBMITTED,
+                                timestamp=submission.submitted_at,  # type: ignore[arg-type]
+                                event_data=AssignmentSubmitedEvent(
+                                    assignment_id=delivery.course_content.assignment.id,  # type: ignore[union-attr]
+                                    assignment_title=delivery.course_content.assignment.title,  # type: ignore[union-attr]
+                                ),
+                            )
+                        )
+                        if (
+                            submission.reviewed_at
+                            and submission.status
+                            != AssignmentSubmission.SubmissionStatus.PENDING_REVIEW
+                        ):
+                            events.append(
+                                Event(
+                                    type=EventType.ASSIGNMENT_REVIEWED,
+                                    timestamp=submission.reviewed_at,  # type: ignore[arg-type]
+                                    event_data=AssignmentReviewdEvent(
+                                        assignment_id=delivery.course_content.assignment.id,  # type: ignore[union-attr]
+                                        assignment_title=delivery.course_content.assignment.title,  # type: ignore[union-attr]
+                                        review_result=ReviewResult(submission.status),  # type: ignore[union-attr]
+                                        reviewed_by=submission.reviewer.display_name,  # type: ignore[union-attr, arg-type]
+                                    ),
+                                )
+                            )
                     # TODO:events for reminders and submissions for assignments
 
                 if delivery.course_content.type == "quiz":

django_email_learning/platform/views.py

@@ -580,7 +580,15 @@ def get_locale_messages(self) -> Dict[str, str]:
             "learner_verified": _("Learner Verified Email"),
             "lesson_sent": _("Lesson Sent"),
             "quiz_sent": _("Quiz Sent"),
+            "assignment_sent": _("Assignment Sent"),
             "quiz_submitted": _("Quiz Submitted"),
+            "assignment_submitted": _("Assignment Submitted"),
+            "assignment_reviewed": _("Assignment Reviewed"),
+            "reviewed_by": _("Reviewed By"),
+            "assignment_title": _("Assignment Title"),
+            "requesting_changes": _("Requesting Changes"),
+            "approved": _("Approved"),
+            "rejected": _("Rejected"),
             "course_completed": _("Course Completed"),
             "learner_deactivated": _("Learner Deactivated"),
             "score": _("Score"),

frontend/platform/learners/Learners.jsx

@@ -6,6 +6,8 @@ import AppRegistrationIcon from '@mui/icons-material/AppRegistration';
 import HowToRegIcon from '@mui/icons-material/HowToReg';
 import LibraryBooksIcon from '@mui/icons-material/LibraryBooks';
 import BallotIcon from '@mui/icons-material/Ballot';
+import AssignmentIcon from '@mui/icons-material/Assignment';
+import AssignmentIndIcon from '@mui/icons-material/AssignmentInd';
 import AssignmentReturnedIcon from '@mui/icons-material/AssignmentReturned';
 import NotificationsActiveIcon from '@mui/icons-material/NotificationsActive';
 import CheckCircleIcon from '@mui/icons-material/CheckCircle';
@@ -39,10 +41,13 @@ function Learners(initialQs="") {
     'verified': {icon: <HowToRegIcon />, color: "#66bb6a", title: localeMessages["learner_verified"]},
     'content_sent_lesson': {icon: <LibraryBooksIcon />, color: "#00acc1", title: localeMessages["lesson_sent"]},
     'content_sent_quiz': {icon: <BallotIcon />, color: "#26a69a", title: localeMessages["quiz_sent"]},
+    'content_sent_assignment': {icon: <AssignmentIcon />, color: "#336eb7", title: localeMessages["assignment_sent"]},
     'quiz_submitted': {icon: <AssignmentReturnedIcon />, color: "#26a69a", title: localeMessages["quiz_submitted"]},
     'course_completed': {icon: <SchoolIcon />, color: "#0097a7", title: localeMessages["course_completed"]},
     'deactivated': {icon: <BackspaceIcon />, color: "#b71c1c", title: localeMessages["learner_deactivated"]},
-    "reminder_sent": {icon: <NotificationsActiveIcon />, color: "#ae4ad6", title: localeMessages["reminder_sent"]},
+    'reminder_sent': {icon: <NotificationsActiveIcon />, color: "#ae4ad6", title: localeMessages["reminder_sent"]},
+    'assignment_submitted': {icon: <AssignmentReturnedIcon />, color: "#23bca8", title: localeMessages["assignment_submitted"]},
+    'assignment_reviewed': {icon: <AssignmentIndIcon />, color: "#336eb7", title: localeMessages["assignment_reviewed"]},
   };
 
 
@@ -97,6 +102,13 @@ function Learners(initialQs="") {
                   <Box><Typography>{localeMessages["score"]}: {event.event_data.score}</Typography></Box>
                   <Box><Typography sx={{ display: 'flex', alignItems: 'center' }}>{ event.event_data.is_practice ? <Chip label={localeMessages["practice_attempt"]} size="small"/> : <>{localeMessages["result"]}: {event.event_data.is_passed ? <>{localeMessages["passed"]}<CheckCircleIcon sx={{color: "#4caf50", marginX: "4px"}} /></> : <> {localeMessages["failed"]}<CancelIcon sx={{color: "#f44336", marginX: "4px"}} /></>}</>}</Typography></Box>
                 </>}
+                { event.type === "assignment_reviewed" && <>
+                  <Box><Typography>{localeMessages["result"]}: {event.event_data.review_result === "approved" ? <><Typography component="span" sx={{color: "#4caf50"}}>{localeMessages["approved"]}</Typography><CheckCircleIcon sx={{color: "#4caf50", marginX: "4px"}} /></> : event.event_data.review_result === "rejected" ? <><Typography component="span" sx={{color: "#f44336"}}>{localeMessages["rejected"]}</Typography><CancelIcon sx={{color: "#f44336", marginX: "4px"}} /></> : <Typography component="span" sx={{color: "#ff9800"}}>{localeMessages["requesting_changes"]}</Typography>}</Typography></Box>
+                  <Box><Typography>{localeMessages["reviewed_by"]}: {event.event_data.reviewed_by}</Typography></Box>
+                </>}
+                { event.type === "assignment_submitted" && <>
+                  <Box><Typography>{localeMessages["assignment_title"]}: {event.event_data.assignment_title}</Typography></Box>
+                </>}
                 { event.type === "content_sent" && <>
                   <Box><Typography>{event.event_data.course_content_title}</Typography></Box>
                 </>}