From b3f5721f3cf4225902000f2f76e5138135383792 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Thu, 8 Feb 2018 14:29:38 +0530
Subject: Add weightage for Quiz and Create Grading System App

App Name: grades

Grading System provides with the grade for a given value.
It contains different grade ranges.

Has its own default grading system.
Allows you to modify and add grading system wth grade ranges.

To be done:
- Need to add README
- Good UI
- There are fields like can_be_used and order in models for future use.
- More tests

App name: Yaksh

Now every quiz has a default weightage of 100%, can be changed.
An aggregate is calculated for a given course.
Using grades app a grade is provide to the aggregate value.
---
 yaksh/templates/manage.html               | 3 ++-
 yaksh/templates/yaksh/course_modules.html | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html
index 17ce23e..2590655 100644
--- a/yaksh/templates/manage.html
+++ b/yaksh/templates/manage.html
@@ -18,7 +18,8 @@
             <li><a href="{{ URL_ROOT }}/exam/manage/courses">Courses</a></li>
             <li><a href="{{ URL_ROOT }}/exam/manage/monitor">Monitor</a></li>
             <li><a href="{{ URL_ROOT }}/exam/manage/gradeuser">Grade User</a></li>
-            <li><a href="{{ URL_ROOT }}/exam/manage/grader"> Grader </a></li>
+            <li><a href="{{ url_root }}/exam/manage/grader"> Grader </a></li>
+            <li><a href="{% url 'grades:grading_systems'%}"> Grading Systems </a></li>
             <li><a href="{{ URL_ROOT }}/exam/reset/changepassword">Change Password</a></li>
             <li><a href="{{ URL_ROOT }}/exam/viewprofile"> {{ user.get_full_name.title }} </a></li>
             <li><a href="{{URL_ROOT}}/exam/logout/" id="logout">Logout</a></li>
diff --git a/yaksh/templates/yaksh/course_modules.html b/yaksh/templates/yaksh/course_modules.html
index fad1be0..eba7409 100644
--- a/yaksh/templates/yaksh/course_modules.html
+++ b/yaksh/templates/yaksh/course_modules.html
@@ -17,6 +17,7 @@
         <center>{{ msg }}</center>
     </div>
 {% endif %}
+<b>Grade: {% if grade %} {{ grade }} {% else %} Will be available once the course is complete {% endif %}</b>
 {% if learning_modules %}
     {% for module in learning_modules %}
         <div class="row well">
-- 
cgit 


From 65c368a1360a83c2b10458ec61a4b74d9ac8e9f5 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 1 Mar 2018 19:00:55 +0530
Subject: Show student grade in course status page

---
 yaksh/templates/yaksh/course_detail.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index a5d10a7..9fcae68 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -136,12 +136,14 @@
                 <th>Sr No.</th>
                 <th>Students</th>
                 <th>Total</th>
+                <th>Grade</th>
                 <th colspan="{{modules|length}}">Modules</th>
                 </tr>
                 <tr>
                     <th scope="row"></th>
                     <th></th>
                     <th></th>
+                    <th></th>
                     {% if modules %}
                         {% for module in modules %}
                             <th>
@@ -170,6 +172,10 @@
                     <td>
                         {% course_completion_percent course student as c_percent %}
                         {{c_percent}} %
+                    </td>
+                    <td>
+                        {% course_grade course student as grade %}
+                        {{grade}}
                     </td>
                         {% if modules %}
                             {% for module in modules %}
-- 
cgit 


From e1c1d0d0d6ae170d3ce9966b98ec6d03ff35c062 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Wed, 21 Mar 2018 17:43:26 +0530
Subject: Move Grading systems from navbar to Courses sidebar

---
 yaksh/templates/manage.html        | 3 +--
 yaksh/templates/yaksh/courses.html | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html
index 2590655..c1f9da3 100644
--- a/yaksh/templates/manage.html
+++ b/yaksh/templates/manage.html
@@ -18,8 +18,7 @@
             <li><a href="{{ URL_ROOT }}/exam/manage/courses">Courses</a></li>
             <li><a href="{{ URL_ROOT }}/exam/manage/monitor">Monitor</a></li>
             <li><a href="{{ URL_ROOT }}/exam/manage/gradeuser">Grade User</a></li>
-            <li><a href="{{ url_root }}/exam/manage/grader"> Grader </a></li>
-            <li><a href="{% url 'grades:grading_systems'%}"> Grading Systems </a></li>
+            <li><a href="{{ url_root }}/exam/manage/grader"> Regrade </a></li>
             <li><a href="{{ URL_ROOT }}/exam/reset/changepassword">Change Password</a></li>
             <li><a href="{{ URL_ROOT }}/exam/viewprofile"> {{ user.get_full_name.title }} </a></li>
             <li><a href="{{URL_ROOT}}/exam/logout/" id="logout">Logout</a></li>
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index bc96bf5..811aa0f 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -47,6 +47,10 @@
                 <a href="{{URL_ROOT}}/exam/manage/courses/all_learning_module">
                 Add/View Modules</a>
             </li>
+            <li>
+                <a href="{% url 'grades:grading_systems'%}"> 
+                Add/View Grading Systems </a>
+            </li>
         </ul>
     </div>
 </div>
-- 
cgit