From 51a93b42b1d7b3a94e227796aa8d4f6e97de9929 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Wed, 27 Dec 2017 17:32:21 +0530
Subject: Exercise feature in video lessons

Exercise is same as quiz except for following differences:
- no time limit
- no marks weightage
- no instruction page
- skip denied for a particular time

An attribute 'is_exercise' in Quiz determines whether the quiz is
exercise or not.
Questions contains 'min_time' attribute.
For an exercise a question cannot be skipped for an allotted minimum
time, after which either django or JavaScript makes Next button
available.

Implementation is as such due to complexity of our existing views and
templates.
Also, after min_time, same question with Next button is available to
move on, assuming that solution is present in the video.
---
 yaksh/templates/exam.html               |  4 ++--
 yaksh/templates/yaksh/add_exercise.html | 41 +++++++++++++++++++++++++++++++++
 yaksh/templates/yaksh/add_question.html |  1 +
 yaksh/templates/yaksh/courses.html      |  7 +++++-
 yaksh/templates/yaksh/question.html     | 37 ++++++++++++++++++++---------
 5 files changed, 76 insertions(+), 14 deletions(-)
 create mode 100644 yaksh/templates/yaksh/add_exercise.html

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index d0812a4..4fd83dd 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -20,9 +20,9 @@
             <ul class="nav navbar-nav navbar">
               <li style="padding: 10px"><button class="btn btn-danger btn-sm" type="submit" name="quit">
                 {% if paper.questions_unanswered.all %}
-                  Quit Exam
+                  Quit {{ quiz_type }}
                 {% else %}
-                  Finish Exam
+                  Finish {{ quiz_type }}
                 {% endif %}
               <span class="glyphicon glyphicon-off"></span></button></li>
             </ul>
diff --git a/yaksh/templates/yaksh/add_exercise.html b/yaksh/templates/yaksh/add_exercise.html
new file mode 100644
index 0000000..af3e7b4
--- /dev/null
+++ b/yaksh/templates/yaksh/add_exercise.html
@@ -0,0 +1,41 @@
+{% extends "manage.html" %}
+
+
+{% block subtitle %}Add Exercise{% endblock %}
+
+{% block css %}
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/jquery.datetimepicker.css" type="text/css" />
+{% endblock %}
+{% block script %}
+<script src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.9.1.min.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/add_quiz.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/jquery.datetimepicker.full.min.js"></script>
+{% endblock %}
+{% block onload %} onload="javascript:test();"  {% endblock %}
+{% block content %}
+
+<form name=frm id=frm action="" method="post" >
+  {% csrf_token %}
+  <center>
+  <table class="span1 table">
+  {{ form.as_table }}
+  </table>
+  <script type="text/javascript">
+    $("#id_start_date_time").datetimepicker({format: 'Y-m-d H:i:s'});
+    $("#id_end_date_time").datetimepicker({format: 'Y-m-d H:i:s'});
+  </script>
+  <br/><br/>
+  </center>
+
+  <center><button class="btn" type="submit" id="submit" name="questionpaper"> Save
+  </button>
+
+  <button class="btn" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/courses/");'>Cancel</button> </center>
+</form>
+ <style type="text/css">
+   #rendered_text{
+    width: 550px;
+   }
+ </style>
+{% endblock %}
diff --git a/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html
index 6ead019..c294d9a 100644
--- a/yaksh/templates/yaksh/add_question.html
+++ b/yaksh/templates/yaksh/add_question.html
@@ -25,6 +25,7 @@
   <tr><td>Description: <td>{{ qform.description}}  {{qform.description.errors}}
   <tr><td>Tags: <td>{{ qform.tags }}
   <tr><td>Snippet: <td>{{ qform.snippet }}
+  <tr><td>Minimum Time(in minutes):<td> {{ qform.min_time }}
   <tr><td>Partial Grading: <td>{{ qform.partial_grading }}
   <tr><td>Grade Assignment Upload:<td> {{ qform.grade_assignment_upload }}
   <tr><td> File: <td> {{ fileform.file_field }}{{ fileform.file_field.errors }}
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index 5daf944..a06ee7e 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -290,7 +290,8 @@
 <div id="all_quizzes" >
 <div class="col-md-offset-2 main">
 {% if type == "quiz" %}
