Merge pull request #784 from adityacp/improve_lesson_stats

Improve lesson statistics

14 files changed, 251 insertions, 96 deletions

diff --git a/requirements/requirements-common.txt b/requirements/requirements-common.txt
index b9901ae..4475957 100644
--- a/requirements/requirements-common.txt
+++ b/requirements/requirements-common.txt
@@ -18,3 +18,4 @@ django-celery-results==1.2.1
 djangorestframework==3.11.0
 django-cors-headers==3.1.0
 Pillow
+pandas
\ No newline at end of file
diff --git a/yaksh/code_server.py b/yaksh/code_server.py
index 4feb7fd..60f966f 100644
--- a/yaksh/code_server.py
+++ b/yaksh/code_server.py
@@ -17,7 +17,10 @@ import json
 from multiprocessing import Process, Queue, Manager
 import os
 from os.path import dirname, abspath
-import pwd
+try:
+    import pwd
+except ImportError:
+    pass
 import sys
 import time
 
diff --git a/yaksh/models.py b/yaksh/models.py
index cca2a2c..2a06cc8 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -25,6 +25,7 @@ import zipfile
 import tempfile
 from textwrap import dedent
 from ast import literal_eval
+import pandas as pd
 
 # Django Imports
 from django.db import models
@@ -2821,19 +2822,50 @@ class TOCManager(models.Manager):
         data = {}
         for toc in contents:
             data[toc] = LessonQuizAnswer.objects.filter(
-                toc_id=toc.id).values_list("toc_id").distinct().count()
+                toc_id=toc.id).values_list(
+                "student_id", flat=True).distinct().count()
         return data
 
     def get_question_stats(self, toc_id):
         answers = LessonQuizAnswer.objects.get_queryset().filter(
             toc_id=toc_id).order_by('id')
-        question = answers.first().toc.content_object
-        answers = answers.values(
-            "student__first_name", "student__last_name", "student__email",
-            "student_id", "toc_id"
-            ).distinct()
+        question = TableOfContents.objects.get(id=toc_id).content_object
+        if answers.exists():
+            answers = answers.values(
+                "student__first_name", "student__last_name", "student__email",
+                "student_id", "toc_id"
+                )
+            df = pd.DataFrame(answers)
+            answers = df.drop_duplicates().to_dict(orient='records')
         return question, answers
 
+    def get_per_tc_ans(self, toc_id, question_type, is_percent=True):
+        answers = LessonQuizAnswer.objects.filter(toc_id=toc_id).values(
+            "student_id", "answer__answer"
+        ).order_by("id")
+        data = None
+        if answers.exists():
+            df = pd.DataFrame(answers)
+            grp = df.groupby(["student_id"]).tail(1)
+            total_count = grp.count().answer__answer
+            data = grp.groupby(["answer__answer"]).count().to_dict().get(
+                "student_id")
+            if question_type == "mcc":
+                tc_ids = []
+                mydata = {}
+                for i in data.keys():
+                    tc_ids.extend(literal_eval(i))
+                for j in tc_ids:
+                    if j not in mydata:
+                        mydata[j] = 1
+                    else:
+                        mydata[j] +=1
+                data = mydata.copy()
+            if is_percent:
+                for key, value in data.items():
+                    data[key] = (value/total_count)*100
+        return data, total_count
+
     def get_answer(self, toc_id, user_id):
         submission = LessonQuizAnswer.objects.filter(
             toc_id=toc_id, student_id=user_id).last()
diff --git a/yaksh/static/yaksh/js/show_toc.js b/yaksh/static/yaksh/js/show_toc.js
index 7d9b68e..a2507d0 100644
--- a/yaksh/static/yaksh/js/show_toc.js
+++ b/yaksh/static/yaksh/js/show_toc.js
@@ -13,7 +13,7 @@ $(document).ready(function() {
                       });
                 },
                 max_height: 400,
-                height: 400,
+                height: 200,
                 plugins: "image code link",
                 convert_urls: false
             });
diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html
index 4fa12c7..cba56cb 100644
--- a/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
@@ -52,6 +52,7 @@
   <script defer src="https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/katex.min.js" integrity="sha384-g7c+Jr9ZivxKLnZTDUhnkOnsh30B4H0rpLUpJ4jAIKs4fnJI+sEnkvrMWph2EDg4" crossorigin="anonymous"></script>
 
   <!-- To automatically render math in text elements, include the auto-render extension: -->
