Resolve conflicts

16 files changed, 132 insertions, 132 deletions

diff --git a/yaksh/forms.py b/yaksh/forms.py
index 091505d..d57d388 100644
--- a/yaksh/forms.py
+++ b/yaksh/forms.py
@@ -715,7 +715,8 @@ class VideoQuizForm(forms.ModelForm):
         )
         self.fields['type'].initial = question_type
         self.fields['description'].widget.attrs.update(
-            {'class': form_input_class, 'placeholder': 'Description'}
+            {'class': form_input_class, 'placeholder': 'Description',
+             'id': 'que_description'}
         )
         self.fields['timer'].widget.attrs.update(
             {'class': form_input_class, 'placeholder': 'Quiz Time'}
diff --git a/yaksh/models.py b/yaksh/models.py
index 932e38c..2a06cc8 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -2379,15 +2379,24 @@ class AnswerPaper(models.Model):
                     'error_list': [e for e in json.loads(answer.error)]
                 }]
 
+        q_a.update(
+            { q: [] for q in self.questions_unanswered.all() }
+        )
+
         for question, answers in q_a.items():
             answers = q_a[question]
-            q_a[question].append({
-                'marks': max([
-                    answer['answer'].marks
-                    for answer in answers
-                    if question == answer['answer'].question
-                ])
-            })
+            if answers:
+                q_a[question].append({
+                    'marks': max([
+                        answer['answer'].marks
+                        for answer in answers
+                        if question == answer['answer'].question
+                    ]),
+                })
+            else:
+                q_a[question].append({
+                    'marks': 0.0,
+                })
 
         return q_a
 
diff --git a/yaksh/static/yaksh/js/lesson.js b/yaksh/static/yaksh/js/lesson.js
index 2cc2e62..586ae18 100644
--- a/yaksh/static/yaksh/js/lesson.js
+++ b/yaksh/static/yaksh/js/lesson.js
@@ -1,13 +1,20 @@
 $(document).ready(function() {
-    MathJax.Hub.Queue(["Typeset", MathJax.Hub]);
     var simplemde = new SimpleMDE({
         element: document.getElementById("id_description"),
         forceSync: true,
         hideIcons: ["preview", "side-by-side", "fullscreen"]
     });
     simplemde.codemirror.on("change", function() {
-        MathJax.Hub.Queue(["Typeset", MathJax.Hub]);
         $("#description_body").html(simplemde.markdown(simplemde.value()));
+        renderMathInElement(
+          document.body,
+          {
+            delimiters: [
+              {left: "$$", right: "$$", display: false},
+              {left: "$", right: "$", display: true},
+            ]
+          }
+        );
     });
     const player = new Plyr('#player');
     var timer = $("#vtimer");
diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html
index a108f8c..cba56cb 100644
--- a/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
@@ -52,11 +52,23 @@
   <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 defer src="https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/contrib/auto-render.min.js" integrity="sha384-mll67QQFJfxn0IYznZYonOWZ644AWYC+Pt2cHqMaRhXVrursRwvLnLaebdGIlYNa" crossorigin="anonymous"
-      onload="renderMathInElement(document.body);"></script>
   <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>
+ 
   <script>
       new WOW().init();
+      $(document).ready(function() {
+        renderMathInElement(
+          document.body,
+          {
+            delimiters: [
+              {left: "$$", right: "$$", display: false},
+              {left: "$", right: "$", display: true},
+            ]
+          }
+        );
+      });
   </script>
   {% block script %}
   {% endblock %}
diff --git a/yaksh/templates/yaksh/add_lesson.html b/yaksh/templates/yaksh/add_lesson.html
index d8ce09c..4400032 100644
--- a/yaksh/templates/yaksh/add_lesson.html
+++ b/yaksh/templates/yaksh/add_lesson.html
@@ -25,8 +25,8 @@
         {{error}}
     </div>
     {% endif %}
-    <div class="row justify-content-center form-group">
-        <div class="col-md-5 col-md-offset-4">
+    <div class="row">
+        <div class="col-md-6">
             <a class="btn btn-primary" href="{% url 'yaksh:get_course_modules' course_id %}">
                 <i class="fa fa-arrow-left"></i>&nbsp;Back
             </a>
@@ -145,7 +145,7 @@
             </form>
         </div>
         <br><br>
-        <div class="col-md-5">
+        <div class="col-md-6">
             <br>
             <div class="card">
                 <div class="card-header">
@@ -154,13 +154,13 @@
                     </a>
                 </div>
                 <div class="collapse show" id="toc-collapse">
-                    <div class="card-body" id="toc">{{toc}}</div>
+                    <div class="card-body" id="toc" style="max-height: 400px; overflow-y: auto;">{{toc}}</div>
                 </div>
             </div>
             <br>
             <div class="card" id="preview_text_div">
                 <div class="card-header">
-                    Setup Lesson
+                    Create lesson table of contents
                 </div>
                 <div class="card-body">
                     {% if lesson_form.instance and lesson_form.instance.video_path %}
diff --git a/yaksh/templates/yaksh/add_video_quiz.html b/yaksh/templates/yaksh/add_video_quiz.html
index ad087bc..b8a788e 100644
--- a/yaksh/templates/yaksh/add_video_quiz.html
+++ b/yaksh/templates/yaksh/add_video_quiz.html
@@ -76,9 +76,9 @@
                 $('#id_type').children("option[value='code']").show();
             }
         });
