From b9afb77607c9b05171a8d1abfd3c39201974f141 Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Mon, 30 Jun 2014 14:52:37 +0530
Subject: changes for user dashboard

---
 testapp/templates/exam/quizzes_user.html | 57 ++++++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 3 deletions(-)

(limited to 'testapp/templates')

diff --git a/testapp/templates/exam/quizzes_user.html b/testapp/templates/exam/quizzes_user.html
index b55d3e5..a1204bd 100644
--- a/testapp/templates/exam/quizzes_user.html
+++ b/testapp/templates/exam/quizzes_user.html
@@ -1,18 +1,69 @@
 {% extends "user.html" %}
 
 
-{% block subtitle %}Available Quizzes{% endblock %}
+{% block subtitle %}Hello {{ user.first_name }}, welcome to your dashboard !{% endblock %}
 
 {% block css %}
 <link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" />
 {% endblock %}
 
+{% block script %}
+<script src="{{ URL_ROOT }}/static/exam/js/bootstrap-alert.js"></script>
+<script src="{{ URL_ROOT }}/static/exam/js/quizzes_user.js"></script>
+{% endblock %}
+
+
 {% block manage %}
+    {% if cannot_attempt %}
+        <p>You have not passed the prerequisite & hence you cannot take the quiz.</p>
+    {% endif %}
+    <h4>List of quizzes availbale for you</h4>
     {% if not quizzes %}
-        <center><h4>No active quizzes for you</h4></center>
+        <h5>No active quizzes for you</h5>
     {% endif %}
+    <table>
+    <th>Quiz</th>
+    <th>Pre requisite quiz</th>
     {% for paper in quizzes %}
-     <a href="{{ URL_ROOT }}/exam/intro/{{paper.id}}">{{ paper.quiz.description }}</a><br>
+        <tr>
+            <td>
+                <a href="{{ URL_ROOT }}/exam/intro/{{paper.id}}">{{ paper.quiz.description }}</a><br>
+            </td>
+            <td>
+                {% if paper.quiz.prerequisite %}
+                    You have to pass <a href="{{ URL_ROOT }}/exam/intro/{{paper.quiz.prerequisite.id}}">{{ paper.quiz.prerequisite.description }}</a> for taking <a href="{{ URL_ROOT }}/exam/intro/{{paper.id}}">{{ paper.quiz.description }}</a>
+                {% else %}
+                    No pre requisites for {{ paper.quiz.description }}
+                {% endif %}
+            </td>
+        </tr>
     {% endfor %}
+    </table>
+    <hr>    
+    <h4>List of quizzes taken by you so far</h4>
+    {% if quizzes_taken %}
+        <table>
+            <th>Quiz</th>
+            <th>Result</th>
+        {% for paper in quizzes_taken %}
+            <tr>
+                <td>
+                    {{ paper.question_paper.quiz.description }}
+                </td>
+                <td>
+                    {% if paper.passed %}
+                        <p>Pass</p>
+                    {% else %}
+                        <p>Fail</p>
+                    {% endif %}
+                </td>
+            </tr>
+        {% endfor %}
+        </table>
+    {% else %}
+        <p>You have not taken any quiz yet !!</p>
+    {% endif %}
+
+
 {% endblock %}
 
-- 
cgit 


From 87c791a8600033e197d53346a8e2be873bfaa884 Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Mon, 30 Jun 2014 15:06:56 +0530
Subject: adding marks obtained & percentage

---
 testapp/templates/exam/quizzes_user.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'testapp/templates')

diff --git a/testapp/templates/exam/quizzes_user.html b/testapp/templates/exam/quizzes_user.html
index a1204bd..c284b87 100644
--- a/testapp/templates/exam/quizzes_user.html
+++ b/testapp/templates/exam/quizzes_user.html
@@ -45,6 +45,9 @@
         <table>
             <th>Quiz</th>
             <th>Result</th>
+            <th>Mraks Obtained</th>
+            <th>Total Marks</th>
+            <th>Percentage</th>
         {% for paper in quizzes_taken %}
             <tr>
                 <td>
@@ -57,6 +60,15 @@
                         <p>Fail</p>
                     {% endif %}
                 </td>
+                <td>
+                    {{ paper.marks_obtained }}
+                </td>
+                <td>
+                    {{ paper.question_paper.total_marks }}
+                </td>
+                <td>
+                    {{ paper.percent }}
+                </td>
             </tr>
         {% endfor %}
         </table>
-- 
cgit 


From ad4a695e16dc5de2bba4851bbc3329bcdaab76cf Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Mon, 30 Jun 2014 15:09:45 +0530
Subject: adding table designing

---
 testapp/templates/exam/quizzes_user.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'testapp/templates')

diff --git a/testapp/templates/exam/quizzes_user.html b/testapp/templates/exam/quizzes_user.html
index c284b87..9a49df7 100644
--- a/testapp/templates/exam/quizzes_user.html
+++ b/testapp/templates/exam/quizzes_user.html
@@ -42,7 +42,7 @@
     <hr>    
     <h4>List of quizzes taken by you so far</h4>
     {% if quizzes_taken %}
-        <table>
+        <table class="bordered-table zebra-striped">
             <th>Quiz</th>
             <th>Result</th>
             <th>Mraks Obtained</th>
-- 
cgit 


From 3e9626308098bf412ca4f228f7667526ad52bbdd Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Wed, 2 Jul 2014 13:12:19 +0530
Subject: removing links

---
 testapp/templates/exam/quizzes_user.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'testapp/templates')

diff --git a/testapp/templates/exam/quizzes_user.html b/testapp/templates/exam/quizzes_user.html
index 9a49df7..914b6b4 100644
--- a/testapp/templates/exam/quizzes_user.html
+++ b/testapp/templates/exam/quizzes_user.html
@@ -31,7 +31,7 @@
             </td>
             <td>
                 {% if paper.quiz.prerequisite %}
-                    You have to pass <a href="{{ URL_ROOT }}/exam/intro/{{paper.quiz.prerequisite.id}}">{{ paper.quiz.prerequisite.description }}</a> for taking <a href="{{ URL_ROOT }}/exam/intro/{{paper.id}}">{{ paper.quiz.description }}</a>
+                    You have to pass {{ paper.quiz.prerequisite.description }} for taking {{ paper.quiz.description }}
                 {% else %}
                     No pre requisites for {{ paper.quiz.description }}
                 {% endif %}
-- 
cgit