+  <script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
   <script defer src="https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/contrib/auto-render.min.js" integrity="sha384-mll67QQFJfxn0IYznZYonOWZ644AWYC+Pt2cHqMaRhXVrursRwvLnLaebdGIlYNa" crossorigin="anonymous">
   </script>
  
@@ -67,9 +68,6 @@
             ]
           }
         );
-        $(".alert").delay(2000).slideUp(200, function() {
-            $(this).alert('close');
-        });
       });
   </script>
   {% block script %}
diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html
index 53d5c72..047f784 100644
--- a/yaksh/templates/manage.html
+++ b/yaksh/templates/manage.html
@@ -65,6 +65,13 @@
     </ul>
     </div>
 </nav>
+<script type="text/javascript">
+    $(document).ready(function() {
+        $(".alert").delay(2000).slideUp(200, function() {
+            $(this).alert('close');
+        });
+    });
+</script>
 
 {% endblock %}
 {% block content %}
diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html
index 4e3974b..7211d5c 100644
--- a/yaksh/templates/user.html
+++ b/yaksh/templates/user.html
@@ -43,7 +43,13 @@
     </nav>
 </div>
 {% endblock %}
-
+<script type="text/javascript">
+    $(document).ready(function() {
+        $(".alert").delay(2000).slideUp(200, function() {
+            $(this).alert('close');
+        });
+    });
+</script>
 
 {% block content %}  
   {% block main %}
diff --git a/yaksh/templates/yaksh/add_lesson.html b/yaksh/templates/yaksh/add_lesson.html
index f05fbe0..4400032 100644
--- a/yaksh/templates/yaksh/add_lesson.html
+++ b/yaksh/templates/yaksh/add_lesson.html
@@ -89,9 +89,11 @@
                     {{lesson_form.video_path}}
                     <br>
                     Video File:
-                    <span class="badge badge-info">
-                        {{lesson_form.video_file.help_text}}
-                    </span>
+                    <div class="table-responsive">
+                        <span class="badge badge-info">
+                            {{lesson_form.video_file.help_text}}
+                        </span>
+                    </div>
                     <div class="col-md-4">
                         {{lesson_form.video_file}}
                     </div>
@@ -210,10 +212,12 @@
                             </div>
                         {% endwith %}
                     {% else %}
-                        <div class="badge badge-info">
-                            <strong>
-                                Add a Video Path or Upload a video file to setup lesson contents
-                            </strong>
+                        <div class="table-responsive">
+                            <div class="badge badge-info">
+                                <strong>
+                                    Add a Video Path or Upload a video file to setup lesson contents
+                                </strong>
+                            </div>
                         </div>
                     {% endif %}
                 </div>
diff --git a/yaksh/templates/yaksh/show_lesson_statistics.html b/yaksh/templates/yaksh/show_lesson_statistics.html
index 2bcdd2d..31261f3 100644
--- a/yaksh/templates/yaksh/show_lesson_statistics.html
+++ b/yaksh/templates/yaksh/show_lesson_statistics.html
@@ -102,6 +102,19 @@
                             </span>
                             {% endif %}
                             {{tc.options}}
+                            {% if per_tc_ans %}
+                                {% get_tc_percent tc.id per_tc_ans as percent %}
+                                <div class="progress" style="width: 30%">
+                                {% if percent %}
+                                    <div class="progress-bar bg-success" role="progressbar" aria-valuenow="{{percent}}"
+                                      aria-valuemin="0" aria-valuemax="100" style="width:{{percent}}%">
+                                        <b style="color: white;">{{percent}}%</b>
+                                    </div>
+                                {% else %}
+                                    <b style="color: black;">0%</b>
+                                {% endif %}
+                                </div>
+                            {% endif %}
                             {% elif question.type == "integer" %}
                             <span class="badge badge-pill badge-success">Answer:</span>
                             {{tc.correct}}
@@ -116,33 +129,43 @@
                     </div>
                 </div>
                 <br>
+                <strong>Total Submissions: {{total_count}}</strong>
+                <br><br>
+                {% if question.type != 'mcq' and question.type != 'mcc' %}
+                    <div id="plot_div"></div>
+                    <script type="text/javascript">
+                        var x_data = [];
+                        var y_data = [];
+                        {% for i, j in per_tc_ans.items %}
+                            x_data.push("{{i}}");
+                            y_data.push("{{j}}");
+                        {% endfor %}
+                        var data = [{x: x_data, y: y_data, type: 'bar'}];
+                        var layout = {
+                            title: "Submission records",
+                            xaxis: {title: 'Submitted Value'},
+                            yaxis: {title: 'Number of Submissions'}
+                        };
+                        var config = {responsive: true}
+                        Plotly.newPlot('plot_div', data, layout, config);
+                    </script>
+                    <br><br>
+                {% endif %}
                 {% include "yaksh/paginator.html" %}
                 <table class="table table-responsive">
                     <tr>
                         <th>Sr No.</th>
                         <th>Student Name</th>
                         <th>Email</th>