-        function init_editor() {
+        $(function() {
             tinymce.init({
-                selector : "textarea",
+                selector: 'textarea#que_description',
                 setup : function(ed) {
                       ed.on('change', function(e) {
                          tinymce.triggerSave();
@@ -89,6 +89,6 @@
                 plugins: "image code link",
                 convert_urls: false
             });
-        }
+        });
     });
 </script>
\ No newline at end of file
diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html
index acd6861..b98688b 100644
--- a/yaksh/templates/yaksh/course_forum.html
+++ b/yaksh/templates/yaksh/course_forum.html
@@ -129,7 +129,7 @@
                                         {% endwith %}
                                     </td>
                                     <td>
-                                        {% if user == course.creator %}
+                                        {% if user == course.creator or user in course.get_teachers %}
                                             <small><a href="{% url 'yaksh:hide_post' course.id post.uid %}" class="pull-right fa fa-trash"></i></a></small>
                                         {% endif %}
                                     </td>
diff --git a/yaksh/templates/yaksh/lessons_forum.html b/yaksh/templates/yaksh/lessons_forum.html
index 250536d..58fb360 100644
--- a/yaksh/templates/yaksh/lessons_forum.html
+++ b/yaksh/templates/yaksh/lessons_forum.html
@@ -61,7 +61,7 @@
                                         {% endwith %}
                                     </td>
                                     <td>
-                                        {% if user == course.creator %}
+                                        {% if user == course.creator or user in course.get_teachers %}
                                             <small><a href="{% url 'yaksh:hide_post' course.id post.uid %}" class="pull-right fa fa-trash"></i></a></small>
                                         {% endif %}
                                     </td>
diff --git a/yaksh/templates/yaksh/post_comments.html b/yaksh/templates/yaksh/post_comments.html
index bc452e0..70aac47 100644
--- a/yaksh/templates/yaksh/post_comments.html
+++ b/yaksh/templates/yaksh/post_comments.html
@@ -38,7 +38,7 @@
                         {% endif %}
                     </strong>
                     {{post.created_at}}
-                    {% if user == course.creator %}<a href="{% url 'yaksh:hide_post' post.target.id post.uid %}" class="pull-right fa fa-trash"></a>{% endif %}
+                    {% if user == course.creator or user in course.get_teachers %}<a href="{% url 'yaksh:hide_post' post.target.id post.uid %}" class="pull-right fa fa-trash"></a>{% endif %}
                 </small>
 
             </div>
@@ -77,7 +77,7 @@
                                 </strong>
                             </div>
                             <div class="col-6 text-right">
-                                <small class="text-muted">{{comment.created_at}} {% if user == course.creator %} <a href="{% url 'yaksh:hide_comment' post.target.id comment.uid %}" class="fa fa-trash"></a>{% endif %}</small>
+                                <small class="text-muted">{{comment.created_at}} {% if user == course.creator or user in course.get_teachers %} <a href="{% url 'yaksh:hide_comment' post.target.id comment.uid %}" class="fa fa-trash"></a>{% endif %}</small>
                             </div>
                         </div>
                         <p class="card-text description">{{comment.description|safe}}</p>
diff --git a/yaksh/templates/yaksh/show_lesson_quiz.html b/yaksh/templates/yaksh/show_lesson_quiz.html
index fb5ae6c..82e01bc 100644
--- a/yaksh/templates/yaksh/show_lesson_quiz.html
+++ b/yaksh/templates/yaksh/show_lesson_quiz.html
@@ -1,5 +1,16 @@
 {% load custom_filters %}
 <script type="text/javascript">
+    $(document).ready(function() {
+      renderMathInElement(
+        document.body,
+        {
+          delimiters: [
+            {left: "$$", right: "$$", display: false},
+            {left: "$", right: "$", display: true},
+          ]
+        }
+      );
+    });
     function user_arranged_options() {
         var temp_array = []
         var add_array = document.getElementById("arrange_order");
@@ -120,11 +131,11 @@
                   var order_array = $(arrange).sortable(['serialize']);
                 </script>
             {% endif %}
-            {% if question.type == "mcq" or  question.type == "mcc" or question.type == "integer" or question.type == "float" or question.type ==  "string" %}
+            {% if question.type == "arrange" %}
+              <br><button class="btn btn-success" type="submit" name="check" id="check" onClick="return user_arranged_options();">Submit</button>
+            {% else %}
               <br><button class="btn btn-success" type="submit" name="check" id="check">Submit
               </button>
-            {% elif question.type == "arrange" %}
-              <br><button class="btn btn-success" type="submit" name="check" id="check" onClick="return user_arranged_options();">Submit</button>
             {% endif %}
         </div>
     </div>
diff --git a/yaksh/templates/yaksh/show_toc.html b/yaksh/templates/yaksh/show_toc.html
index 104815f..4c8ffe2 100644
--- a/yaksh/templates/yaksh/show_toc.html
+++ b/yaksh/templates/yaksh/show_toc.html
@@ -1,20 +1,22 @@
 {% load custom_filters %}
 {% has_lesson_video lesson_id as has_video %}
 {% if has_video %}
-    <div>
-        <a href="{% url 'yaksh:download_sample_toc' %}">
-            <i class="fa fa-download"></i>&nbsp;Download Sample
-        </a>
-        <br><br>
-        <form action="" method="POST" enctype="multipart/form-data">
-            {% csrf_token %}
-            <input type="file" name="toc" required="">
-            <button class="btn btn-outline-success" id="upload_toc" name="upload_toc">
-                <i class="fa fa-upload"></i>&nbsp;Upload TOC
-            </button>
-        </form>
+    <div class="card">
+        <div class="card-body">
+            <a href="{% url 'yaksh:download_sample_toc' %}">
+                <i class="fa fa-download"></i>&nbsp;Download Sample
+            </a>
+            <hr>
+            <form action="" method="POST" enctype="multipart/form-data">
+                {% csrf_token %}
+                <input type="file" name="toc" required="">
+                <button class="btn btn-outline-success" id="upload_toc" name="upload_toc">
+                    <i class="fa fa-upload"></i>&nbsp;Upload TOC
+                </button>
+            </form>
+        </div>
     </div>
-    <hr>
+    <br>
 {% endif %}
 <table class="table table-responsive">
 {% for toc in contents %}
diff --git a/yaksh/templates/yaksh/show_video.html b/yaksh/templates/yaksh/show_video.html
index 9061e70..d27293e 100644
--- a/yaksh/templates/yaksh/show_video.html
+++ b/yaksh/templates/yaksh/show_video.html
@@ -141,59 +141,59 @@
             <!-- Lesson Table of contents -->
             <div class="row">
                 {% 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>
-                {% 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 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 class="collapse show" id="toc-collapse">
-                            <div class="card-body" id="toc">
-                                <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>
+                    {% 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>
-                {% endif %}
+                    {% endif %}
                 {% endif %}
                 <div class="col-md-8">
                     <div class="card">
diff --git a/yaksh/test_models.py b/yaksh/test_models.py
index 67da7d1..fe0d3b5 100644
--- a/yaksh/test_models.py
+++ b/yaksh/test_models.py
@@ -1788,20 +1788,7 @@ class AnswerPaperTestCases(unittest.TestCase):
         """ Test get_question_answer() method of Answer Paper"""
         questions = self.answerpaper.questions.all()
         answered = self.answerpaper.get_question_answers()
-        for question in questions:
-            answers_saved = Answer.objects.filter(question=question)
-            error_list = [json.loads(ans.error) for ans in answers_saved]
-            if answers_saved:
-                self.assertGreater(len(answered[question]), len(answers_saved))
-                ans = []
-                err = []
-                for val in answered[question]:
-                    if val.get('answer') is not None:
-                        ans.append(val.get('answer'))
-                    if val.get('error_list') is not None:
-                        err.append(val.get('error_list'))
-                self.assertEqual(set(ans), set(answers_saved))
-                self.assertEqual(error_list, err)
+        self.assertEqual(list(questions), list(answered.keys()))
 
     def test_is_answer_correct(self):
         self.assertTrue(self.answerpaper.is_answer_correct(self.questions[0]))
diff --git a/yaksh/test_views.py b/yaksh/test_views.py
index 2db217f..4351a66 100644
--- a/yaksh/test_views.py
+++ b/yaksh/test_views.py
@@ -6728,20 +6728,6 @@ class TestLessons(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context["msg"], err_msg)
 
-    def test_preview_lesson_description(self):
-        """ Test preview lesson description converted from md to html"""
-        self.client.login(
-            username=self.teacher.username,
-            password=self.teacher_plaintext_pass
-        )
-        lesson = json.dumps({'description': self.lesson.description})
-        response = self.client.post(
-            reverse('yaksh:preview_html_text'),
-            data=lesson, content_type="application/json"
-            )
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json()['data'], '<p>test description</p>')
-
 
 class TestPost(TestCase):
     def setUp(self):
diff --git a/yaksh/urls.py b/yaksh/urls.py
index 82785ca..f15d91a 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -199,8 +199,6 @@ urlpatterns = [
         views.design_module, name="design_module"),
     url(r'^manage/courses/designmodule/(?P<module_id>\d+)/'
         '(?P<course_id>\d+)/$', views.design_module, name="design_module"),
-    url(r'^manage/courses/lesson/preview/$',
-        views.preview_html_text, name="preview_html_text"),
     url(r'^manage/courses/add_module/(?P<course_id>\d+)/$',
         views.add_module, name="add_module"),
     url(r'^manage/courses/add_module/(?P<course_id>\d+)/(?P<module_id>\d+)/$',
diff --git a/yaksh/views.py b/yaksh/views.py
index e01bf86..bd8ca5d 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -2987,19 +2987,6 @@ def add_module(request, course_id=None, module_id=None):
 
 @login_required
 @email_verified
-def preview_html_text(request):
-    user = request.user
-    if not is_moderator(user):
-        raise Http404('You are not allowed to view this page!')
-    response_kwargs = {}
-    response_kwargs['content_type'] = 'application/json'
-    request_data = json.loads(request.body.decode("utf-8"))
-    html_text = get_html_text(request_data['description'])
-    return HttpResponse(json.dumps({"data": html_text}), **response_kwargs)
-
-
-@login_required
-@email_verified
 def get_next_unit(request, course_id, module_id, current_unit_id=None,
                   first_unit=None):
     user = request.user