Merge pull request #97 from maheshgudi/grade_user_2

Grade User

3 files changed, 100 insertions, 35 deletions

diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index dd05670..2c5403c 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -1,46 +1,101 @@
 {% extends "manage.html" %}
 
-{% block title %} Grading papers for {{ data.user.get_full_name.title }} {% endblock title %}
+{% block title %} Grade User {% endblock title %}
 
-{% block subtitle %}Grading papers for {{ data.user.get_full_name.title }}{% endblock %}
+{% block subtitle %} Grade User {% endblock %}
  
 {% block css %}
-	 <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/gradeuser.css" type="text/css" /> 
+     <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/gradeuser.css" type="text/css" /> 
 {% endblock %}
 
 {% block script %}
-<script src= "{{ URL_ROOT }}/static/yaksh/js/edit_question.js"></script>
+    <script src= "{{ URL_ROOT }}/static/yaksh/js/edit_question.js"></script>
 {% endblock %}
+
 {% block manage %}
 
-<p> 
-Name: {{ data.user.get_full_name.title }}
+{% if course_details %}
+    <table id = "course-details" class = "zebra-striped">
+    <tr>
+    <th>Courses</th> 
+    <th> Quizzes </th>
+    </tr>
+
+    {% for course in course_details %}
+    <tr>
+    <td><ul>{{course.name}} </td>
+
+    {% if course.get_quizzes %}
+    <td>
+    {% for quiz in course.get_quizzes %}
+     <li><a href = "{{URL_ROOT}}/exam/manage/gradeuser/{{quiz.id}}">{{quiz.description}}</a></li>
+
+    {% endfor %}
+    </td>
+    {% else %}
+    <td> No quiz</td>
+    {% endif %}
+    </ul></tr>
+    {% endfor %}
+    </table>
+{% endif %}
+
+<div class="row">
+{%if users %}
+    <div id = "student" class="span2">
+    {% for user in users %}
+    <p><a href = "{{URL_ROOT}}/exam/manage/gradeuser/{{quiz_id}}/{{user.user__id}}">{{user.user__first_name}} {{user.user__last_name}}</a></p>
+    {% endfor %}
+    </div>
+{% endif %}
+
+
+
+<div id = "paper" class="span12">
+{% if data %}
+
+
+<p> <h3> <center> Showing paper for {{data.user.get_full_name.title}} </center></h3>
+<p><b>Name:</b>{{ data.user.get_full_name.title }}
 {% if data.profile %}
-(roll number: {{ data.profile.roll_number }}) <br/>
-Position: {{ data.profile.position }} <br/>
-Department: {{ data.profile.department }} <br/>
-Institute: {{ data.profile.institute }} <br/>
+
+<p><b> Roll number:</b> {{ data.profile.roll_number }}
+<p><b>Position: </b> {{ data.profile.position }}
+<p><b>Department: </b>{{ data.profile.department }} 
+<p><b>Institute: </b>{{ data.profile.institute }}
 {% endif %}
-</p>
 
 {% if data.papers %}
 
 {% for paper in data.papers %}
-
-{% if forloop.counter == 2 and data.questionpaperid %}
 <hr>
-<u><h2> Previous attempts </h2></u>
-{% endif %}
 {{ paper.total_marks }}
 
-<h2> Quiz: {{ paper.question_paper.quiz.description }} </h2>
+<h3> Quiz: {{ paper.question_paper.quiz.description }} </h3>
 
 <p>
-Attempt Number: {{ paper.attempt_number }}<br/>
-Questions correctly answered: {{ paper.get_answered_str }} <br/>
+Attempt Number: <b>{{paper.attempt_number}} </b>
+<select id = "attempt" onchange="window.location.href=this.value">
+<option selected="">Select attempt number</option>
+{%for attempt in attempts %}
+<option value = "{{URL_ROOT}}/exam/manage/gradeuser/{{quiz_id}}/{{user_id}}/{{attempt.attempt_number}}/"> 
+{{attempt.attempt_number}}
+</option>
+{% endfor %}
+</select>
+
+<br/>Questions correctly answered: {{ paper.get_answered_str }} <br/>
 Total attempts at questions: {{ paper.answers.count }} <br/>
-Marks obtained: {{ paper.get_total_marks }} <br/>
+Marks obtained: {{ paper.marks_obtained }} <br/>
 Start time: {{ paper.start_time }} <br/>
+{%if paper.percent%}
+Percentage obtained: {{paper.percent}}% <br/>
+{% endif %}
+{% if paper.passed == 0 %}
+Status : <b style="color: red;"> Failed </b><br/>
+{% else %}
+Status : <b style="color: green;"> Passed </b><br/>
+{% endif %}
 </p>
 
 {% if paper.answers.count %}
@@ -59,12 +114,13 @@ Start time: {{ paper.start_time }} <br/>
     {% endfor %}
 </table>
 
+
 <h3> Answers </h3><br>
 <form name=frm id="q{{ paper.quiz.id }}_form"
     {% if data.questionpaperid %}
-    action="{{URL_ROOT}}/exam/manage/gradeuser/{{data.user.username}}/{{data.questionpaperid}}/"
+    action="{{URL_ROOT}}/exam/manage/gradeuser/{{quiz_id}}/{{user_id}}/{{paper.attempt_number}}/"
     {% else %}
