From 48e81cc7a088ac61293a26102af0ff2d7a6d5536 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Mon, 18 May 2020 22:52:13 +0530 Subject: [PATCH 01/11] Course deadline notification task - WIP quiz deadline notification task. --- notification/__init__.py | 0 notification/admin.py | 3 +++ notification/apps.py | 5 ++++ notification/models.py | 3 +++ notification/tasks.py | 53 ++++++++++++++++++++++++++++++++++++++++ notification/tests.py | 3 +++ notification/views.py | 3 +++ online_test/settings.py | 14 ++++++++++- 8 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 notification/__init__.py create mode 100644 notification/admin.py create mode 100644 notification/apps.py create mode 100644 notification/models.py create mode 100644 notification/tasks.py create mode 100644 notification/tests.py create mode 100644 notification/views.py diff --git a/notification/__init__.py b/notification/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/notification/admin.py b/notification/admin.py new file mode 100644 index 000000000..8c38f3f3d --- /dev/null +++ b/notification/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/notification/apps.py b/notification/apps.py new file mode 100644 index 000000000..40b3eb9cd --- /dev/null +++ b/notification/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class NotificationConfig(AppConfig): + name = 'notification' diff --git a/notification/models.py b/notification/models.py new file mode 100644 index 000000000..71a836239 --- /dev/null +++ b/notification/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/notification/tasks.py b/notification/tasks.py new file mode 100644 index 000000000..a9b50dfff --- /dev/null +++ b/notification/tasks.py @@ -0,0 +1,53 @@ +from textwrap import dedent + +from django.utils import timezone + +from celery import task +from notifications_plugin.models import NotificationMessage, Notification + +from yaksh.models import Course, Quiz, QuestionPaper, AnswerPaper + + +@task(name='course_deadline_task') +def course_deadline_task(): + courses = Course.objects.filter(active=True, is_trial=False) + for course in courses: + if course.is_active_enrollment(): + message = dedent(""" + The deadline for the course {0} is {1}, please complete + the course if not completed before the deadline. + """.format(course.name, course.end_enroll_time) + ) + students = course.students.all() + creator = course.creator + if students: + students_id = students.values_list('id', flat=True) + notification_type = "warning" + nm = NotificationMessage.objects.add_single_message( + creator_id=creator.id, summary='Course Notification', + description=message, msg_type=notification_type + ) + Notification.objects.add_bulk_user_notifications( + receiver_ids=students_id, msg_id=nm.id + ) + + +@task(name='quiz_deadline_task') +def quiz_deadline_task(): + courses = Course.objects.filter(active=True, is_trial=False) + for course in courses: + students = course.students.all() + creator = course.creator + modules = course.learning_modules.all() + for module in modules: + units = module.learning_unit.all() + for unit in units: + if unit.type == 'quiz': + quiz = unit.quiz + if not quiz.is_expired(): + message = dedent(""" + The deadline for the quiz {0} is {1}, please + complete the quiz if not completed before the + deadline. + """.format(quiz, quiz.end_date_time) + ) \ No newline at end of file diff --git a/notification/tests.py b/notification/tests.py new file mode 100644 index 000000000..7ce503c2d --- /dev/null +++ b/notification/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/notification/views.py b/notification/views.py new file mode 100644 index 000000000..91ea44a21 --- /dev/null +++ b/notification/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/online_test/settings.py b/online_test/settings.py index 3b89c28bf..a3467718f 100644 --- a/online_test/settings.py +++ b/online_test/settings.py @@ -7,6 +7,7 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/1.6/ref/settings/ """ +from celery.schedules import crontab from yaksh.pipeline.settings import AUTH_PIPELINE import os from decouple import config @@ -51,7 +52,8 @@ 'rest_framework', 'api', 'corsheaders', - 'rest_framework.authtoken' + 'rest_framework.authtoken', + 'notification' ) MIDDLEWARE = ( @@ -229,6 +231,16 @@ CELERY_BROKER_URL = 'redis://localhost' CELERY_RESULT_BACKEND = 'django-db' +CELERY_BEAT_SCHEDULE = { + 'send-summary-every-hour': { + 'task': 'course_deadline_task', + 'schedule': crontab( + hour='00', minute=3, day_of_week='Monday', day_of_month='*', + month_of_year='*' + ), + }, +} + REST_FRAMEWORK = { # Use Django's standard `django.contrib.auth` permissions, # or allow read-only access for unauthenticated users. From 30c79fd86e0c8e20517d8c92e5b0cfa8e77a7a6a Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Mon, 18 May 2020 23:50:39 +0530 Subject: [PATCH 02/11] Send quiz deadline notifications to user --- notification/tasks.py | 11 ++++++++++- online_test/settings.py | 11 +++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/notification/tasks.py b/notification/tasks.py index a9b50dfff..2f1ed5832 100644 --- a/notification/tasks.py +++ b/notification/tasks.py @@ -37,8 +37,9 @@ def quiz_deadline_task(): courses = Course.objects.filter(active=True, is_trial=False) for course in courses: students = course.students.all() + students_id = students.values_list('id', flat=True) creator = course.creator - modules = course.learning_modules.all() + modules = course.learning_module.all() for module in modules: units = module.learning_unit.all() for unit in units: @@ -50,4 +51,12 @@ def quiz_deadline_task(): complete the quiz if not completed before the deadline. """.format(quiz, quiz.end_date_time) + ) + notification_type = 'warning' + nm = NotificationMessage.objects.add_single_message( + creator_id=creator.id, summary='Quiz Notification', + description=message, msg_type=notification_type + ) + Notification.objects.add_bulk_user_notifications( + receiver_ids=students_id, msg_id=nm.id ) \ No newline at end of file diff --git a/online_test/settings.py b/online_test/settings.py index a3467718f..824839754 100644 --- a/online_test/settings.py +++ b/online_test/settings.py @@ -232,13 +232,20 @@ CELERY_RESULT_BACKEND = 'django-db' CELERY_BEAT_SCHEDULE = { - 'send-summary-every-hour': { + 'send-course-deadline-notifications-once-a-week': { 'task': 'course_deadline_task', 'schedule': crontab( - hour='00', minute=3, day_of_week='Monday', day_of_month='*', + hour='08', minute=43, day_of_week='Friday', day_of_month='*', month_of_year='*' ), }, + 'send-quiz-deadline-notifications-once-a-week': { + 'task': 'quiz_deadline_task', + 'schedule': crontab( + hour='09', minute=47, day_of_week='Friday', day_of_month='*', + month_of_year='*' + ), + } } REST_FRAMEWORK = { From 5a023159deb2d59de2a4b71e7c24dfd82e95f308 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Tue, 19 May 2020 15:11:12 +0530 Subject: [PATCH 03/11] Resolve comments --- notification/tasks.py | 67 ++++++++++++++++++++++++----------------- online_test/settings.py | 16 ---------- 2 files changed, 40 insertions(+), 43 deletions(-) diff --git a/notification/tasks.py b/notification/tasks.py index 2f1ed5832..535c30fa0 100644 --- a/notification/tasks.py +++ b/notification/tasks.py @@ -3,12 +3,21 @@ from django.utils import timezone from celery import task +from celery.decorators import periodic_task +from celery.task.schedules import crontab from notifications_plugin.models import NotificationMessage, Notification from yaksh.models import Course, Quiz, QuestionPaper, AnswerPaper -@task(name='course_deadline_task') +@periodic_task( + run_every=( + crontab( + hour='15', minute=6, day_of_week='Tuesday', day_of_month='*', + month_of_year='*' + ) + ), name='course_deadline_task' +) def course_deadline_task(): courses = Course.objects.filter(active=True, is_trial=False) for course in courses: @@ -18,10 +27,9 @@ def course_deadline_task(): the course if not completed before the deadline. """.format(course.name, course.end_enroll_time) ) - students = course.students.all() creator = course.creator - if students: - students_id = students.values_list('id', flat=True) + students_id = course.students.values_list('id', flat=True) + if students_id: notification_type = "warning" nm = NotificationMessage.objects.add_single_message( creator_id=creator.id, summary='Course Notification', @@ -32,31 +40,36 @@ def course_deadline_task(): ) -@task(name='quiz_deadline_task') +@periodic_task( + run_every=( + crontab( + hour='15', minute=8, day_of_week='Tuesday', day_of_month='*', + month_of_year='*' + ) + ), name='quiz_deadline_task' +) def quiz_deadline_task(): courses = Course.objects.filter(active=True, is_trial=False) for course in courses: - students = course.students.all() - students_id = students.values_list('id', flat=True) + students_id = course.students.values_list('id', flat=True) creator = course.creator - modules = course.learning_module.all() - for module in modules: - units = module.learning_unit.all() - for unit in units: - if unit.type == 'quiz': - quiz = unit.quiz - if not quiz.is_expired(): - message = dedent(""" - The deadline for the quiz {0} is {1}, please - complete the quiz if not completed before the - deadline. - """.format(quiz, quiz.end_date_time) + quizzes = course.get_quizzes() + if students_id: + for quiz in quizzes: + if not quiz.is_expired(): + message = dedent(""" + The deadline for the quiz {0} of course {1} is + {2}, please complete the quiz if not completed + before the deadline. + """.format( + quiz.description, course.name, quiz.end_date_time ) - notification_type = 'warning' - nm = NotificationMessage.objects.add_single_message( - creator_id=creator.id, summary='Quiz Notification', - description=message, msg_type=notification_type - ) - Notification.objects.add_bulk_user_notifications( - receiver_ids=students_id, msg_id=nm.id - ) \ No newline at end of file + ) + notification_type = 'warning' + nm = NotificationMessage.objects.add_single_message( + creator_id=creator.id, summary='Quiz Notification', + description=message, msg_type=notification_type + ) + Notification.objects.add_bulk_user_notifications( + receiver_ids=students_id, msg_id=nm.id + ) diff --git a/online_test/settings.py b/online_test/settings.py index 824839754..a59280322 100644 --- a/online_test/settings.py +++ b/online_test/settings.py @@ -231,22 +231,6 @@ CELERY_BROKER_URL = 'redis://localhost' CELERY_RESULT_BACKEND = 'django-db' -CELERY_BEAT_SCHEDULE = { - 'send-course-deadline-notifications-once-a-week': { - 'task': 'course_deadline_task', - 'schedule': crontab( - hour='08', minute=43, day_of_week='Friday', day_of_month='*', - month_of_year='*' - ), - }, - 'send-quiz-deadline-notifications-once-a-week': { - 'task': 'quiz_deadline_task', - 'schedule': crontab( - hour='09', minute=47, day_of_week='Friday', day_of_month='*', - month_of_year='*' - ), - } -} REST_FRAMEWORK = { # Use Django's standard `django.contrib.auth` permissions, From dabcbb4351ce8da9051a774406ee52ec10f1e805 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Tue, 19 May 2020 15:13:49 +0530 Subject: [PATCH 04/11] Remove crontab import from settings.py --- online_test/settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/online_test/settings.py b/online_test/settings.py index a59280322..843ff6588 100644 --- a/online_test/settings.py +++ b/online_test/settings.py @@ -7,7 +7,6 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/1.6/ref/settings/ """ -from celery.schedules import crontab from yaksh.pipeline.settings import AUTH_PIPELINE import os from decouple import config From 0b0410c70c95f64cf15861ac6188e45f0e9802cb Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Wed, 20 May 2020 19:04:46 +0530 Subject: [PATCH 05/11] Send a course deadline notification by email --- notification/tasks.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/notification/tasks.py b/notification/tasks.py index 535c30fa0..724db3197 100644 --- a/notification/tasks.py +++ b/notification/tasks.py @@ -8,12 +8,12 @@ from notifications_plugin.models import NotificationMessage, Notification from yaksh.models import Course, Quiz, QuestionPaper, AnswerPaper - +from yaksh.send_emails import send_bulk_mail @periodic_task( run_every=( crontab( - hour='15', minute=6, day_of_week='Tuesday', day_of_month='*', + hour='08', minute=36, day_of_week='*/3', day_of_month='*', month_of_year='*' ) ), name='course_deadline_task' @@ -38,12 +38,15 @@ def course_deadline_task(): Notification.objects.add_bulk_user_notifications( receiver_ids=students_id, msg_id=nm.id ) + subject = 'Course Notification' + send_bulk_mail(subject=subject, email_body=message, + recipients=students_id, attachments=None) @periodic_task( run_every=( crontab( - hour='15', minute=8, day_of_week='Tuesday', day_of_month='*', + hour='09', minute=12, day_of_week='*/3', day_of_month='*', month_of_year='*' ) ), name='quiz_deadline_task' From 6416f79f339742cfe386db90ec71638093482e70 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Fri, 22 May 2020 14:38:48 +0530 Subject: [PATCH 06/11] Show notifications on student interface --- yaksh/templates/user.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html index 4e3974b02..31d624f61 100644 --- a/yaksh/templates/user.html +++ b/yaksh/templates/user.html @@ -15,6 +15,16 @@
  •  Home
      • +
    • + +  Notifications + {% if request.custom_notifications > 0 %} + + {{request.custom_notifications}} + + {% endif %} + +
    • {{user.get_full_name|title}} From 61737df274c6cf275c1e772d691ebec7a12fcd00 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Tue, 26 May 2020 14:27:24 +0530 Subject: [PATCH 07/11] Create quizzes list of each course - Create quizzes list of each course and mail the status of the quiz to the students. --- notification/admin.py | 5 +++- notification/models.py | 13 ++++++++++- notification/tasks.py | 53 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 65 insertions(+), 6 deletions(-) diff --git a/notification/admin.py b/notification/admin.py index 8c38f3f3d..352bb1baa 100644 --- a/notification/admin.py +++ b/notification/admin.py @@ -1,3 +1,6 @@ from django.contrib import admin -# Register your models here. +from .models import Subscription + + +admin.site.register(Subscription) \ No newline at end of file diff --git a/notification/models.py b/notification/models.py index 71a836239..5fcdb26df 100644 --- a/notification/models.py +++ b/notification/models.py @@ -1,3 +1,14 @@ from django.db import models +from django.contrib.auth.models import User -# Create your models here. +from yaksh.models import Course + + +class Subscription(models.Model): + user = models.ForeignKey(User, on_delete=models.CASCADE) + course = models.ForeignKey(Course, on_delete=models.CASCADE, + related_name='subscribe') + subscribe = models.BooleanField(default=True) + + def __str__(self): + return '{0}: {1}: {2}'.format(self.user, self.course, self.subscribe) diff --git a/notification/tasks.py b/notification/tasks.py index 724db3197..a06bf0e7f 100644 --- a/notification/tasks.py +++ b/notification/tasks.py @@ -1,6 +1,9 @@ from textwrap import dedent +from collections import OrderedDict from django.utils import timezone +from django.core.mail import send_mail +from django.template.loader import render_to_string from celery import task from celery.decorators import periodic_task @@ -8,7 +11,8 @@ from notifications_plugin.models import NotificationMessage, Notification from yaksh.models import Course, Quiz, QuestionPaper, AnswerPaper -from yaksh.send_emails import send_bulk_mail +from .models import Subscription + @periodic_task( run_every=( @@ -38,9 +42,6 @@ def course_deadline_task(): Notification.objects.add_bulk_user_notifications( receiver_ids=students_id, msg_id=nm.id ) - subject = 'Course Notification' - send_bulk_mail(subject=subject, email_body=message, - recipients=students_id, attachments=None) @periodic_task( @@ -76,3 +77,47 @@ def quiz_deadline_task(): Notification.objects.add_bulk_user_notifications( receiver_ids=students_id, msg_id=nm.id ) + + +@periodic_task( + run_every=( + crontab( + hour='14', minute=14, day_of_week='Tuesday', day_of_month='*', + month_of_year='*' + ) + ), name='course_quiz_deadline_mail_task' +) +def course_quiz_deadline_mail_task(): + courses = Course.objects.filter(active=True, is_trial=False) + for course in courses: + if course.is_active_enrollment(): + students = course.students.all() + quizzes = course.get_quizzes() + for student in students: + subscribtion = student.subscription_set.all() + if subscribtion.exists(): + data = [] + for quiz in quizzes: + quiz_data = {} + answer_paper = AnswerPaper.objects.filter( + course=course, user=student + ) + if answer_paper.exists(): + quiz_data['quiz'] = quiz + quiz_data['status'] = True + else: + quiz_data['quiz'] = quiz + quiz_data['status'] = False + quiz_data['deadline'] = quiz.end_date_time + data.append(quiz_data) + msg_html = render_to_string('notification/email.html', { + 'data': data + } + ) + msg_plain = render_to_string('notification/email.txt', { + 'data': data + } + ) + send_mail('email title', msg_plain, 'some@sender.com', + [student.email], html_message=msg_html + ) From 47a34cee3e4caa9acfb2a972baa47e74471e49f0 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Tue, 26 May 2020 23:34:05 +0530 Subject: [PATCH 08/11] Use GenericForeignKey instead of ForeignKey --- notification/models.py | 26 +++++++++++++++++++------- notification/tasks.py | 6 +++--- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/notification/models.py b/notification/models.py index 5fcdb26df..23cb87b83 100644 --- a/notification/models.py +++ b/notification/models.py @@ -1,14 +1,26 @@ from django.db import models from django.contrib.auth.models import User - -from yaksh.models import Course +from django.contrib.contenttypes.models import ContentType +from django.contrib.contenttypes.fields import GenericForeignKey class Subscription(models.Model): - user = models.ForeignKey(User, on_delete=models.CASCADE) - course = models.ForeignKey(Course, on_delete=models.CASCADE, - related_name='subscribe') + user = models.ForeignKey(User, + related_name='subscription', + db_index=True, + on_delete=models.CASCADE) subscribe = models.BooleanField(default=True) + target_ct = models.ForeignKey(ContentType, + blank=True, + null=True, + related_name='target_obj', + on_delete=models.CASCADE + ) + target_id = models.PositiveIntegerField(null=True, + blank=True, + db_index=True) + target = GenericForeignKey('target_ct', 'target_id') + created = models.DateTimeField(auto_now_add=True, db_index=True) - def __str__(self): - return '{0}: {1}: {2}'.format(self.user, self.course, self.subscribe) + class Meta: + ordering = ('-created', ) \ No newline at end of file diff --git a/notification/tasks.py b/notification/tasks.py index a06bf0e7f..d8947ae57 100644 --- a/notification/tasks.py +++ b/notification/tasks.py @@ -82,7 +82,7 @@ def quiz_deadline_task(): @periodic_task( run_every=( crontab( - hour='14', minute=14, day_of_week='Tuesday', day_of_month='*', + hour='23', minute=30, day_of_week='Tuesday', day_of_month='*', month_of_year='*' ) ), name='course_quiz_deadline_mail_task' @@ -94,8 +94,8 @@ def course_quiz_deadline_mail_task(): students = course.students.all() quizzes = course.get_quizzes() for student in students: - subscribtion = student.subscription_set.all() - if subscribtion.exists(): + subscribed = student.subscription.exists() + if subscribed: data = [] for quiz in quizzes: quiz_data = {} From 131a16aedf2d76fbeeb1a5dda1fb44ff0d997005 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Thu, 4 Jun 2020 01:11:16 +0530 Subject: [PATCH 09/11] Multiple improvements - Use generic relation for subscription model. - Create email template. - Toggle subscription feature. - Move celery crontab configs to settings.py. - Model method in course to get quizzes digest. --- notification/models.py | 2 +- notification/tasks.py | 82 ++++++------------- .../templates/notification/email.html | 54 ++++++++++++ notification/templates/notification/email.txt | 54 ++++++++++++ notification/urls.py | 10 +++ notification/views.py | 31 ++++++- online_test/settings.py | 24 ++++++ online_test/urls.py | 2 +- yaksh/models.py | 17 ++++ yaksh/templates/yaksh/course_modules.html | 32 +++++++- yaksh/views.py | 7 ++ 11 files changed, 250 insertions(+), 65 deletions(-) create mode 100644 notification/templates/notification/email.html create mode 100644 notification/templates/notification/email.txt create mode 100644 notification/urls.py diff --git a/notification/models.py b/notification/models.py index 23cb87b83..5a67ff314 100644 --- a/notification/models.py +++ b/notification/models.py @@ -23,4 +23,4 @@ class Subscription(models.Model): created = models.DateTimeField(auto_now_add=True, db_index=True) class Meta: - ordering = ('-created', ) \ No newline at end of file + ordering = ('-created', ) diff --git a/notification/tasks.py b/notification/tasks.py index d8947ae57..85921e371 100644 --- a/notification/tasks.py +++ b/notification/tasks.py @@ -4,24 +4,16 @@ from django.utils import timezone from django.core.mail import send_mail from django.template.loader import render_to_string +from django.contrib.contenttypes.models import ContentType from celery import task -from celery.decorators import periodic_task -from celery.task.schedules import crontab from notifications_plugin.models import NotificationMessage, Notification from yaksh.models import Course, Quiz, QuestionPaper, AnswerPaper from .models import Subscription -@periodic_task( - run_every=( - crontab( - hour='08', minute=36, day_of_week='*/3', day_of_month='*', - month_of_year='*' - ) - ), name='course_deadline_task' -) +@task(name='course_deadline_task') def course_deadline_task(): courses = Course.objects.filter(active=True, is_trial=False) for course in courses: @@ -44,14 +36,7 @@ def course_deadline_task(): ) -@periodic_task( - run_every=( - crontab( - hour='09', minute=12, day_of_week='*/3', day_of_month='*', - month_of_year='*' - ) - ), name='quiz_deadline_task' -) +@task(name='quiz_deadline_task') def quiz_deadline_task(): courses = Course.objects.filter(active=True, is_trial=False) for course in courses: @@ -79,45 +64,24 @@ def quiz_deadline_task(): ) -@periodic_task( - run_every=( - crontab( - hour='23', minute=30, day_of_week='Tuesday', day_of_month='*', - month_of_year='*' - ) - ), name='course_quiz_deadline_mail_task' -) +@task(name='course_quiz_deadline_mail_task') def course_quiz_deadline_mail_task(): - courses = Course.objects.filter(active=True, is_trial=False) - for course in courses: - if course.is_active_enrollment(): - students = course.students.all() - quizzes = course.get_quizzes() - for student in students: - subscribed = student.subscription.exists() - if subscribed: - data = [] - for quiz in quizzes: - quiz_data = {} - answer_paper = AnswerPaper.objects.filter( - course=course, user=student - ) - if answer_paper.exists(): - quiz_data['quiz'] = quiz - quiz_data['status'] = True - else: - quiz_data['quiz'] = quiz - quiz_data['status'] = False - quiz_data['deadline'] = quiz.end_date_time - data.append(quiz_data) - msg_html = render_to_string('notification/email.html', { - 'data': data - } - ) - msg_plain = render_to_string('notification/email.txt', { - 'data': data - } - ) - send_mail('email title', msg_plain, 'some@sender.com', - [student.email], html_message=msg_html - ) + ct = ContentType.objects.get_for_model(Course) + subs = Subscription.objects.filter(target_ct=ct, subscribe=True) + if subs.exists(): + for sub in subs: + course = sub.target + if course.is_active_enrollment(): + user = sub.user + data = course.get_quizzes_digest(user) + msg_html = render_to_string('notification/email.html', { + 'data': data + }) + msg_plain = render_to_string('notification/email.txt', { + 'data': data + }) + send_mail( + 'email title', msg_plain, + 'some@sender.com', [user.email], + html_message=msg_html + ) diff --git a/notification/templates/notification/email.html b/notification/templates/notification/email.html new file mode 100644 index 000000000..a37ac908c --- /dev/null +++ b/notification/templates/notification/email.html @@ -0,0 +1,54 @@ + + + + + + + + {% with data.0 as data %} +

      Course:{{data.course.name}}

      +

      The deadline for the course is {{data.course.end_enroll_time}}

      +

      Below is the table of the quizzes for the course {{data.course.name}}. Please + make sure to complete these quizzes before the deadline.

      + {% endwith %} + + + + + + + + + + {% for quiz in data %} + + + + + + {% endfor %} + +
      QuizDeadlineCompleted
      {{quiz.quiz.description}}{{quiz.quiz.end_date_time|date:'Y-M-D h:i A'}} + {% if quiz.ap.exists %} + Complete + {% else %} + Incomplete + {% endif %} +
      + + \ No newline at end of file diff --git a/notification/templates/notification/email.txt b/notification/templates/notification/email.txt new file mode 100644 index 000000000..a37ac908c --- /dev/null +++ b/notification/templates/notification/email.txt @@ -0,0 +1,54 @@ + + + + + + + + {% with data.0 as data %} +

      Course:{{data.course.name}}

      +

      The deadline for the course is {{data.course.end_enroll_time}}

      +

      Below is the table of the quizzes for the course {{data.course.name}}. Please + make sure to complete these quizzes before the deadline.

      + {% endwith %} + + + + + + + + + + {% for quiz in data %} + + + + + + {% endfor %} + +
      QuizDeadlineCompleted
      {{quiz.quiz.description}}{{quiz.quiz.end_date_time|date:'Y-M-D h:i A'}} + {% if quiz.ap.exists %} + Complete + {% else %} + Incomplete + {% endif %} +
      + + \ No newline at end of file diff --git a/notification/urls.py b/notification/urls.py new file mode 100644 index 000000000..63171a3bc --- /dev/null +++ b/notification/urls.py @@ -0,0 +1,10 @@ +from django.conf.urls import url + +from . import views + +app_name = 'notification' + +urlpatterns = [ + url(r'(?P\d+)/$', views.toggle_subscription_status, name="toggle_subscription_status"), + +] diff --git a/notification/views.py b/notification/views.py index 91ea44a21..eec830066 100644 --- a/notification/views.py +++ b/notification/views.py @@ -1,3 +1,30 @@ -from django.shortcuts import render +from django.shortcuts import render, get_object_or_404, redirect +from django.contrib.contenttypes.models import ContentType +from django.contrib import messages -# Create your views here. + +from yaksh.models import Course +from .models import Subscription + + +def toggle_subscription_status(request, course_id): + user = request.user + course = get_object_or_404(Course, pk=course_id) + if not course.is_creator(user) and not course.is_teacher(user): + raise Http404('This course does not belong to you') + + ct = ContentType.objects.get_for_model(course) + course_sub = Subscription.objects.get( + target_ct=ct, user=user, target_id=course.id + ) + + if course_sub.subscribe: + course_sub.subscribe = False + message = 'Unsubscribed from the course mail letter.' + else: + course_sub.subscribe = True + message = 'Subscribed to the course mail letter.' + course_sub.save() + messages.info(request, message) + + return redirect('yaksh:course_modules', course_id) \ No newline at end of file diff --git a/online_test/settings.py b/online_test/settings.py index 843ff6588..cf731febb 100644 --- a/online_test/settings.py +++ b/online_test/settings.py @@ -10,6 +10,7 @@ from yaksh.pipeline.settings import AUTH_PIPELINE import os from decouple import config +from celery.schedules import crontab # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(__file__)) @@ -230,6 +231,29 @@ CELERY_BROKER_URL = 'redis://localhost' CELERY_RESULT_BACKEND = 'django-db' +CELERY_BEAT_SCHEDULE = { + 'send-course-deadline-notifications-twice-a-week': { + 'task': 'course_deadline_task', + 'schedule': crontab( + hour='08', minute=30, day_of_week='*/3', day_of_month='*', + month_of_year='*' + ), + }, + 'send-quiz-deadline-notifications-twice-a-week': { + 'task': 'quiz_deadline_task', + 'schedule': crontab( + hour='09', minute=00, day_of_week='*/3', day_of_month='*', + month_of_year='*' + ), + }, + 'send_course_quiz_deadline_mail': { + 'task': 'course_quiz_deadline_mail_task', + 'schedule': crontab( + hour='09', minute=31, day_of_week='*/3', day_of_month='*', + month_of_year='*' + ) + } +} REST_FRAMEWORK = { # Use Django's standard `django.contrib.auth` permissions, diff --git a/online_test/urls.py b/online_test/urls.py index bb5a04ab4..7b9802c23 100644 --- a/online_test/urls.py +++ b/online_test/urls.py @@ -17,6 +17,6 @@ url(r'^', include('social_django.urls', namespace='social')), url(r'^grades/', include(('grades.urls', 'grades'))), url(r'^api/', include('api.urls', namespace='api')), - + url(r'^subscribe/', include('notification.urls', namespace='notification')) ] urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/yaksh/models.py b/yaksh/models.py index 7d4dd9817..3fb67d940 100644 --- a/yaksh/models.py +++ b/yaksh/models.py @@ -11,6 +11,7 @@ from django.db import models from django.contrib.auth.models import User, Group, Permission +from django.contrib.contenttypes.fields import GenericRelation from django.core.exceptions import ValidationError from django.contrib.contenttypes.models import ContentType from taggit.managers import TaggableManager @@ -41,6 +42,8 @@ from django.forms.models import model_to_dict from grades.models import GradingSystem +from notification.models import Subscription + languages = ( ("python", "Python"), ("bash", "Bash"), @@ -896,6 +899,7 @@ class Course(models.Model): view_grade = models.BooleanField(default=False) learning_module = models.ManyToManyField(LearningModule, related_name='learning_module') + subscription = GenericRelation(Subscription, related_query_name='courses') # The start date of the course enrollment. start_enroll_time = models.DateTimeField( @@ -1057,6 +1061,19 @@ def get_quizzes(self): quiz_list.extend(module.get_quiz_units()) return quiz_list + def get_quizzes_digest(self, user): + quizzes = self.get_quizzes() + data = [] + for quiz in quizzes: + quiz_data = {} + qp = quiz.questionpaper_set.get() + ap = qp.answerpaper_set.filter(course__id=self.id, user=user) + quiz_data['quiz'] = quiz + quiz_data['course'] = self + quiz_data['user'] = user + data.append(quiz_data) + return data + def get_quiz_details(self): return [(quiz, quiz.get_total_students(self), quiz.get_passed_students(self), diff --git a/yaksh/templates/yaksh/course_modules.html b/yaksh/templates/yaksh/course_modules.html index b80856224..52f20804f 100644 --- a/yaksh/templates/yaksh/course_modules.html +++ b/yaksh/templates/yaksh/course_modules.html @@ -4,10 +4,38 @@ {% block main %}
      +
      + {% if messages %} + {% for message in messages %} +
      + + {{ message }} +
      + {% endfor %} + {% endif %} +
      - {{ course.name }} - Discussion Forum +
      + {{ course.name }} +
      +
      +
      + + {% if course_sub.subscribe %} + + {% else %} + + {% endif %} + + Subscribe to course mail letter +
      +
      + Discussion Forum +
      +
      {% if course.view_grade %} diff --git a/yaksh/views.py b/yaksh/views.py index e4a9038e2..96f4baff2 100644 --- a/yaksh/views.py +++ b/yaksh/views.py @@ -10,6 +10,7 @@ from django.views.decorators.csrf import csrf_exempt from django.contrib.auth.decorators import login_required from django.contrib.auth.models import Group +from django.contrib.contenttypes.models import ContentType from django.forms.models import inlineformset_factory from django.forms import fields from django.utils import timezone @@ -46,6 +47,7 @@ LessonFileForm, LearningModuleForm, ExerciseForm, TestcaseForm, SearchFilterForm, PostForm, CommentForm ) +from notification.models import Subscription from yaksh.settings import SERVER_POOL_PORT, SERVER_HOST_NAME from .settings import URL_ROOT from .file_utils import extract_files, is_csv @@ -3057,6 +3059,11 @@ def course_modules(request, course_id, msg=None): if not course_status.grade: course_status.set_grade() context['grade'] = course_status.get_grade() + ct = ContentType.objects.get_for_model(course) + course_sub = Subscription.objects.get( + target_ct=ct, user=user, target_id=course.id + ) + context['course_sub'] = course_sub return my_render_to_response(request, 'yaksh/course_modules.html', context) From c487fb12f4976823d3b9e7842aa90982fe93a546 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Mon, 8 Jun 2020 22:15:30 +0530 Subject: [PATCH 10/11] PEP8 fix and minor changes --- notification/admin.py | 2 +- notification/tasks.py | 8 ++++++-- notification/urls.py | 4 ++-- notification/views.py | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/notification/admin.py b/notification/admin.py index 352bb1baa..9405e58f0 100644 --- a/notification/admin.py +++ b/notification/admin.py @@ -3,4 +3,4 @@ from .models import Subscription -admin.site.register(Subscription) \ No newline at end of file +admin.site.register(Subscription) diff --git a/notification/tasks.py b/notification/tasks.py index 85921e371..000144792 100644 --- a/notification/tasks.py +++ b/notification/tasks.py @@ -5,6 +5,7 @@ from django.core.mail import send_mail from django.template.loader import render_to_string from django.contrib.contenttypes.models import ContentType +from django.conf import settings from celery import task from notifications_plugin.models import NotificationMessage, Notification @@ -74,6 +75,9 @@ def course_quiz_deadline_mail_task(): if course.is_active_enrollment(): user = sub.user data = course.get_quizzes_digest(user) + subject = 'Quiz deadline notification for course {0}'.format( + course.name + ) msg_html = render_to_string('notification/email.html', { 'data': data }) @@ -81,7 +85,7 @@ def course_quiz_deadline_mail_task(): 'data': data }) send_mail( - 'email title', msg_plain, - 'some@sender.com', [user.email], + subject, msg_plain, + settings.SENDER_EMAIL, [user.email], html_message=msg_html ) diff --git a/notification/urls.py b/notification/urls.py index 63171a3bc..8c4c671ec 100644 --- a/notification/urls.py +++ b/notification/urls.py @@ -5,6 +5,6 @@ app_name = 'notification' urlpatterns = [ - url(r'(?P\d+)/$', views.toggle_subscription_status, name="toggle_subscription_status"), - + url(r'(?P\d+)/$', + views.toggle_subscription_status, name="toggle_subscription_status"), ] diff --git a/notification/views.py b/notification/views.py index eec830066..780f7936b 100644 --- a/notification/views.py +++ b/notification/views.py @@ -27,4 +27,4 @@ def toggle_subscription_status(request, course_id): course_sub.save() messages.info(request, message) - return redirect('yaksh:course_modules', course_id) \ No newline at end of file + return redirect('yaksh:course_modules', course_id) From 9cc2398fc83bfaf81ad0b693ab8f1395acb5ad19 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Thu, 11 Jun 2020 15:51:38 +0530 Subject: [PATCH 11/11] Notify teacher and user when post created --- notification/tasks.py | 62 ++++++++++++++++++++++++++++++++++++++----- yaksh/views.py | 23 ++++++++++++++-- 2 files changed, 76 insertions(+), 9 deletions(-) diff --git a/notification/tasks.py b/notification/tasks.py index 000144792..91bbac201 100644 --- a/notification/tasks.py +++ b/notification/tasks.py @@ -5,12 +5,15 @@ from django.core.mail import send_mail from django.template.loader import render_to_string from django.contrib.contenttypes.models import ContentType +from django.contrib.auth.models import User from django.conf import settings from celery import task +from celery import shared_task + from notifications_plugin.models import NotificationMessage, Notification -from yaksh.models import Course, Quiz, QuestionPaper, AnswerPaper +from yaksh.models import Course, Quiz, QuestionPaper, AnswerPaper, Post from .models import Subscription @@ -25,15 +28,15 @@ def course_deadline_task(): """.format(course.name, course.end_enroll_time) ) creator = course.creator - students_id = course.students.values_list('id', flat=True) - if students_id: + student_ids = course.students.values_list('id', flat=True) + if student_ids: notification_type = "warning" nm = NotificationMessage.objects.add_single_message( creator_id=creator.id, summary='Course Notification', description=message, msg_type=notification_type ) Notification.objects.add_bulk_user_notifications( - receiver_ids=students_id, msg_id=nm.id + receiver_ids=student_ids, msg_id=nm.id ) @@ -41,10 +44,10 @@ def course_deadline_task(): def quiz_deadline_task(): courses = Course.objects.filter(active=True, is_trial=False) for course in courses: - students_id = course.students.values_list('id', flat=True) + student_ids = course.students.values_list('id', flat=True) creator = course.creator quizzes = course.get_quizzes() - if students_id: + if student_ids: for quiz in quizzes: if not quiz.is_expired(): message = dedent(""" @@ -61,7 +64,7 @@ def quiz_deadline_task(): description=message, msg_type=notification_type ) Notification.objects.add_bulk_user_notifications( - receiver_ids=students_id, msg_id=nm.id + receiver_ids=student_ids, msg_id=nm.id ) @@ -89,3 +92,48 @@ def course_quiz_deadline_mail_task(): settings.SENDER_EMAIL, [user.email], html_message=msg_html ) + + +@shared_task +def notify_teachers(data): + teacher_ids = data.get("teacher_ids") + new_post_id = data.get("new_post_id") + course_id = data.get("course_id") + student_id = data.get("student_id") + course = Course.objects.get(id=course_id) + creator = course.creator + post = Post.objects.get(id=new_post_id) + student = User.objects.get(id=student_id) + teacher_ids = User.objects.filter(id__in=teacher_ids).values_list('id', flat=True) + message = '{0} has asked a question in forum on course {1}'.format( + student.get_full_name(), course.name + ) + notification_type = 'success' + nm = NotificationMessage.objects.add_single_message( + creator_id=creator.id, summary='Forum Notification', + description=message, msg_type=notification_type + ) + Notification.objects.add_bulk_user_notifications( + receiver_ids=teacher_ids, msg_id=nm.id + ) + + +@shared_task +def notify_post_creator(data): + course_id = data.get("course_id") + post_id = data.get("post_id") + course = Course.objects.get(id=course_id) + course_creator = course.creator + post = Post.objects.get(id=post_id) + post_creator = post.creator + message = 'You received comment on your post {0} in course {1}'.format( + post.title, course.name + ) + notification_type = 'success' + nm = NotificationMessage.objects.add_single_message( + creator_id=course_creator.id, summary='Forum Notification', + description=message, msg_type=notification_type + ) + Notification.objects.add_single_notification( + receiver_id=post_creator.id, msg_id=nm.id + ) \ No newline at end of file diff --git a/yaksh/views.py b/yaksh/views.py index 96f4baff2..7f0ccd241 100644 --- a/yaksh/views.py +++ b/yaksh/views.py @@ -48,6 +48,7 @@ SearchFilterForm, PostForm, CommentForm ) from notification.models import Subscription +from notification.tasks import notify_teachers, notify_post_creator from yaksh.settings import SERVER_POOL_PORT, SERVER_HOST_NAME from .settings import URL_ROOT from .file_utils import extract_files, is_csv @@ -3338,7 +3339,7 @@ def course_forum(request, course_id): else: posts = course.post.get_queryset().filter( active=True).order_by('-modified_at') - paginator = Paginator(posts, 1) + paginator = Paginator(posts, 10) page = request.GET.get('page') posts = paginator.get_page(page) if request.method == "POST": @@ -3348,6 +3349,18 @@ def course_forum(request, course_id): new_post.creator = user new_post.course = course new_post.save() + teacher_ids = list(course.get_teachers().values_list( + 'id', flat=True + ) + ) + teacher_ids.append(course.creator.id) # append course creator id + data = { + "teacher_ids": teacher_ids, + "new_post_id": new_post.id, + "course_id": course.id, + "student_id": user.id + } + notify_teachers.delay(data) return redirect('yaksh:post_comments', course_id=course.id, uuid=new_post.uid) else: @@ -3371,6 +3384,7 @@ def post_comments(request, course_id, uuid): if is_moderator(user): base_template = 'manage.html' post = get_object_or_404(Post, uid=uuid) + post_creator = post.creator comments = post.comment.filter(active=True) course = get_object_or_404(Course, id=course_id) if (not course.is_creator(user) and not course.is_teacher(user) @@ -3381,9 +3395,14 @@ def post_comments(request, course_id, uuid): form = CommentForm(request.POST, request.FILES) if form.is_valid(): new_comment = form.save(commit=False) - new_comment.creator = request.user + new_comment.creator = user new_comment.post_field = post new_comment.save() + data = { + "course_id": course.id, + "post_id": post.id + } + notify_post_creator.delay(data) return redirect(request.path_info) return render(request, 'yaksh/post_comments.html', { 'post': post,