-                        <th>Latest Answer</th>
-                        <th>Status</th>
+                        <th>Latest Submission</th>
                     </tr>
                     {% for data in objects.object_list %}
                         <tr>
-                            <td>{{forloop.counter}}</td>
+                            <td>{{ forloop.counter0|add:objects.start_index }}</td>
                             <td>{{data.student__first_name}} {{data.student__last_name}}</td>
                             <td>{{data.student__email}}</td>
                             {% get_answers data.toc_id data.student_id as user_answer %}
                             <td>{{ user_answer.0 }}</td>
-                            <td>
-                                {% if user_answer.1 %}
-                                    <span class="badge badge-success">
-                                        Correct
-                                    </span>
-                                {% else %}
-                                    <span class="badge badge-secondary">
-                                        Incorrect
-                                    </span>
-                                {% endif %}
-                            </td>
                         </tr>
                     {% endfor %}
                 </table>
diff --git a/yaksh/templates/yaksh/show_toc.html b/yaksh/templates/yaksh/show_toc.html
index 680c17b..4c8ffe2 100644
--- a/yaksh/templates/yaksh/show_toc.html
+++ b/yaksh/templates/yaksh/show_toc.html
@@ -18,7 +18,7 @@
     </div>
     <br>
 {% endif %}
-<table class="table table-responsive-sm">
+<table class="table table-responsive">
 {% for toc in contents %}
     {% with toc.get_toc_text as toc_name %}
     <tr>
diff --git a/yaksh/templates/yaksh/show_video.html b/yaksh/templates/yaksh/show_video.html
index 627773d..d27293e 100644
--- a/yaksh/templates/yaksh/show_video.html
+++ b/yaksh/templates/yaksh/show_video.html
@@ -140,64 +140,62 @@
         {% else %}    <!--  Lesson body   -->
             <!-- Lesson Table of contents -->
             <div class="row">
-                <div class="col-md-8">
-                    <div class="card-body">
-                    {% if lesson.video_path %}
-                        {% with lesson.video_path|video_name as video %}
-                            {% if video.1 == "others" %}
-                            <video id="player" playsinline controls>
-                                <source src="{{video.0}}" />
-                            </video>
-                            {% else %}
-                            <div id="player" data-plyr-provider="{{video.1}}" data-plyr-embed-id="{{video.0}}"></div>
-                            {% endif %}
-                        {% endwith %}
-                    {% endif %}
-                    </div>
-                </div>
-                <div class="col-md-4">
-                <div class="card">
-                    <div class="card-header">
-                        <a class="card-link" data-toggle="collapse" href="#toc-collapse">
-                            Table Of Contents&nbsp;<i class="fa fa-angle-down"></i>
-                        </a>
+                {% if lesson.video_path %}
+                    <div class="col-md-8">
+                        <div class="card-body">
+                            {% with lesson.video_path|video_name as video %}
+                                {% if video.1 == "others" %}
+                                <video id="player" playsinline controls>
+                                    <source src="{{video.0}}" />
+                                </video>
+                                {% else %}
+                                <div id="player" data-plyr-provider="{{video.1}}" data-plyr-embed-id="{{video.0}}"></div>
+                                {% endif %}
+                            {% endwith %}
+                        </div>
                     </div>