-    <a href="{{URL_ROOT}}/exam/manage/addquiz/" class="btn btn-primary">Add new Quiz</a>
+    <a href="{{URL_ROOT}}/exam/manage/addquiz/" class="btn btn-primary">Add New Quiz</a>
+    <a href="{{URL_ROOT}}/exam/manage/add_exercise/" class="btn btn-primary">Add New Exercise</a>
     {% if not quizzes %}
         <center><h4> No new Quiz Added</h4></center>
         <br><br>
@@ -308,7 +309,11 @@
         <td>{{forloop.counter}}</td>
         <td width="30%">
             <ul class="list-group">
+            {% if quiz.is_exercise %}
+                <a href="{{URL_ROOT}}/exam/manage/add_exercise/{{quiz.id}}/">{{ quiz.description }}</a>
+            {% else %}
             <a href="{{URL_ROOT}}/exam/manage/addquiz/{{quiz.id}}/">{{ quiz.description }}</a>
+            {% endif %}
             {% if quiz.active %}
                 <span class="label label-success">Active</span>
             {% else %}
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 6adda5b..978d226 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -23,7 +23,18 @@
 <script type="text/javascript" async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-MML-AM_CHTML"></script>
 
 <script>
+init_val = '{{ last_attempt|escape_quotes|safe }}';
+lang = "{{ question.language }}"
+course_id = "{{course.id}}"
+module_id = "{{module.id}}"
+is_exercise = "{{ quiz.is_exercise }}"
+can_skip = "{{ can_skip }}"
+delay_time = new Number("{{ delay_time }}")
+
 var time_left = {{ paper.time_left }}
+{% if quiz.is_exercise %}
+    time_left = {{ delay_time }}
+{% endif %}
 
 function getTimeRemaining(endtime){
   var t = Date.parse(endtime) - Date.parse(new Date());
@@ -52,13 +63,15 @@ function updateClock(){
     var mm = ('0' + t.minutes).slice(-2);
     var ss = ('0' + t.seconds).slice(-2);
 
-    if(t.total<0){
-        
+    if(t.total<0 && is_exercise=="False"){
       document.forms["code"].submit();
       clearInterval(timeinterval);
       return null;
     }
-    if (t.total<=300000){
+    if(t.total<=0 && is_exercise=="True"){
+      clearInterval(timeinterval);
+    }
+    if (t.total<=300000 && t.total > 0){
         clock.innerHTML = "<blink><center><span style='color:red'><strong>" + hh + ":" + mm + ":" + ss + "</strong></center></span></blink>";
     }
     if (t.total>=300000) {
@@ -68,6 +81,7 @@ function updateClock(){
 var clock = document.getElementById("time_left");
 updateClock();
 var timeinterval = setInterval(updateClock,1000);
+
 }
 
 function validate(){
@@ -85,13 +99,7 @@ function call_skip(url)
     form.action = url
     form.submit();
 }
-init_val = '{{ last_attempt|escape_quotes|safe }}';
-lang = "{{ question.language }}"
-course_id = "{{course.id}}"
-module_id = "{{module.id}}"
-
 </script>
-
 {% endblock script %}
 
 {% block onload %} onload="updateTime();" {% endblock %}
@@ -253,16 +261,23 @@ module_id = "{{module.id}}"
          <br><button class="btn btn-primary" type="submit" name="check" id="check" onClick="return validate();">Upload</button>&nbsp;&nbsp;
 
          {% else %}
-           {% if question in paper.get_questions_unanswered %}
+           {% if question in paper.get_questions_unanswered or quiz.is_exercise %}
            <button class="btn btn-primary" type="submit" name="check" id="check" >Check Answer <span class="glyphicon glyphicon-cog"></span></button>&nbsp;&nbsp;
            {% endif %}
          {% endif %}
+         {% if quiz.is_exercise %}
+         {% if can_skip %}
+             <button id="skip_ex" class="btn btn-primary"  onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ paper.attempt_number }}/{{ module.id }}/{{ paper.question_paper.id }}/{{course.id}}/')" name="skip"> Next <span class="glyphicon glyphicon-arrow-right"></span></button>
+         {% else %}
+             <button id="skip_ex" class="btn btn-primary"  onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ paper.attempt_number }}/{{ module.id }}/{{ paper.question_paper.id }}/{{course.id}}/')" name="skip" style="visibility:hidden"> Next <span class="glyphicon glyphicon-arrow-right"></span></button>
+        {% endif %}
+        {% endif %}
 
          {% if paper.question_paper.quiz.allow_skip and not paper.get_questions_unanswered|length_is:"1" %}
          {% if question in paper.get_questions_unanswered %}
          <button class="btn btn-primary"  onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ paper.attempt_number }}/{{ module.id }}/{{ paper.question_paper.id }}/{{course.id}}/')" name="skip" id="skip">Attempt Later <span class="glyphicon glyphicon-arrow-right"></span></button>
          {% endif %}
