diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py index 28668ef088..beade43aea 100644 --- a/common/lib/xmodule/xmodule/course_module.py +++ b/common/lib/xmodule/xmodule/course_module.py @@ -127,6 +127,24 @@ class CourseDescriptor(SequenceDescriptor): def grade_cutoffs(self): return self._grading_policy['GRADE_CUTOFFS'] + @property + def show_calculator(self): + return self.metadata.get("show_calculator", None) == "Yes" + + @lazyproperty + def __grading_policy(self): + policy_string = "" + + try: + with self.system.resources_fs.open("grading_policy.json") as grading_policy_file: + policy_string = grading_policy_file.read() + except (IOError, ResourceNotFoundError): + log.warning("Unable to load course settings file from grading_policy.json in course " + self.id) + + grading_policy = load_grading_policy(policy_string) + + return grading_policy + @lazyproperty def grading_context(self): """ diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html index 95b9a690e7..0d390d83a2 100644 --- a/lms/templates/courseware/courseware.html +++ b/lms/templates/courseware/courseware.html @@ -73,35 +73,38 @@ -
- Calculator -
-
-
- +% if course.show_calculator: +
+ Calculator -
- Hints -
-
Suffixes:
-
%kMGTcmunp
-
Operations:
-
^ * / + - ()
-
Functions:
-
sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs
-
Constants
-
e, pi
+
+ +
+ - -
+ + +
-
- - -
+ + + +
- +% endif