-                    <div class="collapse show" id="toc-collapse">
-                        <div class="card-body" id="toc" style="max-height: 400px; overflow-y: auto;">
-                            <table class="table table-responsive">
-                                {% for content in toc %}
-                                    {% with content.get_toc_text as toc_name %}
-                                    <tr>
-                                        <td>
-                                            <a href="#" onclick="select_toc(this);" data-toc="{{content.id}}" data-toc-type="{{content.content}}">
-                                                {{ toc_name }}
-                                            </a>
-                                        </td>
-                                        <td>
-                                            {{content.get_content_display}}
-                                        </td>
-                                        <td id="toc_time_{{content.id}}">
-                                            {{content.time}}
-                                        </td>
-                                        <input type="hidden" id="toc_{{content.id}}" value="{% url 'yaksh:get_marker_quiz' course.id content.id %}" data-content="{{content.content}}"/>
-                                        <input type="hidden" id="toc_desc_{{content.id}}" value="{{content.content_object.description|safe}}" data-content="{{content.content}}"/>
-                                    </tr>
-                                    {% endwith %}
-                                {% empty %}
-                                    <center>
-                                        <span class="badge badge-warning">No Table of contents added</span>
-                                    </center>
-                                {% endfor %}
-                            </table>
+                    {% if toc %}
+                    <div class="col-md-4">
+                        <div class="card">
+                            <div class="card-header">
+                                <a class="card-link" data-toggle="collapse" href="#toc-collapse">
+                                    Table Of Contents&nbsp;<i class="fa fa-angle-down"></i>
+                                </a>
+                            </div>
+                            <div class="collapse show" id="toc-collapse">
+                                <div class="card-body" id="toc" style="max-height: 400px; overflow-y: auto;">
+                                    <table class="table table-responsive">
+                                        {% for content in toc %}
+                                            {% with content.get_toc_text as toc_name %}
+                                            <tr>
+                                                <td>
+                                                    <a href="#" onclick="select_toc(this);" data-toc="{{content.id}}" data-toc-type="{{content.content}}">
+                                                        {{ toc_name }}
+                                                    </a>
+                                                </td>
+                                                <td>
+                                                    {{content.get_content_display}}
+                                                </td>
+                                                <td id="toc_time_{{content.id}}">
+                                                    {{content.time}}
+                                                </td>
+                                                <input type="hidden" id="toc_{{content.id}}" value="{% url 'yaksh:get_marker_quiz' course.id content.id %}" data-content="{{content.content}}"/>
+                                                <input type="hidden" id="toc_desc_{{content.id}}" value="{{content.content_object.description|safe}}" data-content="{{content.content}}"/>
+                                            </tr>
+                                            {% endwith %}
+                                        {% empty %}
+                                            <center class=table-responsive>
+                                                <span class="badge badge-warning">No Table of contents added</span>
+                                            </center>
+                                        {% endfor %}
+                                    </table>
+                                </div>
+                            </div>
                         </div>
                     </div>
-                </div>
-                </div>
+                    {% endif %}
+                {% endif %}
                 <div class="col-md-8">
-                    <a href="{% url 'yaksh:next_unit' course.id learning_module.id current_unit.id %}" class="btn btn-info btn-lg" >
-                        Next&nbsp;<i class="fa fa-step-forward"></i>
-                    </a>
-                    <br><br>
                     <div class="card">
                         <div class="card-header"><h3><strong>Lesson Description</strong></h3></div>
                         <div class="card-body">
@@ -227,23 +225,28 @@
                     </div>
                 </div>
             </div>
+            <br>
+            <a href="{% url 'yaksh:next_unit' course.id learning_module.id current_unit.id %}" class="btn btn-info btn-lg" >
+                    Next&nbsp;<i class="fa fa-step-forward"></i>
+            </a>
         {% endif %}
         {% if state == 'lesson' %}
-            <div>
-                <b><u>Add comment:</u></b>
+            <div class="col-md-8">
+                <hr>
+                <b><u>Comments:</u></b>
                 <form action="" method="POST" enctype='multipart/form-data'>
                     <div class="form-group">
                         {% csrf_token %}
-                        {{form}}
+                        {{form.as_p}}
                     </div>
-                    <input type="submit" value="Submit" class="btn btn-success">
+                    <input type="submit" value="Submit" class="btn btn-success btn-lg">
                 </form>
             </div>
         {% endif %}
         <br>
         {% if comments %}
             {% for comment in comments %}
-                <div class="card mb-2">
+                <div class="card mb-2 col-md-8">
                     <div class="card-body p-3">
                         <div class="row mb-3">
                             <div class="col-6">
diff --git a/yaksh/templatetags/custom_filters.py b/yaksh/templatetags/custom_filters.py
index 57ec7dd..a3cd3f1 100644
--- a/yaksh/templatetags/custom_filters.py
+++ b/yaksh/templatetags/custom_filters.py
@@ -3,6 +3,7 @@ from django.template.defaultfilters import stringfilter
 from django.forms.fields import CheckboxInput
 from ast import literal_eval
 import os
+import pandas as pd
 try:
     from itertools import zip_longest
 except ImportError:
@@ -192,4 +193,10 @@ def has_lesson_video(lesson_id):
         status = True if lesson.first().video_path else False
     else:
         status = False
