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.
---
 grades/templates/add_grades.html | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 grades/templates/add_grades.html

(limited to 'grades/templates/add_grades.html')
diff --git a/grades/templates/add_grades.html b/grades/templates/add_grades.html
new file mode 100644
index 0000000..f2f0051
--- /dev/null
+++ b/grades/templates/add_grades.html
@@ -0,0 +1,28 @@
+<html>
+<a href="{% url 'grades:grading_systems'%}"> Back to Grading Systems </a>
+<p><b>Note: For grade range lower limit is inclusive and upper limit is exclusive</b></p>
+{% if not system_id  %}
+    <form action="{% url 'grades:add_grade' %}" method="POST">
+{% else %}
+    <form action="{% url 'grades:edit_grade' system_id %}" method="POST">
+{% endif %}
+    {% csrf_token %}
+    <table>
+      {{ grade_form }}
+    </table>
+      {{ formset.management_form }}
+      <br>
+      <b><u>Grade Ranges</u></b>
+      <hr>
+      {% for form in formset %}
+      <div>
+            {{ form }}
+      </div>
+      <hr>
+      {% endfor %}
+
+  <input type="submit" id="add" name="add" value="Add">
+  <input type="submit" id="save" name="save" value="Save">
+
+</form>
+</html>
-- 
cgit 


From f06a5d2ffbb1a06320935841a4ba24720e651985 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Tue, 13 Feb 2018 12:48:19 +0530
Subject: Change default grading system behaviour

Cannot edit default system.
Code as per PEP8 standards.
Updates grade after regrade or manual grading
Field change from total marks to percentage
Removed unused fields from grades app
---
 grades/templates/add_grades.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'grades/templates/add_grades.html')

diff --git a/grades/templates/add_grades.html b/grades/templates/add_grades.html
index f2f0051..1e4d29e 100644
--- a/grades/templates/add_grades.html
+++ b/grades/templates/add_grades.html
@@ -20,9 +20,11 @@
       </div>
       <hr>
       {% endfor %}
-
-  <input type="submit" id="add" name="add" value="Add">
-  <input type="submit" id="save" name="save" value="Save">
-
+  {% if not is_default %}
+      <input type="submit" id="add" name="add" value="Add">
+      <input type="submit" id="save" name="save" value="Save">
+  {% else %}
+    <p><b>Note: This is a default grading system. You cannot change this.</b></p>
+  {% endif %}
 </form>
 </html>
-- 
cgit 


From 95f5f27c18380e2fb2f33526c467e822dd10c4d8 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 1 Mar 2018 18:56:13 +0530
Subject: Add basic UI for grading system

---
 grades/templates/add_grades.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'grades/templates/add_grades.html')

diff --git a/grades/templates/add_grades.html b/grades/templates/add_grades.html
index 1e4d29e..e4ea915 100644
--- a/grades/templates/add_grades.html
+++ b/grades/templates/add_grades.html
@@ -1,13 +1,16 @@
+{% extends "manage.html" %}
+{% block main %}
 <html>
-<a href="{% url 'grades:grading_systems'%}"> Back to Grading Systems </a>
+<a href="{% url 'grades:grading_systems'%}" class="btn btn-primary"> Back to Grading Systems </a>
 <p><b>Note: For grade range lower limit is inclusive and upper limit is exclusive</b></p>
+<br>
 {% if not system_id  %}
     <form action="{% url 'grades:add_grade' %}" method="POST">
 {% else %}
     <form action="{% url 'grades:edit_grade' system_id %}" method="POST">
 {% endif %}
     {% csrf_token %}
-    <table>
+    <table class="table">
       {{ grade_form }}
     </table>
       {{ formset.management_form }}
@@ -21,10 +24,11 @@
       <hr>
       {% endfor %}
   {% if not is_default %}
-      <input type="submit" id="add" name="add" value="Add">
-      <input type="submit" id="save" name="save" value="Save">
+      <input type="submit" id="add" name="add" value="Add" class="btn btn-info">
+      <input type="submit" id="save" name="save" value="Save" class="btn btn-success">
   {% else %}
     <p><b>Note: This is a default grading system. You cannot change this.</b></p>
   {% endif %}
 </form>
 </html>
+{% endblock %}
-- 
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

---
 grades/templates/add_grades.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'grades/templates/add_grades.html')

diff --git a/grades/templates/add_grades.html b/grades/templates/add_grades.html
index e4ea915..a3f52da 100644
--- a/grades/templates/add_grades.html
+++ b/grades/templates/add_grades.html
@@ -1,7 +1,8 @@
 {% extends "manage.html" %}
 {% block main %}
 <html>
-<a href="{% url 'grades:grading_systems'%}" class="btn btn-primary"> Back to Grading Systems </a>
+<a href="{% url 'grades:grading_systems'%}" class="btn btn-danger"> Back to Grading Systems </a>
+<br><br>
 <p><b>Note: For grade range lower limit is inclusive and upper limit is exclusive</b></p>
 <br>
 {% if not system_id  %}
-- 
cgit 