-         {% endif %} 
+         {% endif %}
        </div>
          </form>
          </div>
-- 
cgit 


From 7fe8e17438b8e67e7290f11ddcd29cda3953921b Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Wed, 27 Dec 2017 17:54:31 +0530
Subject: cleaned add exercise HTML

---
 yaksh/templates/yaksh/add_exercise.html | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/add_exercise.html b/yaksh/templates/yaksh/add_exercise.html
index af3e7b4..dac35d4 100644
--- a/yaksh/templates/yaksh/add_exercise.html
+++ b/yaksh/templates/yaksh/add_exercise.html
@@ -5,12 +5,10 @@
 
 {% block css %}
 <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" />
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/jquery.datetimepicker.css" type="text/css" />
 {% endblock %}
 {% block script %}
 <script src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.9.1.min.js"></script>
 <script src="{{ URL_ROOT }}/static/yaksh/js/add_quiz.js"></script>
-<script src="{{ URL_ROOT }}/static/yaksh/js/jquery.datetimepicker.full.min.js"></script>
 {% endblock %}
 {% block onload %} onload="javascript:test();"  {% endblock %}
 {% block content %}
@@ -21,10 +19,6 @@
   <table class="span1 table">
   {{ form.as_table }}
   </table>
-  <script type="text/javascript">
-    $("#id_start_date_time").datetimepicker({format: 'Y-m-d H:i:s'});
-    $("#id_end_date_time").datetimepicker({format: 'Y-m-d H:i:s'});
-  </script>
   <br/><br/>
   </center>
 
@@ -33,9 +27,4 @@
 
   <button class="btn" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/courses/");'>Cancel</button> </center>
 </form>
- <style type="text/css">
-   #rendered_text{
-    width: 550px;
-   }
- </style>
 {% endblock %}
-- 
cgit 


From e14514e01052fb36cd9f14675cbe7ca940945a34 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Tue, 2 Jan 2018 16:46:52 +0530
Subject: Allowed user to skip and view solution if the answer is correct.

Added solution attribute to the Question model.
---
 yaksh/templates/yaksh/add_question.html |  2 ++
 yaksh/templates/yaksh/courses.html      |  9 +++++++--
 yaksh/templates/yaksh/question.html     | 17 +++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html
index c294d9a..4ec9bee 100644
--- a/yaksh/templates/yaksh/add_question.html
+++ b/yaksh/templates/yaksh/add_question.html
@@ -24,6 +24,8 @@
     <tr><td><strong>Rendered: </strong><td><p id='my'></p>
   <tr><td>Description: <td>{{ qform.description}}  {{qform.description.errors}}
   <tr><td>Tags: <td>{{ qform.tags }}
+  <tr><td><strong>Rendered Solution: </strong><td><p id='rend_solution'></p>
+  <tr><td>Solution: <td>{{ qform.solution }}
   <tr><td>Snippet: <td>{{ qform.snippet }}
   <tr><td>Minimum Time(in minutes):<td> {{ qform.min_time }}
   <tr><td>Partial Grading: <td>{{ qform.partial_grading }}
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index a06ee7e..a41c8c3 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -151,8 +151,13 @@
                         <ul class="inputs-list">
                         <li>
                         {% if unit.learning_type == "quiz" %}