-    return status
\ No newline at end of file
+    return status
+
+
+@register.simple_tag
+def get_tc_percent(tc_id, data):
+    return data.get(str(tc_id), 0)
+
diff --git a/yaksh/test_views.py b/yaksh/test_views.py
index 82f456e..4351a66 100644
--- a/yaksh/test_views.py
+++ b/yaksh/test_views.py
@@ -8181,6 +8181,29 @@ class TestLessonContents(TestCase):
                   'integertestcase_set-0-type': 'integertestcase',
                   'integertestcase_set-0-correct': "1"}
             )
+        self.client.post(
+            reverse('yaksh:add_marker_quiz',
+                    kwargs={"content_type": '3',
+                            "course_id": self.user1_course1.id,
+                            "lesson_id": self.lesson1.id}),
+            data={'timer': '00:00:00', 'summary': 'Mcc_Lesson_stats',
+                  'description': 'My lesson question description',
+                  'language': 'other', 'type': 'mcc', 'topic': 'test',
+                  'points': '1', 'form-TOTAL_FORMS': 2,
+                  'form-MAX_NUM_FORMS': '',
+                  'form-INITIAL_FORMS': 0,
+                  'mcqtestcase_set-TOTAL_FORMS': 2,
+                  'mcqtestcase_set-INITIAL_FORMS': 0,
+                  'mcqtestcase_set-MIN_NUM_FORMS': 0,
+                  'mcqtestcase_set-MAX_NUM_FORMS': 0,
+                  'mcqtestcase_set-0-type': 'mcqtestcase',
+                  'mcqtestcase_set-0-options': "1",
+                  'mcqtestcase_set-0-correct': True,
+                  'mcqtestcase_set-1-type': 'mcqtestcase',
+                  'mcqtestcase_set-1-options': "2",
+                  'mcqtestcase_set-1-correct': False
+                }
+            )
         que = Question.objects.filter(summary="My_Lesson_question")
 
         single_que = que.first()
@@ -8233,6 +8256,43 @@ class TestLessonContents(TestCase):
         )
         self.assertEqual(student_info.get("student_id"), self.student.id)
 
+        # Test for mcc lesson question statistics
+        # Given
+        que = Question.objects.filter(summary="Mcc_Lesson_stats")
+
+        single_que = que.first()
+        toc = TableOfContents.objects.get(
+            course_id=self.user1_course1.id, lesson_id=self.lesson1.id,
+            object_id=single_que.id
+        )
+        self.client.logout()
+
+        self.client.login(
+            username=self.student.username,
+            password=self.student_plaintext_pass
+        )
+        response = self.client.post(
+            reverse('yaksh:submit_marker_quiz',
+                    kwargs={"course_id": self.user1_course1.id,
+                            "toc_id": toc.id}),
+            data={'answer': [str(i.id) for i in single_que.get_test_cases()]}
+            )
+        self.client.logout()
+
+        # Then
+        self.client.login(
+            username=self.user1.username,
+            password=self.user1_plaintext_pass
+        )
+        response = self.client.get(
+            reverse('yaksh:lesson_statistics',
+                    kwargs={"course_id": self.user1_course1.id,
+                            "lesson_id": self.lesson1.id,
+                            "toc_id": toc.id})
+            )
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(student_info.get("student_id"), self.student.id)
+
     def test_multiple_lesson_question_types(self):
         self.client.login(
             username=self.user1.username,
diff --git a/yaksh/views.py b/yaksh/views.py
index da5748b..bd8ca5d 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -4012,8 +4012,19 @@ def lesson_statistics(request, course_id, lesson_id, toc_id=None):
     context['course_id'] = course_id
     if toc_id:
         per_que_data = TableOfContents.objects.get_question_stats(toc_id)
-        paginator = Paginator(per_que_data[1], 50)
-        context['question'] = per_que_data[0]
+        question = per_que_data[0]
+        answers = per_que_data[1]
+        is_percent_reqd = (
+            True if question.type == "mcq" or question.type == "mcc"
+                else False
+            )
+        per_tc_ans, total_count = TableOfContents.objects.get_per_tc_ans(
+            toc_id, question.type, is_percent_reqd
+        )
+        context['per_tc_ans'] = per_tc_ans
+        context['total_count'] = total_count
+        paginator = Paginator(answers, 50)
+        context['question'] = question
         page = request.GET.get('page')
         per_que_data = paginator.get_page(page)
         context['is_que_data'] = True