Merge pull request #268 from adityacp/download_assignments

Download assignments

3 files changed, 57 insertions, 25 deletions

diff --git a/yaksh/templates/404.html b/yaksh/templates/404.html
index 7d33dd3..e9d99de 100644
--- a/yaksh/templates/404.html
+++ b/yaksh/templates/404.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-The requested page does not exist.
+It seems that you have encountered an error
+Type of Error - {{ exception }}
+Please contact your administrator
 {% endblock %}
diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index 67f25a4..c93ec10 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -51,6 +51,12 @@
 {% endif %}
 {% endif %}
 
+{% if has_quiz_assignments %}
+
+<a href="{{URL_ROOT}}/exam/manage/download/quiz_assignments/{{quiz_id}}/">
+    Download All Assignments</a>
+{% endif %}
+
 <div id = "paper" class="col-md-10">
 {% if data %}
 
@@ -84,7 +90,6 @@ Attempt Number: <b>{{paper.attempt_number}} </b>
 </option>
 {% endfor %}
 </select>
-
 <br/>Questions correctly answered: {{ paper.get_answered_str }} <br/>
 Total attempts at questions: {{ paper.answers.count }} <br/>
 Marks obtained: {{ paper.marks_obtained }} <br/>
@@ -99,7 +104,6 @@ Status : <b style="color: red;"> Failed </b><br/>
 Status : <b style="color: green;"> Passed </b><br/>
 {% endif %}
 </p>
-
 {% if paper.answers.count %}
 
 <h4> Report </h4><br>
@@ -126,8 +130,8 @@ Status : <b style="color: green;"> Passed </b><br/>
     {% endif %}
     method="post">
 {% csrf_token %}
-{% for question, answers in paper.get_question_answers.items %}
 
+{% for question, answers in paper.get_question_answers.items %}
 <div class="panel panel-info">
         <div class="panel-heading">
             <strong> Details: {{forloop.counter}}. {{ question.summary }} 
@@ -157,7 +161,6 @@ Status : <b style="color: green;"> Passed </b><br/>
                     <strong>{{ testcase.error_margin|safe }}</strong>
                     {% endif %}
                     {% endfor %}
-
             {% else %}
                 <h5> <u>Test cases: </u></h5>
                     {% for testcase in question.get_test_cases %}
@@ -167,29 +170,50 @@ Status : <b style="color: green;"> Passed </b><br/>
         </div>
     </div>
     <h5>Student answer: </h5>
-    {% for ans in answers %}
-    {% if ans.answer.correct %}
-            <div class="panel panel-success">
-                <div class="panel-heading">Correct answer:
+    {% if question.type == "upload" %}
+    {% if has_user_assignments %}
+        <a href="{{URL_ROOT}}/exam/manage/download/user_assignment/{{question.id}}/{{data.user.id}}/{{paper.question_paper.quiz.id}}">
+        <div class="panel">
+        Assignment File for {{ data.user.get_full_name.title }}
+        </div>
+        </a>
+        {% with answers|last as answer%}
+            {% if answer.answer.correct %}
+                <div class="panel panel-success">
+                <div class="panel-heading">Correct answer</div></div>
+            {% else %}
+                <div class="panel panel-danger">
+                <div class="panel-heading">Incorrect Answer</div></div>
+            {% endif %}
+        {% endwith %}
+    {% else %}
+        <h5>No Assignment submitted by {{ data.user.get_full_name.title }}</h5>
+    {% endif %}
+    {% else %}
+        {% for ans in answers %}
+        {% if ans.answer.correct %}
+                <div class="panel panel-success">
+                    <div class="panel-heading">Correct answer:
+            {% else %}
+                <div class="panel panel-danger">
+                    <div class="panel-heading">Error:
+            {% endif %}
+            {% for err in ans.error_list %}
+                <div><pre>{{ err }}</pre></div>
+            {% endfor %}
+        </div>
+        <div class="panel-body">
+        {% if question.type != "code" %}
+        <div class="well well-sm">
+        {{ ans.answer.answer.strip|safe }}
+        </div>
         {% else %}
-            <div class="panel panel-danger">
-                <div class="panel-heading">Error:
+        <pre><code>{{ ans.answer.answer.strip|safe }}</code></pre>
         {% endif %}
-        {% for err in ans.error_list %}
-            <div><pre>{{ err }}</pre></div>
+        </div>
+        </div>
         {% endfor %}
-    </div>
-    <div class="panel-body">
-    {% if question.type != "code" %}
-    <div class="well well-sm">
-    {{ ans.answer.answer.strip|safe }}
-    </div>
-    {% else %}
-    <pre><code>{{ ans.answer.answer.strip|safe }}</code></pre>
     {% endif %}
-    </div>
-    </div>
-    {% endfor %}
     {% with answers|last as answer %}
     Marks: <input id="q{{ question.id }}" type="text" 
         name="q{{ question.id }}_marks" size="4"
diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html
index 4520ac3..f4c8846 100644
--- a/yaksh/templates/yaksh/view_answerpaper.html
+++ b/yaksh/templates/yaksh/view_answerpaper.html
@@ -84,7 +84,13 @@
                 <h5><u>Student answer:</u></h5>
                 <div class="well well-sm">
                  {{ answers.0.answer|safe }}
-                 </div>
+                 {% if question.type == "upload" and has_user_assignment %}
+                <a href="{{URL_ROOT}}/exam/download/user_assignment/{{question.id}}/{{data.user.id}}/{{paper.question_paper.quiz.id}}">
+                <div class="panel">
+                Assignment File for {{ data.user.get_full_name.title }}
+                </div></a>
+                {% endif %}
+                </div>
             </div>
             </div>
     {% else %}