-                            <a href="{{URL_ROOT}}/exam/manage/addquiz/{{unit.quiz.id}}/{{course.id}}">
-                            {{unit.quiz.description}}</a>
+                            {% if unit.quiz.is_exercise %}
+                                <a href="{{URL_ROOT}}/exam/manage/add_exercise/{{unit.quiz.id}}/{{course.id}}">
+                                {{unit.quiz.description}}</a>
+                            {% else %}
+                                <a href="{{URL_ROOT}}/exam/manage/addquiz/{{unit.quiz.id}}/{{course.id}}">
+                                {{unit.quiz.description}}</a>
+                            {% endif %}
                         {% else %}
                             <a href="{{URL_ROOT}}/exam/manage/courses/edit_lesson/{{unit.lesson.id}}/{{course.id}}">
                             {{unit.lesson.name}}</a>
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 978d226..c9a5211 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -192,6 +192,23 @@ function call_skip(url)
                       <h5><a href="{{f_name.file.url}}">{{f_name.file.name}}</a></h5>
                       {% endfor %}
                       {% endif %}
+
+                        {% if quiz.is_exercise %}
+                            {% if question.solution %}
+                                <h4><u> Solution by teacher</u></h4>
+                            {% else %}
+                                <h4><u> No solution provided by teacher </u></h4>
+                            {% endif%}
+                            {% if can_skip %}
+                                <div id="solution">
+                                    <font size=3 face=arial> {{ question.solution|safe }} </font>
+                                </div>
+                            {% else %}
+                                <div id="solution" style="display:none">
+                                    <font size=3 face=arial> {{ question.solution|safe }} </font>
+                                </div>
+                            {% endif %}
+                        {% endif %}
                  </div>
                  <div class="panel-body">
                      {% if question.type == "mcq" %}
-- 
cgit 


From 4310d5905a9cc702198e42830c1b670957cd7360 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Wed, 3 Jan 2018 19:27:25 +0530
Subject: Made UI changes as per suggestion

Added view answerpaper option to exercise form.
---
 yaksh/templates/yaksh/course_modules.html   | 16 ++++++++++++----
 yaksh/templates/yaksh/courses.html          | 11 ++++++++---
 yaksh/templates/yaksh/question.html         | 16 +++++++---------
 yaksh/templates/yaksh/quit.html             | 10 +++++++---
 yaksh/templates/yaksh/view_answerpaper.html | 10 +++++++++-
 5 files changed, 43 insertions(+), 20 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_modules.html b/yaksh/templates/yaksh/course_modules.html
index 8e6f5a6..fad1be0 100644
--- a/yaksh/templates/yaksh/course_modules.html
+++ b/yaksh/templates/yaksh/course_modules.html
@@ -31,7 +31,7 @@
                 </span>
                 <span class="glyphicon glyphicon-chevron-up" id="learning_units{{module.id}}{{course.id}}_up" style="display: none;"></span>
                 <a data-toggle="collapse" data-target="#learning_units{{module.id}}{{course.id}}" onclick="view_unit('learning_units{{module.id}}{{course.id}}');">
-                View Lessons/Quizzes</a>
+                View Lessons/Quizzes/Exercises</a>
                 </td>
                 <td>
                 {% get_module_status user module course as module_status %}
@@ -56,7 +56,7 @@
         <div id="learning_units{{module.id}}{{course.id}}" class="collapse">
         <table class="table">
             <tr>
-            <th>Lesson/Quiz</th>
+            <th>Lesson/Quiz/Exercise</th>
             <th>Status</th>
             <th>Type</th>
             <th>View AnswerPaper</th>
@@ -85,7 +85,15 @@
                 {% endif %}
                 </td>
                 <td>
-                    {{unit.type|title}}
+                {% if unit.type == "quiz" %}
+                    {% if unit.quiz.is_exercise %}
+                        Exercise
+                    {% else %}
+                        Quiz
+                    {% endif %}
+                {% else %}
+                    Lesson
+                {% endif %}
                 </td>
                 <td>
                 {% if unit.type == "quiz" %}
