diff --git a/.gitignore b/.gitignore
index d1a33cb27..ef257ebe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,6 @@ bulk-storage
/.coverage
/coverage.xml
/.vscode/
+
+__pycache__
+local_settings.py
\ No newline at end of file
diff --git a/course/analytics.py b/course/analytics.py
index 04ad212a3..fde625d4b 100644
--- a/course/analytics.py
+++ b/course/analytics.py
@@ -287,9 +287,11 @@ def __init__(self, group_id, page_id, title, average_correctness,
self.group_id = group_id
self.page_id = page_id
self.title = title
- self.average_correctness_percent = 99.99*average_correctness
- self.average_emptiness_percent = 99.99*average_emptiness
- self.average_wrongness_percent = 99.99*(
+
+ self.pct = 100.0
+ self.average_correctness_percent = self.pct*average_correctness
+ self.average_emptiness_percent = self.pct*average_emptiness
+ self.average_wrongness_percent = self.pct*(
1-average_correctness-average_emptiness)
self.answer_count = answer_count
self.total_count = total_count
diff --git a/course/flow.py b/course/flow.py
index e27a2ff95..56537208f 100644
--- a/course/flow.py
+++ b/course/flow.py
@@ -703,9 +703,7 @@ def __init__(
self.optional_incorrect_count = optional_incorrect_count
self.optional_unknown_count = optional_unknown_count
- # Rounding to larger than 100% will break the percent bars on the
- # flow results page.
- FULL_PERCENT = 99.99
+ FULL_PERCENT = 100.0
# {{{ point percentages
@@ -736,11 +734,10 @@ def unreachable_points_percent(self):
return 0
else:
return self.FULL_PERCENT*(
- self.max_points - self.max_reachable_points)/self.max_points
+ self.max_points - self.max_reachable_points)/self.max_points
def total_points_percent(self):
- return (
- self.points_percent()
+ return (self.points_percent()
+ self.missed_points_percent()
+ self.unreachable_points_percent())
@@ -778,23 +775,27 @@ def optional_total_count(self):
def optional_fully_correct_percent(self):
"""Only to be used for visualization purposes."""
- return self.FULL_PERCENT * self.optional_fully_correct_count\
- / self.optional_total_count()
+ return (self.FULL_PERCENT
+ * self.optional_fully_correct_count
+ / self.optional_total_count())
def optional_partially_correct_percent(self):
"""Only to be used for visualization purposes."""
- return self.FULL_PERCENT * self.optional_partially_correct_count\
- / self.optional_total_count()
+ return (self.FULL_PERCENT
+ * self.optional_partially_correct_count
+ / self.optional_total_count())
def optional_incorrect_percent(self):
"""Only to be used for visualization purposes."""
- return self.FULL_PERCENT * self.optional_incorrect_count\
- / self.optional_total_count()
+ return (self.FULL_PERCENT
+ * self.optional_incorrect_count
+ / self.optional_total_count())
def optional_unknown_percent(self):
"""Only to be used for visualization purposes."""
- return self.FULL_PERCENT * self.optional_unknown_count\
- / self.optional_total_count()
+ return (self.FULL_PERCENT
+ * self.optional_unknown_count
+ / self.optional_total_count())
# }}}
diff --git a/course/templates/course/flow-completion-grade.html b/course/templates/course/flow-completion-grade.html
index 79fbfd00c..9d0dd52c1 100644
--- a/course/templates/course/flow-completion-grade.html
+++ b/course/templates/course/flow-completion-grade.html
@@ -1,5 +1,5 @@
{% extends "course/course-base.html" %}
-
+{% load mathfilters %}
{% load i18n %}
{% block title %}
@@ -42,12 +42,20 @@ {% trans "Results" %}: {{flow_desc.title}}
{% if grade_info.total_points_percent < 100.001 %}
{# otherwise we'll have trouble drawing the bar #}
+ {# Multiplying by 0.9999 to avoid rounding to larger than 100% #}
+ {# to avoid breaking percent bar. #}
+ {% with points_percent=grade_info.points_percent|mul:0.9999 %}
+ {% with missed_points_percent=grade_info.missed_points_percent|mul:0.9999 %}
+ {% with unreachable_points_percent=grade_info.unreachable_points_percent|mul:0.9999 %}
+ style="width: {{ points_percent|stringformat:".6f" }}%">
@@ -64,14 +72,24 @@
{% trans "Results" %}: {{flow_desc.title}}
{% endif %}
+ {# Multiplying by 0.9999 to avoid rounding to larger than 100% #}
+ {# to avoid breaking percent bar. #}
+ {% with fully_correct_percent=grade_info.fully_correct_percent|mul:0.9999 %}
+ {% with partially_correct_percent=grade_info.partially_correct_percent|mul:0.9999 %}
+ {% with incorrect_percent=grade_info.incorrect_percent|mul:0.9999 %}
+ {% with unknown_percent=grade_info.unknown_percent|mul:0.9999 %}
+ style="width: {{ fully_correct_percent|stringformat:".6f" }}%">
{% trans "Results" %}: {{flow_desc.title}}
{% endif %}
+ {# Multiplying by 0.9999 to avoid rounding to larger than 100% #}
+ {# to avoid breaking percent bar. #}
+ {% with optional_fully_correct_percent=grade_info.optional_fully_correct_percent|mul:0.9999 %}
+ {% with optional_partially_correct_percent=grade_info.optional_partially_correct_percent|mul:0.9999 %}
+ {% with optional_incorrect_percent=grade_info.optional_incorrect_percent|mul:0.9999 %}
+ {% with optional_unknown_percent=grade_info.optional_unknown_percent|mul:0.9999 %}
+ style="width: {{ optional_fully_correct_percent|stringformat:".6f" }}%">