-    action="{{URL_ROOT}}/exam/manage/gradeuser/{{data.user.username}}/"
+    action="{{URL_ROOT}}/exam/manage/gradeuser/{{quiz_id}}/{{user_id}}/{{paper.attempt_number}}/"
     {% endif %}
     method="post">
 {% csrf_token %}
@@ -72,13 +128,13 @@ Start time: {{ paper.start_time }} <br/>
 
 <div class="for-question">
 <p><strong> 
-	Question: {{ question.id }}. {{ question.summary }} (Points: {{ question.points }})
+    Question: {{ question.id }}. {{ question.summary }} (Points: {{ question.points }})
 </strong>
 <strong><a href="" onClick="grade_data('myContent{{question.id}}'); return false;" style="cursor:pointer;" />Details</strong></p></a>
 <div id="contentDiv">
      <div id="myContent{{question.id}}" style="padding:5px; display:none;">
         <p> Description : {{ question.description }} </p>
-    	<p> Test : {{ question.test }} </p>
+        <p> Test : {{ question.test }} </p>
      </div>
 </div> 
 <div class="question-form">
@@ -113,10 +169,16 @@ Marks: <input id="q{{ question.id }}" type="text"
 <br><button class="btn" type="submit" name="submit_{{paper.quiz.id}}">Save Marks</button>
 
 </form>
+</div>
+
 {% endif %} {# if paper.answers.count #}
 
 {% endfor %} {# for paper in data.papers #}
 
-{% endif %} {# if data.papers #}
+{% endif %} {#  if data.papers #}
+{% else %}
+    </div>
+{% endif %} {#if data#}
 
+</div>
 {% endblock%}
diff --git a/yaksh/templates/yaksh/monitor.html b/yaksh/templates/yaksh/monitor.html
index b81c9f2..80ad06c 100644
--- a/yaksh/templates/yaksh/monitor.html
+++ b/yaksh/templates/yaksh/monitor.html
@@ -9,13 +9,13 @@
 {% endblock %}
 {% block subtitle %}
   {% if not quizzes and not quiz %}
-	Quiz Results
+  Quiz Results
   {% endif %}
   {% if quizzes %}
-	Available Quizzes
+  Available Quizzes
   {% endif %}
   {% if quiz %}
-	{{ quiz.description }} Results
+  {{ quiz.description }} Results
   {% endif %}
 {% endblock %}
 {% block manage %}
@@ -54,7 +54,7 @@
     </tr>
     {% for paper in latest_attempts %}
     <tr> 
-        <td> <a href="{{URL_ROOT}}/exam/manage/user_data/{{paper.user.username}}/{{paper.question_paper.id}}">{{ paper.user.get_full_name.title }}</a> </td>
+        <td> <a href="{{URL_ROOT}}/exam/manage/user_data/{{paper.user.id}}/{{paper.question_paper.id}}">{{ paper.user.get_full_name.title }}</a> </td>
         <td> {{ paper.user.username }} </td>
         <td> {{ paper.user.profile.roll_number }} </td>
         <td> {{ paper.user.profile.institute }} </td>
@@ -69,4 +69,4 @@
 <p> No answer papers so far. </p>
 {% endif %} {# if papers #}
 {% endif %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 22be3ed..04544f9 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -22,11 +22,11 @@ Last login: {{ data.user.last_login }}
 
 {% if data.papers %}
 {% if data.questionpaperid %}
-<p><a href="{{URL_ROOT}}/exam/manage/gradeuser/{{ data.user.username }}/{{ data.questionpaperid }}">
+<p><a href="{{URL_ROOT}}/exam/manage/gradeuser/{{data.papers.0.question_paper.quiz.id}}/{{ data.user.id }}">
     Grade/correct paper</a>
 </p>
 {% else %}
-<p><a href="{{URL_ROOT}}/exam/manage/gradeuser/{{ data.user.username }}">
+<p><a href="{{URL_ROOT}}/exam/manage/gradeuser/{{data.papers.0.question_paper.quiz.id}}/{{ data.user.id }}">
     Grade/correct paper</a>
 {% endif %}
 
@@ -41,7 +41,7 @@ Last login: {{ data.user.last_login }}
 Attempt Number: {{ paper.attempt_number }}<br/>
 Questions correctly answered: {{ paper.get_answered_str }} <br/>
 Total attempts at questions: {{ paper.answers.count }} <br/>
-Marks obtained: {{ paper.get_total_marks }} <br/>
+Marks obtained: {{ paper.marks_obtained }} <br/>
 Start time: {{ paper.start_time }} <br/>
 User IP address: {{ paper.user_ip }} 
 </p>
@@ -75,9 +75,12 @@ User IP address: {{ paper.user_ip }}
 {% endif %} {# if data.papers #}
 <br />
 <hr />
-<a href="{{URL_ROOT}}/exam/manage/gradeuser/{{ data.user.username }}/">
-    Grade/correct paper</a>
-<br/>
+
+{% with data.papers.0 as paper %}
+<a href="{{URL_ROOT}}/exam/manage/gradeuser/{{paper.question_paper.quiz.id}}/{{ data.user.id }}/">Grade/correct paper</a>
+{% endwith %}
+<br />
+
 {% if data.papers.count > 1 %}
 <a href="{{URL_ROOT}}/exam/manage/monitor/">Monitor quiz</a>
 {% else %}