Fixed weight ignore issue on grade calculation

mitodl · Jun 17, 2015 · fdd006b · fdd006b
1 parent 1a0b28d
commit fdd006b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/edx_sga/sga.py b/edx_sga/sga.py
@@ -259,6 +259,7 @@ def student_state(self):
             "annotated": annotated,
             "graded": graded,
             "max_score": self.max_score(),
+            'weight': self.weight,
             "upload_allowed": self.upload_allowed(),
         }
 
@@ -329,6 +330,7 @@ def get_student_data():
         return {
             'assignments': list(get_student_data()),
             'max_score': self.max_score(),
+            'weight': self.weight,
             'display_name': self.display_name
         }
 

diff --git a/edx_sga/templates/staff_graded_assignment/show.html b/edx_sga/templates/staff_graded_assignment/show.html
@@ -13,7 +13,9 @@
       <p>No file has been uploaded.</p>
     <% } %>
     <% if (graded) { %>
-      <p>Your score is <%= graded.score %> / <%= max_score %><br/>
+        <% if (weight > 0) { %>
+          <p>Your score is <%= (graded.score / max_score) * weight %> / <%= weight %><br/>
+        <% } %>
         <% if (graded.comment) { %>
           <b>Instructor comment</b> <%= graded.comment %>
         <% } %>
@@ -73,8 +75,9 @@
           <td><%= assignment.timestamp %></td>
           <td>
             <% if (assignment.score !== null) { %>
-              <%= assignment.score %> /
-              <%= max_score %>
+              <% if (weight > 0) { %>
+                <%= (assignment.score / max_score) * weight %> / <%= weight %>
+              <% } %>
               <% if (! assignment.approved) { %>
                 ({% trans "Awaiting instructor approval" %})
               <% } %>