Change test data files, views, models, template

- Fix upload marks for a quiz column missing error
- Add upload marks task to celery
- Minor fixes to avoid errors in regrade and custom_filters

2 files changed, 31 insertions, 20 deletions

diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index 4e1db2b..32cf09c 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -559,6 +559,9 @@ function searchNames() {
                                   {% endif %}
                                 </div>
                               </div>
+                              <br>
+                              <b>Comment:</b>
+                              <textarea class="form-control" readonly="">{{ans.answer.comment}}</textarea>
                             </div>
                           </div>
                           <br>
diff --git a/yaksh/templates/yaksh/monitor.html b/yaksh/templates/yaksh/monitor.html
index c7755e7..6fd3cb1 100644
--- a/yaksh/templates/yaksh/monitor.html
+++ b/yaksh/templates/yaksh/monitor.html
@@ -52,7 +52,8 @@ $(document).ready(function()
   {% if quiz %}
     {% if papers %}
     <div class="row">
-      <div class="card col-md-3">
+      <div class="col-md-3">
+      <div class="card">
         <div class="card-body">
           <div class="table-responsive">
             <table id="course-detail" class="table">
@@ -83,34 +84,41 @@ $(document).ready(function()
             </table>
           </div>
         </div>
-      </div>
-      <div class="col-md-9">
-        <div class="row">
-          <div class="col-md-4">
+        <div class="card-body">
+          <div class="col">
+            <div class="badge badge-info">
+              Auto-Refreshes every 5 minutes
+            </div>
+          </div>
+          <br>
+          <div class="col">
             <button type="button" class="btn btn-info" data-toggle="modal" data-target="#csvModal">
               <i class="fa fa-download"></i>&nbsp;Download CSV
             </button>
           </div>
-          <div class="col-md-4">
+          <br>
+          <div class="col">
             <a href="{% url 'yaksh:show_statistics' papers.0.question_paper.id course.id %}" class="btn btn-primary">
               <i class="fa fa-line-chart"></i>&nbsp;Question Statistics
             </a>
           </div>
-          <div class="col-md-4">
-            <div class="badge badge-info">
-              Auto-Refreshes every 5 minutes
-            </div>
-          </div>
         </div>
-        <hr>
+      </div>
+      </div>
+      <div class="col-md-9">
         <div class="row">
-          <div class="col-md-4">
-          <p>
-          <b>
-          - Download the CSV file from the button above<br />
-          - Edit and upload the same <br />
-          </b>
-          </p>
+          <div class="col-md-5">
+            <ul>
+              <li>
+                Download the CSV file from the button
+              </li>
+              <li>
+                Edit and upload the same
+              </li>
+              <li>
+                <b>Note: Do not change the CSV Headers</b>
+              </li>
+            </ul>
           </div>
           <div class="col-md-6">
           <form id="upload_users" action="{% url 'yaksh:upload_marks' course.id papers.0.question_paper.id %}" method="POST" enctype="multipart/form-data">
@@ -123,7 +131,7 @@ $(document).ready(function()
           </form>
           </div>
         </div>
-        <br>
+        <hr>
         <div class="row">
           <div class="col-md-3">
             <b>Select Attempt number:</b>