From a37b9b082ef9c89bd8f06844afad5db691e25995 Mon Sep 17 00:00:00 2001
From: mahesh
Date: Fri, 21 Apr 2017 03:12:10 +0530
Subject: added search tag feature in showquestions

---
 yaksh/templates/yaksh/showquestions.html | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/showquestions.html b/yaksh/templates/yaksh/showquestions.html
index a136ddf..6e1ea6e 100644
--- a/yaksh/templates/yaksh/showquestions.html
+++ b/yaksh/templates/yaksh/showquestions.html
@@ -26,9 +26,9 @@ Upload File <span class="glyphicon glyphicon-open"></span></button>
 {% endif %}
 <br><br>
 <form name=frm action="" method="post">
-{% csrf_token %}
+<!-- Filtering Questions  -->
 <div class="row" id="selectors">
-    <h5 style="padding-left: 20px;">Filters</h5>
+    <h4 style="padding-left: 20px;">Filters Questions: </h4>
     <div class="col-md-3">
         {{ form.question_type }}
     </div>
@@ -40,16 +40,37 @@ Upload File <span class="glyphicon glyphicon-open"></span></button>
     </div>
 </div>
 <br>
-    <button class="btn btn-primary" type="button" onClick='location.replace("{{URL_ROOT}}");'>Clear Filters</button>
-<br>
+ <button class="btn btn-primary" type="button" onClick='location.replace("{{URL_ROOT}}");'>
+ Clear Filters</button>
+<br><br>
+<!-- Searching Tags -->
+{% csrf_token %}
+    <div class="col-md-16">
+    <div class="input-group">
+    <span class="input-group-addon" id="basic-addon1">Search Questions </span>
+    <input type="text" name="question_tags" class="form-control"
+     placeholder="Search using comma separated Tags">
+    <span class="input-group-btn">
+    <button class="btn btn-default" type="submit">Search</button>
+    <button class="btn btn-default" onclick='location.replace("{{URL_ROOT}}/exam/manage/questions/");'>
+    Cancel</button>
+    </span>
+    </div>
+     </div>
 
 <div id="filtered-questions">
+{% if not search_result %}
 {% if questions %}
 <h5><input id="checkall" type="checkbox"> Select All </h5>
 {% for i in questions %}
 <input type="checkbox" name="question" value="{{ i.id }}">&nbsp;&nbsp;<a href="{{URL_ROOT}}/exam/manage/addquestion/{{ i.id }}">{{ i }}</a><br>
 {% endfor %}
 {% endif %}
+{% else %}
+{% for i in search_result %}
+<input type="checkbox" name="question" value="{{ i.id }}">&nbsp;&nbsp;<a href="{{URL_ROOT}}/exam/manage/addquestion/{{ i.id }}">{{ i }}</a><br>
+{% endfor %}
+{% endif %}
 </div>
 <br>
 <button class="btn btn-primary" type="button" onclick='location.replace("{{URL_ROOT}}/exam/manage/addquestion/");'>Add Question <span class="glyphicon glyphicon-plus"></span></button>&nbsp;&nbsp;
-- 
cgit 


From 3d43d3d423f6589688ba313ca961360280157543 Mon Sep 17 00:00:00 2001
From: mahesh
Date: Fri, 9 Jun 2017 16:13:24 +0530
Subject: searches for tagged questions

---
 yaksh/templates/yaksh/showquestions.html | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/showquestions.html b/yaksh/templates/yaksh/showquestions.html
index 6e1ea6e..8b7fbf1 100644
--- a/yaksh/templates/yaksh/showquestions.html
+++ b/yaksh/templates/yaksh/showquestions.html
@@ -38,25 +38,40 @@ Upload File <span class="glyphicon glyphicon-open"></span></button>
     <div class="col-md-3">
         {{ form.marks }}
     </div>
-</div>
 <br>
