From e461b7c71d3d33f7e1cde4415ae35733078f4070 Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 3 Dec 2020 14:32:15 +0530 Subject: Show graphs for the lesson video statistics --- stats/models.py | 28 +++++++++-- stats/templates/view_lesson_tracking.html | 59 +++++++++++++++++++++-- stats/views.py | 25 +++++++--- yaksh/templates/yaksh/show_lesson_statistics.html | 6 +-- yaksh/templatetags/custom_filters.py | 2 +- 5 files changed, 99 insertions(+), 21 deletions(-) diff --git a/stats/models.py b/stats/models.py index 56c7f0d..60bc7bd 100644 --- a/stats/models.py +++ b/stats/models.py @@ -24,6 +24,22 @@ def time_to_seconds(time): seconds=time.second).total_seconds() +class TrackLessonManager(models.Manager): + def get_percentage_data(self, tracked_lessons): + percentage_data = {"1": 0, "2": 0, "3": 0, "4": 0} + for tracked in tracked_lessons: + percent = tracked.get_percentage_complete() + if percent < 25: + percentage_data["1"] = percentage_data["1"] + 1 + elif percent >= 25 and percent < 50: + percentage_data["2"] = percentage_data["2"] + 1 + elif percent >= 50 and percent < 75: + percentage_data["3"] = percentage_data["3"] + 1 + elif percent >= 75: + percentage_data["4"] = percentage_data["4"] + 1 + return percentage_data + + class TrackLesson(models.Model): user = models.ForeignKey(User, on_delete=models.CASCADE) course = models.ForeignKey(Course, on_delete=models.CASCADE) @@ -33,6 +49,8 @@ class TrackLesson(models.Model): creation_time = models.DateTimeField(auto_now_add=True) watched = models.BooleanField(default=False) + objects = TrackLessonManager() + class Meta: unique_together = ('user', 'course', 'lesson') @@ -41,12 +59,12 @@ class TrackLesson(models.Model): def get_current_time(self): if self.current_time == '00:00:00': - return 'just started' + return '00:00:00' return self.current_time def get_video_duration(self): if self.video_duration == '00:00:00': - return 'will be available after 25% completion' + return '00:00:00' return self.video_duration def set_current_time(self, ct): @@ -58,13 +76,13 @@ class TrackLesson(models.Model): def get_percentage_complete(self): if self.current_time == '00:00:00' and self.video_duration == '00:00:00': - return 'less than 25%' + return 0 duration = str_to_time(self.video_duration) watch_time = str_to_time(self.current_time) duration_seconds = time_to_seconds(duration) watched_seconds = time_to_seconds(watch_time) percentage = round((watched_seconds / duration_seconds) * 100) - return 'approx {0} %'.format(percentage) + return percentage def get_last_access_time(self): @@ -78,7 +96,7 @@ class TrackLesson(models.Model): if self.current_time != '00:00:00' and self.video_duration != '00:00:00': duration = str_to_time(self.video_duration) watch_time = (str_to_datetime(self.current_time) + timezone.timedelta( - seconds=10)).time() + seconds=120)).time() self.watched = watch_time >= duration def get_watched(self): diff --git a/stats/templates/view_lesson_tracking.html b/stats/templates/view_lesson_tracking.html index d8d35c2..a9d3025 100644 --- a/stats/templates/view_lesson_tracking.html +++ b/stats/templates/view_lesson_tracking.html @@ -1,6 +1,6 @@ {% extends "manage.html" %} {% load static %} -{% block title %} Lesson Views {% endblock %} +{% block title %} Lesson Video Stats {% endblock %} {% block script %} @@ -33,7 +33,58 @@

{% include "yaksh/paginator.html" %}
-

{{total}} student(s) viewed this lesson

+
+
+
+
+
+ +
@@ -57,13 +108,13 @@ - + diff --git a/stats/views.py b/stats/views.py index 53b7cf7..a5cdeb7 100644 --- a/stats/views.py +++ b/stats/views.py @@ -27,14 +27,14 @@ def add_tracker(request, tracker_id): if current_time: track.set_current_time(current_time) track.video_duration = video_duration - LessonLog.objects.create( - track_id=track.id, current_time=current_time, - last_access_time=timezone.now() - ) track.save() if not track.watched: track.set_watched() track.save() + LessonLog.objects.create( + track_id=track.id, current_time=current_time, + last_access_time=timezone.now() + ) success = True else: success = False @@ -46,16 +46,25 @@ def add_tracker(request, tracker_id): @email_verified def view_lesson_watch_stats(request, course_id, lesson_id): user = request.user - course = get_object_or_404(Course, pk=course_id) + course = get_object_or_404( + Course.objects.prefetch_related("students"), id=course_id + ) if not course.is_creator(user) and not course.is_teacher(user): raise Http404('This course does not belong to you') trackings = TrackLesson.objects.get_queryset().filter( course_id=course_id, lesson_id=lesson_id ).order_by("id") - total = trackings.count() + percentage_data = TrackLesson.objects.get_percentage_data(trackings) + visited = trackings.count() + completed = trackings.filter(watched=True).count() + students_total = course.students.count() paginator = Paginator(trackings, 30) page = request.GET.get('page') trackings = paginator.get_page(page) - context = {'objects': trackings, 'total': total, 'course_id': course_id, - 'lesson_id': lesson_id} + context = { + 'objects': trackings, 'total': visited, 'course_id': course_id, + 'lesson_id': lesson_id, "percentage_data": percentage_data, + 'completion': [completed, students_total-completed, students_total], + 'visits': [visited, students_total-visited, students_total] + } return render(request, 'view_lesson_tracking.html', context) diff --git a/yaksh/templates/yaksh/show_lesson_statistics.html b/yaksh/templates/yaksh/show_lesson_statistics.html index a7c2ebd..dfce52c 100644 --- a/yaksh/templates/yaksh/show_lesson_statistics.html +++ b/yaksh/templates/yaksh/show_lesson_statistics.html @@ -1,7 +1,7 @@ {% extends "manage.html" %} {% load static %} {% load custom_filters %} -{% block title %} Lesson Statistics {% endblock %} +{% block title %} Lesson Quiz Stats {% endblock %} {% block pagetitle %} Statistics for {{lesson}} {% endblock %} {% block script %}
{{track.creation_time}} {{track.get_current_time}} {{track.get_video_duration}}{{track.get_percentage_complete}}{{track.get_percentage_complete}} % {% with track.get_watched as watched %} {% if watched %} {{watched}} {% else %} - {{watched}} + {{watched}} {% endif %} {% endwith %}