@@ -109,4 +117,4 @@
 {% else %}
     <h3> No lectures found </h3>
 {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index 2456433..b6b9f7e 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -151,7 +151,7 @@
                     {% for unit in module.get_learning_units %}
                         <ul class="inputs-list">
                         <li>
-                        {% if unit.learning_type == "quiz" %}
+                        {% if unit.type == "quiz" %}
                             {% if unit.quiz.is_exercise %}
                                 <a href="{{URL_ROOT}}/exam/manage/add_exercise/{{unit.quiz.id}}/{{course.id}}">
                                 {{unit.quiz.description}}</a>
@@ -288,8 +288,13 @@
                         <ul class="inputs-list">
                         <li>
                         {% if unit.type == "quiz" %}
-                            <a href="{{URL_ROOT}}/exam/manage/addquiz/{{unit.quiz.id}}/{{course.id}}">
-                            {{unit.quiz.description}}</a>
+                            {% if unit.quiz.is_exercise %}
+                                <a href="{{URL_ROOT}}/exam/manage/add_exercise/{{unit.quiz.id}}/{{course.id}}">
+                                {{unit.quiz.description}}</a>
+                            {% else %}
+                                <a href="{{URL_ROOT}}/exam/manage/addquiz/{{unit.quiz.id}}/{{course.id}}">
+                                {{unit.quiz.description}}</a>
+                            {% endif %}
                         {% else %}
                             <a href="{{URL_ROOT}}/exam/manage/courses/edit_lesson/{{unit.lesson.id}}/{{course.id}}">
                             {{unit.lesson.name}}</a>
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index fe5917c..b7251ad 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -199,20 +199,18 @@ question_type = "{{ question.type }}"
                       {% endif %}
 
                         {% if quiz.is_exercise %}
-                            {% if question.solution %}
-                                <h4><u> Solution by teacher</u></h4>
-                            {% else %}
-                                <h4><u> No solution provided by teacher </u></h4>
-                            {% endif%}
                             {% if can_skip %}
                                 <div id="solution">
-                                    <font size=3 face=arial> {{ question.solution|safe }} </font>
-                                </div>
                             {% else %}
                                 <div id="solution" style="display:none">
-                                    <font size=3 face=arial> {{ question.solution|safe }} </font>
-                                </div>
                             {% endif %}
+                                {% if question.solution %}
+                                <h4><u> Solution by teacher</u></h4>
+                                {% else %}
+                                <h4><u> No solution provided by teacher </u></h4>
+                                {% endif%}
+                                <font size=3 face=arial> {{ question.solution|safe }} </font>
+                                </div>
                         {% endif %}
                  </div>
                  <div class="panel-body">
diff --git a/yaksh/templates/yaksh/quit.html b/yaksh/templates/yaksh/quit.html
index 78a9b47..ee72026 100644
--- a/yaksh/templates/yaksh/quit.html
+++ b/yaksh/templates/yaksh/quit.html
@@ -28,9 +28,13 @@ width="80" alt="YAKSH"></img> {% endblock %}
         {% endfor %}
 </table></center>
 
-	<center><h4>Your current answers are saved.</h4></center>
-	<center><h4> Are you sure you wish to quit the exam?</h4></center>
-	<center><h4> Be sure, as you won't be able to restart this exam.</h4></center>
+    {% if paper.question_paper.quiz.is_exercise %}
+	    <center><h4> Are you sure you wish to quit the Exercise?</h4></center>
+    {% else %}
+        <center><h4>Your current answers are saved.</h4></center>
+        <center><h4> Are you sure you wish to quit the exam?</h4></center>
+        <center><h4> Be sure, as you won't be able to restart this exam.</h4></center>
+    {% endif %}
 	<form action="{{URL_ROOT}}/exam/complete/{{ paper.attempt_number }}/{{module_id}}/{{ paper.question_paper.id }}/{{course_id}}/" method="post">
 	{% csrf_token %}
 	<center>
diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html
index 5f899e3..410b578 100644
--- a/yaksh/templates/yaksh/view_answerpaper.html
+++ b/yaksh/templates/yaksh/view_answerpaper.html
@@ -11,13 +11,21 @@
 {% block main %}
 
 {% if not data.papers %}
+    {% if quiz.is_exercise %}
+    <p><b> You have not attempted the Exercise {{ quiz.description }} </b></p>
+    {% else %}
     <p><b> You have not attempted the quiz {{ quiz.description }} </b></p>
+    {% endif %}
 {% else %}
     {% for paper in data.papers %}
     {% if forloop.counter == 2 and data.questionpaperid %}
     <U><h2> Previous attempts </h2></U>
     {% endif %}
-    <h2> Quiz: {{ paper.question_paper.quiz.description }} </h2>
+    {% if quiz.is_exercise %}
+        <h2> Exercise: {{ paper.question_paper.quiz.description }} </h2>
+    {% else %}
+        <h2> Quiz: {{ paper.question_paper.quiz.description }} </h2>
+    {% endif %}
 
     <p>
     Attempt Number: {{ paper.attempt_number }}<br/>
-- 
cgit