- <button class="btn btn-primary" type="button" onClick='location.replace("{{URL_ROOT}}");'>
- Clear Filters</button>
-<br><br>
+<h4 style="padding-left: 20px;">Or</h4>
+
+<h4 style="padding-left: 20px;">Search using Tags: </h4>
+</div>
 <!-- Searching Tags -->
 {% csrf_token %}
-    <div class="col-md-16">
+    <div class="col-md-14">
     <div class="input-group">
     <span class="input-group-addon" id="basic-addon1">Search Questions </span>
-    <input type="text" name="question_tags" class="form-control"
+    <input type="text" id="question_tags" name="question_tags" class="form-control"
      placeholder="Search using comma separated Tags">
     <span class="input-group-btn">
     <button class="btn btn-default" type="submit">Search</button>
-    <button class="btn btn-default" onclick='location.replace("{{URL_ROOT}}/exam/manage/questions/");'>
-    Cancel</button>
     </span>
+    <div class="col-md-6">
+    <select class="form-control" id="sel1" onchange="append_tag(this);">
+    {% if all_tags %}
+     <option value="" disabled selected>Available Tags</option>
+    {% for tag in all_tags %}
+    <option>
+        {{tag}}
+    </option>
+    {% endfor %}
+    {% else %}
+     <option value="" disabled selected>No Available Tags</option>
+    {% endif %}
+    </select>
+    </div>
     </div>
      </div>
+<br><br>
+<button class="btn btn-primary" type="button" onClick='location.replace("{{URL_ROOT}}");'>
+ Clear Filters</button>
 
 <div id="filtered-questions">
 {% if not search_result %}
@@ -67,6 +82,7 @@ Upload File <span class="glyphicon glyphicon-open"></span></button>
 {% endfor %}
 {% endif %}
 {% else %}
+<h5><input id="checkall" type="checkbox"> Select All </h5>
 {% for i in search_result %}
 <input type="checkbox" name="question" value="{{ i.id }}">&nbsp;&nbsp;<a href="{{URL_ROOT}}/exam/manage/addquestion/{{ i.id }}">{{ i }}</a><br>
 {% endfor %}
-- 
cgit 


From c57a1f81ca6fef8368bf2e4ebb74d3422c6a1024 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Thu, 27 Jul 2017 16:04:57 +0530
Subject: Fix bug: Prevent students from attempting pre-enrolled deactivated
 courses

---
 yaksh/templates/yaksh/quizzes_user.html | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html
index 90d7f8e..b90db18 100644
--- a/yaksh/templates/yaksh/quizzes_user.html
+++ b/yaksh/templates/yaksh/quizzes_user.html
@@ -28,8 +28,9 @@ No Courses to display
             <div class="col-md-4">
                 <h4><b><u> {{ course.name }} by {{ course.creator.get_full_name }}</u></b></h4>
             </div>
-             <div class="col-md-4">
-                {% if course.hidden %}<span class="label label-info">Open Course</span>
+            <div class="col-md-4">
+                {% if not course.active %}
+                    <span class="label label-danger">Closed</span>
                 {% endif %}
                 {% if user in course.requests.all %} <span class="label label-warning">Request Pending </span>
                 {% elif user in course.rejected.all %}<span class="label label-danger">Request Rejected</span>
@@ -45,8 +46,8 @@ No Courses to display
                         <span class="label label-danger">Enrollment Closed</span>
                     {% endif %}
                 {% endif %}
-             </div>
-         </div>
+            </div>
+        </div>
 
         <div class="row">
         {% if user in course.students.all %}
@@ -57,7 +58,7 @@ No Courses to display
                 {% for quiz in course.get_quizzes %}
                     {% if quiz.active and quiz.course_id == course.id %}
                     <tr>
-                        {% if not quiz.is_expired %}
+                        {% if not quiz.is_expired and course.active %}
                             <td>
                                 <a href="{{ URL_ROOT }}/exam/start/{{quiz.questionpaper_set.get.id}}">{{ quiz.description }}</a><br>
                             </td>
-- 
cgit