diff --git a/common/djangoapps/student/admin.py b/common/djangoapps/student/admin.py
index ec3b708ca7..64fe844801 100644
--- a/common/djangoapps/student/admin.py
+++ b/common/djangoapps/student/admin.py
@@ -12,6 +12,8 @@ admin.site.register(UserTestGroup)
admin.site.register(CourseEnrollment)
+admin.site.register(CourseEnrollmentAllowed)
+
admin.site.register(Registration)
admin.site.register(PendingNameChange)
diff --git a/common/djangoapps/student/migrations/0021_auto__add_courseenrollmentallowed__add_unique_courseenrollmentallowed_.py b/common/djangoapps/student/migrations/0021_auto__add_courseenrollmentallowed__add_unique_courseenrollmentallowed_.py
new file mode 100644
index 0000000000..f7e2571685
--- /dev/null
+++ b/common/djangoapps/student/migrations/0021_auto__add_courseenrollmentallowed__add_unique_courseenrollmentallowed_.py
@@ -0,0 +1,155 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding model 'CourseEnrollmentAllowed'
+ db.create_table('student_courseenrollmentallowed', (
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('email', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+ ('course_id', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+ ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, null=True, db_index=True, blank=True)),
+ ))
+ db.send_create_signal('student', ['CourseEnrollmentAllowed'])
+
+ # Adding unique constraint on 'CourseEnrollmentAllowed', fields ['email', 'course_id']
+ db.create_unique('student_courseenrollmentallowed', ['email', 'course_id'])
+
+
+ def backwards(self, orm):
+ # Removing unique constraint on 'CourseEnrollmentAllowed', fields ['email', 'course_id']
+ db.delete_unique('student_courseenrollmentallowed', ['email', 'course_id'])
+
+ # Deleting model 'CourseEnrollmentAllowed'
+ db.delete_table('student_courseenrollmentallowed')
+
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'student.courseenrollment': {
+ 'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'CourseEnrollment'},
+ 'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+ 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+ },
+ 'student.courseenrollmentallowed': {
+ 'Meta': {'unique_together': "(('email', 'course_id'),)", 'object_name': 'CourseEnrollmentAllowed'},
+ 'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+ 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'student.pendingemailchange': {
+ 'Meta': {'object_name': 'PendingEmailChange'},
+ 'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'new_email': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+ },
+ 'student.pendingnamechange': {
+ 'Meta': {'object_name': 'PendingNameChange'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'new_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+ 'rationale': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}),
+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+ },
+ 'student.registration': {
+ 'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"},
+ 'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'})
+ },
+ 'student.testcenteruser': {
+ 'Meta': {'object_name': 'TestCenterUser'},
+ 'address_1': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+ 'address_2': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}),
+ 'address_3': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}),
+ 'candidate_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'db_index': 'True'}),
+ 'city': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
+ 'client_candidate_id': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+ 'company_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+ 'country': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
+ 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'extension': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '8', 'blank': 'True'}),
+ 'fax': ('django.db.models.fields.CharField', [], {'max_length': '35', 'blank': 'True'}),
+ 'fax_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'db_index': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+ 'middle_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'phone': ('django.db.models.fields.CharField', [], {'max_length': '35'}),
+ 'phone_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
+ 'postal_code': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'blank': 'True'}),
+ 'salutation': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+ 'state': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '20', 'blank': 'True'}),
+ 'suffix': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+ 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'unique': 'True'}),
+ 'user_updated_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'})
+ },
+ 'student.userprofile': {
+ 'Meta': {'object_name': 'UserProfile', 'db_table': "'auth_userprofile'"},
+ 'courseware': ('django.db.models.fields.CharField', [], {'default': "'course.xml'", 'max_length': '255', 'blank': 'True'}),
+ 'gender': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}),
+ 'goals': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'language': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+ 'level_of_education': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}),
+ 'location': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+ 'mailing_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'meta': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"}),
+ 'year_of_birth': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'})
+ },
+ 'student.usertestgroup': {
+ 'Meta': {'object_name': 'UserTestGroup'},
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
+ 'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'db_index': 'True', 'symmetrical': 'False'})
+ }
+ }
+
+ complete_apps = ['student']
\ No newline at end of file
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index cf7bc7696a..5311e49844 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -261,6 +261,23 @@ class CourseEnrollment(models.Model):
return "[CourseEnrollment] %s: %s (%s)" % (self.user, self.course_id, self.created)
+class CourseEnrollmentAllowed(models.Model):
+ """
+ Table of users (specified by email address strings) who are allowed to enroll in a specified course.
+ The user may or may not (yet) exist. Enrollment by users listed in this table is allowed
+ even if the enrollment time window is past.
+ """
+ email = models.CharField(max_length=255, db_index=True)
+ course_id = models.CharField(max_length=255, db_index=True)
+
+ created = models.DateTimeField(auto_now_add=True, null=True, db_index=True)
+
+ class Meta:
+ unique_together = (('email', 'course_id'), )
+
+ def __unicode__(self):
+ return "[CourseEnrollmentAllowed] %s: %s (%s)" % (self.email, self.course_id, self.created)
+
#cache_relation(User.profile)
#### Helper methods for use from python manage.py shell.
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 06c59d7937..39805fd85f 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -78,7 +78,7 @@ def index(request, extra_context={}, user=None):
courses = get_courses(None, domain=domain)
# Sort courses by how far are they from they start day
- key = lambda course: course.metadata['days_to_start']
+ key = lambda course: course.days_until_start
courses = sorted(courses, key=key, reverse=True)
# Get the 3 most recent news
diff --git a/common/lib/capa/capa/capa_problem.py b/common/lib/capa/capa/capa_problem.py
index efc96fc717..2eaa0e4286 100644
--- a/common/lib/capa/capa/capa_problem.py
+++ b/common/lib/capa/capa/capa_problem.py
@@ -186,24 +186,6 @@ class LoncapaProblem(object):
maxscore += responder.get_max_score()
return maxscore
- def message_post(self,event_info):
- """
- Handle an ajax post that contains feedback on feedback
- Returns a boolean success variable
- Note: This only allows for feedback to be posted back to the grading controller for the first
- open ended response problem on each page. Multiple problems will cause some sync issues.
- TODO: Handle multiple problems on one page sync issues.
- """
- success=False
- message = "Could not find a valid responder."
- log.debug("in lcp")
- for responder in self.responders.values():
- if hasattr(responder, 'handle_message_post'):
- success, message = responder.handle_message_post(event_info)
- if success:
- break
- return success, message
-
def get_score(self):
"""
Compute score for this problem. The score is the number of points awarded.
diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index e3eb47acc5..1d3646fefc 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -735,51 +735,3 @@ class ChemicalEquationInput(InputTypeBase):
registry.register(ChemicalEquationInput)
#-----------------------------------------------------------------------------
-
-class OpenEndedInput(InputTypeBase):
- """
- A text area input for code--uses codemirror, does syntax highlighting, special tab handling,
- etc.
- """
-
- template = "openendedinput.html"
- tags = ['openendedinput']
-
- # pulled out for testing
- submitted_msg = ("Feedback not yet available. Reload to check again. "
- "Once the problem is graded, this message will be "
- "replaced with the grader's feedback.")
-
- @classmethod
- def get_attributes(cls):
- """
- Convert options to a convenient format.
- """
- return [Attribute('rows', '30'),
- Attribute('cols', '80'),
- Attribute('hidden', ''),
- ]
-
- def setup(self):
- """
- Implement special logic: handle queueing state, and default input.
- """
- # if no student input yet, then use the default input given by the problem
- if not self.value:
- self.value = self.xml.text
-
- # Check if problem has been queued
- self.queue_len = 0
- # Flag indicating that the problem has been queued, 'msg' is length of queue
- if self.status == 'incomplete':
- self.status = 'queued'
- self.queue_len = self.msg
- self.msg = self.submitted_msg
-
- def _extra_context(self):
- """Defined queue_len, add it """
- return {'queue_len': self.queue_len,}
-
-registry.register(OpenEndedInput)
-
-#-----------------------------------------------------------------------------
diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
index 1bc34b70a3..3d97cb0bea 100644
--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -1815,436 +1815,6 @@ class ImageResponse(LoncapaResponse):
return (dict([(ie.get('id'), ie.get('rectangle')) for ie in self.ielements]),
dict([(ie.get('id'), ie.get('regions')) for ie in self.ielements]))
#-----------------------------------------------------------------------------
-
-class OpenEndedResponse(LoncapaResponse):
- """
- Grade student open ended responses using an external grading system,
- accessed through the xqueue system.
-
- Expects 'xqueue' dict in ModuleSystem with the following keys that are
- needed by OpenEndedResponse:
-
- system.xqueue = { 'interface': XqueueInterface object,
- 'callback_url': Per-StudentModule callback URL
- where results are posted (string),
- }
-
- External requests are only submitted for student submission grading
- (i.e. and not for getting reference answers)
-
- By default, uses the OpenEndedResponse.DEFAULT_QUEUE queue.
- """
-
- DEFAULT_QUEUE = 'open-ended'
- DEFAULT_MESSAGE_QUEUE = 'open-ended-message'
- response_tag = 'openendedresponse'
- allowed_inputfields = ['openendedinput']
- max_inputfields = 1
-
- def setup_response(self):
- '''
- Configure OpenEndedResponse from XML.
- '''
- xml = self.xml
- self.url = xml.get('url', None)
- self.queue_name = xml.get('queuename', self.DEFAULT_QUEUE)
- self.message_queue_name = xml.get('message-queuename', self.DEFAULT_MESSAGE_QUEUE)
-
- # The openendedparam tag encapsulates all grader settings
- oeparam = self.xml.find('openendedparam')
- prompt = self.xml.find('prompt')
- rubric = self.xml.find('openendedrubric')
-
- #This is needed to attach feedback to specific responses later
- self.submission_id=None
- self.grader_id=None
-
- if oeparam is None:
- raise ValueError("No oeparam found in problem xml.")
- if prompt is None:
- raise ValueError("No prompt found in problem xml.")
- if rubric is None:
- raise ValueError("No rubric found in problem xml.")
-
- self._parse(oeparam, prompt, rubric)
-
- @staticmethod
- def stringify_children(node):
- """
- Modify code from stringify_children in xmodule. Didn't import directly
- in order to avoid capa depending on xmodule (seems to be avoided in
- code)
- """
- parts=[node.text if node.text is not None else '']
- for p in node.getchildren():
- parts.append(etree.tostring(p, with_tail=True, encoding='unicode'))
-
- return ' '.join(parts)
-
- def _parse(self, oeparam, prompt, rubric):
- '''
- Parse OpenEndedResponse XML:
- self.initial_display
- self.payload - dict containing keys --
- 'grader' : path to grader settings file, 'problem_id' : id of the problem
-
- self.answer - What to display when show answer is clicked
- '''
- # Note that OpenEndedResponse is agnostic to the specific contents of grader_payload
- prompt_string = self.stringify_children(prompt)
- rubric_string = self.stringify_children(rubric)
-
- grader_payload = oeparam.find('grader_payload')
- grader_payload = grader_payload.text if grader_payload is not None else ''
-
- #Update grader payload with student id. If grader payload not json, error.
- try:
- parsed_grader_payload = json.loads(grader_payload)
- # NOTE: self.system.location is valid because the capa_module
- # __init__ adds it (easiest way to get problem location into
- # response types)
- except TypeError, ValueError:
- log.exception("Grader payload %r is not a json object!", grader_payload)
-
- self.initial_display = find_with_default(oeparam, 'initial_display', '')
- self.answer = find_with_default(oeparam, 'answer_display', 'No answer given.')
-
- parsed_grader_payload.update({
- 'location' : self.system.location,
- 'course_id' : self.system.course_id,
- 'prompt' : prompt_string,
- 'rubric' : rubric_string,
- 'initial_display' : self.initial_display,
- 'answer' : self.answer,
- })
- updated_grader_payload = json.dumps(parsed_grader_payload)
-
- self.payload = {'grader_payload': updated_grader_payload}
-
- try:
- self.max_score = int(find_with_default(oeparam, 'max_score', 1))
- except ValueError:
- self.max_score = 1
-
- def handle_message_post(self,event_info):
- """
- Handles a student message post (a reaction to the grade they received from an open ended grader type)
- Returns a boolean success/fail and an error message
- """
- survey_responses=event_info['survey_responses']
- for tag in ['feedback', 'submission_id', 'grader_id', 'score']:
- if tag not in survey_responses:
- return False, "Could not find needed tag {0}".format(tag)
- try:
- submission_id=int(survey_responses['submission_id'])
- grader_id = int(survey_responses['grader_id'])
- feedback = str(survey_responses['feedback'].encode('ascii', 'ignore'))
- score = int(survey_responses['score'])
- except:
- error_message=("Could not parse submission id, grader id, "
- "or feedback from message_post ajax call. Here is the message data: {0}".format(survey_responses))
- log.exception(error_message)
- return False, "There was an error saving your feedback. Please contact course staff."
-
- qinterface = self.system.xqueue['interface']
- qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
- anonymous_student_id = self.system.anonymous_student_id
- queuekey = xqueue_interface.make_hashkey(str(self.system.seed) + qtime +
- anonymous_student_id +
- self.answer_id)
-
- xheader = xqueue_interface.make_xheader(
- lms_callback_url=self.system.xqueue['callback_url'],
- lms_key=queuekey,
- queue_name=self.message_queue_name
- )
-
- student_info = {'anonymous_student_id': anonymous_student_id,
- 'submission_time': qtime,
- }
- contents= {
- 'feedback' : feedback,
- 'submission_id' : submission_id,
- 'grader_id' : grader_id,
- 'score': score,
- 'student_info' : json.dumps(student_info),
- }
-
- (error, msg) = qinterface.send_to_queue(header=xheader,
- body=json.dumps(contents))
-
- #Convert error to a success value
- success=True
- if error:
- success=False
-
- return success, "Successfully submitted your feedback."
-
- def get_score(self, student_answers):
-
- try:
- submission = student_answers[self.answer_id]
- except KeyError:
- msg = ('Cannot get student answer for answer_id: {0}. student_answers {1}'
- .format(self.answer_id, student_answers))
- log.exception(msg)
- raise LoncapaProblemError(msg)
-
- # Prepare xqueue request
- #------------------------------------------------------------
-
- qinterface = self.system.xqueue['interface']
- qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
-
- anonymous_student_id = self.system.anonymous_student_id
-
- # Generate header
- queuekey = xqueue_interface.make_hashkey(str(self.system.seed) + qtime +
- anonymous_student_id +
- self.answer_id)
-
- xheader = xqueue_interface.make_xheader(lms_callback_url=self.system.xqueue['callback_url'],
- lms_key=queuekey,
- queue_name=self.queue_name)
-
- self.context.update({'submission': submission})
-
- contents = self.payload.copy()
-
- # Metadata related to the student submission revealed to the external grader
- student_info = {'anonymous_student_id': anonymous_student_id,
- 'submission_time': qtime,
- }
-
- #Update contents with student response and student info
- contents.update({
- 'student_info': json.dumps(student_info),
- 'student_response': submission,
- 'max_score' : self.max_score,
- })
-
- # Submit request. When successful, 'msg' is the prior length of the queue
- (error, msg) = qinterface.send_to_queue(header=xheader,
- body=json.dumps(contents))
-
- # State associated with the queueing request
- queuestate = {'key': queuekey,
- 'time': qtime,}
-
- cmap = CorrectMap()
- if error:
- cmap.set(self.answer_id, queuestate=None,
- msg='Unable to deliver your submission to grader. (Reason: {0}.)'
- ' Please try again later.'.format(msg))
- else:
- # Queueing mechanism flags:
- # 1) Backend: Non-null CorrectMap['queuestate'] indicates that
- # the problem has been queued
- # 2) Frontend: correctness='incomplete' eventually trickles down
- # through inputtypes.textbox and .filesubmission to inform the
- # browser that the submission is queued (and it could e.g. poll)
- cmap.set(self.answer_id, queuestate=queuestate,
- correctness='incomplete', msg=msg)
-
- return cmap
-
- def update_score(self, score_msg, oldcmap, queuekey):
- log.debug(score_msg)
- score_msg = self._parse_score_msg(score_msg)
- if not score_msg.valid:
- oldcmap.set(self.answer_id,
- msg = 'Invalid grader reply. Please contact the course staff.')
- return oldcmap
-
- correctness = 'correct' if score_msg.correct else 'incorrect'
-
- # TODO: Find out how this is used elsewhere, if any
- self.context['correct'] = correctness
-
- # Replace 'oldcmap' with new grading results if queuekey matches. If queuekey
- # does not match, we keep waiting for the score_msg whose key actually matches
- if oldcmap.is_right_queuekey(self.answer_id, queuekey):
- # Sanity check on returned points
- points = score_msg.points
- if points < 0:
- points = 0
-
- # Queuestate is consumed, so reset it to None
- oldcmap.set(self.answer_id, npoints=points, correctness=correctness,
- msg = score_msg.msg.replace(' ', ' '), queuestate=None)
- else:
- log.debug('OpenEndedResponse: queuekey {0} does not match for answer_id={1}.'.format(
- queuekey, self.answer_id))
-
- return oldcmap
-
- def get_answers(self):
- anshtml = '
{0}
'.format(self.answer)
- return {self.answer_id: anshtml}
-
- def get_initial_display(self):
- return {self.answer_id: self.initial_display}
-
- def _convert_longform_feedback_to_html(self, response_items):
- """
- Take in a dictionary, and return html strings for display to student.
- Input:
- response_items: Dictionary with keys success, feedback.
- if success is True, feedback should be a dictionary, with keys for
- types of feedback, and the corresponding feedback values.
- if success is False, feedback is actually an error string.
-
- NOTE: this will need to change when we integrate peer grading, because
- that will have more complex feedback.
-
- Output:
- String -- html that can be displayed to the student.
- """
-
- # We want to display available feedback in a particular order.
- # This dictionary specifies which goes first--lower first.
- priorities = {# These go at the start of the feedback
- 'spelling': 0,
- 'grammar': 1,
- # needs to be after all the other feedback
- 'markup_text': 3}
-
- default_priority = 2
-
- def get_priority(elt):
- """
- Args:
- elt: a tuple of feedback-type, feedback
- Returns:
- the priority for this feedback type
- """
- return priorities.get(elt[0], default_priority)
-
- def encode_values(feedback_type,value):
- feedback_type=str(feedback_type).encode('ascii', 'ignore')
- if not isinstance(value,basestring):
- value=str(value)
- value=value.encode('ascii', 'ignore')
- return feedback_type,value
-
- def format_feedback(feedback_type, value):
- feedback_type,value=encode_values(feedback_type,value)
- feedback= """
-
'
+ slider_els = xml.xpath('//slider')
+ for slider_el in slider_els:
+ slider_el.getparent().replace(slider_el, html.fromstring(
+ slider_div.format(element_class=self.html_class,
+ element_id=self.html_id,
+ var=slider_el.get('var', ""),
+ style=slider_el.get('style', ""))))
+
+ # substitute inputs aka textboxes
+ input_div = ''
+ input_els = xml.xpath('//textbox')
+ for input_index, input_el in enumerate(input_els):
+ input_el.getparent().replace(input_el, html.fromstring(
+ input_div.format(element_class=self.html_class,
+ element_id=self.html_id,
+ var=input_el.get('var', ""),
+ style=input_el.get('style', ""),
+ input_index=input_index)))
+
+ return html.tostring(xml)
+
+ def build_configuration_json(self):
+ """Creates json element from xml element (with aim to transfer later
+ directly to javascript via hidden field in template). Steps:
+
+ 1. Convert xml tree to python dict.
+
+ 2. Dump dict to json.
+
+ """
+ # added for interface compatibility with xmltodict.parse
+ # class added for javascript's part purposes
+ return json.dumps(xmltodict.parse('' + self.definition['configuration'] + ''))
+
+
+class GraphicalSliderToolDescriptor(MakoModuleDescriptor, XmlDescriptor):
+ module_class = GraphicalSliderToolModule
+ template_dir_name = 'graphical_slider_tool'
+
+ @classmethod
+ def definition_from_xml(cls, xml_object, system):
+ """
+ Pull out the data into dictionary.
+
+ Args:
+ xml_object: xml from file.
+
+ Returns:
+ dict
+ """
+ # check for presense of required tags in xml
+ expected_children_level_0 = ['render', 'configuration']
+ for child in expected_children_level_0:
+ if len(xml_object.xpath(child)) != 1:
+ raise ValueError("Graphical Slider Tool definition must include \
+ exactly one '{0}' tag".format(child))
+
+ expected_children_level_1 = ['functions']
+ for child in expected_children_level_1:
+ if len(xml_object.xpath('configuration')[0].xpath(child)) != 1:
+ raise ValueError("Graphical Slider Tool definition must include \
+ exactly one '{0}' tag".format(child))
+ # finished
+
+ def parse(k):
+ """Assumes that xml_object has child k"""
+ return stringify_children(xml_object.xpath(k)[0])
+ return {
+ 'render': parse('render'),
+ 'configuration': parse('configuration')
+ }
+
+ def definition_to_xml(self, resource_fs):
+ '''Return an xml element representing this definition.'''
+ xml_object = etree.Element('graphical_slider_tool')
+
+ def add_child(k):
+ child_str = '<{tag}>{body}'.format(tag=k, body=self.definition[k])
+ child_node = etree.fromstring(child_str)
+ xml_object.append(child_node)
+
+ for child in ['render', 'configuration']:
+ add_child(child)
+
+ return xml_object
diff --git a/common/lib/xmodule/xmodule/js/src/capa/display.coffee b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
index ba746fecb8..1c0ace9e59 100644
--- a/common/lib/xmodule/xmodule/js/src/capa/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
@@ -25,7 +25,6 @@ class @Problem
@$('section.action input.reset').click @reset
@$('section.action input.show').click @show
@$('section.action input.save').click @save
- @$('section.evaluation input.submit-message').click @message_post
# Collapsibles
Collapsible.setCollapsibles(@el)
@@ -198,35 +197,6 @@ class @Problem
else
@gentle_alert response.success
- message_post: =>
- Logger.log 'message_post', @answers
-
- fd = new FormData()
- feedback = @$('section.evaluation textarea.feedback-on-feedback')[0].value
- submission_id = $('div.external-grader-message div.submission_id')[0].innerHTML
- grader_id = $('div.external-grader-message div.grader_id')[0].innerHTML
- score = $(".evaluation-scoring input:radio[name='evaluation-score']:checked").val()
- fd.append('feedback', feedback)
- fd.append('submission_id', submission_id)
- fd.append('grader_id', grader_id)
- if(!score)
- @gentle_alert "You need to pick a rating before you can submit."
- return
- else
- fd.append('score', score)
-
-
- settings =
- type: "POST"
- data: fd
- processData: false
- contentType: false
- success: (response) =>
- @gentle_alert response.message
- @$('section.evaluation').slideToggle()
-
- $.ajaxWithPrefix("#{@url}/message_post", settings)
-
reset: =>
Logger.log 'problem_reset', @answers
$.postWithPrefix "#{@url}/problem_reset", id: @id, (response) =>
diff --git a/common/lib/xmodule/xmodule/js/src/collapsible.coffee b/common/lib/xmodule/xmodule/js/src/collapsible.coffee
index 18a186e106..e414935784 100644
--- a/common/lib/xmodule/xmodule/js/src/collapsible.coffee
+++ b/common/lib/xmodule/xmodule/js/src/collapsible.coffee
@@ -22,7 +22,7 @@ class @Collapsible
if $(event.target).text() == 'See full output'
new_text = 'Hide output'
else
- new_text = 'See full ouput'
+ new_text = 'See full output'
$(event.target).text(new_text)
@toggleHint: (event) =>
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
new file mode 100644
index 0000000000..2cbba143a3
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -0,0 +1,282 @@
+class @CombinedOpenEnded
+ constructor: (element) ->
+ @element=element
+ @reinitialize(element)
+
+ reinitialize: (element) ->
+ @wrapper=$(element).find('section.xmodule_CombinedOpenEndedModule')
+ @el = $(element).find('section.combined-open-ended')
+ @combined_open_ended=$(element).find('section.combined-open-ended')
+ @id = @el.data('id')
+ @ajax_url = @el.data('ajax-url')
+ @state = @el.data('state')
+ @task_count = @el.data('task-count')
+ @task_number = @el.data('task-number')
+
+ @allow_reset = @el.data('allow_reset')
+ @reset_button = @$('.reset-button')
+ @reset_button.click @reset
+ @next_problem_button = @$('.next-step-button')
+ @next_problem_button.click @next_problem
+
+ @show_results_button=@$('.show-results-button')
+ @show_results_button.click @show_results
+
+ # valid states: 'initial', 'assessing', 'post_assessment', 'done'
+ Collapsible.setCollapsibles(@el)
+ @submit_evaluation_button = $('.submit-evaluation-button')
+ @submit_evaluation_button.click @message_post
+
+ @results_container = $('.result-container')
+
+ # Where to put the rubric once we load it
+ @el = $(element).find('section.open-ended-child')
+ @errors_area = @$('.error')
+ @answer_area = @$('textarea.answer')
+
+ @rubric_wrapper = @$('.rubric-wrapper')
+ @hint_wrapper = @$('.hint-wrapper')
+ @message_wrapper = @$('.message-wrapper')
+ @submit_button = @$('.submit-button')
+ @child_state = @el.data('state')
+ @child_type = @el.data('child-type')
+ if @child_type=="openended"
+ @skip_button = @$('.skip-button')
+ @skip_button.click @skip_post_assessment
+
+ @open_ended_child= @$('.open-ended-child')
+
+ @find_assessment_elements()
+ @find_hint_elements()
+
+ @rebind()
+
+ # locally scoped jquery.
+ $: (selector) ->
+ $(selector, @el)
+
+ show_results: (event) =>
+ status_item = $(event.target).parent().parent()
+ status_number = status_item.data('status-number')
+ data = {'task_number' : status_number}
+ $.postWithPrefix "#{@ajax_url}/get_results", data, (response) =>
+ if response.success
+ @results_container.after(response.html).remove()
+ @results_container = $('div.result-container')
+ @submit_evaluation_button = $('.submit-evaluation-button')
+ @submit_evaluation_button.click @message_post
+ Collapsible.setCollapsibles(@results_container)
+ else
+ @errors_area.html(response.error)
+
+ message_post: (event)=>
+ Logger.log 'message_post', @answers
+ external_grader_message=$(event.target).parent().parent().parent()
+ evaluation_scoring = $(event.target).parent()
+
+ fd = new FormData()
+ feedback = evaluation_scoring.find('textarea.feedback-on-feedback')[0].value
+ submission_id = external_grader_message.find('input.submission_id')[0].value
+ grader_id = external_grader_message.find('input.grader_id')[0].value
+ score = evaluation_scoring.find("input:radio[name='evaluation-score']:checked").val()
+
+ fd.append('feedback', feedback)
+ fd.append('submission_id', submission_id)
+ fd.append('grader_id', grader_id)
+ if(!score)
+ @gentle_alert "You need to pick a rating before you can submit."
+ return
+ else
+ fd.append('score', score)
+
+ settings =
+ type: "POST"
+ data: fd
+ processData: false
+ contentType: false
+ success: (response) =>
+ @gentle_alert response.msg
+ $('section.evaluation').slideToggle()
+ @message_wrapper.html(response.message_html)
+
+ $.ajaxWithPrefix("#{@ajax_url}/save_post_assessment", settings)
+
+
+ rebind: () =>
+ # rebind to the appropriate function for the current state
+ @submit_button.unbind('click')
+ @submit_button.show()
+ @reset_button.hide()
+ @next_problem_button.hide()
+ @hint_area.attr('disabled', false)
+
+ if @child_type=="openended"
+ @skip_button.hide()
+ if @allow_reset=="True"
+ @reset_button.show()
+ @submit_button.hide()
+ @answer_area.attr("disabled", true)
+ @hint_area.attr('disabled', true)
+ else if @child_state == 'initial'
+ @answer_area.attr("disabled", false)
+ @submit_button.prop('value', 'Submit')
+ @submit_button.click @save_answer
+ else if @child_state == 'assessing'
+ @answer_area.attr("disabled", true)
+ @submit_button.prop('value', 'Submit assessment')
+ @submit_button.click @save_assessment
+ if @child_type == "openended"
+ @submit_button.hide()
+ @queueing()
+ else if @child_state == 'post_assessment'
+ if @child_type=="openended"
+ @skip_button.show()
+ @skip_post_assessment()
+ @answer_area.attr("disabled", true)
+ @submit_button.prop('value', 'Submit post-assessment')
+ if @child_type=="selfassessment"
+ @submit_button.click @save_hint
+ else
+ @submit_button.click @message_post
+ else if @child_state == 'done'
+ @answer_area.attr("disabled", true)
+ @hint_area.attr('disabled', true)
+ @submit_button.hide()
+ if @child_type=="openended"
+ @skip_button.hide()
+ if @task_number<@task_count
+ @next_problem()
+ else
+ @reset_button.show()
+
+
+ find_assessment_elements: ->
+ @assessment = @$('select.assessment')
+
+ find_hint_elements: ->
+ @hint_area = @$('textarea.post_assessment')
+
+ save_answer: (event) =>
+ event.preventDefault()
+ if @child_state == 'initial'
+ data = {'student_answer' : @answer_area.val()}
+ $.postWithPrefix "#{@ajax_url}/save_answer", data, (response) =>
+ if response.success
+ @rubric_wrapper.html(response.rubric_html)
+ @child_state = 'assessing'
+ @find_assessment_elements()
+ @rebind()
+ else
+ @errors_area.html(response.error)
+ else
+ @errors_area.html('Problem state got out of sync. Try reloading the page.')
+
+ save_assessment: (event) =>
+ event.preventDefault()
+ if @child_state == 'assessing'
+ data = {'assessment' : @assessment.find(':selected').text()}
+ $.postWithPrefix "#{@ajax_url}/save_assessment", data, (response) =>
+ if response.success
+ @child_state = response.state
+
+ if @child_state == 'post_assessment'
+ @hint_wrapper.html(response.hint_html)
+ @find_hint_elements()
+ else if @child_state == 'done'
+ @message_wrapper.html(response.message_html)
+
+ @rebind()
+ else
+ @errors_area.html(response.error)
+ else
+ @errors_area.html('Problem state got out of sync. Try reloading the page.')
+
+ save_hint: (event) =>
+ event.preventDefault()
+ if @child_state == 'post_assessment'
+ data = {'hint' : @hint_area.val()}
+
+ $.postWithPrefix "#{@ajax_url}/save_post_assessment", data, (response) =>
+ if response.success
+ @message_wrapper.html(response.message_html)
+ @child_state = 'done'
+ @rebind()
+ else
+ @errors_area.html(response.error)
+ else
+ @errors_area.html('Problem state got out of sync. Try reloading the page.')
+
+ skip_post_assessment: =>
+ if @child_state == 'post_assessment'
+
+ $.postWithPrefix "#{@ajax_url}/skip_post_assessment", {}, (response) =>
+ if response.success
+ @child_state = 'done'
+ @rebind()
+ else
+ @errors_area.html(response.error)
+ else
+ @errors_area.html('Problem state got out of sync. Try reloading the page.')
+
+ reset: (event) =>
+ event.preventDefault()
+ if @child_state == 'done' or @allow_reset=="True"
+ $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
+ if response.success
+ @answer_area.val('')
+ @rubric_wrapper.html('')
+ @hint_wrapper.html('')
+ @message_wrapper.html('')
+ @child_state = 'initial'
+ @combined_open_ended.after(response.html).remove()
+ @allow_reset="False"
+ @reinitialize(@element)
+ @rebind()
+ @reset_button.hide()
+ else
+ @errors_area.html(response.error)
+ else
+ @errors_area.html('Problem state got out of sync. Try reloading the page.')
+
+ next_problem: =>
+ if @child_state == 'done'
+ $.postWithPrefix "#{@ajax_url}/next_problem", {}, (response) =>
+ if response.success
+ @answer_area.val('')
+ @rubric_wrapper.html('')
+ @hint_wrapper.html('')
+ @message_wrapper.html('')
+ @child_state = 'initial'
+ @combined_open_ended.after(response.html).remove()
+ @reinitialize(@element)
+ @rebind()
+ @next_problem_button.hide()
+ if !response.allow_reset
+ @gentle_alert "Moved to next step."
+ else
+ @gentle_alert "Your score did not meet the criteria to move to the next step."
+ else
+ @errors_area.html(response.error)
+ else
+ @errors_area.html('Problem state got out of sync. Try reloading the page.')
+
+ gentle_alert: (msg) =>
+ if @el.find('.open-ended-alert').length
+ @el.find('.open-ended-alert').remove()
+ alert_elem = "
" + msg + "
"
+ @el.find('.open-ended-action').after(alert_elem)
+ @el.find('.open-ended-alert').css(opacity: 0).animate(opacity: 1, 700)
+
+ queueing: =>
+ if @child_state=="assessing" and @child_type=="openended"
+ if window.queuePollerID # Only one poller 'thread' per Problem
+ window.clearTimeout(window.queuePollerID)
+ window.queuePollerID = window.setTimeout(@poll, 10000)
+
+ poll: =>
+ $.postWithPrefix "#{@ajax_url}/check_for_score", (response) =>
+ if response.state == "done" or response.state=="post_assessment"
+ delete window.queuePollerID
+ location.reload()
+ else
+ window.queuePollerID = window.setTimeout(@poll, 10000)
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
new file mode 100644
index 0000000000..3175aae3f0
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
@@ -0,0 +1,139 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('ElOutput', ['logme'], function (logme) {
+
+ return ElOutput;
+
+ function ElOutput(config, state) {
+
+ if ($.isPlainObject(config.functions.function)) {
+ processFuncObj(config.functions.function);
+ } else if ($.isArray(config.functions.function)) {
+ (function (c1) {
+ while (c1 < config.functions.function.length) {
+ if ($.isPlainObject(config.functions.function[c1])) {
+ processFuncObj(config.functions.function[c1]);
+ }
+
+ c1 += 1;
+ }
+ }(0));
+ }
+
+ return;
+
+ function processFuncObj(obj) {
+ var paramNames, funcString, func, el, disableAutoReturn, updateOnEvent;
+
+ // We are only interested in functions that are meant for output to an
+ // element.
+ if (
+ (typeof obj['@output'] !== 'string') ||
+ ((obj['@output'].toLowerCase() !== 'element') && (obj['@output'].toLowerCase() !== 'none'))
+ ) {
+ return;
+ }
+
+ if (typeof obj['@el_id'] !== 'string') {
+ logme('ERROR: You specified "output" as "element", but did not spify "el_id".');
+
+ return;
+ }
+
+ if (typeof obj['#text'] !== 'string') {
+ logme('ERROR: Function body is not defined.');
+
+ return;
+ }
+
+ updateOnEvent = 'slide';
+ if (
+ (obj.hasOwnProperty('@update_on') === true) &&
+ (typeof obj['@update_on'] === 'string') &&
+ ((obj['@update_on'].toLowerCase() === 'slide') || (obj['@update_on'].toLowerCase() === 'change'))
+ ) {
+ updateOnEvent = obj['@update_on'].toLowerCase();
+ }
+
+ disableAutoReturn = obj['@disable_auto_return'];
+
+ funcString = obj['#text'];
+
+ if (
+ (disableAutoReturn === undefined) ||
+ (
+ (typeof disableAutoReturn === 'string') &&
+ (disableAutoReturn.toLowerCase() !== 'true')
+ )
+ ) {
+ if (funcString.search(/return/i) === -1) {
+ funcString = 'return ' + funcString;
+ }
+ } else {
+ if (funcString.search(/return/i) === -1) {
+ logme(
+ 'ERROR: You have specified a JavaScript ' +
+ 'function without a "return" statemnt. Your ' +
+ 'function will return "undefined" by default.'
+ );
+ }
+ }
+
+ // Make sure that all HTML entities are converted to their proper
+ // ASCII text equivalents.
+ funcString = $('
').html(funcString).text();
+
+ paramNames = state.getAllParameterNames();
+ paramNames.push(funcString);
+
+ try {
+ func = Function.apply(null, paramNames);
+ } catch (err) {
+ logme(
+ 'ERROR: The function body "' +
+ funcString +
+ '" was not converted by the Function constructor.'
+ );
+ logme('Error message: "' + err.message + '".');
+
+ $('#' + gstId).html('
' + 'ERROR IN XML: Could not create a function from string "' + funcString + '".' + '
');
+ $('#' + gstId).append('
' + 'Error message: "' + err.message + '".' + '
');
+
+ paramNames.pop();
+
+ return;
+ }
+
+ paramNames.pop();
+
+ if (obj['@output'].toLowerCase() !== 'none') {
+ el = $('#' + obj['@el_id']);
+
+ if (el.length !== 1) {
+ logme(
+ 'ERROR: DOM element with ID "' + obj['@el_id'] + '" ' +
+ 'not found. Dynamic element not created.'
+ );
+
+ return;
+ }
+
+ el.html(func.apply(window, state.getAllParameterValues()));
+ } else {
+ el = null;
+ func.apply(window, state.getAllParameterValues());
+ }
+
+ state.addDynamicEl(el, func, obj['@el_id'], updateOnEvent);
+ }
+
+ }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js
new file mode 100644
index 0000000000..13c9dd3389
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js
@@ -0,0 +1,113 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('GLabelElOutput', ['logme'], function (logme) {
+ return GLabelElOutput;
+
+ function GLabelElOutput(config, state) {
+ if ($.isPlainObject(config.functions.function)) {
+ processFuncObj(config.functions.function);
+ } else if ($.isArray(config.functions.function)) {
+ (function (c1) {
+ while (c1 < config.functions.function.length) {
+ if ($.isPlainObject(config.functions.function[c1])) {
+ processFuncObj(config.functions.function[c1]);
+ }
+
+ c1 += 1;
+ }
+ }(0));
+ }
+
+ return;
+
+ function processFuncObj(obj) {
+ var paramNames, funcString, func, disableAutoReturn;
+
+ // We are only interested in functions that are meant for output to an
+ // element.
+ if (
+ (typeof obj['@output'] !== 'string') ||
+ (obj['@output'].toLowerCase() !== 'plot_label')
+ ) {
+ return;
+ }
+
+ if (typeof obj['@el_id'] !== 'string') {
+ logme('ERROR: You specified "output" as "plot_label", but did not spify "el_id".');
+
+ return;
+ }
+
+ if (typeof obj['#text'] !== 'string') {
+ logme('ERROR: Function body is not defined.');
+
+ return;
+ }
+
+ disableAutoReturn = obj['@disable_auto_return'];
+
+ funcString = obj['#text'];
+
+ if (
+ (disableAutoReturn === undefined) ||
+ (
+ (typeof disableAutoReturn === 'string') &&
+ (disableAutoReturn.toLowerCase() !== 'true')
+ )
+ ) {
+ if (funcString.search(/return/i) === -1) {
+ funcString = 'return ' + funcString;
+ }
+ } else {
+ if (funcString.search(/return/i) === -1) {
+ logme(
+ 'ERROR: You have specified a JavaScript ' +
+ 'function without a "return" statemnt. Your ' +
+ 'function will return "undefined" by default.'
+ );
+ }
+ }
+
+ // Make sure that all HTML entities are converted to their proper
+ // ASCII text equivalents.
+ funcString = $('
').html(funcString).text();
+
+ paramNames = state.getAllParameterNames();
+ paramNames.push(funcString);
+
+ try {
+ func = Function.apply(null, paramNames);
+ } catch (err) {
+ logme(
+ 'ERROR: The function body "' +
+ funcString +
+ '" was not converted by the Function constructor.'
+ );
+ logme('Error message: "' + err.message + '".');
+
+ $('#' + gstId).html('
' + 'ERROR IN XML: Could not create a function from string "' + funcString + '".' + '
');
+ $('#' + gstId).append('
' + 'Error message: "' + err.message + '".' + '
');
+
+ paramNames.pop();
+
+ return;
+ }
+
+ paramNames.pop();
+
+ state.plde.push({
+ 'elId': obj['@el_id'],
+ 'func': func
+ });
+ }
+
+ }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/general_methods.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/general_methods.js
new file mode 100644
index 0000000000..9cdd4fff0f
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/general_methods.js
@@ -0,0 +1,23 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('GeneralMethods', [], function () {
+ if (!String.prototype.trim) {
+ // http://blog.stevenlevithan.com/archives/faster-trim-javascript
+ String.prototype.trim = function trim(str) {
+ return str.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+ };
+ }
+
+ return {
+ 'module_name': 'GeneralMethods',
+ 'module_status': 'OK'
+ };
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
new file mode 100644
index 0000000000..2520f0b12f
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -0,0 +1,1496 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('Graph', ['logme'], function (logme) {
+
+ return Graph;
+
+ function Graph(gstId, config, state) {
+ var plotDiv, dataSeries, functions, xaxis, yaxis, numPoints, xrange,
+ asymptotes, movingLabels, xTicksNames, yTicksNames, graphBarWidth, graphBarAlign;
+
+ // We need plot configuration settings. Without them we can't continue.
+ if ($.isPlainObject(config.plot) === false) {
+ return;
+ }
+
+ // We must have a graph container DIV element available in order to
+ // proceed.
+ plotDiv = $('#' + gstId + '_plot');
+ if (plotDiv.length === 0) {
+ logme('ERROR: Could not find the plot DIV with ID "' + gstId + '_plot".');
+
+ return;
+ }
+
+ if (plotDiv.width() === 0) {
+ plotDiv.width(300);
+ }
+
+ // Sometimes, when height is not explicitly set via CSS (or by some
+ // other means), it is 0 pixels by default. When Flot will try to plot
+ // a graph in this DIV with 0 height, then it will raise an error. To
+ // prevent this, we will set it to be equal to the width.
+ if (plotDiv.height() === 0) {
+ plotDiv.height(plotDiv.width());
+ }
+
+ plotDiv.css('position', 'relative');
+
+ // Configure some settings for the graph.
+ if (setGraphXRange() === false) {
+ logme('ERROR: Could not configure the xrange. Will not continue.');
+
+ return;
+ }
+
+ if (setGraphAxes() === false) {
+ logme('ERROR: Could not process configuration for the axes.');
+
+ return;
+ }
+
+ graphBarWidth = 1;
+ graphBarAlign = null;
+
+ getBarWidth();
+ getBarAlign();
+
+ // Get the user defined functions. If there aren't any, don't do
+ // anything else.
+ createFunctions();
+
+ if (functions.length === 0) {
+ logme('ERROR: No functions were specified, or something went wrong.');
+
+ return;
+ }
+
+ if (createMarkingsFunctions() === false) {
+ return;
+ }
+ if (createMovingLabelFunctions() === false) {
+ return;
+ }
+
+ // Create the initial graph and plot it for the user to see.
+ if (generateData() === true) {
+ updatePlot();
+ }
+
+ // Bind an event. Whenever some constant changes, the graph will be
+ // redrawn
+ state.bindUpdatePlotEvent(plotDiv, onUpdatePlot);
+
+ return;
+
+ function getBarWidth() {
+ if (config.plot.hasOwnProperty('bar_width') === false) {
+ return;
+ }
+
+ if (typeof config.plot.bar_width !== 'string') {
+ logme('ERROR: The parameter config.plot.bar_width must be a string.');
+
+ return;
+ }
+
+ if (isFinite(graphBarWidth = parseFloat(config.plot.bar_width)) === false) {
+ logme('ERROR: The parameter config.plot.bar_width is not a valid floating number.');
+ graphBarWidth = 1;
+
+ return;
+ }
+
+ return;
+ }
+
+ function getBarAlign() {
+ if (config.plot.hasOwnProperty('bar_align') === false) {
+ return;
+ }
+
+ if (typeof config.plot.bar_align !== 'string') {
+ logme('ERROR: The parameter config.plot.bar_align must be a string.');
+
+ return;
+ }
+
+ if (
+ (config.plot.bar_align.toLowerCase() !== 'left') &&
+ (config.plot.bar_align.toLowerCase() !== 'center')
+ ) {
+ logme('ERROR: Property config.plot.bar_align can be one of "left", or "center".');
+
+ return;
+ }
+
+ graphBarAlign = config.plot.bar_align.toLowerCase();
+
+ return;
+ }
+
+ function createMovingLabelFunctions() {
+ var c1, returnStatus;
+
+ returnStatus = true;
+ movingLabels = [];
+
+ if (config.plot.hasOwnProperty('moving_label') !== true) {
+ returnStatus = true;
+ } else if ($.isPlainObject(config.plot.moving_label) === true) {
+ if (processMovingLabel(config.plot.moving_label) === false) {
+ returnStatus = false;
+ }
+ } else if ($.isArray(config.plot.moving_label) === true) {
+ for (c1 = 0; c1 < config.plot.moving_label.length; c1++) {
+ if (processMovingLabel(config.plot.moving_label[c1]) === false) {
+ returnStatus = false;
+ }
+ }
+ }
+
+ return returnStatus;
+ }
+
+ function processMovingLabel(obj) {
+ var labelText, funcString, disableAutoReturn, paramNames, func,
+ fontWeight, fontColor;
+
+ if (obj.hasOwnProperty('@text') === false) {
+ logme('ERROR: You did not define a "text" attribute for the moving_label.');
+
+ return false;
+ }
+ if (typeof obj['@text'] !== 'string') {
+ logme('ERROR: "text" attribute is not a string.');
+
+ return false;
+ }
+ labelText = obj['@text'];
+
+ if (obj.hasOwnProperty('#text') === false) {
+ logme('ERROR: moving_label is missing function declaration.');
+
+ return false;
+ }
+ if (typeof obj['#text'] !== 'string') {
+ logme('ERROR: Function declaration is not a string.');
+
+ return false;
+ }
+ funcString = obj['#text'];
+
+ fontColor = 'black';
+ if (
+ (obj.hasOwnProperty('@color') === true) &&
+ (typeof obj['@color'] === 'string')
+ ) {
+ fontColor = obj['@color'];
+ }
+
+ fontWeight = 'normal';
+ if (
+ (obj.hasOwnProperty('@weight') === true) &&
+ (typeof obj['@weight'] === 'string')
+ ) {
+ if (
+ (obj['@weight'].toLowerCase() === 'normal') ||
+ (obj['@weight'].toLowerCase() === 'bold')
+ ) {
+ fontWeight = obj['@weight'];
+ } else {
+ logme('ERROR: Moving label can have a weight property of "normal" or "bold".');
+ }
+ }
+
+ disableAutoReturn = obj['@disable_auto_return'];
+
+ funcString = $('
').html(funcString).text();
+
+ if (
+ (disableAutoReturn === undefined) ||
+ (
+ (typeof disableAutoReturn === 'string') &&
+ (disableAutoReturn.toLowerCase() !== 'true')
+ )
+ ) {
+ if (funcString.search(/return/i) === -1) {
+ funcString = 'return ' + funcString;
+ }
+ } else {
+ if (funcString.search(/return/i) === -1) {
+ logme(
+ 'ERROR: You have specified a JavaScript ' +
+ 'function without a "return" statemnt. Your ' +
+ 'function will return "undefined" by default.'
+ );
+ }
+ }
+
+ paramNames = state.getAllParameterNames();
+ paramNames.push(funcString);
+
+ try {
+ func = Function.apply(null, paramNames);
+ } catch (err) {
+ logme(
+ 'ERROR: The function body "' +
+ funcString +
+ '" was not converted by the Function constructor.'
+ );
+ logme('Error message: "' + err.message + '"');
+
+ $('#' + gstId).html('
' + 'ERROR IN XML: Could not create a function from the string "' + funcString + '".' + '
');
+ $('#' + gstId).append('
' + 'Error message: "' + err.message + '".' + '
');
+
+ paramNames.pop();
+
+ return false;
+ }
+
+ paramNames.pop();
+
+ movingLabels.push({
+ 'labelText': labelText,
+ 'func': func,
+ 'el': null,
+ 'fontColor': fontColor,
+ 'fontWeight': fontWeight
+ });
+
+ return true;
+ }
+
+ function createMarkingsFunctions() {
+ var c1, paramNames, returnStatus;
+
+ returnStatus = true;
+
+ asymptotes = [];
+ paramNames = state.getAllParameterNames();
+
+ if ($.isPlainObject(config.plot.asymptote)) {
+ if (processAsymptote(config.plot.asymptote) === false) {
+ returnStatus = false;
+ }
+ } else if ($.isArray(config.plot.asymptote)) {
+ for (c1 = 0; c1 < config.plot.asymptote.length; c1 += 1) {
+ if (processAsymptote(config.plot.asymptote[c1]) === false) {
+ returnStatus = false;
+ }
+ }
+ }
+
+ return returnStatus;
+
+ // Read configuration options for asymptotes, and store them as
+ // an array of objects. Each object will have 3 properties:
+ //
+ // - color: the color of the asymptote line
+ // - type: 'x' (vertical), or 'y' (horizontal)
+ // - func: the function that will generate the value at which
+ // the asymptote will be plotted; i.e. x = func(), or
+ // y = func(); for now only horizontal and vertical
+ // asymptotes are supported
+ //
+ // Since each asymptote can have a variable function - function
+ // that relies on some parameter specified in the config - we will
+ // generate each asymptote just before we draw the graph. See:
+ //
+ // function updatePlot()
+ // function generateMarkings()
+ //
+ // Asymptotes are really thin rectangles implemented via the Flot's
+ // markings option.
+ function processAsymptote(asyObj) {
+ var newAsyObj, funcString, func;
+
+ newAsyObj = {};
+
+ if (typeof asyObj['@type'] === 'string') {
+ if (asyObj['@type'].toLowerCase() === 'x') {
+ newAsyObj.type = 'x';
+ } else if (asyObj['@type'].toLowerCase() === 'y') {
+ newAsyObj.type = 'y';
+ } else {
+ logme('ERROR: Attribute "type" for asymptote can be "x" or "y".');
+
+ return false;
+ }
+ } else {
+ logme('ERROR: Attribute "type" for asymptote is not specified.');
+
+ return false;
+ }
+
+ if (typeof asyObj['#text'] === 'string') {
+ funcString = asyObj['#text'];
+ } else {
+ logme('ERROR: Function body for asymptote is not specified.');
+
+ return false;
+ }
+
+ newAsyObj.color = '#000';
+ if (typeof asyObj['@color'] === 'string') {
+ newAsyObj.color = asyObj['@color'];
+ }
+
+ newAsyObj.label = false;
+ if (
+ (asyObj.hasOwnProperty('@label') === true) &&
+ (typeof asyObj['@label'] === 'string')
+ ) {
+ newAsyObj.label = asyObj['@label'];
+ }
+
+ funcString = $('
').html(funcString).text();
+
+ disableAutoReturn = asyObj['@disable_auto_return'];
+ if (
+ (disableAutoReturn === undefined) ||
+ (
+ (typeof disableAutoReturn === 'string') &&
+ (disableAutoReturn.toLowerCase() !== 'true')
+ )
+ ) {
+ if (funcString.search(/return/i) === -1) {
+ funcString = 'return ' + funcString;
+ }
+ } else {
+ if (funcString.search(/return/i) === -1) {
+ logme(
+ 'ERROR: You have specified a JavaScript ' +
+ 'function without a "return" statemnt. Your ' +
+ 'function will return "undefined" by default.'
+ );
+ }
+ }
+
+ paramNames.push(funcString);
+
+ try {
+ func = Function.apply(null, paramNames);
+ } catch (err) {
+ logme('ERROR: Asymptote function body could not be converted to function object.');
+ logme('Error message: "".' + err.message);
+
+ return false;
+ }
+
+ paramNames.pop();
+
+ newAsyObj.func = func;
+ asymptotes.push(newAsyObj);
+
+ return true;
+ }
+ }
+
+ function setGraphAxes() {
+ xaxis = {
+ 'tickFormatter': null
+ };
+
+ if (typeof config.plot['xticks'] === 'string') {
+ if (processTicks(config.plot['xticks'], xaxis, 'xunits') === false) {
+ logme('ERROR: Could not process the ticks for x-axis.');
+
+ return false;
+ }
+ } else {
+ logme('MESSAGE: "xticks" were not specified. Using defaults.');
+
+ return false;
+ }
+
+ yaxis = {
+ 'tickFormatter': null
+ };
+ if (typeof config.plot['yticks'] === 'string') {
+ if (processTicks(config.plot['yticks'], yaxis, 'yunits') === false) {
+ logme('ERROR: Could not process the ticks for y-axis.');
+
+ return false;
+ }
+ } else {
+ logme('MESSAGE: "yticks" were not specified. Using defaults.');
+
+ return false;
+ }
+
+ xTicksNames = null;
+ yTicksNames = null;
+
+ if (checkForTicksNames('x') === false) {
+ return false;
+ }
+
+ if (checkForTicksNames('y') === false) {
+ return false;
+ }
+
+ return true;
+
+ //
+ // function checkForTicksNames(axisName)
+ //
+ // The parameter "axisName" can be either "x" or "y" (string). Depending on it, the function
+ // will set "xTicksNames" or "yTicksNames" private variable.
+ //
+ // This function does not return anything. It sets the private variable "xTicksNames" ("yTicksNames")
+ // to the object converted by JSON.parse from the XML parameter "plot.xticks_names" ("plot.yticks_names").
+ // If the "plot.xticks_names" ("plot.yticks_names") is missing or it is not a valid JSON string, then
+ // "xTicksNames" ("yTicksNames") will be set to "null".
+ //
+ // Depending on the "xTicksNames" ("yTicksNames") being "null" or an object, the plot will either draw
+ // number ticks, or use the names specified by the opbject.
+ //
+ function checkForTicksNames(axisName) {
+ var tmpObj;
+
+ if ((axisName !== 'x') && (axisName !== 'y')) {
+ // This is not an error. This funcion should simply stop executing.
+
+ return true;
+ }
+
+ if (
+ (config.plot.hasOwnProperty(axisName + 'ticks_names') === true) ||
+ (typeof config.plot[axisName + 'ticks_names'] === 'string')
+ ) {
+ try {
+ tmpObj = JSON.parse(config.plot[axisName + 'ticks_names']);
+ } catch (err) {
+ logme(
+ 'ERROR: plot.' + axisName + 'ticks_names is not a valid JSON string.',
+ 'Error message: "' + err.message + '".'
+ );
+
+ return false;
+ }
+
+ if (axisName === 'x') {
+ xTicksNames = tmpObj;
+ xaxis.tickFormatter = xAxisTickFormatter;
+ }
+ // At this point, we are certain that axisName = 'y'.
+ else {
+ yTicksNames = tmpObj;
+ yaxis.tickFormatter = yAxisTickFormatter;
+ }
+ }
+ }
+
+ function processTicks(ticksStr, ticksObj, unitsType) {
+ var ticksBlobs, tempFloat, tempTicks, c1, c2;
+
+ // The 'ticks' setting is a string containing 3 floating-point
+ // numbers.
+ ticksBlobs = ticksStr.split(',');
+
+ if (ticksBlobs.length !== 3) {
+ logme('ERROR: Did not get 3 blobs from ticksStr = "' + ticksStr + '".');
+
+ return false;
+ }
+
+ tempFloat = parseFloat(ticksBlobs[0]);
+ if (isNaN(tempFloat) === false) {
+ ticksObj.min = tempFloat;
+ } else {
+ logme('ERROR: Invalid "min". ticksBlobs[0] = ', ticksBlobs[0]);
+
+ return false;
+ }
+
+ tempFloat = parseFloat(ticksBlobs[1]);
+ if (isNaN(tempFloat) === false) {
+ ticksObj.tickSize = tempFloat;
+ } else {
+ logme('ERROR: Invalid "tickSize". ticksBlobs[1] = ', ticksBlobs[1]);
+
+ return false;
+ }
+
+ tempFloat = parseFloat(ticksBlobs[2]);
+ if (isNaN(tempFloat) === false) {
+ ticksObj.max = tempFloat;
+ } else {
+ logme('ERROR: Invalid "max". ticksBlobs[2] = ', ticksBlobs[2]);
+
+ return false;
+ }
+
+ // Is the starting tick to the left of the ending tick (on the
+ // x-axis)? If not, set default starting and ending tick.
+ if (ticksObj.min >= ticksObj.max) {
+ logme('ERROR: Ticks min >= max.');
+
+ return false;
+ }
+
+ // Make sure the range makes sense - i.e. that there are at
+ // least 3 ticks. If not, set a tickSize which will produce
+ // 11 ticks. tickSize is the spacing between the ticks.
+ if (ticksObj.tickSize > ticksObj.max - ticksObj.min) {
+ logme('ERROR: tickSize > max - min.');
+
+ return false;
+ }
+
+ // units: change last tick to units
+ if (typeof config.plot[unitsType] === 'string') {
+ tempTicks = [];
+
+ for (c1 = ticksObj.min; c1 <= ticksObj.max; c1 += ticksObj.tickSize) {
+ c2 = roundToPrec(c1, ticksObj.tickSize);
+ tempTicks.push([c2, c2]);
+ }
+
+ tempTicks.pop();
+ tempTicks.push([
+ roundToPrec(ticksObj.max, ticksObj.tickSize),
+ config.plot[unitsType]
+ ]);
+
+ ticksObj.tickSize = null;
+ ticksObj.ticks = tempTicks;
+ }
+
+ return true;
+
+ function roundToPrec(num, prec) {
+ var c1, tn1, tn2, digitsBefore, digitsAfter;
+
+ tn1 = Math.abs(num);
+ tn2 = Math.abs(prec);
+
+ // Find out number of digits BEFORE the decimal point.
+ c1 = 0;
+ tn1 = Math.abs(num);
+ while (tn1 >= 1) {
+ c1 += 1;
+
+ tn1 /= 10;
+ }
+ digitsBefore = c1;
+
+ // Find out number of digits AFTER the decimal point.
+ c1 = 0;
+ tn1 = Math.abs(num);
+ while (Math.round(tn1) !== tn1) {
+ c1 += 1;
+
+ tn1 *= 10;
+ }
+ digitsAfter = c1;
+
+ // For precision, find out number of digits AFTER the
+ // decimal point.
+ c1 = 0;
+ while (Math.round(tn2) !== tn2) {
+ c1 += 1;
+
+ tn2 *= 10;
+ }
+
+ // If precision is more than 1 (no digits after decimal
+ // points).
+ if (c1 === 0) {
+ return num;
+ }
+
+ // If the precision contains digits after the decimal
+ // point, we apply special rules.
+ else {
+ tn1 = Math.abs(num);
+
+ // if (digitsAfter > c1) {
+ tn1 = tn1.toFixed(c1);
+ // } else {
+ // tn1 = tn1.toPrecision(digitsBefore + digitsAfter);
+ // }
+ }
+
+ if (num < 0) {
+ return -tn1;
+ }
+
+ return tn1;
+ }
+ }
+ }
+
+ function setGraphXRange() {
+ var xRangeStr, xRangeBlobs, tempNum, allParamNames, funcString,
+ disableAutoReturn;
+
+ xrange = {};
+
+ if ($.isPlainObject(config.plot.xrange) === false) {
+ logme(
+ 'ERROR: Expected config.plot.xrange to be an object. ' +
+ 'It is not.'
+ );
+ logme('config.plot.xrange = ', config.plot.xrange);
+
+ return false;
+ }
+
+ if (config.plot.xrange.hasOwnProperty('min') === false) {
+ logme(
+ 'ERROR: Expected config.plot.xrange.min to be ' +
+ 'present. It is not.'
+ );
+
+ return false;
+ }
+
+ disableAutoReturn = false;
+ if (typeof config.plot.xrange.min === 'string') {
+ funcString = config.plot.xrange.min;
+ } else if (
+ ($.isPlainObject(config.plot.xrange.min) === true) &&
+ (config.plot.xrange.min.hasOwnProperty('#text') === true) &&
+ (typeof config.plot.xrange.min['#text'] === 'string')
+ ) {
+ funcString = config.plot.xrange.min['#text'];
+
+ disableAutoReturn =
+ config.plot.xrange.min['@disable_auto_return'];
+ if (
+ (disableAutoReturn === undefined) ||
+ (
+ (typeof disableAutoReturn === 'string') &&
+ (disableAutoReturn.toLowerCase() !== 'true')
+ )
+ ) {
+ disableAutoReturn = false;
+ } else {
+ disableAutoReturn = true;
+ }
+ } else {
+ logme(
+ 'ERROR: Could not get a function definition for ' +
+ 'xrange.min property.'
+ );
+
+ return false;
+ }
+
+ funcString = $('
').html(funcString).text();
+
+ if (disableAutoReturn === false) {
+ if (funcString.search(/return/i) === -1) {
+ funcString = 'return ' + funcString;
+ }
+ } else {
+ if (funcString.search(/return/i) === -1) {
+ logme(
+ 'ERROR: You have specified a JavaScript ' +
+ 'function without a "return" statemnt. Your ' +
+ 'function will return "undefined" by default.'
+ );
+ }
+ }
+
+ allParamNames = state.getAllParameterNames();
+
+ allParamNames.push(funcString);
+ try {
+ xrange.min = Function.apply(null, allParamNames);
+ } catch (err) {
+ logme(
+ 'ERROR: could not create a function from the string "' +
+ funcString + '" for xrange.min.'
+ );
+ logme('Error message: "' + err.message + '"');
+
+ $('#' + gstId).html(
+ '
' + 'ERROR IN ' +
+ 'XML: Could not create a function from the string "' +
+ funcString + '" for xrange.min.' + '
').html(funcString).text();
+
+ if (disableAutoReturn === false) {
+ if (funcString.search(/return/i) === -1) {
+ funcString = 'return ' + funcString;
+ }
+ } else {
+ if (funcString.search(/return/i) === -1) {
+ logme(
+ 'ERROR: You have specified a JavaScript ' +
+ 'function without a "return" statemnt. Your ' +
+ 'function will return "undefined" by default.'
+ );
+ }
+ }
+
+ allParamNames.push(funcString);
+ try {
+ xrange.max = Function.apply(null, allParamNames);
+ } catch (err) {
+ logme(
+ 'ERROR: could not create a function from the string "' +
+ funcString + '" for xrange.max.'
+ );
+ logme('Error message: "' + err.message + '"');
+
+ $('#' + gstId).html(
+ '
' + 'ERROR IN ' +
+ 'XML: Could not create a function from the string "' +
+ funcString + '" for xrange.max.' + '
'
+ );
+ $('#' + gstId).append(
+ '
' + 'Error message: "' +
+ err.message + '".' + '
'
+ );
+
+ return false;
+ }
+ allParamNames.pop();
+
+ tempNum = parseInt(config.plot.num_points, 10);
+ if (isFinite(tempNum) === false) {
+ tempNum = plotDiv.width() / 5.0;
+ }
+
+ if (
+ (tempNum < 2) &&
+ (tempNum > 1000)
+ ) {
+ logme(
+ 'ERROR: Number of points is outside the allowed range ' +
+ '[2, 1000]'
+ );
+ logme('config.plot.num_points = ' + tempNum);
+
+ return false;
+ }
+
+ numPoints = tempNum;
+
+ return true;
+ }
+
+ function createFunctions() {
+ var c1;
+
+ functions = [];
+
+ if (typeof config.functions === 'undefined') {
+ logme('ERROR: config.functions is undefined.');
+
+ return;
+ }
+
+ if (typeof config.functions.function === 'string') {
+
+ // If just one function string is present.
+ addFunction(config.functions.function);
+
+ } else if ($.isPlainObject(config.functions.function) === true) {
+
+ // If a function is present, but it also has properties
+ // defined.
+ callAddFunction(config.functions.function);
+
+ } else if ($.isArray(config.functions.function)) {
+
+ // If more than one function is defined.
+ for (c1 = 0; c1 < config.functions.function.length; c1 += 1) {
+
+ // For each definition, we must check if it is a simple
+ // string definition, or a complex one with properties.
+ if (typeof config.functions.function[c1] === 'string') {
+
+ // Simple string.
+ addFunction(config.functions.function[c1]);
+
+ } else if ($.isPlainObject(config.functions.function[c1])) {
+
+ // Properties are present.
+ callAddFunction(config.functions.function[c1]);
+
+ }
+ }
+ } else {
+ logme('ERROR: config.functions.function is of an unsupported type.');
+
+ return;
+ }
+
+ return;
+
+ // This function will reduce code duplication. We have to call
+ // the function addFunction() several times passing object
+ // properties as parameters. Rather than writing them out every
+ // time, we will have a single place where it is done.
+ function callAddFunction(obj) {
+ if (
+ (obj.hasOwnProperty('@output')) &&
+ (typeof obj['@output'] === 'string')
+ ) {
+
+ // If this function is meant to be calculated for an
+ // element then skip it.
+ if ((obj['@output'].toLowerCase() === 'element') ||
+ (obj['@output'].toLowerCase() === 'none')) {
+ return;
+ }
+
+ // If this function is meant to be calculated for a
+ // dynamic element in a label then skip it.
+ else if (obj['@output'].toLowerCase() === 'plot_label') {
+ return;
+ }
+
+ // It is an error if '@output' is not 'element',
+ // 'plot_label', or 'graph'. However, if the '@output'
+ // attribute is omitted, we will not have reached this.
+ else if (obj['@output'].toLowerCase() !== 'graph') {
+ logme(
+ 'ERROR: Function "output" attribute can be ' +
+ 'either "element", "plot_label", "none" or "graph".'
+ );
+
+ return;
+ }
+
+ }
+
+ // The user did not specify an "output" attribute, or it is
+ // "graph".
+ addFunction(
+ obj['#text'],
+ obj['@color'],
+ obj['@line'],
+ obj['@dot'],
+ obj['@label'],
+ obj['@point_size'],
+ obj['@fill_area'],
+ obj['@bar'],
+ obj['@disable_auto_return']
+ );
+ }
+
+ function addFunction(funcString, color, line, dot, label,
+ pointSize, fillArea, bar, disableAutoReturn) {
+
+ var newFunctionObject, func, paramNames, c1, rgxp;
+
+ // The main requirement is function string. Without it we can't
+ // create a function, and the series cannot be calculated.
+ if (typeof funcString !== 'string') {
+ return;
+ }
+
+ // Make sure that any HTML entities that were escaped will be
+ // unescaped. This is done because if a string with escaped
+ // HTML entities is passed to the Function() constructor, it
+ // will break.
+ funcString = $('
').html(funcString).text();
+
+ // If the user did not specifically turn off this feature,
+ // check if the function string contains a 'return', and
+ // prepend a 'return ' to the string if one, or more, is not
+ // found.
+ if (
+ (disableAutoReturn === undefined) ||
+ (
+ (typeof disableAutoReturn === 'string') &&
+ (disableAutoReturn.toLowerCase() !== 'true')
+ )
+ ) {
+ if (funcString.search(/return/i) === -1) {
+ funcString = 'return ' + funcString;
+ }
+ } else {
+ if (funcString.search(/return/i) === -1) {
+ logme(
+ 'ERROR: You have specified a JavaScript ' +
+ 'function without a "return" statemnt. Your ' +
+ 'function will return "undefined" by default.'
+ );
+ }
+ }
+
+ // Some defaults. If no options are set for the graph, we will
+ // make sure that at least a line is drawn for a function.
+ newFunctionObject = {
+ 'line': true,
+ 'dot': false,
+ 'bars': false
+ };
+
+ // Get all of the parameter names defined by the user in the
+ // XML.
+ paramNames = state.getAllParameterNames();
+
+ // The 'x' is always one of the function parameters.
+ paramNames.push('x');
+
+ // Must make sure that the function body also gets passed to
+ // the Function constructor.
+ paramNames.push(funcString);
+
+ // Create the function from the function string, and all of the
+ // available parameters AND the 'x' variable as it's parameters.
+ // For this we will use the built-in Function object
+ // constructor.
+ //
+ // If something goes wrong during this step, most
+ // likely the user supplied an invalid JavaScript function body
+ // string. In this case we will not proceed.
+ try {
+ func = Function.apply(null, paramNames);
+ } catch (err) {
+ logme(
+ 'ERROR: The function body "' +
+ funcString +
+ '" was not converted by the Function constructor.'
+ );
+ logme('Error message: "' + err.message + '"');
+
+ $('#' + gstId).html('
' + 'ERROR IN XML: Could not create a function from the string "' + funcString + '".' + '
');
+ $('#' + gstId).append('
' + 'Error message: "' + err.message + '".' + '
');
+
+ paramNames.pop();
+ paramNames.pop();
+
+ return;
+ }
+
+ // Return the array back to original state. Remember that it is
+ // a pointer to original array which is stored in state object.
+ paramNames.pop();
+ paramNames.pop();
+
+ newFunctionObject['func'] = func;
+
+ if (typeof color === 'string') {
+ newFunctionObject['color'] = color;
+ }
+
+ if (typeof line === 'string') {
+ if (line.toLowerCase() === 'true') {
+ newFunctionObject['line'] = true;
+ } else if (line.toLowerCase() === 'false') {
+ newFunctionObject['line'] = false;
+ }
+ }
+
+ if (typeof dot === 'string') {
+ if (dot.toLowerCase() === 'true') {
+ newFunctionObject['dot'] = true;
+ } else if (dot.toLowerCase() === 'false') {
+ newFunctionObject['dot'] = false;
+ }
+ }
+
+ if (typeof pointSize === 'string') {
+ newFunctionObject['pointSize'] = pointSize;
+ }
+
+ if (typeof bar === 'string') {
+ if (bar.toLowerCase() === 'true') {
+ newFunctionObject['bars'] = true;
+ } else if (bar.toLowerCase() === 'false') {
+ newFunctionObject['bars'] = false;
+ }
+ }
+
+ if (newFunctionObject['bars'] === true) {
+ newFunctionObject['line'] = false;
+ newFunctionObject['dot'] = false;
+ // To do: See if need to do anything here.
+ } else if (
+ (newFunctionObject['dot'] === false) &&
+ (newFunctionObject['line'] === false)
+ ) {
+ newFunctionObject['line'] = true;
+ }
+
+ if (newFunctionObject['line'] === true) {
+ if (typeof fillArea === 'string') {
+ if (fillArea.toLowerCase() === 'true') {
+ newFunctionObject['fillArea'] = true;
+ } else if (fillArea.toLowerCase() === 'false') {
+ newFunctionObject['fillArea'] = false;
+ } else {
+ logme('ERROR: The attribute fill_area should be either "true" or "false".');
+ logme('fill_area = "' + fillArea + '".');
+
+ return;
+ }
+ }
+ }
+
+ if (typeof label === 'string') {
+
+ newFunctionObject.specialLabel = false;
+ newFunctionObject.pldeHash = [];
+
+ // Let's check the label against all of the plde objects.
+ // plde is an abbreviation for Plot Label Dynamic Elements.
+ for (c1 = 0; c1 < state.plde.length; c1 += 1) {
+ rgxp = new RegExp(state.plde[c1].elId, 'g');
+
+ // If we find a dynamic element in the label, we will
+ // hash the current plde object, and indicate that this
+ // is a special label.
+ if (rgxp.test(label) === true) {
+ newFunctionObject.specialLabel = true;
+ newFunctionObject.pldeHash.push(state.plde[c1]);
+ }
+ }
+
+ newFunctionObject.label = label;
+ } else {
+ newFunctionObject.label = false;
+ }
+
+ functions.push(newFunctionObject);
+ }
+ }
+
+ // The callback that will be called whenever a constant changes (gets
+ // updated via a slider or a text input).
+ function onUpdatePlot(event) {
+ if (generateData() === true) {
+ updatePlot();
+ }
+ }
+
+ function generateData() {
+ var c0, c1, c3, functionObj, seriesObj, dataPoints, paramValues, x, y,
+ start, end, step, numNotUndefined;
+
+ paramValues = state.getAllParameterValues();
+
+ dataSeries = [];
+
+ for (c0 = 0; c0 < functions.length; c0 += 1) {
+ functionObj = functions[c0];
+
+ try {
+ start = xrange.min.apply(window, paramValues);
+ } catch (err) {
+ logme('ERROR: Could not determine xrange start.');
+ logme('Error message: "' + err.message + '".');
+
+ $('#' + gstId).html('
' + 'ERROR IN XML: Could not determine xrange start from defined function.' + '
' + 'ERROR IN XML: Could not determine xrange end from defined function.' + '
');
+ $('#' + gstId).append('
' + 'Error message: "' + err.message + '".' + '
');
+
+ return false;
+ }
+
+ seriesObj = {};
+ dataPoints = [];
+
+ // For counting number of points added. In the end we will
+ // compare this number to 'numPoints' specified in the config
+ // JSON.
+ c1 = 0;
+
+ step = (end - start) / (numPoints - 1);
+
+ // Generate the data points.
+ for (x = start; x <= end; x += step) {
+
+ // Push the 'x' variable to the end of the parameter array.
+ paramValues.push(x);
+
+ // We call the user defined function, passing all of the
+ // available parameter values. Inside this function they
+ // will be accessible by their names.
+ try {
+ y = functionObj.func.apply(window, paramValues);
+ } catch (err) {
+ logme('ERROR: Could not generate data.');
+ logme('Error message: "' + err.message + '".');
+
+ $('#' + gstId).html('
' + 'ERROR IN XML: Could not generate data from defined function.' + '
');
+ $('#' + gstId).append('
' + 'Error message: "' + err.message + '".' + '
');
+
+ return false;
+ }
+
+ // Return the paramValues array to how it was before we
+ // added 'x' variable to the end of it.
+ paramValues.pop();
+
+ // Add the generated point to the data points set.
+ dataPoints.push([x, y]);
+
+ c1 += 1;
+
+ }
+
+ // If the last point did not get included because of rounding
+ // of floating-point number addition, then we will include it
+ // manually.
+ if (c1 != numPoints) {
+ x = end;
+ paramValues.push(x);
+ try {
+ y = functionObj.func.apply(window, paramValues);
+ } catch (err) {
+ logme('ERROR: Could not generate data.');
+ logme('Error message: "' + err.message + '".');
+
+ $('#' + gstId).html('
' + 'ERROR IN XML: Could not generate data from function.' + '
');
+ $('#' + gstId).append('
' + 'Error message: "' + err.message + '".' + '
');
+
+ return false;
+ }
+ paramValues.pop();
+ dataPoints.push([x, y]);
+ }
+
+ // Put the entire data points set into the series object.
+ seriesObj.data = dataPoints;
+
+ // See if user defined a specific color for this function.
+ if (functionObj.hasOwnProperty('color') === true) {
+ seriesObj.color = functionObj.color;
+ }
+
+ // See if a user defined a label for this function.
+ if (functionObj.label !== false) {
+ if (functionObj.specialLabel === true) {
+ (function (c1) {
+ var tempLabel;
+
+ tempLabel = functionObj.label;
+
+ while (c1 < functionObj.pldeHash.length) {
+ tempLabel = tempLabel.replace(
+ functionObj.pldeHash[c1].elId,
+ functionObj.pldeHash[c1].func.apply(
+ window,
+ state.getAllParameterValues()
+ )
+ );
+
+ c1 += 1;
+ }
+
+ seriesObj.label = tempLabel;
+ }(0));
+ } else {
+ seriesObj.label = functionObj.label;
+ }
+ }
+
+ // Should the data points be connected by a line?
+ seriesObj.lines = {
+ 'show': functionObj.line
+ };
+
+ if (functionObj.hasOwnProperty('fillArea') === true) {
+ seriesObj.lines.fill = functionObj.fillArea;
+ }
+
+ // Should each data point be represented by a point on the
+ // graph?
+ seriesObj.points = {
+ 'show': functionObj.dot
+ };
+
+ seriesObj.bars = {
+ 'show': functionObj.bars,
+ 'barWidth': graphBarWidth
+ };
+
+ if (graphBarAlign !== null) {
+ seriesObj.bars.align = graphBarAlign;
+ }
+
+ if (functionObj.hasOwnProperty('pointSize')) {
+ seriesObj.points.radius = functionObj.pointSize;
+ }
+
+ // Add the newly created series object to the series set which
+ // will be plotted by Flot.
+ dataSeries.push(seriesObj);
+ }
+
+ if (graphBarAlign === null) {
+ for (c0 = 0; c0 < numPoints; c0 += 1) {
+ // Number of points that have a value other than 'undefined' (undefined).
+ numNotUndefined = 0;
+
+ for (c1 = 0; c1 < dataSeries.length; c1 += 1) {
+ if (dataSeries[c1].bars.show === false) {
+ continue;
+ }
+
+ if (isFinite(parseInt(dataSeries[c1].data[c0][1])) === true) {
+ numNotUndefined += 1;
+ }
+ }
+
+ c3 = 0;
+ for (c1 = 0; c1 < dataSeries.length; c1 += 1) {
+ if (dataSeries[c1].bars.show === false) {
+ continue;
+ }
+
+ dataSeries[c1].data[c0][0] -= graphBarWidth * (0.5 * numNotUndefined - c3);
+
+ if (isFinite(parseInt(dataSeries[c1].data[c0][1])) === true) {
+ c3 += 1;
+ }
+ }
+ }
+ }
+
+ for (c0 = 0; c0 < asymptotes.length; c0 += 1) {
+
+ // If the user defined a label for this asympote, then the
+ // property 'label' will be a string (in the other case it is
+ // a boolean value 'false'). We will create an empty data set,
+ // and add to it a label. This solution is a bit _wrong_ , but
+ // it will have to do for now. Flot JS does not provide a way
+ // to add labels to markings, and we use markings to generate
+ // asymptotes.
+ if (asymptotes[c0].label !== false) {
+ dataSeries.push({
+ 'data': [],
+ 'label': asymptotes[c0].label,
+ 'color': asymptotes[c0].color
+ });
+ }
+
+ }
+
+ return true;
+ } // End-of: function generateData
+
+ function updatePlot() {
+ var paramValues, plotObj;
+
+ paramValues = state.getAllParameterValues();
+
+ if (xaxis.tickFormatter !== null) {
+ xaxis.ticks = null;
+ }
+
+ if (yaxis.tickFormatter !== null) {
+ yaxis.ticks = null;
+ }
+
+ // Tell Flot to draw the graph to our specification.
+ plotObj = $.plot(
+ plotDiv,
+ dataSeries,
+ {
+ 'xaxis': xaxis,
+ 'yaxis': yaxis,
+ 'legend': {
+
+ // To show the legend or not. Note, even if 'show' is
+ // 'true', the legend will only show if labels are
+ // provided for at least one of the series that are
+ // going to be plotted.
+ 'show': true,
+
+ // A floating point number in the range [0, 1]. The
+ // smaller the number, the more transparent will the
+ // legend background become.
+ 'backgroundOpacity': 0
+
+ },
+ 'grid': {
+ 'markings': generateMarkings()
+ }
+ }
+ );
+
+ updateMovingLabels();
+
+ // The first time that the graph gets added to the page, the legend
+ // is created from scratch. When it appears, MathJax works some
+ // magic, and all of the specially marked TeX gets rendered nicely.
+ // The next time when we update the graph, no such thing happens.
+ // We must ask MathJax to typeset the legend again (well, we will
+ // ask it to look at our entire graph DIV), the next time it's
+ // worker queue is available.
+ MathJax.Hub.Queue([
+ 'Typeset',
+ MathJax.Hub,
+ plotDiv.attr('id')
+ ]);
+
+ return;
+
+ function updateMovingLabels() {
+ var c1, labelCoord, pointOffset;
+
+ for (c1 = 0; c1 < movingLabels.length; c1 += 1) {
+ if (movingLabels[c1].el === null) {
+ movingLabels[c1].el = $(
+ '
' +
+ movingLabels[c1].labelText +
+ '
'
+ );
+ movingLabels[c1].el.css('position', 'absolute');
+ movingLabels[c1].el.css('color', movingLabels[c1].fontColor);
+ movingLabels[c1].el.css('font-weight', movingLabels[c1].fontWeight);
+ movingLabels[c1].el.appendTo(plotDiv);
+
+ movingLabels[c1].elWidth = movingLabels[c1].el.width();
+ movingLabels[c1].elHeight = movingLabels[c1].el.height();
+ } else {
+ movingLabels[c1].el.detach();
+ movingLabels[c1].el.appendTo(plotDiv);
+ }
+
+ labelCoord = movingLabels[c1].func.apply(window, paramValues);
+
+ pointOffset = plotObj.pointOffset({'x': labelCoord.x, 'y': labelCoord.y});
+
+ movingLabels[c1].el.css('left', pointOffset.left - 0.5 * movingLabels[c1].elWidth);
+ movingLabels[c1].el.css('top', pointOffset.top - 0.5 * movingLabels[c1].elHeight);
+ }
+ }
+
+ // Generate markings to represent asymptotes defined by the user.
+ // See the following function for more details:
+ //
+ // function processAsymptote()
+ //
+ function generateMarkings() {
+ var c1, asymptote, markings, val;
+
+ markings = [];
+
+ for (c1 = 0; c1 < asymptotes.length; c1 += 1) {
+ asymptote = asymptotes[c1];
+
+ try {
+ val = asymptote.func.apply(window, paramValues);
+ } catch (err) {
+ logme('ERROR: Could not generate value from asymptote function.');
+ logme('Error message: ', err.message);
+
+ continue;
+ }
+
+ if (asymptote.type === 'x') {
+ markings.push({
+ 'color': asymptote.color,
+ 'lineWidth': 2,
+ 'xaxis': {
+ 'from': val,
+ 'to': val
+ }
+ });
+ } else {
+ markings.push({
+ 'color': asymptote.color,
+ 'lineWidth': 2,
+ 'yaxis': {
+ 'from': val,
+ 'to': val
+ }
+ });
+
+ }
+ }
+
+ return markings;
+ }
+ }
+
+ function xAxisTickFormatter(val, axis) {
+ if (xTicksNames.hasOwnProperty(val.toFixed(axis.tickDecimals)) === true) {
+ return xTicksNames[val.toFixed(axis.tickDecimals)];
+ }
+
+ return '';
+ }
+
+ function yAxisTickFormatter(val, axis) {
+ if (yTicksNames.hasOwnProperty(val.toFixed(axis.tickDecimals)) === true) {
+ return yTicksNames[val.toFixed(axis.tickDecimals)];
+ }
+
+ return '';
+ }
+ }
+
+
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js
new file mode 100644
index 0000000000..1434d05f70
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js
@@ -0,0 +1,20 @@
+/*
+ * We will add a function that will be called for all GraphicalSliderTool
+ * xmodule module instances. It must be available globally by design of
+ * xmodule.
+ */
+window.GraphicalSliderTool = function (el) {
+ // All the work will be performed by the GstMain module. We will get access
+ // to it, and all it's dependencies, via Require JS. Currently Require JS
+ // is namespaced and is available via a global object RequireJS.
+ RequireJS.require(['GstMain'], function (GstMain) {
+ // The GstMain module expects the DOM ID of a Graphical Slider Tool
+ // element. Since we are given a element which might in
+ // theory contain multiple graphical_slider_tool
elements (each
+ // with a unique DOM ID), we will iterate over all children, and for
+ // each match, we will call GstMain module.
+ $(el).children('.graphical_slider_tool').each(function (index, value) {
+ GstMain($(value).attr('id'));
+ });
+ });
+};
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
new file mode 100644
index 0000000000..34b54b4216
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
@@ -0,0 +1,84 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define(
+ 'GstMain',
+
+ // Even though it is not explicitly in this module, we have to specify
+ // 'GeneralMethods' as a dependency. It expands some of the core JS objects
+ // with additional useful methods that are used in other modules.
+ ['State', 'GeneralMethods', 'Sliders', 'Inputs', 'Graph', 'ElOutput', 'GLabelElOutput', 'logme'],
+ function (State, GeneralMethods, Sliders, Inputs, Graph, ElOutput, GLabelElOutput, logme) {
+
+ return GstMain;
+
+ function GstMain(gstId) {
+ var config, gstClass, state;
+
+ if ($('#' + gstId).attr('data-processed') !== 'processed') {
+ $('#' + gstId).attr('data-processed', 'processed');
+ } else {
+ logme('MESSAGE: Already processed GST with ID ' + gstId + '. Skipping.');
+
+ return;
+ }
+
+ // Get the JSON configuration, parse it, and store as an object.
+ try {
+ config = JSON.parse($('#' + gstId + '_json').html()).root;
+ } catch (err) {
+ logme('ERROR: could not parse config JSON.');
+ logme('$("#" + gstId + "_json").html() = ', $('#' + gstId + '_json').html());
+ logme('JSON.parse(...) = ', JSON.parse($('#' + gstId + '_json').html()));
+ logme('config = ', config);
+
+ return;
+ }
+
+ // Get the class name of the GST. All elements are assigned a class
+ // name that is based on the class name of the GST. For example, inputs
+ // are assigned a class name '{GST class name}_input'.
+ if (typeof config['@class'] !== 'string') {
+ logme('ERROR: Could not get the class name of GST.');
+ logme('config["@class"] = ', config['@class']);
+
+ return;
+ }
+ gstClass = config['@class'];
+
+ // Parse the configuration settings for parameters, and store them in a
+ // state object.
+ state = State(gstId, config);
+
+ // It is possible that something goes wrong while extracting parameters
+ // from the JSON config object. In this case, we will not continue.
+ if (state === undefined) {
+ logme('ERROR: The state object was not initialized properly.');
+
+ return;
+ }
+
+ // Create the sliders and the text inputs, attaching them to
+ // appropriate parameters.
+ Sliders(gstId, state);
+ Inputs(gstId, gstClass, state);
+
+ // Configure functions that output to an element instead of the graph.
+ ElOutput(config, state);
+
+ // Configure functions that output to an element instead of the graph
+ // label.
+ GLabelElOutput(config, state);
+
+ // Configure and display the graph. Attach event for the graph to be
+ // updated on any change of a slider or a text input.
+ Graph(gstId, config, state);
+ }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
new file mode 100644
index 0000000000..a04ed113ec
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
@@ -0,0 +1,88 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('Inputs', ['logme'], function (logme) {
+ return Inputs;
+
+ function Inputs(gstId, gstClass, state) {
+ var c1, paramName, allParamNames;
+
+ allParamNames = state.getAllParameterNames();
+
+ for (c1 = 0; c1 < allParamNames.length; c1 += 1) {
+ $('#' + gstId).find('.' + gstClass + '_input').each(function (index, value) {
+ var inputDiv, paramName;
+
+ paramName = allParamNames[c1];
+ inputDiv = $(value);
+
+ if (paramName === inputDiv.data('var')) {
+ createInput(inputDiv, paramName);
+ }
+ });
+ }
+
+ return;
+
+ function createInput(inputDiv, paramName) {
+ var paramObj;
+
+ paramObj = state.getParamObj(paramName);
+
+ // Check that the retrieval went OK.
+ if (paramObj === undefined) {
+ logme('ERROR: Could not get a paramObj for parameter "' + paramName + '".');
+
+ return;
+ }
+
+ // Bind a function to the 'change' event. Whenever the user changes
+ // the value of this text input, and presses 'enter' (or clicks
+ // somewhere else on the page), this event will be triggered, and
+ // our callback will be called.
+ inputDiv.bind('change', inputOnChange);
+
+ inputDiv.val(paramObj.value);
+
+ // Lets style the input element nicely. We will use the button()
+ // widget for this since there is no native widget for the text
+ // input.
+ inputDiv.button().css({
+ 'font': 'inherit',
+ 'color': 'inherit',
+ 'text-align': 'left',
+ 'outline': 'none',
+ 'cursor': 'text',
+ 'height': '15px'
+ });
+
+ // Tell the parameter object from state that we are attaching a
+ // text input to it. Next time the parameter will be updated with
+ // a new value, tis input will also be updated.
+ paramObj.inputDivs.push(inputDiv);
+
+ return;
+
+ // Update the 'state' - i.e. set the value of the parameter this
+ // input is attached to to a new value.
+ //
+ // This will cause the plot to be redrawn each time after the user
+ // changes the value in the input. Note that he has to either press
+ // 'Enter', or click somewhere else on the page in order for the
+ // 'change' event to be tiggered.
+ function inputOnChange(event) {
+ var inputDiv;
+
+ inputDiv = $(this);
+ state.setParameterValue(paramName, inputDiv.val(), inputDiv);
+ }
+ }
+ }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/jstat-1.0.0.min.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/jstat-1.0.0.min.js
new file mode 100644
index 0000000000..7f9cd4a124
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/jstat-1.0.0.min.js
@@ -0,0 +1,236 @@
+function jstat(){}
+j=jstat;(function(){var initializing=false,fnTest=/xyz/.test(function(){xyz;})?/\b_super\b/:/.*/;this.Class=function(){};Class.extend=function(prop){var _super=this.prototype;initializing=true;var prototype=new this();initializing=false;for(var name in prop){prototype[name]=typeof prop[name]=="function"&&typeof _super[name]=="function"&&fnTest.test(prop[name])?(function(name,fn){return function(){var tmp=this._super;this._super=_super[name];var ret=fn.apply(this,arguments);this._super=tmp;return ret;};})(name,prop[name]):prop[name];}
+function Class(){if(!initializing&&this.init)
+this.init.apply(this,arguments);}
+Class.prototype=prototype;Class.constructor=Class;Class.extend=arguments.callee;return Class;};})();jstat.ONE_SQRT_2PI=0.3989422804014327;jstat.LN_SQRT_2PI=0.9189385332046727417803297;jstat.LN_SQRT_PId2=0.225791352644727432363097614947;jstat.DBL_MIN=2.22507e-308;jstat.DBL_EPSILON=2.220446049250313e-16;jstat.SQRT_32=5.656854249492380195206754896838;jstat.TWO_PI=6.283185307179586;jstat.DBL_MIN_EXP=-999;jstat.SQRT_2dPI=0.79788456080287;jstat.LN_SQRT_PI=0.5723649429247;jstat.seq=function(min,max,length){var r=new Range(min,max,length);return r.getPoints();}
+jstat.dnorm=function(x,mean,sd,log){if(mean==null)mean=0;if(sd==null)sd=1;if(log==null)log=false;var n=new NormalDistribution(mean,sd);if(!isNaN(x)){return n._pdf(x,log);}else if(x.length){var res=[];for(var i=0;i
').css({position:'absolute',display:'none',top:y+15,'font-size':'small',left:x+5,border:'1px solid '+color[1],color:color[2],padding:'5px','background-color':color[0],opacity:0.80}).appendTo("body").show();}
+var previousPoint=null;$(this._container).bind("plothover",function(event,pos,item){$("#x").text(pos.x.toFixed(2));$("#y").text(pos.y.toFixed(2));if(item){if(previousPoint!=item.datapoint){previousPoint=item.datapoint;$("#jstat_tooltip").remove();var x=jstat.toSigFig(item.datapoint[0],2),y=jstat.toSigFig(item.datapoint[1],2);var text=null;var color=item.series.color;if(item.series.label=='PDF'){text="P("+x+") = "+y;color=["#fee","#fdd","#C05F5F"];}else{text="F("+x+") = "+y;color=["#eef","#ddf","#4A4AC0"];}
+showTooltip(item.pageX,item.pageY,text,color);}}
+else{$("#jstat_tooltip").remove();previousPoint=null;}});$(this._container).bind("mouseleave",function(){if($('#jstat_tooltip').is(':visible')){$('#jstat_tooltip').remove();previousPoint=null;}});}else{if(this._options.grid==null){this._options.grid={hoverable:false}}else{this._options.grid.hoverable=false}
+$(this._container).unbind("plothover");}
+this.render();},setType:function(type){this._plotType=type;var lines={};var points={};if(this._plotType=='line'){lines.show=true;points.show=false;}else if(this._plotType=='points'){lines.show=false;points.show=true;}else if(this._plotType=='both'){lines.show=true;points.show=true;}
+if(this._options.series==null){this._options.series={lines:lines,points:points}}else{if(this._options.series.lines==null){this._options.series.lines=lines;}else{this._options.series.lines.show=lines.show;}
+if(this._options.series.points==null){this._options.series.points=points;}else{this._options.series.points.show=points.show;}}
+this.render();},setFill:function(bool){this._fill=bool;if(this._options.series==null){this._options.series={lines:{fill:bool}}}else{if(this._options.series.lines==null){this._options.series.lines={fill:bool}}else{this._options.series.lines.fill=bool;}}
+this.render();},clear:function(){this._super();this._distribution=null;this._pdfValues=[];this._cdfValues=[];this.render();},_generateValues:function(){this._cdfValues=[];this._pdfValues=[];var xs=this._range.getPoints();this._options.xaxis={min:xs[0],max:xs[xs.length-1]}
+var pdfs=this._distribution.density(this._range);var cdfs=this._distribution.cumulativeDensity(this._range);for(var i=0;i 1) {
+ logme('ERROR: Found more than one slider for the parameter "' + paramName + '".');
+ logme('sliderDiv.length = ', sliderDiv.length);
+ } else {
+ logme('MESSAGE: Did not find a slider for the parameter "' + paramName + '".');
+ }
+ }
+
+ function createSlider(sliderDiv, paramName) {
+ var paramObj;
+
+ paramObj = state.getParamObj(paramName);
+
+ // Check that the retrieval went OK.
+ if (paramObj === undefined) {
+ logme('ERROR: Could not get a paramObj for parameter "' + paramName + '".');
+
+ return;
+ }
+
+ // Create a jQuery UI slider from the slider DIV. We will set
+ // starting parameters, and will also attach a handler to update
+ // the 'state' on the 'slide' event.
+ sliderDiv.slider({
+ 'min': paramObj.min,
+ 'max': paramObj.max,
+ 'value': paramObj.value,
+ 'step': paramObj.step
+ });
+
+ // Tell the parameter object stored in state that we have a slider
+ // that is attached to it. Next time when the parameter changes, it
+ // will also update the value of this slider.
+ paramObj.sliderDiv = sliderDiv;
+
+ // Atach callbacks to update the slider's parameter.
+ paramObj.sliderDiv.on('slide', sliderOnSlide);
+ paramObj.sliderDiv.on('slidechange', sliderOnChange);
+
+ return;
+
+ // Update the 'state' - i.e. set the value of the parameter this
+ // slider is attached to to a new value.
+ //
+ // This will cause the plot to be redrawn each time after the user
+ // drags the slider handle and releases it.
+ function sliderOnSlide(event, ui) {
+ // Last parameter passed to setParameterValue() will be 'true'
+ // so that the function knows we are a slider, and it can
+ // change the our value back in the case when the new value is
+ // invalid for some reason.
+ if (state.setParameterValue(paramName, ui.value, sliderDiv, true, 'slide') === undefined) {
+ logme('ERROR: Could not update the parameter named "' + paramName + '" with the value "' + ui.value + '".');
+ }
+ }
+
+ function sliderOnChange(event, ui) {
+ if (state.setParameterValue(paramName, ui.value, sliderDiv, true, 'change') === undefined) {
+ logme('ERROR: Could not update the parameter named "' + paramName + '" with the value "' + ui.value + '".');
+ }
+ }
+ }
+ }
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
new file mode 100644
index 0000000000..8b534fd19d
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
@@ -0,0 +1,395 @@
+// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
+// define() functions from Require JS available inside the anonymous function.
+(function (requirejs, require, define) {
+
+define('State', ['logme'], function (logme) {
+ var stateInst;
+
+ // Since there will be (can be) multiple GST on a page, and each will have
+ // a separate state, we will create a factory constructor function. The
+ // constructor will expect the ID of the DIV with the GST contents, and the
+ // configuration object (parsed from a JSON string). It will return an
+ // object containing methods to set and get the private state properties.
+
+ stateInst = 0;
+
+ // This module defines and returns a factory constructor.
+ return State;
+
+ function State(gstId, config) {
+ var parameters, allParameterNames, allParameterValues,
+ plotDiv, dynamicEl, dynamicElByElId;
+
+ dynamicEl = [];
+ dynamicElByElId = {};
+
+ stateInst += 1;
+ logme('MESSAGE: Creating state instance # ' + stateInst + '.');
+
+ // Initially, there are no parameters to track. So, we will instantiate
+ // an empty object.
+ //
+ // As we parse the JSON config object, we will add parameters as
+ // named properties. For example
+ //
+ // parameters.a = {...};
+ //
+ // will be created for the parameter 'a'.
+ parameters = {};
+
+ // Check that the required parameters config object is available.
+ if ($.isPlainObject(config.parameters) === false) {
+ logme('ERROR: Expected config.parameters to be an object. It is not.');
+ logme('config.parameters = ', config.parameters);
+
+ return;
+ }
+
+ // If config.parameters.param is an array, pass it to the processor
+ // element by element.
+ if ($.isArray(config.parameters.param) === true) {
+ (function (c1) {
+ while (c1 < config.parameters.param.length) {
+ processParameter(config.parameters.param[c1]);
+ c1 += 1;
+ }
+ }(0));
+ }
+
+ // If config.parameters.param is an object, pass this object to the
+ // processor directly.
+ else if ($.isPlainObject(config.parameters.param) === true) {
+ processParameter(config.parameters.param);
+ }
+
+ // If config.parameters.param is some other type, report an error and
+ // do not continue.
+ else {
+ logme('ERROR: config.parameters.param is of an unsupported type.');
+ logme('config.parameters.param = ', config.parameters.param);
+
+ return;
+ }
+
+ // Instead of building these arrays every time when some component
+ // requests them, we will create them in the beginning, and then update
+ // each element individually when some parameter's value changes.
+ //
+ // Then we can just return the required array, instead of iterating
+ // over all of the properties of the 'parameters' object, and
+ // extracting their names/values one by one.
+ allParameterNames = [];
+ allParameterValues = [];
+
+ // Populate 'allParameterNames', and 'allParameterValues' with data.
+ generateHelperArrays();
+
+ // The constructor will return an object with methods to operate on
+ // it's private properties.
+ return {
+ 'getParameterValue': getParameterValue,
+ 'setParameterValue': setParameterValue,
+
+ 'getParamObj': getParamObj,
+
+ 'getAllParameterNames': getAllParameterNames,
+ 'getAllParameterValues': getAllParameterValues,
+
+ 'bindUpdatePlotEvent': bindUpdatePlotEvent,
+ 'addDynamicEl': addDynamicEl,
+
+ // plde is an abbreviation for Plot Label Dynamic Elements.
+ plde: []
+ };
+
+ function getAllParameterNames() {
+ return allParameterNames;
+ }
+
+ function getAllParameterValues() {
+ return allParameterValues;
+ }
+
+ function getParamObj(paramName) {
+ if (parameters.hasOwnProperty(paramName) === false) {
+ logme('ERROR: Object parameters does not have a property named "' + paramName + '".');
+
+ return;
+ }
+
+ return parameters[paramName];
+ }
+
+ function bindUpdatePlotEvent(newPlotDiv, callback) {
+ plotDiv = newPlotDiv;
+
+ plotDiv.bind('update_plot', callback);
+ }
+
+ function addDynamicEl(el, func, elId, updateOnEvent) {
+ var newLength;
+
+ newLength = dynamicEl.push({
+ 'el': el,
+ 'func': func,
+ 'elId': elId,
+ 'updateOnEvent': updateOnEvent
+ });
+
+ if (typeof dynamicElByElId[elId] !== 'undefined') {
+ logme(
+ 'ERROR: Duplicate dynamic element ID "' + elId + '" found.'
+ );
+ } else {
+ dynamicElByElId[elId] = dynamicEl[newLength - 1];
+ }
+ }
+
+ function getParameterValue(paramName) {
+
+ // If the name of the constant is not tracked by state, return an
+ // 'undefined' value.
+ if (parameters.hasOwnProperty(paramName) === false) {
+ logme('ERROR: Object parameters does not have a property named "' + paramName + '".');
+
+ return;
+ }
+
+ return parameters[paramname].value;
+ }
+
+ // ####################################################################
+ //
+ // Function: setParameterValue(paramName, paramValue, element)
+ // --------------------------------------------------
+ //
+ //
+ // This function can be called from a callback, registered by a slider
+ // or a text input, when specific events ('slide' or 'change') are
+ // triggered.
+ //
+ // The 'paramName' is the name of the parameter in 'parameters' object
+ // whose value must be updated to the new value of 'paramValue'.
+ //
+ // Before we update the value, we must check that:
+ //
+ // 1.) the parameter named as 'paramName' actually exists in the
+ // 'parameters' object;
+ // 2.) the value 'paramValue' is a valid floating-point number, and
+ // it lies within the range specified by the 'min' and 'max'
+ // properties of the stored parameter object.
+ //
+ // If 'paramName' and 'paramValue' turn out to be valid, we will update
+ // the stored value in the parameter with the new value, and also
+ // update all of the text inputs and the slider that correspond to this
+ // parameter (if any), so that they reflect the new parameter's value.
+ // Finally, the helper array 'allParameterValues' will also be updated
+ // to reflect the change.
+ //
+ // If something went wrong (for example the new value is outside the
+ // allowed range), then we will reset the 'element' to display the
+ // original value.
+ //
+ // ####################################################################
+ function setParameterValue(paramName, paramValue, element, slider, updateOnEvent) {
+ var paramValueNum, c1;
+
+ // If a parameter with the name specified by the 'paramName'
+ // parameter is not tracked by state, do not do anything.
+ if (parameters.hasOwnProperty(paramName) === false) {
+ logme('ERROR: Object parameters does not have a property named "' + paramName + '".');
+
+ return;
+ }
+
+ // Try to convert the passed value to a valid floating-point
+ // number.
+ paramValueNum = parseFloat(paramValue);
+
+ // We are interested only in valid float values. NaN, -INF,
+ // +INF we will disregard.
+ if (isFinite(paramValueNum) === false) {
+ logme('ERROR: New parameter value is not a floating-point number.');
+ logme('paramValue = ', paramValue);
+
+ return;
+ }
+
+ if (paramValueNum < parameters[paramName].min) {
+ paramValueNum = parameters[paramName].min;
+ } else if (paramValueNum > parameters[paramName].max) {
+ paramValueNum = parameters[paramName].max;
+ }
+
+ parameters[paramName].value = paramValueNum;
+
+ // Update all text inputs with the new parameter's value.
+ for (c1 = 0; c1 < parameters[paramName].inputDivs.length; c1 += 1) {
+ parameters[paramName].inputDivs[c1].val(paramValueNum);
+ }
+
+ // Update the single slider with the new parameter's value.
+ if ((slider === false) && (parameters[paramName].sliderDiv !== null)) {
+ parameters[paramName].sliderDiv.slider('value', paramValueNum);
+ }
+
+ // Update the helper array with the new parameter's value.
+ allParameterValues[parameters[paramName].helperArrayIndex] = paramValueNum;
+
+ for (c1 = 0; c1 < dynamicEl.length; c1++) {
+ if (
+ ((updateOnEvent !== undefined) && (dynamicEl[c1].updateOnEvent === updateOnEvent)) ||
+ (updateOnEvent === undefined)
+ ) {
+ // If we have a DOM element, call the function "paste" the answer into the DIV.
+ if (dynamicEl[c1].el !== null) {
+ dynamicEl[c1].el.html(dynamicEl[c1].func.apply(window, allParameterValues));
+ }
+ // If we DO NOT have an element, simply call the function. The function can then
+ // manipulate all the DOM elements it wants, without the fear of them being overwritten
+ // by us afterwards.
+ else {
+ dynamicEl[c1].func.apply(window, allParameterValues);
+ }
+ }
+ }
+
+ // If we have a plot DIV to work with, tell to update.
+ if (plotDiv !== undefined) {
+ plotDiv.trigger('update_plot');
+ }
+
+ return true;
+ } // End-of: function setParameterValue
+
+ // ####################################################################
+ //
+ // Function: processParameter(obj)
+ // -------------------------------
+ //
+ //
+ // This function will be run once for each instance of a GST when
+ // parsing the JSON config object.
+ //
+ // 'newParamObj' must be empty from the start for each invocation of
+ // this function, that's why we will declare it locally.
+ //
+ // We will parse the passed object 'obj' and populate the 'newParamObj'
+ // object with required properties.
+ //
+ // Since there will be many properties that are of type floating-point
+ // number, we will have a separate function for parsing them.
+ //
+ // processParameter() will fail right away if 'obj' does not have a
+ // '@var' property which represents the name of the parameter we want
+ // to process.
+ //
+ // If, after all of the properties have been processed, we reached the
+ // end of the function successfully, the 'newParamObj' will be added to
+ // the 'parameters' object (that is defined in the scope of State()
+ // function) as a property named as the name of the parameter.
+ //
+ // If at least one of the properties from 'obj' does not get correctly
+ // parsed, then the parameter represented by 'obj' will be disregarded.
+ // It will not be available to user-defined plotting functions, and
+ // things will most likely break. We will notify the user about this.
+ //
+ // ####################################################################
+ function processParameter(obj) {
+ var paramName, newParamObj;
+
+ if (typeof obj['@var'] !== 'string') {
+ logme('ERROR: Expected obj["@var"] to be a string. It is not.');
+ logme('obj["@var"] = ', obj['@var']);
+
+ return;
+ }
+
+ paramName = obj['@var'];
+ newParamObj = {};
+
+ if (
+ (processFloat('@min', 'min') === false) ||
+ (processFloat('@max', 'max') === false) ||
+ (processFloat('@step', 'step') === false) ||
+ (processFloat('@initial', 'value') === false)
+ ) {
+ logme('ERROR: A required property is missing. Not creating parameter "' + paramName + '"');
+
+ return;
+ }
+
+ // Pointers to text input and slider DIV elements that this
+ // parameter will be attached to. Initially there are none. When we
+ // will create text inputs and sliders, we will update these
+ // properties.
+ newParamObj.inputDivs = [];
+ newParamObj.sliderDiv = null;
+
+ // Everything went well, so save the new parameter object.
+ parameters[paramName] = newParamObj;
+
+ return;
+
+ function processFloat(attrName, newAttrName) {
+ var attrValue;
+
+ if (typeof obj[attrName] !== 'string') {
+ logme('ERROR: Expected obj["' + attrName + '"] to be a string. It is not.');
+ logme('obj["' + attrName + '"] = ', obj[attrName]);
+
+ return false;
+ } else {
+ attrValue = parseFloat(obj[attrName]);
+
+ if (isFinite(attrValue) === false) {
+ logme('ERROR: Expected obj["' + attrName + '"] to be a valid floating-point number. It is not.');
+ logme('obj["' + attrName + '"] = ', obj[attrName]);
+
+ return false;
+ }
+ }
+
+ newParamObj[newAttrName] = attrValue;
+
+ return true;
+ } // End-of: function processFloat
+ } // End-of: function processParameter
+
+ // ####################################################################
+ //
+ // Function: generateHelperArrays()
+ // -------------------------------
+ //
+ //
+ // Populate 'allParameterNames' and 'allParameterValues' with data.
+ // Link each parameter object with the corresponding helper array via
+ // an index 'helperArrayIndex'. It will be the same for both of the
+ // arrays.
+ //
+ // NOTE: It is important to remember to update these helper arrays
+ // whenever a new parameter is added (or one is removed), or when a
+ // parameter's value changes.
+ //
+ // ####################################################################
+ function generateHelperArrays() {
+ var paramName, c1;
+
+ c1 = 0;
+ for (paramName in parameters) {
+ allParameterNames.push(paramName);
+ allParameterValues.push(parameters[paramName].value);
+
+ parameters[paramName].helperArrayIndex = c1;
+
+ c1 += 1;
+ }
+ }
+ } // End-of: function State
+});
+
+// End of wrapper for RequireJS. As you can see, we are passing
+// namespaced Require JS variables to an anonymous function. Within
+// it, you can use the standard requirejs(), require(), and define()
+// functions as if they were in the global namespace.
+}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee b/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
deleted file mode 100644
index 5b70ab29aa..0000000000
--- a/common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
+++ /dev/null
@@ -1,133 +0,0 @@
-class @SelfAssessment
- constructor: (element) ->
- @el = $(element).find('section.self-assessment')
- @id = @el.data('id')
- @ajax_url = @el.data('ajax-url')
- @state = @el.data('state')
- @allow_reset = @el.data('allow_reset')
- # valid states: 'initial', 'assessing', 'request_hint', 'done'
-
- # Where to put the rubric once we load it
- @errors_area = @$('.error')
- @answer_area = @$('textarea.answer')
-
- @rubric_wrapper = @$('.rubric-wrapper')
- @hint_wrapper = @$('.hint-wrapper')
- @message_wrapper = @$('.message-wrapper')
- @submit_button = @$('.submit-button')
- @reset_button = @$('.reset-button')
- @reset_button.click @reset
-
- @find_assessment_elements()
- @find_hint_elements()
-
- @rebind()
-
- # locally scoped jquery.
- $: (selector) ->
- $(selector, @el)
-
- rebind: () =>
- # rebind to the appropriate function for the current state
- @submit_button.unbind('click')
- @submit_button.show()
- @reset_button.hide()
- @hint_area.attr('disabled', false)
- if @state == 'initial'
- @answer_area.attr("disabled", false)
- @submit_button.prop('value', 'Submit')
- @submit_button.click @save_answer
- else if @state == 'assessing'
- @answer_area.attr("disabled", true)
- @submit_button.prop('value', 'Submit assessment')
- @submit_button.click @save_assessment
- else if @state == 'request_hint'
- @answer_area.attr("disabled", true)
- @submit_button.prop('value', 'Submit hint')
- @submit_button.click @save_hint
- else if @state == 'done'
- @answer_area.attr("disabled", true)
- @hint_area.attr('disabled', true)
- @submit_button.hide()
- if @allow_reset
- @reset_button.show()
- else
- @reset_button.hide()
-
-
- find_assessment_elements: ->
- @assessment = @$('select.assessment')
-
- find_hint_elements: ->
- @hint_area = @$('textarea.hint')
-
- save_answer: (event) =>
- event.preventDefault()
- if @state == 'initial'
- data = {'student_answer' : @answer_area.val()}
- $.postWithPrefix "#{@ajax_url}/save_answer", data, (response) =>
- if response.success
- @rubric_wrapper.html(response.rubric_html)
- @state = 'assessing'
- @find_assessment_elements()
- @rebind()
- else
- @errors_area.html(response.error)
- else
- @errors_area.html('Problem state got out of sync. Try reloading the page.')
-
- save_assessment: (event) =>
- event.preventDefault()
- if @state == 'assessing'
- data = {'assessment' : @assessment.find(':selected').text()}
- $.postWithPrefix "#{@ajax_url}/save_assessment", data, (response) =>
- if response.success
- @state = response.state
-
- if @state == 'request_hint'
- @hint_wrapper.html(response.hint_html)
- @find_hint_elements()
- else if @state == 'done'
- @message_wrapper.html(response.message_html)
- @allow_reset = response.allow_reset
-
- @rebind()
- else
- @errors_area.html(response.error)
- else
- @errors_area.html('Problem state got out of sync. Try reloading the page.')
-
-
- save_hint: (event) =>
- event.preventDefault()
- if @state == 'request_hint'
- data = {'hint' : @hint_area.val()}
-
- $.postWithPrefix "#{@ajax_url}/save_hint", data, (response) =>
- if response.success
- @message_wrapper.html(response.message_html)
- @state = 'done'
- @allow_reset = response.allow_reset
- @rebind()
- else
- @errors_area.html(response.error)
- else
- @errors_area.html('Problem state got out of sync. Try reloading the page.')
-
-
- reset: (event) =>
- event.preventDefault()
- if @state == 'done'
- $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
- if response.success
- @answer_area.val('')
- @rubric_wrapper.html('')
- @hint_wrapper.html('')
- @message_wrapper.html('')
- @state = 'initial'
- @rebind()
- @reset_button.hide()
- else
- @errors_area.html(response.error)
- else
- @errors_area.html('Problem state got out of sync. Try reloading the page.')
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
new file mode 100644
index 0000000000..11f96c9848
--- /dev/null
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -0,0 +1,660 @@
+"""
+A Self Assessment module that allows students to write open-ended responses,
+submit, then see a rubric and rate themselves. Persists student supplied
+hints, answers, and assessment judgment (currently only correct/incorrect).
+Parses xml definition file--see below for exact format.
+"""
+
+import copy
+from fs.errors import ResourceNotFoundError
+import itertools
+import json
+import logging
+from lxml import etree
+from lxml.html import rewrite_links
+from path import path
+import os
+import sys
+import hashlib
+import capa.xqueue_interface as xqueue_interface
+
+from pkg_resources import resource_string
+
+from .capa_module import only_one, ComplexEncoder
+from .editing_module import EditingDescriptor
+from .html_checker import check_html
+from progress import Progress
+from .stringify import stringify_children
+from .xml_module import XmlDescriptor
+from xmodule.modulestore import Location
+from capa.util import *
+import openendedchild
+
+from mitxmako.shortcuts import render_to_string
+from numpy import median
+
+from datetime import datetime
+
+from combined_open_ended_rubric import CombinedOpenEndedRubric
+
+log = logging.getLogger("mitx.courseware")
+
+class OpenEndedModule(openendedchild.OpenEndedChild):
+ """
+ The open ended module supports all external open ended grader problems.
+ Sample XML file:
+
+
+ Enter essay here.
+ This is the answer.
+ {"grader_settings" : "ml_grading.conf", "problem_id" : "6.002x/Welcome/OETest"}
+
+
+ """
+
+ def setup_response(self, system, location, definition, descriptor):
+ """
+ Sets up the response type.
+ @param system: Modulesystem object
+ @param location: The location of the problem
+ @param definition: The xml definition of the problem
+ @param descriptor: The OpenEndedDescriptor associated with this
+ @return: None
+ """
+ oeparam = definition['oeparam']
+
+ self.url = definition.get('url', None)
+ self.queue_name = definition.get('queuename', self.DEFAULT_QUEUE)
+ self.message_queue_name = definition.get('message-queuename', self.DEFAULT_MESSAGE_QUEUE)
+
+ #This is needed to attach feedback to specific responses later
+ self.submission_id = None
+ self.grader_id = None
+
+ if oeparam is None:
+ raise ValueError("No oeparam found in problem xml.")
+ if self.prompt is None:
+ raise ValueError("No prompt found in problem xml.")
+ if self.rubric is None:
+ raise ValueError("No rubric found in problem xml.")
+
+ self._parse(oeparam, self.prompt, self.rubric, system)
+
+ if self.created == True and self.state == self.ASSESSING:
+ self.created = False
+ self.send_to_grader(self.latest_answer(), system)
+ self.created = False
+
+ def _parse(self, oeparam, prompt, rubric, system):
+ '''
+ Parse OpenEndedResponse XML:
+ self.initial_display
+ self.payload - dict containing keys --
+ 'grader' : path to grader settings file, 'problem_id' : id of the problem
+
+ self.answer - What to display when show answer is clicked
+ '''
+ # Note that OpenEndedResponse is agnostic to the specific contents of grader_payload
+ prompt_string = stringify_children(prompt)
+ rubric_string = stringify_children(rubric)
+ self.prompt = prompt_string
+ self.rubric = rubric_string
+
+ grader_payload = oeparam.find('grader_payload')
+ grader_payload = grader_payload.text if grader_payload is not None else ''
+
+ #Update grader payload with student id. If grader payload not json, error.
+ try:
+ parsed_grader_payload = json.loads(grader_payload)
+ # NOTE: self.system.location is valid because the capa_module
+ # __init__ adds it (easiest way to get problem location into
+ # response types)
+ except TypeError, ValueError:
+ log.exception("Grader payload %r is not a json object!", grader_payload)
+
+ self.initial_display = find_with_default(oeparam, 'initial_display', '')
+ self.answer = find_with_default(oeparam, 'answer_display', 'No answer given.')
+
+ parsed_grader_payload.update({
+ 'location': system.location.url(),
+ 'course_id': system.course_id,
+ 'prompt': prompt_string,
+ 'rubric': rubric_string,
+ 'initial_display': self.initial_display,
+ 'answer': self.answer,
+ })
+ updated_grader_payload = json.dumps(parsed_grader_payload)
+
+ self.payload = {'grader_payload': updated_grader_payload}
+
+ def skip_post_assessment(self, get, system):
+ """
+ Ajax function that allows one to skip the post assessment phase
+ @param get: AJAX dictionary
+ @param system: ModuleSystem
+ @return: Success indicator
+ """
+ self.state = self.DONE
+ return {'success': True}
+
+ def message_post(self, get, system):
+ """
+ Handles a student message post (a reaction to the grade they received from an open ended grader type)
+ Returns a boolean success/fail and an error message
+ """
+
+ event_info = dict()
+ event_info['problem_id'] = system.location.url()
+ event_info['student_id'] = system.anonymous_student_id
+ event_info['survey_responses'] = get
+
+ survey_responses = event_info['survey_responses']
+ for tag in ['feedback', 'submission_id', 'grader_id', 'score']:
+ if tag not in survey_responses:
+ return {'success': False, 'msg': "Could not find needed tag {0}".format(tag)}
+ try:
+ submission_id = int(survey_responses['submission_id'])
+ grader_id = int(survey_responses['grader_id'])
+ feedback = str(survey_responses['feedback'].encode('ascii', 'ignore'))
+ score = int(survey_responses['score'])
+ except:
+ error_message = ("Could not parse submission id, grader id, "
+ "or feedback from message_post ajax call. Here is the message data: {0}".format(
+ survey_responses))
+ log.exception(error_message)
+ return {'success': False, 'msg': "There was an error saving your feedback. Please contact course staff."}
+
+ qinterface = system.xqueue['interface']
+ qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
+ anonymous_student_id = system.anonymous_student_id
+ queuekey = xqueue_interface.make_hashkey(str(system.seed) + qtime +
+ anonymous_student_id +
+ str(len(self.history)))
+
+ xheader = xqueue_interface.make_xheader(
+ lms_callback_url=system.xqueue['callback_url'],
+ lms_key=queuekey,
+ queue_name=self.message_queue_name
+ )
+
+ student_info = {'anonymous_student_id': anonymous_student_id,
+ 'submission_time': qtime,
+ }
+ contents = {
+ 'feedback': feedback,
+ 'submission_id': submission_id,
+ 'grader_id': grader_id,
+ 'score': score,
+ 'student_info': json.dumps(student_info),
+ }
+
+ (error, msg) = qinterface.send_to_queue(header=xheader,
+ body=json.dumps(contents))
+
+ #Convert error to a success value
+ success = True
+ if error:
+ success = False
+
+ self.state = self.DONE
+
+ return {'success': success, 'msg': "Successfully submitted your feedback."}
+
+ def send_to_grader(self, submission, system):
+ """
+ Send a given submission to the grader, via the xqueue
+ @param submission: The student submission to send to the grader
+ @param system: Modulesystem
+ @return: Boolean true (not useful right now)
+ """
+
+ # Prepare xqueue request
+ #------------------------------------------------------------
+
+ qinterface = system.xqueue['interface']
+ qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
+
+ anonymous_student_id = system.anonymous_student_id
+
+ # Generate header
+ queuekey = xqueue_interface.make_hashkey(str(system.seed) + qtime +
+ anonymous_student_id +
+ str(len(self.history)))
+
+ xheader = xqueue_interface.make_xheader(lms_callback_url=system.xqueue['callback_url'],
+ lms_key=queuekey,
+ queue_name=self.queue_name)
+
+ contents = self.payload.copy()
+
+ # Metadata related to the student submission revealed to the external grader
+ student_info = {'anonymous_student_id': anonymous_student_id,
+ 'submission_time': qtime,
+ }
+
+ #Update contents with student response and student info
+ contents.update({
+ 'student_info': json.dumps(student_info),
+ 'student_response': submission,
+ 'max_score': self.max_score(),
+ })
+
+ # Submit request. When successful, 'msg' is the prior length of the queue
+ (error, msg) = qinterface.send_to_queue(header=xheader,
+ body=json.dumps(contents))
+
+ # State associated with the queueing request
+ queuestate = {'key': queuekey,
+ 'time': qtime, }
+ return True
+
+ def _update_score(self, score_msg, queuekey, system):
+ """
+ Called by xqueue to update the score
+ @param score_msg: The message from xqueue
+ @param queuekey: The key sent by xqueue
+ @param system: Modulesystem
+ @return: Boolean True (not useful currently)
+ """
+ new_score_msg = self._parse_score_msg(score_msg)
+ if not new_score_msg['valid']:
+ score_msg['feedback'] = 'Invalid grader reply. Please contact the course staff.'
+
+ self.record_latest_score(new_score_msg['score'])
+ self.record_latest_post_assessment(score_msg)
+ self.state = self.POST_ASSESSMENT
+
+ return True
+
+
+ def get_answers(self):
+ """
+ Gets and shows the answer for this problem.
+ @return: Answer html
+ """
+ anshtml = '
{0}
'.format(self.answer)
+ return {self.answer_id: anshtml}
+
+ def get_initial_display(self):
+ """
+ Gets and shows the initial display for the input box.
+ @return: Initial display html
+ """
+ return {self.answer_id: self.initial_display}
+
+ def _convert_longform_feedback_to_html(self, response_items):
+ """
+ Take in a dictionary, and return html strings for display to student.
+ Input:
+ response_items: Dictionary with keys success, feedback.
+ if success is True, feedback should be a dictionary, with keys for
+ types of feedback, and the corresponding feedback values.
+ if success is False, feedback is actually an error string.
+
+ NOTE: this will need to change when we integrate peer grading, because
+ that will have more complex feedback.
+
+ Output:
+ String -- html that can be displayincorrect-icon.pnged to the student.
+ """
+
+ # We want to display available feedback in a particular order.
+ # This dictionary specifies which goes first--lower first.
+ priorities = {# These go at the start of the feedback
+ 'spelling': 0,
+ 'grammar': 1,
+ # needs to be after all the other feedback
+ 'markup_text': 3}
+
+ default_priority = 2
+
+ def get_priority(elt):
+ """
+ Args:
+ elt: a tuple of feedback-type, feedback
+ Returns:
+ the priority for this feedback type
+ """
+ return priorities.get(elt[0], default_priority)
+
+ def encode_values(feedback_type, value):
+ feedback_type = str(feedback_type).encode('ascii', 'ignore')
+ if not isinstance(value, basestring):
+ value = str(value)
+ value = value.encode('ascii', 'ignore')
+ return feedback_type, value
+
+ def format_feedback(feedback_type, value):
+ feedback_type, value = encode_values(feedback_type, value)
+ feedback = """
+
+ {value}
+
+ """.format(feedback_type=feedback_type, value=value)
+ return feedback
+
+ def format_feedback_hidden(feedback_type, value):
+ feedback_type, value = encode_values(feedback_type, value)
+ feedback = """
+
+ """.format(feedback_type=feedback_type, value=value)
+ return feedback
+
+ # TODO (vshnayder): design and document the details of this format so
+ # that we can do proper escaping here (e.g. are the graders allowed to
+ # include HTML?)
+
+ for tag in ['success', 'feedback', 'submission_id', 'grader_id']:
+ if tag not in response_items:
+ return format_feedback('errors', 'Error getting feedback')
+
+ feedback_items = response_items['feedback']
+ try:
+ feedback = json.loads(feedback_items)
+ except (TypeError, ValueError):
+ log.exception("feedback_items have invalid json %r", feedback_items)
+ return format_feedback('errors', 'Could not parse feedback')
+
+ if response_items['success']:
+ if len(feedback) == 0:
+ return format_feedback('errors', 'No feedback available')
+
+ feedback_lst = sorted(feedback.items(), key=get_priority)
+ feedback_list_part1 = u"\n".join(format_feedback(k, v) for k, v in feedback_lst)
+ else:
+ feedback_list_part1 = format_feedback('errors', response_items['feedback'])
+
+ feedback_list_part2 = (u"\n".join([format_feedback_hidden(feedback_type, value)
+ for feedback_type, value in response_items.items()
+ if feedback_type in ['submission_id', 'grader_id']]))
+
+ return u"\n".join([feedback_list_part1, feedback_list_part2])
+
+ def _format_feedback(self, response_items):
+ """
+ Input:
+ Dictionary called feedback. Must contain keys seen below.
+ Output:
+ Return error message or feedback template
+ """
+
+ log.debug(response_items)
+ rubric_feedback=""
+ feedback = self._convert_longform_feedback_to_html(response_items)
+ if response_items['rubric_scores_complete']==True:
+ rubric_feedback = CombinedOpenEndedRubric.render_rubric(response_items['rubric_xml'])
+
+ if not response_items['success']:
+ return system.render_template("open_ended_error.html",
+ {'errors': feedback})
+
+ feedback_template = render_to_string("open_ended_feedback.html", {
+ 'grader_type': response_items['grader_type'],
+ 'score': "{0} / {1}".format(response_items['score'], self.max_score()),
+ 'feedback': feedback,
+ 'rubric_feedback' : rubric_feedback
+ })
+
+ return feedback_template
+
+
+ def _parse_score_msg(self, score_msg, join_feedback=True):
+ """
+ Grader reply is a JSON-dump of the following dict
+ { 'correct': True/False,
+ 'score': Numeric value (floating point is okay) to assign to answer
+ 'msg': grader_msg
+ 'feedback' : feedback from grader
+ }
+
+ Returns (valid_score_msg, correct, score, msg):
+ valid_score_msg: Flag indicating valid score_msg format (Boolean)
+ correct: Correctness of submission (Boolean)
+ score: Points to be assigned (numeric, can be float)
+ """
+ fail = {'valid': False, 'score': 0, 'feedback': ''}
+ try:
+ score_result = json.loads(score_msg)
+ except (TypeError, ValueError):
+ error_message = ("External grader message should be a JSON-serialized dict."
+ " Received score_msg = {0}".format(score_msg))
+ log.error(error_message)
+ fail['feedback'] = error_message
+ return fail
+
+ if not isinstance(score_result, dict):
+ error_message = ("External grader message should be a JSON-serialized dict."
+ " Received score_result = {0}".format(score_result))
+ log.error(error_message)
+ fail['feedback'] = error_message
+ return fail
+
+ for tag in ['score', 'feedback', 'grader_type', 'success', 'grader_id', 'submission_id']:
+ if tag not in score_result:
+ error_message = ("External grader message is missing required tag: {0}"
+ .format(tag))
+ log.error(error_message)
+ fail['feedback'] = error_message
+ return fail
+ #This is to support peer grading
+ if isinstance(score_result['score'], list):
+ feedback_items = []
+ for i in xrange(0, len(score_result['score'])):
+ new_score_result = {
+ 'score': score_result['score'][i],
+ 'feedback': score_result['feedback'][i],
+ 'grader_type': score_result['grader_type'],
+ 'success': score_result['success'],
+ 'grader_id': score_result['grader_id'][i],
+ 'submission_id': score_result['submission_id'],
+ 'rubric_scores_complete' : score_result['rubric_scores_complete'],
+ 'rubric_xml' : score_result['rubric_xml'],
+ }
+ feedback_items.append(self._format_feedback(new_score_result))
+ if join_feedback:
+ feedback = "".join(feedback_items)
+ else:
+ feedback = feedback_items
+ score = int(median(score_result['score']))
+ else:
+ #This is for instructor and ML grading
+ feedback = self._format_feedback(score_result)
+ score = score_result['score']
+
+ self.submission_id = score_result['submission_id']
+ self.grader_id = score_result['grader_id']
+
+ return {'valid': True, 'score': score, 'feedback': feedback}
+
+ def latest_post_assessment(self, short_feedback=False, join_feedback=True):
+ """
+ Gets the latest feedback, parses, and returns
+ @param short_feedback: If the long feedback is wanted or not
+ @return: Returns formatted feedback
+ """
+ if not self.history:
+ return ""
+
+ feedback_dict = self._parse_score_msg(self.history[-1].get('post_assessment', ""), join_feedback=join_feedback)
+ if not short_feedback:
+ return feedback_dict['feedback'] if feedback_dict['valid'] else ''
+ if feedback_dict['valid']:
+ short_feedback = self._convert_longform_feedback_to_html(
+ json.loads(self.history[-1].get('post_assessment', "")))
+ return short_feedback if feedback_dict['valid'] else ''
+
+ def format_feedback_with_evaluation(self, feedback):
+ """
+ Renders a given html feedback into an evaluation template
+ @param feedback: HTML feedback
+ @return: Rendered html
+ """
+ context = {'msg': feedback, 'id': "1", 'rows': 50, 'cols': 50}
+ html = render_to_string('open_ended_evaluation.html', context)
+ return html
+
+ def handle_ajax(self, dispatch, get, system):
+ '''
+ This is called by courseware.module_render, to handle an AJAX call.
+ "get" is request.POST.
+
+ Returns a json dictionary:
+ { 'progress_changed' : True/False,
+ 'progress' : 'none'/'in_progress'/'done',
+ }
+ '''
+ handlers = {
+ 'save_answer': self.save_answer,
+ 'score_update': self.update_score,
+ 'save_post_assessment': self.message_post,
+ 'skip_post_assessment': self.skip_post_assessment,
+ 'check_for_score': self.check_for_score,
+ }
+
+ if dispatch not in handlers:
+ return 'Error'
+
+ before = self.get_progress()
+ d = handlers[dispatch](get, system)
+ after = self.get_progress()
+ d.update({
+ 'progress_changed': after != before,
+ 'progress_status': Progress.to_js_status_str(after),
+ })
+ return json.dumps(d, cls=ComplexEncoder)
+
+ def check_for_score(self, get, system):
+ """
+ Checks to see if a score has been received yet.
+ @param get: AJAX get dictionary
+ @param system: Modulesystem (needed to align with other ajax functions)
+ @return: Returns the current state
+ """
+ state = self.state
+ return {'state': state}
+
+ def save_answer(self, get, system):
+ """
+ Saves a student answer
+ @param get: AJAX get dictionary
+ @param system: modulesystem
+ @return: Success indicator
+ """
+ if self.attempts > self.max_attempts:
+ # If too many attempts, prevent student from saving answer and
+ # seeing rubric. In normal use, students shouldn't see this because
+ # they won't see the reset button once they're out of attempts.
+ return {
+ 'success': False,
+ 'error': 'Too many attempts.'
+ }
+
+ if self.state != self.INITIAL:
+ return self.out_of_sync_error(get)
+
+ # add new history element with answer and empty score and hint.
+ self.new_history_entry(get['student_answer'])
+ self.send_to_grader(get['student_answer'], system)
+ self.change_state(self.ASSESSING)
+
+ return {'success': True, }
+
+ def update_score(self, get, system):
+ """
+ Updates the current score via ajax. Called by xqueue.
+ Input: AJAX get dictionary, modulesystem
+ Output: None
+ """
+ queuekey = get['queuekey']
+ score_msg = get['xqueue_body']
+ #TODO: Remove need for cmap
+ self._update_score(score_msg, queuekey, system)
+
+ return dict() # No AJAX return is needed
+
+ def get_html(self, system):
+ """
+ Gets the HTML for this problem and renders it
+ Input: Modulesystem object
+ Output: Rendered HTML
+ """
+ #set context variables and render template
+ if self.state != self.INITIAL:
+ latest = self.latest_answer()
+ previous_answer = latest if latest is not None else self.initial_display
+ post_assessment = self.latest_post_assessment()
+ score = self.latest_score()
+ correct = 'correct' if self.is_submission_correct(score) else 'incorrect'
+ else:
+ post_assessment = ""
+ correct = ""
+ previous_answer = self.initial_display
+
+ context = {
+ 'prompt': self.prompt,
+ 'previous_answer': previous_answer,
+ 'state': self.state,
+ 'allow_reset': self._allow_reset(),
+ 'rows': 30,
+ 'cols': 80,
+ 'id': 'open_ended',
+ 'msg': post_assessment,
+ 'child_type': 'openended',
+ 'correct': correct,
+ }
+ log.debug(context)
+ html = system.render_template('open_ended.html', context)
+ return html
+
+
+class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
+ """
+ Module for adding open ended response questions to courses
+ """
+ mako_template = "widgets/html-edit.html"
+ module_class = OpenEndedModule
+ filename_extension = "xml"
+
+ stores_state = True
+ has_score = True
+ template_dir_name = "openended"
+
+ js = {'coffee': [resource_string(__name__, 'js/src/html/edit.coffee')]}
+ js_module_name = "HTMLEditingDescriptor"
+
+ @classmethod
+ def definition_from_xml(cls, xml_object, system):
+ """
+ Pull out the open ended parameters into a dictionary.
+
+ Returns:
+ {
+ 'oeparam': 'some-html'
+ }
+ """
+ for child in ['openendedparam']:
+ if len(xml_object.xpath(child)) != 1:
+ raise ValueError("Open Ended definition must include exactly one '{0}' tag".format(child))
+
+ def parse(k):
+ """Assumes that xml_object has child k"""
+ return xml_object.xpath(k)[0]
+
+ return {'oeparam': parse('openendedparam'), }
+
+
+ def definition_to_xml(self, resource_fs):
+ '''Return an xml element representing this definition.'''
+ elt = etree.Element('openended')
+
+ def add_child(k):
+ child_str = '<{tag}>{body}'.format(tag=k, body=self.definition[k])
+ child_node = etree.fromstring(child_str)
+ elt.append(child_node)
+
+ for child in ['openendedparam']:
+ add_child(child)
+
+ return elt
+
+
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
new file mode 100644
index 0000000000..2ba9528237
--- /dev/null
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -0,0 +1,263 @@
+import copy
+from fs.errors import ResourceNotFoundError
+import itertools
+import json
+import logging
+from lxml import etree
+from lxml.html import rewrite_links
+from path import path
+import os
+import sys
+import hashlib
+import capa.xqueue_interface as xqueue_interface
+
+from pkg_resources import resource_string
+
+from .capa_module import only_one, ComplexEncoder
+from .editing_module import EditingDescriptor
+from .html_checker import check_html
+from progress import Progress
+from .stringify import stringify_children
+from .xml_module import XmlDescriptor
+from xmodule.modulestore import Location
+from capa.util import *
+
+from datetime import datetime
+
+log = logging.getLogger("mitx.courseware")
+
+# Set the default number of max attempts. Should be 1 for production
+# Set higher for debugging/testing
+# attempts specified in xml definition overrides this.
+MAX_ATTEMPTS = 1
+
+# Set maximum available number of points.
+# Overriden by max_score specified in xml.
+MAX_SCORE = 1
+
+class OpenEndedChild():
+ """
+ States:
+
+ initial (prompt, textbox shown)
+ |
+ assessing (read-only textbox, rubric + assessment input shown for self assessment, response queued for open ended)
+ |
+ post_assessment (read-only textbox, read-only rubric and assessment, hint input box shown)
+ |
+ done (submitted msg, green checkmark, everything else read-only. If attempts < max, shows
+ a reset button that goes back to initial state. Saves previous
+ submissions too.)
+ """
+
+ DEFAULT_QUEUE = 'open-ended'
+ DEFAULT_MESSAGE_QUEUE = 'open-ended-message'
+ max_inputfields = 1
+
+ STATE_VERSION = 1
+
+ # states
+ INITIAL = 'initial'
+ ASSESSING = 'assessing'
+ POST_ASSESSMENT = 'post_assessment'
+ DONE = 'done'
+
+ #This is used to tell students where they are at in the module
+ HUMAN_NAMES = {
+ 'initial': 'Started',
+ 'assessing': 'Being scored',
+ 'post_assessment': 'Scoring finished',
+ 'done': 'Problem complete',
+ }
+
+ def __init__(self, system, location, definition, descriptor, static_data,
+ instance_state=None, shared_state=None, **kwargs):
+ # Load instance state
+ if instance_state is not None:
+ instance_state = json.loads(instance_state)
+ else:
+ instance_state = {}
+
+ # History is a list of tuples of (answer, score, hint), where hint may be
+ # None for any element, and score and hint can be None for the last (current)
+ # element.
+ # Scores are on scale from 0 to max_score
+ self.history = instance_state.get('history', [])
+
+ self.state = instance_state.get('state', self.INITIAL)
+
+ self.created = instance_state.get('created', False)
+
+ self.attempts = instance_state.get('attempts', 0)
+ self.max_attempts = static_data['max_attempts']
+
+ self.prompt = static_data['prompt']
+ self.rubric = static_data['rubric']
+
+ # Used for progress / grading. Currently get credit just for
+ # completion (doesn't matter if you self-assessed correct/incorrect).
+ self._max_score = static_data['max_score']
+
+ self.setup_response(system, location, definition, descriptor)
+
+ def setup_response(self, system, location, definition, descriptor):
+ """
+ Needs to be implemented by the inheritors of this module. Sets up additional fields used by the child modules.
+ @param system: Modulesystem
+ @param location: Module location
+ @param definition: XML definition
+ @param descriptor: Descriptor of the module
+ @return: None
+ """
+ pass
+
+ def latest_answer(self):
+ """None if not available"""
+ if not self.history:
+ return ""
+ return self.history[-1].get('answer', "")
+
+ def latest_score(self):
+ """None if not available"""
+ if not self.history:
+ return None
+ return self.history[-1].get('score')
+
+ def latest_post_assessment(self):
+ """None if not available"""
+ if not self.history:
+ return ""
+ return self.history[-1].get('post_assessment', "")
+
+ def new_history_entry(self, answer):
+ """
+ Adds a new entry to the history dictionary
+ @param answer: The student supplied answer
+ @return: None
+ """
+ self.history.append({'answer': answer})
+
+ def record_latest_score(self, score):
+ """Assumes that state is right, so we're adding a score to the latest
+ history element"""
+ self.history[-1]['score'] = score
+
+ def record_latest_post_assessment(self, post_assessment):
+ """Assumes that state is right, so we're adding a score to the latest
+ history element"""
+ self.history[-1]['post_assessment'] = post_assessment
+
+ def change_state(self, new_state):
+ """
+ A centralized place for state changes--allows for hooks. If the
+ current state matches the old state, don't run any hooks.
+ """
+ if self.state == new_state:
+ return
+
+ self.state = new_state
+
+ if self.state == self.DONE:
+ self.attempts += 1
+
+ def get_instance_state(self):
+ """
+ Get the current score and state
+ """
+
+ state = {
+ 'version': self.STATE_VERSION,
+ 'history': self.history,
+ 'state': self.state,
+ 'max_score': self._max_score,
+ 'attempts': self.attempts,
+ 'created': False,
+ }
+ return json.dumps(state)
+
+ def _allow_reset(self):
+ """Can the module be reset?"""
+ return (self.state == self.DONE and self.attempts < self.max_attempts)
+
+ def max_score(self):
+ """
+ Return max_score
+ """
+ return self._max_score
+
+ def get_score(self):
+ """
+ Returns the last score in the list
+ """
+ score = self.latest_score()
+ return {'score': score if score is not None else 0,
+ 'total': self._max_score}
+
+ def reset(self, system):
+ """
+ If resetting is allowed, reset the state.
+
+ Returns {'success': bool, 'error': msg}
+ (error only present if not success)
+ """
+ self.change_state(self.INITIAL)
+ return {'success': True}
+
+ def get_progress(self):
+ '''
+ For now, just return last score / max_score
+ '''
+ if self._max_score > 0:
+ try:
+ return Progress(self.get_score()['score'], self._max_score)
+ except Exception as err:
+ log.exception("Got bad progress")
+ return None
+ return None
+
+ def out_of_sync_error(self, get, msg=''):
+ """
+ return dict out-of-sync error message, and also log.
+ """
+ log.warning("Assessment module state out sync. state: %r, get: %r. %s",
+ self.state, get, msg)
+ return {'success': False,
+ 'error': 'The problem state got out-of-sync'}
+
+ def get_html(self):
+ """
+ Needs to be implemented by inheritors. Renders the HTML that students see.
+ @return:
+ """
+ pass
+
+ def handle_ajax(self):
+ """
+ Needs to be implemented by child modules. Handles AJAX events.
+ @return:
+ """
+ pass
+
+ def is_submission_correct(self, score):
+ """
+ Checks to see if a given score makes the answer correct. Very naive right now (>66% is correct)
+ @param score: Numeric score.
+ @return: Boolean correct.
+ """
+ correct = False
+ if(isinstance(score, (int, long, float, complex))):
+ score_ratio = int(score) / float(self.max_score())
+ correct = (score_ratio >= 0.66)
+ return correct
+
+ def is_last_response_correct(self):
+ """
+ Checks to see if the last response in the module is correct.
+ @return: 'correct' if correct, otherwise 'incorrect'
+ """
+ score = self.get_score()['score']
+ correctness = 'correct' if self.is_submission_correct(score) else 'incorrect'
+ return correctness
+
+
+
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index eb8a275d35..940b61c557 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -1,10 +1,3 @@
-"""
-A Self Assessment module that allows students to write open-ended responses,
-submit, then see a rubric and rate themselves. Persists student supplied
-hints, answers, and assessment judgment (currently only correct/incorrect).
-Parses xml definition file--see below for exact format.
-"""
-
import copy
from fs.errors import ResourceNotFoundError
import itertools
@@ -26,205 +19,50 @@ from .stringify import stringify_children
from .x_module import XModule
from .xml_module import XmlDescriptor
from xmodule.modulestore import Location
+import openendedchild
+
+from combined_open_ended_rubric import CombinedOpenEndedRubric
log = logging.getLogger("mitx.courseware")
-# Set the default number of max attempts. Should be 1 for production
-# Set higher for debugging/testing
-# attempts specified in xml definition overrides this.
-MAX_ATTEMPTS = 1
-
-# Set maximum available number of points.
-# Overriden by max_score specified in xml.
-MAX_SCORE = 1
-
-class SelfAssessmentModule(XModule):
+class SelfAssessmentModule(openendedchild.OpenEndedChild):
"""
- States:
+ A Self Assessment module that allows students to write open-ended responses,
+ submit, then see a rubric and rate themselves. Persists student supplied
+ hints, answers, and assessment judgment (currently only correct/incorrect).
+ Parses xml definition file--see below for exact format.
- initial (prompt, textbox shown)
- |
- assessing (read-only textbox, rubric + assessment input shown)
- |
- request_hint (read-only textbox, read-only rubric and assessment, hint input box shown)
- |
- done (submitted msg, green checkmark, everything else read-only. If attempts < max, shows
- a reset button that goes back to initial state. Saves previous
- submissions too.)
+ Sample XML format:
+
+
+ What hint about this problem would you give to someone?
+
+
+ Save Succcesful. Thanks for participating!
+
+
"""
- STATE_VERSION = 1
-
- # states
- INITIAL = 'initial'
- ASSESSING = 'assessing'
- REQUEST_HINT = 'request_hint'
- DONE = 'done'
-
- js = {'coffee': [resource_string(__name__, 'js/src/selfassessment/display.coffee')]}
- js_module_name = "SelfAssessment"
-
- def __init__(self, system, location, definition, descriptor,
- instance_state=None, shared_state=None, **kwargs):
- XModule.__init__(self, system, location, definition, descriptor,
- instance_state, shared_state, **kwargs)
-
+ def setup_response(self, system, location, definition, descriptor):
"""
- Definition file should have 4 blocks -- prompt, rubric, submitmessage, hintprompt,
- and two optional attributes:
- attempts, which should be an integer that defaults to 1.
- If it's > 1, the student will be able to re-submit after they see
- the rubric.
- max_score, which should be an integer that defaults to 1.
- It defines the maximum number of points a student can get. Assumed to be integer scale
- from 0 to max_score, with an interval of 1.
-
- Note: all the submissions are stored.
-
- Sample file:
-
-
-
- Insert prompt text here. (arbitrary html)
-
-
- Insert grading rubric here. (arbitrary html)
-
-
- Please enter a hint below: (arbitrary html)
-
-
- Thanks for submitting! (arbitrary html)
-
-
+ Sets up the module
+ @param system: Modulesystem
+ @param location: location, to let the module know where it is.
+ @param definition: XML definition of the module.
+ @param descriptor: SelfAssessmentDescriptor
+ @return: None
"""
-
- # Load instance state
- if instance_state is not None:
- instance_state = json.loads(instance_state)
- else:
- instance_state = {}
-
- instance_state = self.convert_state_to_current_format(instance_state)
-
- # History is a list of tuples of (answer, score, hint), where hint may be
- # None for any element, and score and hint can be None for the last (current)
- # element.
- # Scores are on scale from 0 to max_score
- self.history = instance_state.get('history', [])
-
- self.state = instance_state.get('state', 'initial')
-
- self.attempts = instance_state.get('attempts', 0)
- self.max_attempts = int(self.metadata.get('attempts', MAX_ATTEMPTS))
-
- # Used for progress / grading. Currently get credit just for
- # completion (doesn't matter if you self-assessed correct/incorrect).
- self._max_score = int(self.metadata.get('max_score', MAX_SCORE))
-
- self.rubric = definition['rubric']
- self.prompt = definition['prompt']
self.submit_message = definition['submitmessage']
self.hint_prompt = definition['hintprompt']
+ self.prompt = stringify_children(self.prompt)
+ self.rubric = stringify_children(self.rubric)
-
- def latest_answer(self):
- """None if not available"""
- if not self.history:
- return None
- return self.history[-1].get('answer')
-
- def latest_score(self):
- """None if not available"""
- if not self.history:
- return None
- return self.history[-1].get('score')
-
- def latest_hint(self):
- """None if not available"""
- if not self.history:
- return None
- return self.history[-1].get('hint')
-
- def new_history_entry(self, answer):
- self.history.append({'answer': answer})
-
- def record_latest_score(self, score):
- """Assumes that state is right, so we're adding a score to the latest
- history element"""
- self.history[-1]['score'] = score
-
- def record_latest_hint(self, hint):
- """Assumes that state is right, so we're adding a score to the latest
- history element"""
- self.history[-1]['hint'] = hint
-
-
- def change_state(self, new_state):
+ def get_html(self, system):
"""
- A centralized place for state changes--allows for hooks. If the
- current state matches the old state, don't run any hooks.
+ Gets context and renders HTML that represents the module
+ @param system: Modulesystem
+ @return: Rendered HTML
"""
- if self.state == new_state:
- return
-
- self.state = new_state
-
- if self.state == self.DONE:
- self.attempts += 1
-
- @staticmethod
- def convert_state_to_current_format(old_state):
- """
- This module used to use a problematic state representation. This method
- converts that into the new format.
-
- Args:
- old_state: dict of state, as passed in. May be old.
-
- Returns:
- new_state: dict of new state
- """
- if old_state.get('version', 0) == SelfAssessmentModule.STATE_VERSION:
- # already current
- return old_state
-
- # for now, there's only one older format.
-
- new_state = {'version': SelfAssessmentModule.STATE_VERSION}
-
- def copy_if_present(key):
- if key in old_state:
- new_state[key] = old_state[key]
-
- for to_copy in ['attempts', 'state']:
- copy_if_present(to_copy)
-
- # The answers, scores, and hints need to be kept together to avoid them
- # getting out of sync.
-
- # NOTE: Since there's only one problem with a few hundred submissions
- # in production so far, not trying to be smart about matching up hints
- # and submissions in cases where they got out of sync.
-
- student_answers = old_state.get('student_answers', [])
- scores = old_state.get('scores', [])
- hints = old_state.get('hints', [])
-
- new_state['history'] = [
- {'answer': answer,
- 'score': score,
- 'hint': hint}
- for answer, score, hint in itertools.izip_longest(
- student_answers, scores, hints)]
- return new_state
-
-
- def _allow_reset(self):
- """Can the module be reset?"""
- return self.state == self.DONE and self.attempts < self.max_attempts
-
- def get_html(self):
#set context variables and render template
if self.state != self.INITIAL:
latest = self.latest_answer()
@@ -235,46 +73,20 @@ class SelfAssessmentModule(XModule):
context = {
'prompt': self.prompt,
'previous_answer': previous_answer,
- 'ajax_url': self.system.ajax_url,
- 'initial_rubric': self.get_rubric_html(),
- 'initial_hint': self.get_hint_html(),
+ 'ajax_url': system.ajax_url,
+ 'initial_rubric': self.get_rubric_html(system),
+ 'initial_hint': self.get_hint_html(system),
'initial_message': self.get_message_html(),
'state': self.state,
'allow_reset': self._allow_reset(),
+ 'child_type': 'selfassessment',
}
- html = self.system.render_template('self_assessment_prompt.html', context)
- # cdodge: perform link substitutions for any references to course static content (e.g. images)
- return rewrite_links(html, self.rewrite_content_links)
-
- def max_score(self):
- """
- Return max_score
- """
- return self._max_score
-
- def get_score(self):
- """
- Returns the last score in the list
- """
- score = self.latest_score()
- return {'score': score if score is not None else 0,
- 'total': self._max_score}
-
- def get_progress(self):
- '''
- For now, just return last score / max_score
- '''
- if self._max_score > 0:
- try:
- return Progress(self.get_score()['score'], self._max_score)
- except Exception as err:
- log.exception("Got bad progress")
- return None
- return None
+ html = system.render_template('self_assessment_prompt.html', context)
+ return html
- def handle_ajax(self, dispatch, get):
+ def handle_ajax(self, dispatch, get, system):
"""
This is called by courseware.module_render, to handle an AJAX call.
"get" is request.POST.
@@ -288,15 +100,14 @@ class SelfAssessmentModule(XModule):
handlers = {
'save_answer': self.save_answer,
'save_assessment': self.save_assessment,
- 'save_hint': self.save_hint,
- 'reset': self.reset,
+ 'save_post_assessment': self.save_hint,
}
if dispatch not in handlers:
return 'Error'
before = self.get_progress()
- d = handlers[dispatch](get)
+ d = handlers[dispatch](get, system)
after = self.get_progress()
d.update({
'progress_changed': after != before,
@@ -304,37 +115,30 @@ class SelfAssessmentModule(XModule):
})
return json.dumps(d, cls=ComplexEncoder)
- def out_of_sync_error(self, get, msg=''):
- """
- return dict out-of-sync error message, and also log.
- """
- log.warning("Assessment module state out sync. state: %r, get: %r. %s",
- self.state, get, msg)
- return {'success': False,
- 'error': 'The problem state got out-of-sync'}
-
- def get_rubric_html(self):
+ def get_rubric_html(self, system):
"""
Return the appropriate version of the rubric, based on the state.
"""
if self.state == self.INITIAL:
return ''
+ rubric_html = CombinedOpenEndedRubric.render_rubric(self.rubric)
+
# we'll render it
- context = {'rubric': self.rubric,
- 'max_score' : self._max_score,
- }
+ context = {'rubric': rubric_html,
+ 'max_score': self._max_score,
+ }
if self.state == self.ASSESSING:
context['read_only'] = False
- elif self.state in (self.REQUEST_HINT, self.DONE):
+ elif self.state in (self.POST_ASSESSMENT, self.DONE):
context['read_only'] = True
else:
raise ValueError("Illegal state '%r'" % self.state)
- return self.system.render_template('self_assessment_rubric.html', context)
+ return system.render_template('self_assessment_rubric.html', context)
- def get_hint_html(self):
+ def get_hint_html(self, system):
"""
Return the appropriate version of the hint view, based on state.
"""
@@ -343,7 +147,7 @@ class SelfAssessmentModule(XModule):
if self.state == self.DONE:
# display the previous hint
- latest = self.latest_hint()
+ latest = self.latest_post_assessment()
hint = latest if latest is not None else ''
else:
hint = ''
@@ -351,14 +155,14 @@ class SelfAssessmentModule(XModule):
context = {'hint_prompt': self.hint_prompt,
'hint': hint}
- if self.state == self.REQUEST_HINT:
+ if self.state == self.POST_ASSESSMENT:
context['read_only'] = False
elif self.state == self.DONE:
context['read_only'] = True
else:
raise ValueError("Illegal state '%r'" % self.state)
- return self.system.render_template('self_assessment_hint.html', context)
+ return system.render_template('self_assessment_hint.html', context)
def get_message_html(self):
"""
@@ -370,7 +174,7 @@ class SelfAssessmentModule(XModule):
return """
{0}
""".format(self.submit_message)
- def save_answer(self, get):
+ def save_answer(self, get, system):
"""
After the answer is submitted, show the rubric.
@@ -401,10 +205,10 @@ class SelfAssessmentModule(XModule):
return {
'success': True,
- 'rubric_html': self.get_rubric_html()
- }
+ 'rubric_html': self.get_rubric_html(system)
+ }
- def save_assessment(self, get):
+ def save_assessment(self, get, system):
"""
Save the assessment. If the student said they're right, don't ask for a
hint, and go straight to the done state. Otherwise, do ask for a hint.
@@ -429,21 +233,20 @@ class SelfAssessmentModule(XModule):
self.record_latest_score(score)
- d = {'success': True,}
+ d = {'success': True, }
if score == self.max_score():
self.change_state(self.DONE)
d['message_html'] = self.get_message_html()
d['allow_reset'] = self._allow_reset()
else:
- self.change_state(self.REQUEST_HINT)
- d['hint_html'] = self.get_hint_html()
+ self.change_state(self.POST_ASSESSMENT)
+ d['hint_html'] = self.get_hint_html(system)
d['state'] = self.state
return d
-
- def save_hint(self, get):
+ def save_hint(self, get, system):
'''
Save the hint.
Returns a dict { 'success': bool,
@@ -453,63 +256,19 @@ class SelfAssessmentModule(XModule):
with the error key only present if success is False and message_html
only if True.
'''
- if self.state != self.REQUEST_HINT:
+ if self.state != self.POST_ASSESSMENT:
# Note: because we only ask for hints on wrong answers, may not have
# the same number of hints and answers.
return self.out_of_sync_error(get)
- self.record_latest_hint(get['hint'])
+ self.record_latest_post_assessment(get['hint'])
self.change_state(self.DONE)
- # To the tracking logs!
- event_info = {
- 'selfassessment_id': self.location.url(),
- 'state': {
- 'version': self.STATE_VERSION,
- 'history': self.history,
- }
- }
- self.system.track_function('save_hint', event_info)
-
return {'success': True,
'message_html': self.get_message_html(),
'allow_reset': self._allow_reset()}
- def reset(self, get):
- """
- If resetting is allowed, reset the state.
-
- Returns {'success': bool, 'error': msg}
- (error only present if not success)
- """
- if self.state != self.DONE:
- return self.out_of_sync_error(get)
-
- if self.attempts > self.max_attempts:
- return {
- 'success': False,
- 'error': 'Too many attempts.'
- }
- self.change_state(self.INITIAL)
- return {'success': True}
-
-
- def get_instance_state(self):
- """
- Get the current score and state
- """
-
- state = {
- 'version': self.STATE_VERSION,
- 'history': self.history,
- 'state': self.state,
- 'max_score': self._max_score,
- 'attempts': self.attempts,
- }
- return json.dumps(state)
-
-
class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
"""
Module for adding self assessment questions to courses
@@ -532,13 +291,11 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
Returns:
{
- 'rubric': 'some-html',
- 'prompt': 'some-html',
'submitmessage': 'some-html'
'hintprompt': 'some-html'
}
"""
- expected_children = ['rubric', 'prompt', 'submitmessage', 'hintprompt']
+ expected_children = ['submitmessage', 'hintprompt']
for child in expected_children:
if len(xml_object.xpath(child)) != 1:
raise ValueError("Self assessment definition must include exactly one '{0}' tag".format(child))
@@ -547,12 +304,9 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
"""Assumes that xml_object has child k"""
return stringify_children(xml_object.xpath(k)[0])
- return {'rubric': parse('rubric'),
- 'prompt': parse('prompt'),
- 'submitmessage': parse('submitmessage'),
+ return {'submitmessage': parse('submitmessage'),
'hintprompt': parse('hintprompt'),
- }
-
+ }
def definition_to_xml(self, resource_fs):
'''Return an xml element representing this definition.'''
@@ -563,7 +317,7 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
child_node = etree.fromstring(child_str)
elt.append(child_node)
- for child in ['rubric', 'prompt', 'submitmessage', 'hintprompt']:
+ for child in ['submitmessage', 'hintprompt']:
add_child(child)
return elt
diff --git a/common/lib/xmodule/xmodule/tests/test_course_module.py b/common/lib/xmodule/xmodule/tests/test_course_module.py
new file mode 100644
index 0000000000..63eaec1f61
--- /dev/null
+++ b/common/lib/xmodule/xmodule/tests/test_course_module.py
@@ -0,0 +1,90 @@
+import unittest
+from time import strptime, gmtime
+from fs.memoryfs import MemoryFS
+
+from mock import Mock, patch
+
+from xmodule.modulestore.xml import ImportSystem, XMLModuleStore
+
+
+ORG = 'test_org'
+COURSE = 'test_course'
+
+NOW = strptime('2013-01-01T01:00:00', '%Y-%m-%dT%H:%M:00')
+
+
+class DummySystem(ImportSystem):
+ @patch('xmodule.modulestore.xml.OSFS', lambda dir: MemoryFS())
+ def __init__(self, load_error_modules):
+
+ xmlstore = XMLModuleStore("data_dir", course_dirs=[],
+ load_error_modules=load_error_modules)
+ course_id = "/".join([ORG, COURSE, 'test_run'])
+ course_dir = "test_dir"
+ policy = {}
+ error_tracker = Mock()
+ parent_tracker = Mock()
+
+ super(DummySystem, self).__init__(
+ xmlstore,
+ course_id,
+ course_dir,
+ policy,
+ error_tracker,
+ parent_tracker,
+ load_error_modules=load_error_modules,
+ )
+
+
+class IsNewCourseTestCase(unittest.TestCase):
+ """Make sure the property is_new works on courses"""
+ @staticmethod
+ def get_dummy_course(start, is_new=None, load_error_modules=True):
+ """Get a dummy course"""
+
+ system = DummySystem(load_error_modules)
+ is_new = '' if is_new is None else 'is_new="{0}"'.format(is_new).lower()
+
+ start_xml = '''
+
+
+ Two houses, ...
+
+
+ '''.format(org=ORG, course=COURSE, start=start, is_new=is_new)
+
+ return system.process_xml(start_xml)
+
+ @patch('xmodule.course_module.time.gmtime')
+ def test_non_started_yet(self, gmtime_mock):
+ descriptor = self.get_dummy_course(start='2013-01-05T12:00')
+ gmtime_mock.return_value = NOW
+ assert(descriptor.is_new == True)
+ assert(descriptor.days_until_start == 4)
+
+ @patch('xmodule.course_module.time.gmtime')
+ def test_already_started(self, gmtime_mock):
+ gmtime_mock.return_value = NOW
+
+ descriptor = self.get_dummy_course(start='2012-12-02T12:00')
+ assert(descriptor.is_new == False)
+ assert(descriptor.days_until_start < 0)
+
+ @patch('xmodule.course_module.time.gmtime')
+ def test_is_new_set(self, gmtime_mock):
+ gmtime_mock.return_value = NOW
+
+ descriptor = self.get_dummy_course(start='2012-12-02T12:00', is_new=True)
+ assert(descriptor.is_new == True)
+ assert(descriptor.days_until_start < 0)
+
+ descriptor = self.get_dummy_course(start='2013-02-02T12:00', is_new=False)
+ assert(descriptor.is_new == False)
+ assert(descriptor.days_until_start > 0)
+
+ descriptor = self.get_dummy_course(start='2013-02-02T12:00', is_new=True)
+ assert(descriptor.is_new == True)
+ assert(descriptor.days_until_start > 0)
diff --git a/common/lib/xmodule/xmodule/tests/test_export.py b/common/lib/xmodule/xmodule/tests/test_export.py
index aeebc6da6b..7605155a6c 100644
--- a/common/lib/xmodule/xmodule/tests/test_export.py
+++ b/common/lib/xmodule/xmodule/tests/test_export.py
@@ -39,9 +39,12 @@ def strip_filenames(descriptor):
class RoundTripTestCase(unittest.TestCase):
- '''Check that our test courses roundtrip properly'''
+ ''' Check that our test courses roundtrip properly.
+ Same course imported , than exported, then imported again.
+ And we compare original import with second import (after export).
+ Thus we make sure that export and import work properly.
+ '''
def check_export_roundtrip(self, data_dir, course_dir):
-
root_dir = path(mkdtemp())
print "Copying test course to temp dir {0}".format(root_dir)
@@ -117,3 +120,7 @@ class RoundTripTestCase(unittest.TestCase):
def test_selfassessment_roundtrip(self):
#Test selfassessment xmodule to see if it exports correctly
self.check_export_roundtrip(DATA_DIR,"self_assessment")
+
+ def test_graphicslidertool_roundtrip(self):
+ #Test graphicslidertool xmodule to see if it exports correctly
+ self.check_export_roundtrip(DATA_DIR,"graphic_slider_tool")
diff --git a/common/lib/xmodule/xmodule/tests/test_import.py b/common/lib/xmodule/xmodule/tests/test_import.py
index 77532959d7..90ec112f19 100644
--- a/common/lib/xmodule/xmodule/tests/test_import.py
+++ b/common/lib/xmodule/xmodule/tests/test_import.py
@@ -352,3 +352,19 @@ class ImportTestCase(unittest.TestCase):
sa_sample = modulestore.get_instance(sa_id, location)
#10 attempts is hard coded into SampleQuestion, which is the url_name of a selfassessment xml tag
self.assertEqual(sa_sample.metadata['attempts'], '10')
+
+ def test_graphicslidertool_import(self):
+ '''
+ Check to see if definition_from_xml in gst_module.py
+ works properly. Pulls data from the graphic_slider_tool directory
+ in the test data directory.
+ '''
+ modulestore = XMLModuleStore(DATA_DIR, course_dirs=['graphic_slider_tool'])
+
+ sa_id = "edX/gst_test/2012_Fall"
+ location = Location(["i4x", "edX", "gst_test", "graphical_slider_tool", "sample_gst"])
+ gst_sample = modulestore.get_instance(sa_id, location)
+ render_string_from_sample_gst_xml = """
+ \
+""".strip()
+ self.assertEqual(gst_sample.definition['render'], render_string_from_sample_gst_xml)
diff --git a/common/test/data/graphic_slider_tool/README.md b/common/test/data/graphic_slider_tool/README.md
new file mode 100644
index 0000000000..ec4f121ad8
--- /dev/null
+++ b/common/test/data/graphic_slider_tool/README.md
@@ -0,0 +1,2 @@
+This is a very very simple course, useful for debugging graphical slider tool
+code.
diff --git a/common/test/data/graphic_slider_tool/course.xml b/common/test/data/graphic_slider_tool/course.xml
new file mode 120000
index 0000000000..49041310f6
--- /dev/null
+++ b/common/test/data/graphic_slider_tool/course.xml
@@ -0,0 +1 @@
+roots/2012_Fall.xml
\ No newline at end of file
diff --git a/common/test/data/graphic_slider_tool/course/2012_Fall.xml b/common/test/data/graphic_slider_tool/course/2012_Fall.xml
new file mode 100644
index 0000000000..2983c85dd5
--- /dev/null
+++ b/common/test/data/graphic_slider_tool/course/2012_Fall.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/common/test/data/graphic_slider_tool/graphical_slider_tool/sample_gst.xml b/common/test/data/graphic_slider_tool/graphical_slider_tool/sample_gst.xml
new file mode 100644
index 0000000000..bd0360fde8
--- /dev/null
+++ b/common/test/data/graphic_slider_tool/graphical_slider_tool/sample_gst.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+ return Math.sqrt(a * a - x * x);
+ return -Math.sqrt(a * a - x * x);
+
+
+
+
+
+ return -a;
+
+
+ return a;
+
+
+ 1000
+ -30, 6, 30
+ -30, 6, 30
+
+
+
+
diff --git a/common/test/data/graphic_slider_tool/policies/2012_Fall.json b/common/test/data/graphic_slider_tool/policies/2012_Fall.json
new file mode 100644
index 0000000000..6958f8432c
--- /dev/null
+++ b/common/test/data/graphic_slider_tool/policies/2012_Fall.json
@@ -0,0 +1,14 @@
+{
+ "course/2012_Fall": {
+ "graceperiod": "2 days 5 hours 59 minutes 59 seconds",
+ "start": "2015-07-17T12:00",
+ "display_name": "GST Test",
+ "graded": "false"
+ },
+ "chapter/Overview": {
+ "display_name": "Overview"
+ },
+ "graphical_slider_tool/sample_gst": {
+ "display_name": "Sample GST",
+ },
+}
diff --git a/common/test/data/graphic_slider_tool/roots/2012_Fall.xml b/common/test/data/graphic_slider_tool/roots/2012_Fall.xml
new file mode 100644
index 0000000000..1dc86c4afc
--- /dev/null
+++ b/common/test/data/graphic_slider_tool/roots/2012_Fall.xml
@@ -0,0 +1 @@
+
diff --git a/common/test/data/self_assessment/course.xml b/common/test/data/self_assessment/course.xml
deleted file mode 120000
index 49041310f6..0000000000
--- a/common/test/data/self_assessment/course.xml
+++ /dev/null
@@ -1 +0,0 @@
-roots/2012_Fall.xml
\ No newline at end of file
diff --git a/common/test/data/self_assessment/course.xml b/common/test/data/self_assessment/course.xml
new file mode 100644
index 0000000000..ea7d5c420d
--- /dev/null
+++ b/common/test/data/self_assessment/course.xml
@@ -0,0 +1 @@
+
diff --git a/doc/course_grading.md b/doc/course_grading.md
index 6dce2fa70e..5c668df5d9 100644
--- a/doc/course_grading.md
+++ b/doc/course_grading.md
@@ -35,6 +35,43 @@ weights of 30, 10, 10, and 10 to the 4 problems, respectively.
Note that the default weight of a problem **is not 1.** The default weight of a
problem is the module's max_grade.
+If weighting is set, each problem is worth the number of points assigned, regardless of the number of responses it contains.
+
+Consider a Homework section that contains two problems.
+
+
+ ...
+
+
+and
+
+
+ ...
+ ...
+ ...
+
+
+
+
+
+
+Without weighting, Problem 1 is worth 25% of the assignment, and Problem 2 is worth 75% of the assignment.
+
+Weighting for the problems can be set in the policy.json file.
+
+ "problem/problem1": {
+ "weight": 2
+ },
+ "problem/problem2": {
+ "weight": 2
+ },
+
+With the above weighting, Problems 1 and 2 are each worth 50% of the assignment.
+
+Please note: When problems have weight, the point value is automatically included in the display name *except* when “weight”: 1.When “weight”: 1, no visual change occurs in the display name, leaving the point value open to interpretation to the student.
+
+
+
## Section Weighting
Once each section has a percentage score, we must total those sections into a
diff --git a/doc/remote_gradebook.md b/doc/remote_gradebook.md
new file mode 100644
index 0000000000..3743e98753
--- /dev/null
+++ b/doc/remote_gradebook.md
@@ -0,0 +1,47 @@
+Grades can be pushed to a remote gradebook, and course enrollment membership can be pulled from a remote gradebook. This file documents how to setup such a remote gradebook, and what the API should be for writing new remote gradebook "xservers".
+
+1. Definitions
+
+An "xserver" is a web-based server that is part of the MITx eco system. There are a number of "xserver" programs, including one which does python code grading, an xqueue server, and graders for other coding languages.
+
+"Stellar" is the MIT on-campus gradebook system.
+
+2. Setup
+
+The remote gradebook xserver should be specified in the lms.envs configuration using
+
+ MITX_FEATURES[REMOTE_GRADEBOOK_URL]
+
+Each course, in addition, should define the name of the gradebook being used. A class "section" may also be specified. This goes in the policy.json file, eg:
+
+ "remote_gradebook": {
+ "name" : "STELLAR:/project/mitxdemosite",
+ "section" : "r01"
+ },
+
+3. The API for the remote gradebook xserver is an almost RESTful service model, which only employs POSTs, to the xserver url, with form data for the fields:
+
+ - submit: get-assignments, get-membership, post-grades, or get-sections
+ - gradebook: name of gradebook
+ - user: username of staff person initiating the request (for logging)
+ - section: (optional) name of section
+
+The return body content should be a JSON string, of the format {'msg': message, 'data': data}. The message is displayed in the instructor dashboard.
+
+The data is a list of dicts (associative arrays). Each dict should be key:value.
+
+## For submit=post-grades:
+
+A file is also posted, with the field name "datafile". This file is CSV format, with two columns, one being "External email" and the other being the name of the assignment (that column contains the grades for the assignment).
+
+## For submit=get-assignments
+
+data keys = "AssignmentName"
+
+## For submit=get-membership
+
+data keys = "email", "name", "section"
+
+## For submit=get-sections
+
+data keys = "SectionName"
diff --git a/docs/source/graphical_slider_tool.rst b/docs/source/graphical_slider_tool.rst
new file mode 100644
index 0000000000..37b17136e8
--- /dev/null
+++ b/docs/source/graphical_slider_tool.rst
@@ -0,0 +1,563 @@
+*********************************************
+Xml format of graphical slider tool [xmodule]
+*********************************************
+
+.. module:: xml_format_gst
+
+
+Format description
+==================
+
+Graphical slider tool (GST) main tag is::
+
+ BODY
+
+``graphical_slider_tool`` tag must have two children tags: ``render``
+and ``configuration``.
+
+
+Render tag
+----------
+
+Render tag can contain usual html tags mixed with some GST specific tags::
+
+ - represents jQuery slider for changing a parameter's value
+ - represents a text input field for changing a parameter's value
+ - represents Flot JS plot element
+
+Also GST will track all elements inside ```` where ``id``
+attribute is set, and a corresponding parameter referencing that ``id`` is present
+in the configuration section below. These will be referred to as dynamic elements.
+
+The contents of the section will be shown to the user after
+all occurrences of::
+
+
+
+
+
+have been converted to actual sliders, text inputs, and a plot graph.
+Everything in square brackets is optional. After initialization, all
+text input fields, sliders, and dynamic elements will be set to the initial
+values of the parameters that they are assigned to.
+
+``{parameter name}`` specifies the parameter to which the slider or text
+input will be attached to.
+
+[style="{CSS statements}"] specifies valid CSS styling. It will be passed
+directly to the browser without any parsing.
+
+There is a one-to-one relationship between a slider and a parameter.
+I.e. for one parameter you can put only one ```` in the
+```` section. However, you don't have to specify a slider - they
+are optional.
+
+There is a many-to-one relationship between text inputs and a
+parameter. I.e. for one parameter you can put many '' elements in
+the ```` section. However, you don't have to specify a text
+input - they are optional.
+
+You can put only one ```` in the ```` section. It is not
+required.
+
+
+Slider tag
+..........
+
+Slider tag must have ``var`` attribute and optional ``style`` attribute::
+
+
+
+After processing, slider tags will be replaced by jQuery UI sliders with applied
+``style`` attribute.
+
+``var`` attribute must correspond to a parameter. Parameters can be used in any
+of the ``function`` tags in ``functions`` tag. By moving slider, value of
+parameter ``a`` will change, and so result of function, that depends on parameter
+``a``, will also change.
+
+
+Textbox tag
+...........
+
+Texbox tag must have ``var`` attribute and optional ``style`` attribute::
+
+
+
+After processing, textbox tags will be replaced by html text inputs with applied
+``style`` attribute. If you want a readonly text input, then you should use a
+dynamic element instead (see section below "HTML tagsd with ID").
+
+``var`` attribute must correspond to a parameter. Parameters can be used in any
+of the ``function`` tags in ``functions`` tag. By changing the value on the text input,
+value of parameter ``a`` will change, and so result of function, that depends on
+parameter ``a``, will also change.
+
+
+Plot tag
+........
+
+Plot tag may have optional ``style`` attribute::
+
+
+
+After processing plot tags will be replaced by Flot JS plot with applied
+``style`` attribute.
+
+
+HTML tags with ID (dynamic elements)
+....................................
+
+Any HTML tag with ID, e.g. ```` can be used as a
+place where result of function can be inserted. To insert function result to
+an element, element ID must be included in ``function`` tag as ``el_id`` attribute
+and ``output`` value must be ``"element"``::
+
+
+ function add(a, b, precision) {
+ var x = Math.pow(10, precision || 2);
+ return (Math.round(a * x) + Math.round(b * x)) / x;
+ }
+
+ return add(a, b, 5);
+
+
+
+Configuration tag
+-----------------
+
+The configuration tag contains parameter settings, graph
+settings, and function definitions which are to be plotted on the
+graph and that use specified parameters.
+
+Configuration tag contains two mandatory tag ``functions`` and ``parameters`` and
+may contain another ``plot`` tag.
+
+
+Parameters tag
+..............
+
+``Parameters`` tag contains ``parameter`` tags. Each ``parameter`` tag must have
+``var``, ``max``, ``min``, ``step`` and ``initial`` attributes::
+
+
+
+
+
+
+``var`` attribute links min, max, step and initial values to parameter name.
+
+``min`` attribute is the minimal value that a parameter can take. Slider and input
+values can not go below it.
+
+``max`` attribute is the maximal value that a parameter can take. Slider and input
+values can not go over it.
+
+``step`` attribute is value of slider step. When a slider increase or decreases
+the specified parameter, it will do so by the amount specified with 'step'
+
+``initial`` attribute is the initial value that the specified parameter should be
+set to. Sliders and inputs will initially show this value.
+
+The parameter's name is specified by the ``var`` property. All occurrences
+of sliders and/or text inputs that specify a ``var`` property, will be
+connected to this parameter - i.e. they will reflect the current
+value of the parameter, and will be updated when the parameter
+changes.
+
+If at lest one of these attributes is not set, then the parameter
+will not be used, slider's and/or text input elements that specify
+this parameter will not be activated, and the specified functions
+which use this parameter will not return a numeric value. This means
+that neglecting to specify at least one of the attributes for some
+parameter will have the result of the whole GST instance not working
+properly.
+
+
+Functions tag
+.............
+
+For the GST to do something, you must defined at least one
+function, which can use any of the specified parameter values. The
+function expects to take the ``x`` value, do some calculations, and
+return the ``y`` value. I.e. this is a 2D plot in Cartesian
+coordinates. This is how the default function is meant to be used for
+the graph.
+
+There are other special cases of functions. They are used mainly for
+outputting to elements, plot labels, or for custom output. Because
+the return a single value, and that value is meant for a single element,
+these function are invoked only with the set of all of the parameters.
+I.e. no ``x`` value is available inside them. They are useful for
+showing the current value of a parameter, showing complex static
+formulas where some parameter's value must change, and other useful
+things.
+
+The different style of function is specified by the ``output`` attribute.
+
+Each function must be defined inside ``function`` tag in ``functions`` tag::
+
+
+
+ function add(a, b, precision) {
+ var x = Math.pow(10, precision || 2);
+ return (Math.round(a * x) + Math.round(b * x)) / x;
+ }
+
+ return add(a, b, 5);
+
+
+
+The parameter names (along with their values, as provided from text
+inputs and/or sliders), will be available inside all defined
+functions. A defined function body string will be parsed internally
+by the browser's JavaScript engine and converted to a true JS
+function.
+
+The function's parameter list will automatically be created and
+populated, and will include the ``x`` (when ``output`` is not specified or
+is set to ``"graph"``), and all of the specified parameter values (from sliders
+and text inputs). This means that each of the defined functions will have
+access to all of the parameter values. You don't have to use them, but
+they will be there.
+
+Examples::
+
+
+ return x;
+
+
+
+ return (x + a) * Math.sin(x * b);
+
+
+
+ function helperFunc(c1) {
+ return c1 * c1 - a;
+ }
+ return helperFunc(x + 10 * a * b) + Math.sin(a - x);
+
+
+Required parameters::
+
+ function body:
+
+ A string composing a normal JavaScript function
+ except that there is no function declaration
+ (along with parameters), and no closing bracket.
+
+ So if you normally would have written your
+ JavaScript function like this:
+
+ function myFunc(x, a, b) {
+ return x * a + b;
+ }
+
+ here you must specify just the function body
+ (everything that goes between '{' and '}'). So,
+ you would specify the above function like so (the
+ bare-bone minimum):
+
+ return x * a + b;
+
+ VERY IMPORTANT: Because the function will be passed
+ to the browser as a single string, depending on implementation
+ specifics, the end-of-line characters can be stripped. This
+ means that single line JavaScript comments (starting with "//")
+ can lead to the effect that everything after the first such comment
+ will be treated as a comment. Therefore, it is absolutely
+ necessary that such single line comments are not used when
+ defining functions for GST. You can safely use the alternative
+ multiple line JavaScript comments (such comments start with "/*"
+ and end with "*/).
+
+ VERY IMPORTANT: If you have a large function body, and decide to
+ split it into several lines, than you must wrap it in "CDATA" like
+ so:
+
+
+
+
+
+Optional parameters::
+
+
+ color: Color name ('red', 'green', etc.) or in the form of
+ '#FFFF00'. If not specified, a default color (different
+ one for each graphed function) will be given by Flot JS.
+ line: A string - 'true' or 'false'. Should the data points be
+ connected by a line on the graph? Default is 'true'.
+ dot: A string - 'true' or 'false'. Should points be shown for
+ each data point on the graph? Default is 'false'.
+ bar: A string - 'true' or 'false'. When set to 'true', points
+ will be plotted as bars.
+ label: A string. If provided, will be shown in the legend, along
+ with the color that was used to plot the function.
+ output: 'element', 'none', 'plot_label', or 'graph'. If not defined,
+ function will be plotted (same as setting 'output' to 'graph').
+ If defined, and other than 'graph', function will not be
+ plotted, but it's output will be inserted into the element
+ with ID specified by 'el_id' attribute.
+ el_id: Id of HTML element, defined in '' section. Value of
+ function will be inserted as content of this element.
+ disable_auto_return: By default, if JavaScript function string is written
+ without a "return" statement, the "return" will be
+ prepended to it. Set to "true" to disable this
+ functionality. This is done so that simple functions
+ can be defined in an easy fashion (for example, "a",
+ which will be translated into "return a").
+ update_on: A string - 'change', or 'slide'. Default (if not set) is
+ 'slide'. This defines the event on which a given function is
+ called, and its result is inserted into an element. This
+ setting is relevant only when "output" is other than "graph".
+
+When specifying ``el_id``, it is essential to set "output" to one of
+ element - GST will invoke the function, and the return of it will be
+ inserted into a HTML element with id specified by ``el_id``.
+ none - GST will simply inoke the function. It is left to the instructor
+ who writes the JavaScript function body to update all necesary
+ HTML elements inside the function, before it exits. This is done
+ so that extra steps can be preformed after an HTML element has
+ been updated with a value. Note, that because the return value
+ from this function is not actually used, it will be tempting to
+ omit the "return" statement. However, in this case, the attribute
+ "disable_auto_return" must be set to "true" in order to prevent
+ GST from inserting a "return" statement automatically.
+ plot_label - GST will process all plot labels (which are strings), and
+ will replace the all instances of substrings specified by
+ ``el_id`` with the returned value of the function. This is
+ necessary if you want a label in the graph to have some changing
+ number. Because of the nature of Flot JS, it is impossible to
+ achieve the same effect by setting the "output" attribute
+ to "element", and including a HTML element in the label.
+
+The above values for "output" will tell GST that the function is meant for an
+HTML element (not for graph), and that it should not get an 'x' parameter (along
+with some value).
+
+
+[Note on MathJax and labels]
+............................
+
+Independently of this module, will render all TeX code
+within the ```` section into nice mathematical formulas. Just
+remember to wrap it in one of::
+
+ \( and \) - for inline formulas (formulas surrounded by
+ standard text)
+ \[ and \] - if you want the formula to be a separate line
+
+It is possible to define a label in standard TeX notation. The JS
+library MathJax will work on these labels also because they are
+inserted on top of the plot as standard HTML (text within a DIV).
+
+If the label is dynamic, i.e. it will contain some text (numeric, or other)
+that has to be updated on a parameter's change, then one can define
+a special function to handle this. The "output" of such a function must be
+set to "none", and the JavaScript code inside this function must update the
+MathJax element by itself. Before exiting, MathJax typeset function should
+be called so that the new text will be re-rendered by MathJax. For example,
+
+
+ ...
+
+
+ ...
+
+
+
+ ...
+
+
+Plot tag
+........
+
+``Plot`` tag inside ``configuration`` tag defines settings for plot output.
+
+Required parameters::
+
+ xrange: 2 functions that must return value. Value is constant (3.1415)
+ or depend on parameter from parameters section:
+
+ return 0;
+ return 30;
+
+ or
+
+ return -a;
+ return a;
+
+
+ All functions will be calculated over domain between xrange:min
+ and xrange:max. Xrange depending on parameter is extremely
+ useful when domain(s) of your function(s) depends on parameter
+ (like circle, when parameter is radius and you want to allow
+ to change it).
+
+Optional parameters::
+
+ num_points: Number of data points to generated for the plot. If
+ this is not set, the number of points will be
+ calculated as width / 5.
+
+ bar_width: If functions are present which are to be plotted as bars,
+ then this parameter specifies the width of the bars. A
+ numeric value for this parameter is expected.
+
+ bar_align: If functions are present which are to be plotted as bars,
+ then this parameter specifies how to align the bars relative
+ to the tick. Available values are "left" and "center".
+
+ xticks,
+ yticks: 3 floating point numbers separated by commas. This
+ specifies how many ticks are created, what number they
+ start at, and what number they end at. This is different
+ from the 'xrange' setting in that it has nothing to do
+ with the data points - it control what area of the
+ Cartesian space you will see. The first number is the
+ first tick's value, the second number is the step
+ between each tick, the third number is the value of the
+ last tick. If these configurations are not specified,
+ Flot will chose them for you based on the data points
+ set that he is currently plotting. Usually, this results
+ in a nice graph, however, sometimes you need to fine
+ grain the controls. For example, when you want to show
+ a fixed area of the Cartesian space, even when the data
+ set changes. On it's own, Flot will recalculate the
+ ticks, which will result in a different graph each time.
+ By specifying the xticks, yticks configurations, only
+ the plotted data will change - the axes (ticks) will
+ remain as you have defined them.
+
+ xticks_names, yticks_names:
+ A JSON string which represents a mapping of xticks, yticks
+ values to some defined strings. If specified, the graph will
+ not have any xticks, yticks except those for which a string
+ value has been defined in the JSON string. Note that the
+ matching will be string-based and not numeric. I.e. if a tick
+ value was "3.70" before, then inside the JSON there should be
+ a mapping like {..., "3.70": "Some string", ...}. Example:
+
+
+
+
+
+
+
+
+
+ xunits,
+ yunits: Units values to be set on axes. Use MathJax. Example:
+ \(cm\)
+ \(m\)
+
+ moving_label:
+ A way to specify a label that should be positioned dynamically,
+ based on the values of some parameters, or some other factors.
+ It is similar to a , but it is only valid for a plot
+ because it is drawn relative to the plot coordinate system.
+
+ Multiple "moving_label" configurations can be provided, each one
+ with a unique text and a unique set of functions that determine
+ it's dynamic positioning.
+
+ Each "moving_label" can have a "color" attribute (CSS color notation),
+ and a "weight" attribute. "weight" can be one of "normal" or "bold",
+ and determines the styling of moving label's text.
+
+ Each "moving_label" function should return an object with a 'x'
+ and 'y properties. Within those functions, all of the parameter
+ names along with their value are available.
+
+ Example (note that "return" statement is missing; it will be automatically
+ inserted by GST):
+
+
+
+
+
There are two kinds of dynamic lables.
+ 1) Dynamic changing values in graph legends.
+ 2) Dynamic labels, which coordinates depend on parameters
+
a:
+
+
b:
+
+
+
+
+
+
+
+
+
+
+ a * x + b
+
+ a
+
+
+ 030
+ 10
+ 0, 6, 30
+ -9, 1, 9
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/source/gst_example_dynamic_range.xml b/docs/source/gst_example_dynamic_range.xml
new file mode 100644
index 0000000000..0ce4263d62
--- /dev/null
+++ b/docs/source/gst_example_dynamic_range.xml
@@ -0,0 +1,37 @@
+
+
+
+
Graphic slider tool: Dynamic range and implicit functions.
+
+
You can make x range (not ticks of x axis) of functions to depend on
+ parameter value. This can be useful when function domain depends
+ on parameter.
+
Also implicit functons like circle can be plotted as 2 separate
+ functions of same color.
+
+
+
+
+
+
+
+
+
+
+
+ Math.sqrt(a * a - x * x)
+ -Math.sqrt(a * a - x * x)
+
+
+
+
+ -a
+ a
+
+ 1000
+ -30, 6, 30
+ -30, 6, 30
+
+
+
+
diff --git a/docs/source/gst_example_html_element_output.xml b/docs/source/gst_example_html_element_output.xml
new file mode 100644
index 0000000000..340783871a
--- /dev/null
+++ b/docs/source/gst_example_html_element_output.xml
@@ -0,0 +1,40 @@
+
+
+
+
+ A simple equation
+ \(
+ y_1 = 10 \times b \times \frac{sin(a \times x) \times sin(b \times x)}{cos(b \times x) + 10}
+ \)
+ can be plotted.
+
+
+
+
+
Currently \(a\) is
+
+
+
+
+
This one
+ \(
+ y_2 = sin(a \times x)
+ \)
+ will be overlayed on top.
+
+
+
Currently \(b\) is
+
+
+
+
To change \(a\) use:
+
+
+
+
To change \(b\) use:
+
+
+
+
+
Second input for b:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ return 10.0 * b * Math.sin(a * x) * Math.sin(b * x) / (Math.cos(b * x) + 10);
+
+
+
+ Math.sin(a * x);
+
+
+ function helperFunc(c1) {
+ return c1 * c1 - a;
+ }
+
+ return helperFunc(x + 10 * a * b) + Math.sin(a - x);
+
+ a
+
+
+
+
+
+ return 0;
+
+ 30
+
+
+ 120
+
+ 0, 3, 30
+ -1.5, 1.5, 13.5
+
+ \(cm\)
+ \(m\)
+
+
+
+
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 92c535a624..d2082ff3a0 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -14,7 +14,7 @@ Contents:
overview.rst
common-lib.rst
djangoapps.rst
-
+ xml_formats.rst
Indices and tables
==================
diff --git a/docs/source/xml_formats.rst b/docs/source/xml_formats.rst
new file mode 100644
index 0000000000..b76ee11642
--- /dev/null
+++ b/docs/source/xml_formats.rst
@@ -0,0 +1,8 @@
+XML formats of Inputtypes and Xmodule
+=====================================
+Contents:
+
+.. toctree::
+ :maxdepth: 2
+
+ graphical_slider_tool.rst
\ No newline at end of file
diff --git a/jenkins/quality.sh b/jenkins/quality.sh
index 4cf26d76bf..56217af874 100755
--- a/jenkins/quality.sh
+++ b/jenkins/quality.sh
@@ -3,6 +3,8 @@
set -e
set -x
+git remote prune origin
+
# Reset the submodule, in case it changed
git submodule foreach 'git reset --hard HEAD'
diff --git a/jenkins/test.sh b/jenkins/test.sh
index 8a96024785..7a61e914b7 100755
--- a/jenkins/test.sh
+++ b/jenkins/test.sh
@@ -15,6 +15,8 @@ function github_mark_failed_on_exit {
trap '[ $? == "0" ] || github_status state:failure "failed"' EXIT
}
+git remote prune origin
+
github_mark_failed_on_exit
github_status state:pending "is running"
diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index ba9b8a3bc0..26f9fcdfd3 100644
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -13,6 +13,8 @@ from xmodule.modulestore import Location
from xmodule.timeparse import parse_time
from xmodule.x_module import XModule, XModuleDescriptor
+from student.models import CourseEnrollmentAllowed
+
DEBUG_ACCESS = False
log = logging.getLogger(__name__)
@@ -124,6 +126,11 @@ def _has_access_course_desc(user, course, action):
debug("Allow: in enrollment period")
return True
+ # if user is in CourseEnrollmentAllowed with right course_id then can also enroll
+ if user is not None and CourseEnrollmentAllowed:
+ if CourseEnrollmentAllowed.objects.filter(email=user.email, course_id=course.id):
+ return True
+
# otherwise, need staff access
return _has_staff_access_to_descriptor(user, course)
@@ -159,13 +166,19 @@ def _has_access_course_desc(user, course, action):
return _dispatch(checkers, action, user, course)
+
def _get_access_group_name_course_desc(course, action):
'''
- Return name of group which gives staff access to course. Only understands action = 'staff'
+ Return name of group which gives staff access to course. Only understands action = 'staff' and 'instructor'
'''
- if not action=='staff':
- return []
- return _course_staff_group_name(course.location)
+ if action=='staff':
+ return _course_staff_group_name(course.location)
+ elif action=='instructor':
+ return _course_instructor_group_name(course.location)
+
+ return []
+
+
def _has_access_error_desc(user, descriptor, action):
"""
diff --git a/lms/djangoapps/courseware/admin.py b/lms/djangoapps/courseware/admin.py
index cda4fbb788..f7e54d1800 100644
--- a/lms/djangoapps/courseware/admin.py
+++ b/lms/djangoapps/courseware/admin.py
@@ -7,3 +7,8 @@ from django.contrib import admin
from django.contrib.auth.models import User
admin.site.register(StudentModule)
+
+admin.site.register(OfflineComputedGrade)
+
+admin.site.register(OfflineComputedGradeLog)
+
diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py
index dc530bdebc..7c0d30ebd8 100644
--- a/lms/djangoapps/courseware/courses.py
+++ b/lms/djangoapps/courseware/courses.py
@@ -233,35 +233,5 @@ def get_courses(user, domain=None):
courses = branding.get_visible_courses(domain)
courses = [c for c in courses if has_access(user, c, 'see_exists')]
- # Add metadata about the start day and if the course is new
- for course in courses:
- days_to_start = _get_course_days_to_start(course)
-
- metadata = course.metadata
- metadata['days_to_start'] = days_to_start
- metadata['is_new'] = course.metadata.get('is_new', days_to_start > 1)
-
courses = sorted(courses, key=lambda course:course.number)
return courses
-
-
-def _get_course_days_to_start(course):
- from datetime import datetime as dt
- from time import mktime, gmtime
-
- convert_to_datetime = lambda ts: dt.fromtimestamp(mktime(ts))
-
- start_date = convert_to_datetime(course.start)
-
- # If the course has a valid advertised date, use that instead
- advertised_start = course.metadata.get('advertised_start', None)
- if advertised_start:
- try:
- start_date = dt.strptime(advertised_start, "%Y-%m-%dT%H:%M")
- except ValueError:
- pass # Invalid date, keep using course.start
-
- now = convert_to_datetime(gmtime())
- days_to_start = (start_date - now).days
-
- return days_to_start
diff --git a/lms/djangoapps/courseware/migrations/0005_auto__add_offlinecomputedgrade__add_unique_offlinecomputedgrade_user_c.py b/lms/djangoapps/courseware/migrations/0005_auto__add_offlinecomputedgrade__add_unique_offlinecomputedgrade_user_c.py
new file mode 100644
index 0000000000..674f97cec8
--- /dev/null
+++ b/lms/djangoapps/courseware/migrations/0005_auto__add_offlinecomputedgrade__add_unique_offlinecomputedgrade_user_c.py
@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding model 'OfflineComputedGrade'
+ db.create_table('courseware_offlinecomputedgrade', (
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+ ('course_id', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+ ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, null=True, db_index=True, blank=True)),
+ ('updated', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, db_index=True, blank=True)),
+ ('gradeset', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+ ))
+ db.send_create_signal('courseware', ['OfflineComputedGrade'])
+
+ # Adding unique constraint on 'OfflineComputedGrade', fields ['user', 'course_id']
+ db.create_unique('courseware_offlinecomputedgrade', ['user_id', 'course_id'])
+
+ # Adding model 'OfflineComputedGradeLog'
+ db.create_table('courseware_offlinecomputedgradelog', (
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('course_id', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
+ ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, null=True, db_index=True, blank=True)),
+ ('seconds', self.gf('django.db.models.fields.IntegerField')(default=0)),
+ ('nstudents', self.gf('django.db.models.fields.IntegerField')(default=0)),
+ ))
+ db.send_create_signal('courseware', ['OfflineComputedGradeLog'])
+
+
+ def backwards(self, orm):
+ # Removing unique constraint on 'OfflineComputedGrade', fields ['user', 'course_id']
+ db.delete_unique('courseware_offlinecomputedgrade', ['user_id', 'course_id'])
+
+ # Deleting model 'OfflineComputedGrade'
+ db.delete_table('courseware_offlinecomputedgrade')
+
+ # Deleting model 'OfflineComputedGradeLog'
+ db.delete_table('courseware_offlinecomputedgradelog')
+
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'courseware.offlinecomputedgrade': {
+ 'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'OfflineComputedGrade'},
+ 'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+ 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'gradeset': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+ },
+ 'courseware.offlinecomputedgradelog': {
+ 'Meta': {'object_name': 'OfflineComputedGradeLog'},
+ 'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+ 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'nstudents': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'seconds': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+ },
+ 'courseware.studentmodule': {
+ 'Meta': {'unique_together': "(('student', 'module_state_key', 'course_id'),)", 'object_name': 'StudentModule'},
+ 'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+ 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'done': ('django.db.models.fields.CharField', [], {'default': "'na'", 'max_length': '8', 'db_index': 'True'}),
+ 'grade': ('django.db.models.fields.FloatField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'max_grade': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+ 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'module_state_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_column': "'module_id'", 'db_index': 'True'}),
+ 'module_type': ('django.db.models.fields.CharField', [], {'default': "'problem'", 'max_length': '32', 'db_index': 'True'}),
+ 'state': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+ }
+ }
+
+ complete_apps = ['courseware']
\ No newline at end of file
diff --git a/lms/djangoapps/courseware/models.py b/lms/djangoapps/courseware/models.py
index ffc7c929de..21ef8b3d66 100644
--- a/lms/djangoapps/courseware/models.py
+++ b/lms/djangoapps/courseware/models.py
@@ -177,3 +177,40 @@ class StudentModuleCache(object):
def append(self, student_module):
self.cache.append(student_module)
+
+
+class OfflineComputedGrade(models.Model):
+ """
+ Table of grades computed offline for a given user and course.
+ """
+ user = models.ForeignKey(User, db_index=True)
+ course_id = models.CharField(max_length=255, db_index=True)
+
+ created = models.DateTimeField(auto_now_add=True, null=True, db_index=True)
+ updated = models.DateTimeField(auto_now=True, db_index=True)
+
+ gradeset = models.TextField(null=True, blank=True) # grades, stored as JSON
+
+ class Meta:
+ unique_together = (('user', 'course_id'), )
+
+ def __unicode__(self):
+ return "[OfflineComputedGrade] %s: %s (%s) = %s" % (self.user, self.course_id, self.created, self.gradeset)
+
+
+class OfflineComputedGradeLog(models.Model):
+ """
+ Log of when offline grades are computed.
+ Use this to be able to show instructor when the last computed grades were done.
+ """
+ class Meta:
+ ordering = ["-created"]
+ get_latest_by = "created"
+
+ course_id = models.CharField(max_length=255, db_index=True)
+ created = models.DateTimeField(auto_now_add=True, null=True, db_index=True)
+ seconds = models.IntegerField(default=0) # seconds elapsed for computation
+ nstudents = models.IntegerField(default=0)
+
+ def __unicode__(self):
+ return "[OCGLog] %s: %s" % (self.course_id, self.created)
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index f6e87dfe9f..9e52e2b281 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -70,7 +70,7 @@ def courses(request):
courses = get_courses(request.user, domain=request.META.get('HTTP_HOST'))
# Sort courses by how far are they from they start day
- key = lambda course: course.metadata['days_to_start']
+ key = lambda course: course.days_until_start
courses = sorted(courses, key=key, reverse=True)
return render_to_response("courseware/courses.html", {'courses': courses})
@@ -440,7 +440,7 @@ def university_profile(request, org_id):
domain=request.META.get('HTTP_HOST'))[org_id]
# Sort courses by how far are they from they start day
- key = lambda course: course.metadata['days_to_start']
+ key = lambda course: course.days_until_start
courses = sorted(courses, key=key, reverse=True)
context = dict(courses=courses, org_id=org_id)
diff --git a/lms/djangoapps/instructor/management/commands/compute_grades.py b/lms/djangoapps/instructor/management/commands/compute_grades.py
new file mode 100644
index 0000000000..462833ba3c
--- /dev/null
+++ b/lms/djangoapps/instructor/management/commands/compute_grades.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+#
+# django management command: dump grades to csv files
+# for use by batch processes
+
+import os, sys, string
+import datetime
+import json
+
+#import student.models
+from instructor.offline_gradecalc import *
+from courseware.courses import get_course_by_id
+from xmodule.modulestore.django import modulestore
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+class Command(BaseCommand):
+ help = "Compute grades for all students in a course, and store result in DB.\n"
+ help += "Usage: compute_grades course_id_or_dir \n"
+ help += " course_id_or_dir: either course_id or course_dir\n"
+ help += 'Example course_id: MITx/8.01rq_MW/Classical_Mechanics_Reading_Questions_Fall_2012_MW_Section'
+
+ def handle(self, *args, **options):
+
+ print "args = ", args
+
+ if len(args)>0:
+ course_id = args[0]
+ else:
+ print self.help
+ return
+
+ try:
+ course = get_course_by_id(course_id)
+ except Exception as err:
+ if course_id in modulestore().courses:
+ course = modulestore().courses[course_id]
+ else:
+ print "-----------------------------------------------------------------------------"
+ print "Sorry, cannot find course %s" % course_id
+ print "Please provide a course ID or course data directory name, eg content-mit-801rq"
+ return
+
+ print "-----------------------------------------------------------------------------"
+ print "Computing grades for %s" % (course.id)
+
+ offline_grade_calculation(course.id)
+
+
+
+
diff --git a/lms/djangoapps/instructor/offline_gradecalc.py b/lms/djangoapps/instructor/offline_gradecalc.py
new file mode 100644
index 0000000000..7c102805b4
--- /dev/null
+++ b/lms/djangoapps/instructor/offline_gradecalc.py
@@ -0,0 +1,103 @@
+# ======== Offline calculation of grades =============================================================================
+#
+# Computing grades of a large number of students can take a long time. These routines allow grades to
+# be computed offline, by a batch process (eg cronjob).
+#
+# The grades are stored in the OfflineComputedGrade table of the courseware model.
+
+import json
+import logging
+import time
+
+import courseware.models
+
+from collections import namedtuple
+from json import JSONEncoder
+from courseware import grades, models
+from courseware.courses import get_course_by_id
+from django.contrib.auth.models import User, Group
+
+
+class MyEncoder(JSONEncoder):
+
+ def _iterencode(self, obj, markers=None):
+ if isinstance(obj, tuple) and hasattr(obj, '_asdict'):
+ gen = self._iterencode_dict(obj._asdict(), markers)
+ else:
+ gen = JSONEncoder._iterencode(self, obj, markers)
+ for chunk in gen:
+ yield chunk
+
+
+def offline_grade_calculation(course_id):
+ '''
+ Compute grades for all students for a specified course, and save results to the DB.
+ '''
+
+ tstart = time.time()
+ enrolled_students = User.objects.filter(courseenrollment__course_id=course_id).prefetch_related("groups").order_by('username')
+
+ enc = MyEncoder()
+
+ class DummyRequest(object):
+ META = {}
+ def __init__(self):
+ return
+ def get_host(self):
+ return 'edx.mit.edu'
+ def is_secure(self):
+ return False
+
+ request = DummyRequest()
+
+ print "%d enrolled students" % len(enrolled_students)
+ course = get_course_by_id(course_id)
+
+ for student in enrolled_students:
+ gradeset = grades.grade(student, request, course, keep_raw_scores=True)
+ gs = enc.encode(gradeset)
+ ocg, created = models.OfflineComputedGrade.objects.get_or_create(user=student, course_id=course_id)
+ ocg.gradeset = gs
+ ocg.save()
+ print "%s done" % student # print statement used because this is run by a management command
+
+ tend = time.time()
+ dt = tend - tstart
+
+ ocgl = models.OfflineComputedGradeLog(course_id=course_id, seconds=dt, nstudents=len(enrolled_students))
+ ocgl.save()
+ print ocgl
+ print "All Done!"
+
+
+def offline_grades_available(course_id):
+ '''
+ Returns False if no offline grades available for specified course.
+ Otherwise returns latest log field entry about the available pre-computed grades.
+ '''
+ ocgl = models.OfflineComputedGradeLog.objects.filter(course_id=course_id)
+ if not ocgl:
+ return False
+ return ocgl.latest('created')
+
+
+def student_grades(student, request, course, keep_raw_scores=False, use_offline=False):
+ '''
+ This is the main interface to get grades. It has the same parameters as grades.grade, as well
+ as use_offline. If use_offline is True then this will look for an offline computed gradeset in the DB.
+ '''
+
+ if not use_offline:
+ return grades.grade(student, request, course, keep_raw_scores=keep_raw_scores)
+
+ try:
+ ocg = models.OfflineComputedGrade.objects.get(user=student, course_id=course.id)
+ except models.OfflineComputedGrade.DoesNotExist:
+ return dict(raw_scores=[], section_breakdown=[],
+ msg='Error: no offline gradeset available for %s, %s' % (student, course.id))
+
+ return json.loads(ocg.gradeset)
+
+
+
+
diff --git a/lms/djangoapps/instructor/tests.py b/lms/djangoapps/instructor/tests.py
index 865a97951e..2d17cee47d 100644
--- a/lms/djangoapps/instructor/tests.py
+++ b/lms/djangoapps/instructor/tests.py
@@ -25,7 +25,6 @@ from django_comment_client.models import Role, FORUM_ROLE_ADMINISTRATOR, \
FORUM_ROLE_MODERATOR, FORUM_ROLE_COMMUNITY_TA, FORUM_ROLE_STUDENT
from django_comment_client.utils import has_forum_access
-from instructor import staff_grading_service
from courseware.access import _course_staff_group_name
import courseware.tests.tests as ct
from xmodule.modulestore.django import modulestore
@@ -100,7 +99,6 @@ def action_name(operation, rolename):
return '{0} forum {1}'.format(operation, FORUM_ADMIN_ACTION_SUFFIX[rolename])
-_mock_service = staff_grading_service.MockStaffGradingService()
@override_settings(MODULESTORE=ct.TEST_DATA_XML_MODULESTORE)
class TestInstructorDashboardForumAdmin(ct.PageLoader):
@@ -223,94 +221,3 @@ class TestInstructorDashboardForumAdmin(ct.PageLoader):
self.assertTrue(response.content.find('
{0}
'.format(roles))>=0, 'not finding roles "{0}"'.format(roles))
-@override_settings(MODULESTORE=ct.TEST_DATA_XML_MODULESTORE)
-class TestStaffGradingService(ct.PageLoader):
- '''
- Check that staff grading service proxy works. Basically just checking the
- access control and error handling logic -- all the actual work is on the
- backend.
- '''
- def setUp(self):
- xmodule.modulestore.django._MODULESTORES = {}
-
- self.student = 'view@test.com'
- self.instructor = 'view2@test.com'
- self.password = 'foo'
- self.location = 'TestLocation'
- self.create_account('u1', self.student, self.password)
- self.create_account('u2', self.instructor, self.password)
- self.activate_user(self.student)
- self.activate_user(self.instructor)
-
- self.course_id = "edX/toy/2012_Fall"
- self.toy = modulestore().get_course(self.course_id)
- def make_instructor(course):
- group_name = _course_staff_group_name(course.location)
- g = Group.objects.create(name=group_name)
- g.user_set.add(ct.user(self.instructor))
-
- make_instructor(self.toy)
-
- self.mock_service = staff_grading_service.grading_service()
-
- self.logout()
-
- def test_access(self):
- """
- Make sure only staff have access.
- """
- self.login(self.student, self.password)
-
- # both get and post should return 404
- for view_name in ('staff_grading_get_next', 'staff_grading_save_grade'):
- url = reverse(view_name, kwargs={'course_id': self.course_id})
- self.check_for_get_code(404, url)
- self.check_for_post_code(404, url)
-
-
- def test_get_next(self):
- self.login(self.instructor, self.password)
-
- url = reverse('staff_grading_get_next', kwargs={'course_id': self.course_id})
- data = {'location': self.location}
-
- r = self.check_for_post_code(200, url, data)
- d = json.loads(r.content)
- self.assertTrue(d['success'])
- self.assertEquals(d['submission_id'], self.mock_service.cnt)
- self.assertIsNotNone(d['submission'])
- self.assertIsNotNone(d['num_graded'])
- self.assertIsNotNone(d['min_for_ml'])
- self.assertIsNotNone(d['num_pending'])
- self.assertIsNotNone(d['prompt'])
- self.assertIsNotNone(d['ml_error_info'])
- self.assertIsNotNone(d['max_score'])
- self.assertIsNotNone(d['rubric'])
-
-
- def test_save_grade(self):
- self.login(self.instructor, self.password)
-
- url = reverse('staff_grading_save_grade', kwargs={'course_id': self.course_id})
-
- data = {'score': '12',
- 'feedback': 'great!',
- 'submission_id': '123',
- 'location': self.location}
- r = self.check_for_post_code(200, url, data)
- d = json.loads(r.content)
- self.assertTrue(d['success'], str(d))
- self.assertEquals(d['submission_id'], self.mock_service.cnt)
-
- def test_get_problem_list(self):
- self.login(self.instructor, self.password)
-
- url = reverse('staff_grading_get_problem_list', kwargs={'course_id': self.course_id})
- data = {}
-
- r = self.check_for_post_code(200, url, data)
- d = json.loads(r.content)
- self.assertTrue(d['success'], str(d))
- self.assertIsNotNone(d['problem_list'])
-
-
diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 79cf0caaf3..2d58799efe 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -2,10 +2,14 @@
from collections import defaultdict
import csv
+import json
import logging
import os
+import requests
import urllib
+from StringIO import StringIO
+
from django.conf import settings
from django.contrib.auth.models import User, Group
from django.http import HttpResponse
@@ -20,7 +24,7 @@ from courseware.courses import get_course_with_access
from django_comment_client.models import Role, FORUM_ROLE_ADMINISTRATOR, FORUM_ROLE_MODERATOR, FORUM_ROLE_COMMUNITY_TA
from django_comment_client.utils import has_forum_access
from psychometrics import psychoanalyze
-from student.models import CourseEnrollment
+from student.models import CourseEnrollment, CourseEnrollmentAllowed
from xmodule.course_module import CourseDescriptor
from xmodule.modulestore import Location
from xmodule.modulestore.django import modulestore
@@ -28,8 +32,7 @@ from xmodule.modulestore.exceptions import InvalidLocationError, ItemNotFoundErr
from xmodule.modulestore.search import path_to_location
import track.views
-from .grading import StaffGrading
-
+from .offline_gradecalc import student_grades, offline_grades_available
log = logging.getLogger(__name__)
@@ -76,9 +79,12 @@ def instructor_dashboard(request, course_id):
data.append(['metadata', escape(str(course.metadata))])
datatable['data'] = data
- def return_csv(fn, datatable):
- response = HttpResponse(mimetype='text/csv')
- response['Content-Disposition'] = 'attachment; filename={0}'.format(fn)
+ def return_csv(fn, datatable, fp=None):
+ if fp is None:
+ response = HttpResponse(mimetype='text/csv')
+ response['Content-Disposition'] = 'attachment; filename={0}'.format(fn)
+ else:
+ response = fp
writer = csv.writer(response, dialect='excel', quotechar='"', quoting=csv.QUOTE_ALL)
writer.writerow(datatable['header'])
for datarow in datatable['data']:
@@ -87,16 +93,23 @@ def instructor_dashboard(request, course_id):
return response
def get_staff_group(course):
- staffgrp = get_access_group_name(course, 'staff')
+ return get_group(course, 'staff')
+
+ def get_instructor_group(course):
+ return get_group(course, 'instructor')
+
+ def get_group(course, groupname):
+ grpname = get_access_group_name(course, groupname)
try:
- group = Group.objects.get(name=staffgrp)
+ group = Group.objects.get(name=grpname)
except Group.DoesNotExist:
- group = Group(name=staffgrp) # create the group
+ group = Group(name=grpname) # create the group
group.save()
return group
# process actions from form POST
action = request.POST.get('action', '')
+ use_offline = request.POST.get('use_offline_grades',False)
if settings.MITX_FEATURES['ENABLE_MANUAL_GIT_RELOAD']:
if 'GIT pull' in action:
@@ -126,39 +139,98 @@ def instructor_dashboard(request, course_id):
except Exception as err:
msg += '
Error: {0}
'.format(escape(err))
- if action == 'Dump list of enrolled students':
+ if action == 'Dump list of enrolled students' or action=='List enrolled students':
log.debug(action)
- datatable = get_student_grade_summary_data(request, course, course_id, get_grades=False)
+ datatable = get_student_grade_summary_data(request, course, course_id, get_grades=False, use_offline=use_offline)
datatable['title'] = 'List of students enrolled in {0}'.format(course_id)
track.views.server_track(request, 'list-students', {}, page='idashboard')
elif 'Dump Grades' in action:
log.debug(action)
- datatable = get_student_grade_summary_data(request, course, course_id, get_grades=True)
+ datatable = get_student_grade_summary_data(request, course, course_id, get_grades=True, use_offline=use_offline)
datatable['title'] = 'Summary Grades of students enrolled in {0}'.format(course_id)
track.views.server_track(request, 'dump-grades', {}, page='idashboard')
elif 'Dump all RAW grades' in action:
log.debug(action)
datatable = get_student_grade_summary_data(request, course, course_id, get_grades=True,
- get_raw_scores=True)
+ get_raw_scores=True, use_offline=use_offline)
datatable['title'] = 'Raw Grades of students enrolled in {0}'.format(course_id)
track.views.server_track(request, 'dump-grades-raw', {}, page='idashboard')
elif 'Download CSV of all student grades' in action:
track.views.server_track(request, 'dump-grades-csv', {}, page='idashboard')
return return_csv('grades_{0}.csv'.format(course_id),
- get_student_grade_summary_data(request, course, course_id))
+ get_student_grade_summary_data(request, course, course_id, use_offline=use_offline))
elif 'Download CSV of all RAW grades' in action:
track.views.server_track(request, 'dump-grades-csv-raw', {}, page='idashboard')
return return_csv('grades_{0}_raw.csv'.format(course_id),
- get_student_grade_summary_data(request, course, course_id, get_raw_scores=True))
+ get_student_grade_summary_data(request, course, course_id, get_raw_scores=True, use_offline=use_offline))
elif 'Download CSV of answer distributions' in action:
track.views.server_track(request, 'dump-answer-dist-csv', {}, page='idashboard')
return return_csv('answer_dist_{0}.csv'.format(course_id), get_answers_distribution(request, course_id))
+ #----------------------------------------
+ # export grades to remote gradebook
+
+ elif action=='List assignments available in remote gradebook':
+ msg2, datatable = _do_remote_gradebook(request.user, course, 'get-assignments')
+ msg += msg2
+
+ elif action=='List assignments available for this course':
+ log.debug(action)
+ allgrades = get_student_grade_summary_data(request, course, course_id, get_grades=True, use_offline=use_offline)
+
+ assignments = [[x] for x in allgrades['assignments']]
+ datatable = {'header': ['Assignment Name']}
+ datatable['data'] = assignments
+ datatable['title'] = action
+
+ msg += 'assignments=
%s
' % assignments
+
+ elif action=='List enrolled students matching remote gradebook':
+ stud_data = get_student_grade_summary_data(request, course, course_id, get_grades=False, use_offline=use_offline)
+ msg2, rg_stud_data = _do_remote_gradebook(request.user, course, 'get-membership')
+ datatable = {'header': ['Student email', 'Match?']}
+ rg_students = [ x['email'] for x in rg_stud_data['retdata'] ]
+ def domatch(x):
+ return 'yes' if x.email in rg_students else 'No'
+ datatable['data'] = [[x.email, domatch(x)] for x in stud_data['students']]
+ datatable['title'] = action
+
+ elif action in ['Display grades for assignment', 'Export grades for assignment to remote gradebook',
+ 'Export CSV file of grades for assignment']:
+
+ log.debug(action)
+ datatable = {}
+ aname = request.POST.get('assignment_name','')
+ if not aname:
+ msg += "Please enter an assignment name"
+ else:
+ allgrades = get_student_grade_summary_data(request, course, course_id, get_grades=True, use_offline=use_offline)
+ if aname not in allgrades['assignments']:
+ msg += "Invalid assignment name '%s'" % aname
+ else:
+ aidx = allgrades['assignments'].index(aname)
+ datatable = {'header': ['External email', aname]}
+ datatable['data'] = [[x.email, x.grades[aidx]] for x in allgrades['students']]
+ datatable['title'] = 'Grades for assignment "%s"' % aname
+
+ if 'Export CSV' in action:
+ # generate and return CSV file
+ return return_csv('grades %s.csv' % aname, datatable)
+
+ elif 'remote gradebook' in action:
+ fp = StringIO()
+ return_csv('', datatable, fp=fp)
+ fp.seek(0)
+ files = {'datafile': fp}
+ msg2, dataset = _do_remote_gradebook(request.user, course, 'post-grades', files=files)
+ msg += msg2
+
+
#----------------------------------------
# Admin
@@ -172,6 +244,16 @@ def instructor_dashboard(request, course_id):
datatable['title'] = 'List of Staff in course {0}'.format(course_id)
track.views.server_track(request, 'list-staff', {}, page='idashboard')
+ elif 'List course instructors' in action and request.user.is_staff:
+ group = get_instructor_group(course)
+ msg += 'Instructor group = {0}'.format(group.name)
+ log.debug('instructor grp={0}'.format(group.name))
+ uset = group.user_set.all()
+ datatable = {'header': ['Username', 'Full name']}
+ datatable['data'] = [[x.username, x.profile.name] for x in uset]
+ datatable['title'] = 'List of Instructors in course {0}'.format(course_id)
+ track.views.server_track(request, 'list-instructors', {}, page='idashboard')
+
elif action == 'Add course staff':
uname = request.POST['staffuser']
try:
@@ -186,6 +268,20 @@ def instructor_dashboard(request, course_id):
user.groups.add(group)
track.views.server_track(request, 'add-staff {0}'.format(user), {}, page='idashboard')
+ elif action == 'Add instructor' and request.user.is_staff:
+ uname = request.POST['instructor']
+ try:
+ user = User.objects.get(username=uname)
+ except User.DoesNotExist:
+ msg += 'Error: unknown username "{0}"'.format(uname)
+ user = None
+ if user is not None:
+ group = get_instructor_group(course)
+ msg += 'Added {0} to instructor group = {1}'.format(user, group.name)
+ log.debug('staffgrp={0}'.format(group.name))
+ user.groups.add(group)
+ track.views.server_track(request, 'add-instructor {0}'.format(user), {}, page='idashboard')
+
elif action == 'Remove course staff':
uname = request.POST['staffuser']
try:
@@ -200,6 +296,20 @@ def instructor_dashboard(request, course_id):
user.groups.remove(group)
track.views.server_track(request, 'remove-staff {0}'.format(user), {}, page='idashboard')
+ elif action == 'Remove instructor' and request.user.is_staff:
+ uname = request.POST['instructor']
+ try:
+ user = User.objects.get(username=uname)
+ except User.DoesNotExist:
+ msg += 'Error: unknown username "{0}"'.format(uname)
+ user = None
+ if user is not None:
+ group = get_instructor_group(course)
+ msg += 'Removed {0} from instructor group = {1}'.format(user, group.name)
+ log.debug('instructorgrp={0}'.format(group.name))
+ user.groups.remove(group)
+ track.views.server_track(request, 'remove-instructor {0}'.format(user), {}, page='idashboard')
+
#----------------------------------------
# forum administration
@@ -258,6 +368,71 @@ def instructor_dashboard(request, course_id):
track.views.server_track(request, '{0} {1} as {2} for {3}'.format(FORUM_ROLE_ADD, uname, FORUM_ROLE_COMMUNITY_TA, course_id),
{}, page='idashboard')
+ #----------------------------------------
+ # enrollment
+
+ elif action == 'List students who may enroll but may not have yet signed up':
+ ceaset = CourseEnrollmentAllowed.objects.filter(course_id=course_id)
+ datatable = {'header': ['StudentEmail']}
+ datatable['data'] = [[x.email] for x in ceaset]
+ datatable['title'] = action
+
+ elif action == 'Enroll student':
+
+ student = request.POST.get('enstudent','')
+ ret = _do_enroll_students(course, course_id, student)
+ datatable = ret['datatable']
+
+ elif action == 'Un-enroll student':
+
+ student = request.POST.get('enstudent','')
+ datatable = {}
+ isok = False
+ cea = CourseEnrollmentAllowed.objects.filter(course_id=course_id, email=student)
+ if cea:
+ cea.delete()
+ msg += "Un-enrolled student with email '%s'" % student
+ isok = True
+ try:
+ nce = CourseEnrollment.objects.get(user=User.objects.get(email=student), course_id=course_id)
+ nce.delete()
+ msg += "Un-enrolled student with email '%s'" % student
+ except Exception as err:
+ if not isok:
+ msg += "Error! Failed to un-enroll student with email '%s'\n" % student
+ msg += str(err) + '\n'
+
+ elif action == 'Un-enroll ALL students':
+
+ ret = _do_enroll_students(course, course_id, '', overload=True)
+ datatable = ret['datatable']
+
+ elif action == 'Enroll multiple students':
+
+ students = request.POST.get('enroll_multiple','')
+ ret = _do_enroll_students(course, course_id, students)
+ datatable = ret['datatable']
+
+ elif action == 'List sections available in remote gradebook':
+
+ msg2, datatable = _do_remote_gradebook(request.user, course, 'get-sections')
+ msg += msg2
+
+ elif action in ['List students in section in remote gradebook',
+ 'Overload enrollment list using remote gradebook',
+ 'Merge enrollment list with remote gradebook']:
+
+ section = request.POST.get('gradebook_section','')
+ msg2, datatable = _do_remote_gradebook(request.user, course, 'get-membership', dict(section=section) )
+ msg += msg2
+
+ if not 'List' in action:
+ students = ','.join([x['email'] for x in datatable['retdata']])
+ overload = 'Overload' in action
+ ret = _do_enroll_students(course, course_id, students, overload=overload)
+ datatable = ret['datatable']
+
+
#----------------------------------------
# psychometrics
@@ -271,9 +446,15 @@ def instructor_dashboard(request, course_id):
problems = psychoanalyze.problems_with_psychometric_data(course_id)
+ #----------------------------------------
+ # offline grades?
+
+ if use_offline:
+ msg += " Grades from %s" % offline_grades_available(course_id)
#----------------------------------------
# context for rendering
+
context = {'course': course,
'staff_access': True,
'admin_access': request.user.is_staff,
@@ -286,16 +467,66 @@ def instructor_dashboard(request, course_id):
'plots': plots, # psychometrics
'course_errors': modulestore().get_item_errors(course.location),
'djangopid' : os.getpid(),
+ 'mitx_version' : getattr(settings,'MITX_VERSION_STRING',''),
+ 'offline_grade_log' : offline_grades_available(course_id),
}
return render_to_response('courseware/instructor_dashboard.html', context)
+
+def _do_remote_gradebook(user, course, action, args=None, files=None):
+ '''
+ Perform remote gradebook action. Returns msg, datatable.
+ '''
+ rg = course.metadata.get('remote_gradebook','')
+ if not rg:
+ msg = "No remote gradebook defined in course metadata"
+ return msg, {}
+
+ rgurl = settings.MITX_FEATURES.get('REMOTE_GRADEBOOK_URL','')
+ if not rgurl:
+ msg = "No remote gradebook url defined in settings.MITX_FEATURES"
+ return msg, {}
+
+ rgname = rg.get('name','')
+ if not rgname:
+ msg = "No gradebook name defined in course remote_gradebook metadata"
+ return msg, {}
+
+ if args is None:
+ args = {}
+ data = dict(submit=action, gradebook=rgname, user=user.email)
+ data.update(args)
+
+ try:
+ resp = requests.post(rgurl, data=data, verify=False, files=files)
+ retdict = json.loads(resp.content)
+ except Exception as err:
+ msg = "Failed to communicate with gradebook server at %s " % rgurl
+ msg += "Error: %s" % err
+ msg += " resp=%s" % resp.content
+ msg += " data=%s" % data
+ return msg, {}
+
+ msg = '
%s
' % retdict['msg'].replace('\n',' ')
+ retdata = retdict['data'] # a list of dicts
+
+ if retdata:
+ datatable = {'header': retdata[0].keys()}
+ datatable['data'] = [x.values() for x in retdata]
+ datatable['title'] = 'Remote gradebook response for %s' % action
+ datatable['retdata'] = retdata
+ else:
+ datatable = {}
+
+ return msg, datatable
+
def _list_course_forum_members(course_id, rolename, datatable):
'''
Fills in datatable with forum membership information, for a given role,
so that it will be displayed on instructor dashboard.
- course_ID = course's ID string
+ course_ID = the ID string for a course
rolename = one of "Administrator", "Moderator", "Community TA"
Returns message status string to append to displayed message, if role is unknown.
@@ -360,7 +591,7 @@ def _update_forum_role_membership(uname, course, rolename, add_or_remove):
return msg
-def get_student_grade_summary_data(request, course, course_id, get_grades=True, get_raw_scores=False):
+def get_student_grade_summary_data(request, course, course_id, get_grades=True, get_raw_scores=False, use_offline=False):
'''
Return data arrays with student identity and grades for specified course.
@@ -381,16 +612,18 @@ def get_student_grade_summary_data(request, course, course_id, get_grades=True,
enrolled_students = User.objects.filter(courseenrollment__course_id=course_id).prefetch_related("groups").order_by('username')
header = ['ID', 'Username', 'Full Name', 'edX email', 'External email']
+ assignments = []
if get_grades and enrolled_students.count() > 0:
# just to construct the header
- gradeset = grades.grade(enrolled_students[0], request, course, keep_raw_scores=get_raw_scores)
+ gradeset = student_grades(enrolled_students[0], request, course, keep_raw_scores=get_raw_scores, use_offline=use_offline)
# log.debug('student {0} gradeset {1}'.format(enrolled_students[0], gradeset))
if get_raw_scores:
- header += [score.section for score in gradeset['raw_scores']]
+ assignments += [score.section for score in gradeset['raw_scores']]
else:
- header += [x['label'] for x in gradeset['section_breakdown']]
+ assignments += [x['label'] for x in gradeset['section_breakdown']]
+ header += assignments
- datatable = {'header': header}
+ datatable = {'header': header, 'assignments': assignments, 'students': enrolled_students}
data = []
for student in enrolled_students:
@@ -401,40 +634,21 @@ def get_student_grade_summary_data(request, course, course_id, get_grades=True,
datarow.append('')
if get_grades:
- gradeset = grades.grade(student, request, course, keep_raw_scores=get_raw_scores)
- # log.debug('student={0}, gradeset={1}'.format(student,gradeset))
+ gradeset = student_grades(student, request, course, keep_raw_scores=get_raw_scores, use_offline=use_offline)
+ log.debug('student={0}, gradeset={1}'.format(student,gradeset))
if get_raw_scores:
- datarow += [score.earned for score in gradeset['raw_scores']]
+ # TODO (ichuang) encode Score as dict instead of as list, so score[0] -> score['earned']
+ sgrades = [(getattr(score,'earned','') or score[0]) for score in gradeset['raw_scores']]
else:
- datarow += [x['percent'] for x in gradeset['section_breakdown']]
+ sgrades = [x['percent'] for x in gradeset['section_breakdown']]
+ datarow += sgrades
+ student.grades = sgrades # store in student object
data.append(datarow)
datatable['data'] = data
return datatable
-
-
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-def staff_grading(request, course_id):
- """
- Show the instructor grading interface.
- """
- course = get_course_with_access(request.user, course_id, 'staff')
-
- grading = StaffGrading(course)
-
- ajax_url = reverse('staff_grading', kwargs={'course_id': course_id})
- if not ajax_url.endswith('/'):
- ajax_url += '/'
-
- return render_to_response('instructor/staff_grading.html', {
- 'view_html': grading.get_html(),
- 'course': course,
- 'course_id': course_id,
- 'ajax_url': ajax_url,
- # Checked above
- 'staff_access': True, })
-
+#-----------------------------------------------------------------------------
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
def gradebook(request, course_id):
@@ -453,7 +667,7 @@ def gradebook(request, course_id):
student_info = [{'username': student.username,
'id': student.id,
'email': student.email,
- 'grade_summary': grades.grade(student, request, course),
+ 'grade_summary': student_grades(student, request, course),
'realname': student.profile.name,
}
for student in enrolled_students]
@@ -476,6 +690,72 @@ def grade_summary(request, course_id):
return render_to_response('courseware/grade_summary.html', context)
+#-----------------------------------------------------------------------------
+# enrollment
+
+
+def _do_enroll_students(course, course_id, students, overload=False):
+ """Do the actual work of enrolling multiple students, presented as a string
+ of emails separated by commas or returns"""
+
+ ns = [x.split('\n') for x in students.split(',')]
+ new_students = [item for sublist in ns for item in sublist]
+ new_students = [str(s.strip()) for s in new_students]
+ new_students_lc = [x.lower() for x in new_students]
+
+ if '' in new_students:
+ new_students.remove('')
+
+ status = dict([x,'unprocessed'] for x in new_students)
+
+ if overload: # delete all but staff
+ todelete = CourseEnrollment.objects.filter(course_id=course_id)
+ for ce in todelete:
+ if not has_access(ce.user, course, 'staff') and ce.user.email.lower() not in new_students_lc:
+ status[ce.user.email] = 'deleted'
+ ce.delete()
+ else:
+ status[ce.user.email] = 'is staff'
+ ceaset = CourseEnrollmentAllowed.objects.filter(course_id=course_id)
+ for cea in ceaset:
+ status[cea.email] = 'removed from pending enrollment list'
+ ceaset.delete()
+
+ for student in new_students:
+ try:
+ user=User.objects.get(email=student)
+ except User.DoesNotExist:
+ # user not signed up yet, put in pending enrollment allowed table
+ if CourseEnrollmentAllowed.objects.filter(email=student, course_id=course_id):
+ status[student] = 'user does not exist, enrollment already allowed, pending'
+ continue
+ cea = CourseEnrollmentAllowed(email=student, course_id=course_id)
+ cea.save()
+ status[student] = 'user does not exist, enrollment allowed, pending'
+ continue
+
+ if CourseEnrollment.objects.filter(user=user, course_id=course_id):
+ status[student] = 'already enrolled'
+ continue
+ try:
+ nce = CourseEnrollment(user=user, course_id=course_id)
+ nce.save()
+ status[student] = 'added'
+ except:
+ status[student] = 'rejected'
+
+ datatable = {'header': ['StudentEmail', 'action']}
+ datatable['data'] = [[x, status[x]] for x in status]
+ datatable['title'] = 'Enrollment of students'
+
+ def sf(stat): return [x for x in status if status[x]==stat]
+
+ data = dict(added=sf('added'), rejected=sf('rejected')+sf('exists'),
+ deleted=sf('deleted'), datatable=datatable)
+
+ return data
+
+
@ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True)
def enroll_students(request, course_id):
@@ -494,22 +774,10 @@ def enroll_students(request, course_id):
course = get_course_with_access(request.user, course_id, 'staff')
existing_students = [ce.user.email for ce in CourseEnrollment.objects.filter(course_id=course_id)]
- if 'new_students' in request.POST:
- new_students = request.POST['new_students'].split('\n')
- else:
- new_students = []
- new_students = [s.strip() for s in new_students]
-
- added_students = []
- rejected_students = []
-
- for student in new_students:
- try:
- nce = CourseEnrollment(user=User.objects.get(email=student), course_id=course_id)
- nce.save()
- added_students.append(student)
- except:
- rejected_students.append(student)
+ new_students = request.POST.get('new_students')
+ ret = _do_enroll_students(course, course_id, new_students)
+ added_students = ret['added']
+ rejected_students = ret['rejected']
return render_to_response("enroll_students.html", {'course': course_id,
'existing_students': existing_students,
@@ -518,6 +786,9 @@ def enroll_students(request, course_id):
'debug': new_students})
+#-----------------------------------------------------------------------------
+# answer distribution
+
def get_answers_distribution(request, course_id):
"""
Get the distribution of answers for all graded problems in the course.
diff --git a/lms/djangoapps/open_ended_grading/__init__.py b/lms/djangoapps/open_ended_grading/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lms/djangoapps/open_ended_grading/grading_service.py b/lms/djangoapps/open_ended_grading/grading_service.py
new file mode 100644
index 0000000000..7362411daa
--- /dev/null
+++ b/lms/djangoapps/open_ended_grading/grading_service.py
@@ -0,0 +1,100 @@
+# This class gives a common interface for logging into the grading controller
+import json
+import logging
+import requests
+from requests.exceptions import RequestException, ConnectionError, HTTPError
+import sys
+
+from django.conf import settings
+from django.http import HttpResponse, Http404
+
+from courseware.access import has_access
+from util.json_request import expect_json
+from xmodule.course_module import CourseDescriptor
+
+log = logging.getLogger(__name__)
+
+class GradingServiceError(Exception):
+ pass
+
+class GradingService(object):
+ """
+ Interface to staff grading backend.
+ """
+ def __init__(self, config):
+ self.username = config['username']
+ self.password = config['password']
+ self.url = config['url']
+ self.login_url = self.url + '/login/'
+ self.session = requests.session()
+
+ def _login(self):
+ """
+ Log into the staff grading service.
+
+ Raises requests.exceptions.HTTPError if something goes wrong.
+
+ Returns the decoded json dict of the response.
+ """
+ response = self.session.post(self.login_url,
+ {'username': self.username,
+ 'password': self.password,})
+
+ response.raise_for_status()
+
+ return response.json
+
+ def post(self, url, data, allow_redirects=False):
+ """
+ Make a post request to the grading controller
+ """
+ try:
+ op = lambda: self.session.post(url, data=data,
+ allow_redirects=allow_redirects)
+ r = self._try_with_login(op)
+ except (RequestException, ConnectionError, HTTPError) as err:
+ # reraise as promised GradingServiceError, but preserve stacktrace.
+ raise GradingServiceError, str(err), sys.exc_info()[2]
+
+ return r.text
+
+ def get(self, url, params, allow_redirects=False):
+ """
+ Make a get request to the grading controller
+ """
+ log.debug(params)
+ op = lambda: self.session.get(url,
+ allow_redirects=allow_redirects,
+ params=params)
+ try:
+ r = self._try_with_login(op)
+ except (RequestException, ConnectionError, HTTPError) as err:
+ # reraise as promised GradingServiceError, but preserve stacktrace.
+ raise GradingServiceError, str(err), sys.exc_info()[2]
+
+ return r.text
+
+
+ def _try_with_login(self, operation):
+ """
+ Call operation(), which should return a requests response object. If
+ the request fails with a 'login_required' error, call _login() and try
+ the operation again.
+
+ Returns the result of operation(). Does not catch exceptions.
+ """
+ response = operation()
+ if (response.json
+ and response.json.get('success') == False
+ and response.json.get('error') == 'login_required'):
+ # apparrently we aren't logged in. Try to fix that.
+ r = self._login()
+ if r and not r.get('success'):
+ log.warning("Couldn't log into staff_grading backend. Response: %s",
+ r)
+ # try again
+ response = operation()
+ response.raise_for_status()
+
+ return response
+
diff --git a/lms/djangoapps/open_ended_grading/peer_grading_service.py b/lms/djangoapps/open_ended_grading/peer_grading_service.py
new file mode 100644
index 0000000000..9ef0383fb5
--- /dev/null
+++ b/lms/djangoapps/open_ended_grading/peer_grading_service.py
@@ -0,0 +1,355 @@
+"""
+This module provides an interface on the grading-service backend
+for peer grading
+
+Use peer_grading_service() to get the version specified
+in settings.PEER_GRADING_INTERFACE
+
+"""
+import json
+import logging
+import requests
+from requests.exceptions import RequestException, ConnectionError, HTTPError
+import sys
+
+from django.conf import settings
+from django.http import HttpResponse, Http404
+from grading_service import GradingService
+from grading_service import GradingServiceError
+
+from courseware.access import has_access
+from util.json_request import expect_json
+from xmodule.course_module import CourseDescriptor
+from student.models import unique_id_for_user
+
+log = logging.getLogger(__name__)
+
+"""
+This is a mock peer grading service that can be used for unit tests
+without making actual service calls to the grading controller
+"""
+class MockPeerGradingService(object):
+ def get_next_submission(self, problem_location, grader_id):
+ return json.dumps({'success': True,
+ 'submission_id':1,
+ 'submission_key': "",
+ 'student_response': 'fake student response',
+ 'prompt': 'fake submission prompt',
+ 'rubric': 'fake rubric',
+ 'max_score': 4})
+
+ def save_grade(self, location, grader_id, submission_id,
+ score, feedback, submission_key):
+ return json.dumps({'success': True})
+
+ def is_student_calibrated(self, problem_location, grader_id):
+ return json.dumps({'success': True, 'calibrated': True})
+
+ def show_calibration_essay(self, problem_location, grader_id):
+ return json.dumps({'success': True,
+ 'submission_id':1,
+ 'submission_key': '',
+ 'student_response': 'fake student response',
+ 'prompt': 'fake submission prompt',
+ 'rubric': 'fake rubric',
+ 'max_score': 4})
+
+ def save_calibration_essay(self, problem_location, grader_id,
+ calibration_essay_id, submission_key, score, feedback):
+ return {'success': True, 'actual_score': 2}
+
+ def get_problem_list(self, course_id, grader_id):
+ return json.dumps({'success': True,
+ 'problem_list': [
+ json.dumps({'location': 'i4x://MITx/3.091x/problem/open_ended_demo1',
+ 'problem_name': "Problem 1", 'num_graded': 3, 'num_pending': 5}),
+ json.dumps({'location': 'i4x://MITx/3.091x/problem/open_ended_demo2',
+ 'problem_name': "Problem 2", 'num_graded': 1, 'num_pending': 5})
+ ]})
+
+class PeerGradingService(GradingService):
+ """
+ Interface with the grading controller for peer grading
+ """
+ def __init__(self, config):
+ super(PeerGradingService, self).__init__(config)
+ self.get_next_submission_url = self.url + '/get_next_submission/'
+ self.save_grade_url = self.url + '/save_grade/'
+ self.is_student_calibrated_url = self.url + '/is_student_calibrated/'
+ self.show_calibration_essay_url = self.url + '/show_calibration_essay/'
+ self.save_calibration_essay_url = self.url + '/save_calibration_essay/'
+ self.get_problem_list_url = self.url + '/get_problem_list/'
+
+ def get_next_submission(self, problem_location, grader_id):
+ response = self.get(self.get_next_submission_url,
+ {'location': problem_location, 'grader_id': grader_id})
+ return response
+
+ def save_grade(self, location, grader_id, submission_id, score, feedback, submission_key):
+ data = {'grader_id' : grader_id,
+ 'submission_id' : submission_id,
+ 'score' : score,
+ 'feedback' : feedback,
+ 'submission_key': submission_key,
+ 'location': location}
+ return self.post(self.save_grade_url, data)
+
+ def is_student_calibrated(self, problem_location, grader_id):
+ params = {'problem_id' : problem_location, 'student_id': grader_id}
+ return self.get(self.is_student_calibrated_url, params)
+
+ def show_calibration_essay(self, problem_location, grader_id):
+ params = {'problem_id' : problem_location, 'student_id': grader_id}
+ return self.get(self.show_calibration_essay_url, params)
+
+ def save_calibration_essay(self, problem_location, grader_id, calibration_essay_id, submission_key, score, feedback):
+ data = {'location': problem_location,
+ 'student_id': grader_id,
+ 'calibration_essay_id': calibration_essay_id,
+ 'submission_key': submission_key,
+ 'score': score,
+ 'feedback': feedback}
+ return self.post(self.save_calibration_essay_url, data)
+
+ def get_problem_list(self, course_id, grader_id):
+ params = {'course_id': course_id, 'student_id': grader_id}
+ response = self.get(self.get_problem_list_url, params)
+ return response
+
+
+_service = None
+def peer_grading_service():
+ """
+ Return a peer grading service instance--if settings.MOCK_PEER_GRADING is True,
+ returns a mock one, otherwise a real one.
+
+ Caches the result, so changing the setting after the first call to this
+ function will have no effect.
+ """
+ global _service
+ if _service is not None:
+ return _service
+
+ if settings.MOCK_PEER_GRADING:
+ _service = MockPeerGradingService()
+ else:
+ _service = PeerGradingService(settings.PEER_GRADING_INTERFACE)
+
+ return _service
+
+def _err_response(msg):
+ """
+ Return a HttpResponse with a json dump with success=False, and the given error message.
+ """
+ return HttpResponse(json.dumps({'success': False, 'error': msg}),
+ mimetype="application/json")
+
+def _check_required(request, required):
+ actual = set(request.POST.keys())
+ missing = required - actual
+ if len(missing) > 0:
+ return False, "Missing required keys: {0}".format(', '.join(missing))
+ else:
+ return True, ""
+
+def _check_post(request):
+ if request.method != 'POST':
+ raise Http404
+
+
+def get_next_submission(request, course_id):
+ """
+ Makes a call to the grading controller for the next essay that should be graded
+ Returns a json dict with the following keys:
+
+ 'success': bool
+
+ 'submission_id': a unique identifier for the submission, to be passed back
+ with the grade.
+
+ 'submission': the submission, rendered as read-only html for grading
+
+ 'rubric': the rubric, also rendered as html.
+
+ 'submission_key': a key associated with the submission for validation reasons
+
+ 'error': if success is False, will have an error message with more info.
+ """
+ _check_post(request)
+ required = set(['location'])
+ success, message = _check_required(request, required)
+ if not success:
+ return _err_response(message)
+ grader_id = unique_id_for_user(request.user)
+ p = request.POST
+ location = p['location']
+
+ try:
+ response = peer_grading_service().get_next_submission(location, grader_id)
+ return HttpResponse(response,
+ mimetype="application/json")
+ except GradingServiceError:
+ log.exception("Error getting next submission. server url: {0} location: {1}, grader_id: {2}"
+ .format(staff_grading_service().url, location, grader_id))
+ return json.dumps({'success': False,
+ 'error': 'Could not connect to grading service'})
+
+def save_grade(request, course_id):
+ """
+ Saves the grade of a given submission.
+ Input:
+ The request should have the following keys:
+ location - problem location
+ submission_id - id associated with this submission
+ submission_key - submission key given for validation purposes
+ score - the grade that was given to the submission
+ feedback - the feedback from the student
+ Returns
+ A json object with the following keys:
+ success: bool indicating whether the save was a success
+ error: if there was an error in the submission, this is the error message
+ """
+ _check_post(request)
+ required = set(['location', 'submission_id', 'submission_key', 'score', 'feedback'])
+ success, message = _check_required(request, required)
+ if not success:
+ return _err_response(message)
+ grader_id = unique_id_for_user(request.user)
+ p = request.POST
+ location = p['location']
+ submission_id = p['submission_id']
+ score = p['score']
+ feedback = p['feedback']
+ submission_key = p['submission_key']
+ try:
+ response = peer_grading_service().save_grade(location, grader_id, submission_id,
+ score, feedback, submission_key)
+ return HttpResponse(response, mimetype="application/json")
+ except GradingServiceError:
+ log.exception("""Error saving grade. server url: {0}, location: {1}, submission_id:{2},
+ submission_key: {3}, score: {4}"""
+ .format(staff_grading_service().url,
+ location, submission_id, submission_key, score)
+ )
+ return json.dumps({'success': False,
+ 'error': 'Could not connect to grading service'})
+
+
+
+def is_student_calibrated(request, course_id):
+ """
+ Calls the grading controller to see if the given student is calibrated
+ on the given problem
+
+ Input:
+ In the request, we need the following arguments:
+ location - problem location
+
+ Returns:
+ Json object with the following keys
+ success - bool indicating whether or not the call was successful
+ calibrated - true if the grader has fully calibrated and can now move on to grading
+ - false if the grader is still working on calibration problems
+ total_calibrated_on_so_far - the number of calibration essays for this problem
+ that this grader has graded
+ """
+ _check_post(request)
+ required = set(['location'])
+ success, message = _check_required(request, required)
+ if not success:
+ return _err_response(message)
+ grader_id = unique_id_for_user(request.user)
+ p = request.POST
+ location = p['location']
+
+ try:
+ response = peer_grading_service().is_student_calibrated(location, grader_id)
+ return HttpResponse(response, mimetype="application/json")
+ except GradingServiceError:
+ log.exception("Error from grading service. server url: {0}, grader_id: {0}, location: {1}"
+ .format(staff_grading_service().url, grader_id, location))
+ return json.dumps({'success': False,
+ 'error': 'Could not connect to grading service'})
+
+
+
+def show_calibration_essay(request, course_id):
+ """
+ Fetch the next calibration essay from the grading controller and return it
+ Inputs:
+ In the request
+ location - problem location
+
+ Returns:
+ A json dict with the following keys
+ 'success': bool
+
+ 'submission_id': a unique identifier for the submission, to be passed back
+ with the grade.
+
+ 'submission': the submission, rendered as read-only html for grading
+
+ 'rubric': the rubric, also rendered as html.
+
+ 'submission_key': a key associated with the submission for validation reasons
+
+ 'error': if success is False, will have an error message with more info.
+
+ """
+ _check_post(request)
+
+ required = set(['location'])
+ success, message = _check_required(request, required)
+ if not success:
+ return _err_response(message)
+
+ grader_id = unique_id_for_user(request.user)
+ p = request.POST
+ location = p['location']
+ try:
+ response = peer_grading_service().show_calibration_essay(location, grader_id)
+ return HttpResponse(response, mimetype="application/json")
+ except GradingServiceError:
+ log.exception("Error from grading service. server url: {0}, location: {0}"
+ .format(staff_grading_service().url, location))
+ return json.dumps({'success': False,
+ 'error': 'Could not connect to grading service'})
+
+
+def save_calibration_essay(request, course_id):
+ """
+ Saves the grader's grade of a given calibration.
+ Input:
+ The request should have the following keys:
+ location - problem location
+ submission_id - id associated with this submission
+ submission_key - submission key given for validation purposes
+ score - the grade that was given to the submission
+ feedback - the feedback from the student
+ Returns
+ A json object with the following keys:
+ success: bool indicating whether the save was a success
+ error: if there was an error in the submission, this is the error message
+ actual_score: the score that the instructor gave to this calibration essay
+
+ """
+ _check_post(request)
+
+ required = set(['location', 'submission_id', 'submission_key', 'score', 'feedback'])
+ success, message = _check_required(request, required)
+ if not success:
+ return _err_response(message)
+ grader_id = unique_id_for_user(request.user)
+ p = request.POST
+ location = p['location']
+ calibration_essay_id = p['submission_id']
+ submission_key = p['submission_key']
+ score = p['score']
+ feedback = p['feedback']
+
+ try:
+ response = peer_grading_service().save_calibration_essay(location, grader_id, calibration_essay_id, submission_key, score, feedback)
+ return HttpResponse(response, mimetype="application/json")
+ except GradingServiceError:
+ log.exception("Error saving calibration grade, location: {0}, submission_id: {1}, submission_key: {2}, grader_id: {3}".format(location, submission_id, submission_key, grader_id))
+ return _err_response('Could not connect to grading service')
diff --git a/lms/djangoapps/instructor/grading.py b/lms/djangoapps/open_ended_grading/staff_grading.py
similarity index 100%
rename from lms/djangoapps/instructor/grading.py
rename to lms/djangoapps/open_ended_grading/staff_grading.py
diff --git a/lms/djangoapps/instructor/staff_grading_service.py b/lms/djangoapps/open_ended_grading/staff_grading_service.py
similarity index 71%
rename from lms/djangoapps/instructor/staff_grading_service.py
rename to lms/djangoapps/open_ended_grading/staff_grading_service.py
index ea8f0de074..5c6cec17eb 100644
--- a/lms/djangoapps/instructor/staff_grading_service.py
+++ b/lms/djangoapps/open_ended_grading/staff_grading_service.py
@@ -7,6 +7,8 @@ import logging
import requests
from requests.exceptions import RequestException, ConnectionError, HTTPError
import sys
+from grading_service import GradingService
+from grading_service import GradingServiceError
from django.conf import settings
from django.http import HttpResponse, Http404
@@ -14,13 +16,11 @@ from django.http import HttpResponse, Http404
from courseware.access import has_access
from util.json_request import expect_json
from xmodule.course_module import CourseDescriptor
+from student.models import unique_id_for_user
log = logging.getLogger(__name__)
-class GradingServiceError(Exception):
- pass
-
class MockStaffGradingService(object):
"""
@@ -57,62 +57,16 @@ class MockStaffGradingService(object):
return self.get_next(course_id, 'fake location', grader_id)
-class StaffGradingService(object):
+class StaffGradingService(GradingService):
"""
Interface to staff grading backend.
"""
def __init__(self, config):
- self.username = config['username']
- self.password = config['password']
- self.url = config['url']
-
- self.login_url = self.url + '/login/'
+ super(StaffGradingService, self).__init__(config)
self.get_next_url = self.url + '/get_next_submission/'
self.save_grade_url = self.url + '/save_grade/'
self.get_problem_list_url = self.url + '/get_problem_list/'
- self.session = requests.session()
-
-
- def _login(self):
- """
- Log into the staff grading service.
-
- Raises requests.exceptions.HTTPError if something goes wrong.
-
- Returns the decoded json dict of the response.
- """
- response = self.session.post(self.login_url,
- {'username': self.username,
- 'password': self.password,})
-
- response.raise_for_status()
-
- return response.json
-
-
- def _try_with_login(self, operation):
- """
- Call operation(), which should return a requests response object. If
- the request fails with a 'login_required' error, call _login() and try
- the operation again.
-
- Returns the result of operation(). Does not catch exceptions.
- """
- response = operation()
- if (response.json
- and response.json.get('success') == False
- and response.json.get('error') == 'login_required'):
- # apparrently we aren't logged in. Try to fix that.
- r = self._login()
- if r and not r.get('success'):
- log.warning("Couldn't log into staff_grading backend. Response: %s",
- r)
- # try again
- response = operation()
- response.raise_for_status()
-
- return response
def get_problem_list(self, course_id, grader_id):
"""
@@ -130,17 +84,8 @@ class StaffGradingService(object):
Raises:
GradingServiceError: something went wrong with the connection.
"""
- op = lambda: self.session.get(self.get_problem_list_url,
- allow_redirects = False,
- params={'course_id': course_id,
- 'grader_id': grader_id})
- try:
- r = self._try_with_login(op)
- except (RequestException, ConnectionError, HTTPError) as err:
- # reraise as promised GradingServiceError, but preserve stacktrace.
- raise GradingServiceError, str(err), sys.exc_info()[2]
-
- return r.text
+ params = {'course_id': course_id,'grader_id': grader_id}
+ return self.get(self.get_problem_list_url, params)
def get_next(self, course_id, location, grader_id):
@@ -161,17 +106,9 @@ class StaffGradingService(object):
Raises:
GradingServiceError: something went wrong with the connection.
"""
- op = lambda: self.session.get(self.get_next_url,
- allow_redirects=False,
+ return self.get(self.get_next_url,
params={'location': location,
'grader_id': grader_id})
- try:
- r = self._try_with_login(op)
- except (RequestException, ConnectionError, HTTPError) as err:
- # reraise as promised GradingServiceError, but preserve stacktrace.
- raise GradingServiceError, str(err), sys.exc_info()[2]
-
- return r.text
def save_grade(self, course_id, grader_id, submission_id, score, feedback, skipped):
@@ -186,28 +123,20 @@ class StaffGradingService(object):
Raises:
GradingServiceError if there's a problem connecting.
"""
- try:
- data = {'course_id': course_id,
- 'submission_id': submission_id,
- 'score': score,
- 'feedback': feedback,
- 'grader_id': grader_id,
- 'skipped': skipped}
+ data = {'course_id': course_id,
+ 'submission_id': submission_id,
+ 'score': score,
+ 'feedback': feedback,
+ 'grader_id': grader_id,
+ 'skipped': skipped}
- op = lambda: self.session.post(self.save_grade_url, data=data,
- allow_redirects=False)
- r = self._try_with_login(op)
- except (RequestException, ConnectionError, HTTPError) as err:
- # reraise as promised GradingServiceError, but preserve stacktrace.
- raise GradingServiceError, str(err), sys.exc_info()[2]
+ return self.post(self.save_grade_url, data=data)
- return r.text
-
-# don't initialize until grading_service() is called--means that just
+# don't initialize until staff_grading_service() is called--means that just
# importing this file doesn't create objects that may not have the right config
_service = None
-def grading_service():
+def staff_grading_service():
"""
Return a staff grading service instance--if settings.MOCK_STAFF_GRADING is True,
returns a mock one, otherwise a real one.
@@ -248,7 +177,7 @@ def _check_access(user, course_id):
def get_next(request, course_id):
"""
Get the next thing to grade for course_id and with the location specified
- in the .
+ in the request.
Returns a json dict with the following keys:
@@ -276,11 +205,11 @@ def get_next(request, course_id):
if len(missing) > 0:
return _err_response('Missing required keys {0}'.format(
', '.join(missing)))
- grader_id = request.user.id
+ grader_id = unique_id_for_user(request.user)
p = request.POST
location = p['location']
- return HttpResponse(_get_next(course_id, request.user.id, location),
+ return HttpResponse(_get_next(course_id, grader_id, location),
mimetype="application/json")
@@ -308,12 +237,12 @@ def get_problem_list(request, course_id):
"""
_check_access(request.user, course_id)
try:
- response = grading_service().get_problem_list(course_id, request.user.id)
+ response = staff_grading_service().get_problem_list(course_id, unique_id_for_user(request.user))
return HttpResponse(response,
mimetype="application/json")
except GradingServiceError:
log.exception("Error from grading service. server url: {0}"
- .format(grading_service().url))
+ .format(staff_grading_service().url))
return HttpResponse(json.dumps({'success': False,
'error': 'Could not connect to grading service'}))
@@ -323,10 +252,10 @@ def _get_next(course_id, grader_id, location):
Implementation of get_next (also called from save_grade) -- returns a json string
"""
try:
- return grading_service().get_next(course_id, location, grader_id)
+ return staff_grading_service().get_next(course_id, location, grader_id)
except GradingServiceError:
log.exception("Error from grading service. server url: {0}"
- .format(grading_service().url))
+ .format(staff_grading_service().url))
return json.dumps({'success': False,
'error': 'Could not connect to grading service'})
@@ -357,14 +286,14 @@ def save_grade(request, course_id):
return _err_response('Missing required keys {0}'.format(
', '.join(missing)))
- grader_id = request.user.id
+ grader_id = unique_id_for_user(request.user)
p = request.POST
location = p['location']
skipped = 'skipped' in p
try:
- result_json = grading_service().save_grade(course_id,
+ result_json = staff_grading_service().save_grade(course_id,
grader_id,
p['submission_id'],
p['score'],
diff --git a/lms/djangoapps/open_ended_grading/tests.py b/lms/djangoapps/open_ended_grading/tests.py
new file mode 100644
index 0000000000..0c4376a44b
--- /dev/null
+++ b/lms/djangoapps/open_ended_grading/tests.py
@@ -0,0 +1,112 @@
+"""
+Tests for open ended grading interfaces
+
+django-admin.py test --settings=lms.envs.test --pythonpath=. lms/djangoapps/open_ended_grading
+"""
+
+from django.test import TestCase
+from open_ended_grading import staff_grading_service
+from django.core.urlresolvers import reverse
+from django.contrib.auth.models import Group
+
+from courseware.access import _course_staff_group_name
+import courseware.tests.tests as ct
+from xmodule.modulestore.django import modulestore
+import xmodule.modulestore.django
+from nose import SkipTest
+from mock import patch, Mock
+import json
+
+from override_settings import override_settings
+
+_mock_service = staff_grading_service.MockStaffGradingService()
+
+@override_settings(MODULESTORE=ct.TEST_DATA_XML_MODULESTORE)
+class TestStaffGradingService(ct.PageLoader):
+ '''
+ Check that staff grading service proxy works. Basically just checking the
+ access control and error handling logic -- all the actual work is on the
+ backend.
+ '''
+ def setUp(self):
+ xmodule.modulestore.django._MODULESTORES = {}
+
+ self.student = 'view@test.com'
+ self.instructor = 'view2@test.com'
+ self.password = 'foo'
+ self.location = 'TestLocation'
+ self.create_account('u1', self.student, self.password)
+ self.create_account('u2', self.instructor, self.password)
+ self.activate_user(self.student)
+ self.activate_user(self.instructor)
+
+ self.course_id = "edX/toy/2012_Fall"
+ self.toy = modulestore().get_course(self.course_id)
+ def make_instructor(course):
+ group_name = _course_staff_group_name(course.location)
+ g = Group.objects.create(name=group_name)
+ g.user_set.add(ct.user(self.instructor))
+
+ make_instructor(self.toy)
+
+ self.mock_service = staff_grading_service.staff_grading_service()
+
+ self.logout()
+
+ def test_access(self):
+ """
+ Make sure only staff have access.
+ """
+ self.login(self.student, self.password)
+
+ # both get and post should return 404
+ for view_name in ('staff_grading_get_next', 'staff_grading_save_grade'):
+ url = reverse(view_name, kwargs={'course_id': self.course_id})
+ self.check_for_get_code(404, url)
+ self.check_for_post_code(404, url)
+
+
+ def test_get_next(self):
+ self.login(self.instructor, self.password)
+
+ url = reverse('staff_grading_get_next', kwargs={'course_id': self.course_id})
+ data = {'location': self.location}
+
+ r = self.check_for_post_code(200, url, data)
+ d = json.loads(r.content)
+ self.assertTrue(d['success'])
+ self.assertEquals(d['submission_id'], self.mock_service.cnt)
+ self.assertIsNotNone(d['submission'])
+ self.assertIsNotNone(d['num_graded'])
+ self.assertIsNotNone(d['min_for_ml'])
+ self.assertIsNotNone(d['num_pending'])
+ self.assertIsNotNone(d['prompt'])
+ self.assertIsNotNone(d['ml_error_info'])
+ self.assertIsNotNone(d['max_score'])
+ self.assertIsNotNone(d['rubric'])
+
+
+ def test_save_grade(self):
+ self.login(self.instructor, self.password)
+
+ url = reverse('staff_grading_save_grade', kwargs={'course_id': self.course_id})
+
+ data = {'score': '12',
+ 'feedback': 'great!',
+ 'submission_id': '123',
+ 'location': self.location}
+ r = self.check_for_post_code(200, url, data)
+ d = json.loads(r.content)
+ self.assertTrue(d['success'], str(d))
+ self.assertEquals(d['submission_id'], self.mock_service.cnt)
+
+ def test_get_problem_list(self):
+ self.login(self.instructor, self.password)
+
+ url = reverse('staff_grading_get_problem_list', kwargs={'course_id': self.course_id})
+ data = {}
+
+ r = self.check_for_post_code(200, url, data)
+ d = json.loads(r.content)
+ self.assertTrue(d['success'], str(d))
+ self.assertIsNotNone(d['problem_list'])
diff --git a/lms/djangoapps/open_ended_grading/views.py b/lms/djangoapps/open_ended_grading/views.py
new file mode 100644
index 0000000000..858c9a4fd5
--- /dev/null
+++ b/lms/djangoapps/open_ended_grading/views.py
@@ -0,0 +1,118 @@
+# Grading Views
+
+import logging
+import urllib
+
+from django.conf import settings
+from django.views.decorators.cache import cache_control
+from mitxmako.shortcuts import render_to_response
+from django.core.urlresolvers import reverse
+
+from student.models import unique_id_for_user
+from courseware.courses import get_course_with_access
+
+from peer_grading_service import PeerGradingService
+from peer_grading_service import MockPeerGradingService
+from grading_service import GradingServiceError
+import json
+from .staff_grading import StaffGrading
+
+
+log = logging.getLogger(__name__)
+
+template_imports = {'urllib': urllib}
+if settings.MOCK_PEER_GRADING:
+ peer_gs = MockPeerGradingService()
+else:
+ peer_gs = PeerGradingService(settings.PEER_GRADING_INTERFACE)
+
+"""
+Reverses the URL from the name and the course id, and then adds a trailing slash if
+it does not exist yet
+
+"""
+def _reverse_with_slash(url_name, course_id):
+ ajax_url = reverse(url_name, kwargs={'course_id': course_id})
+ if not ajax_url.endswith('/'):
+ ajax_url += '/'
+ return ajax_url
+
+
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+def staff_grading(request, course_id):
+ """
+ Show the instructor grading interface.
+ """
+ course = get_course_with_access(request.user, course_id, 'staff')
+
+ ajax_url = _reverse_with_slash('staff_grading', course_id)
+
+ return render_to_response('instructor/staff_grading.html', {
+ 'course': course,
+ 'course_id': course_id,
+ 'ajax_url': ajax_url,
+ # Checked above
+ 'staff_access': True, })
+
+
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+def peer_grading(request, course_id):
+ '''
+ Show a peer grading interface
+ '''
+ course = get_course_with_access(request.user, course_id, 'load')
+
+ # call problem list service
+ success = False
+ error_text = ""
+ problem_list = []
+ try:
+ problem_list_json = peer_gs.get_problem_list(course_id, unique_id_for_user(request.user))
+ problem_list_dict = json.loads(problem_list_json)
+ success = problem_list_dict['success']
+ if 'error' in problem_list_dict:
+ error_text = problem_list_dict['error']
+
+ problem_list = problem_list_dict['problem_list']
+
+ except GradingServiceError:
+ error_text = "Error occured while contacting the grading service"
+ success = False
+ # catch error if if the json loads fails
+ except ValueError:
+ error_text = "Could not get problem list"
+ success = False
+
+ ajax_url = _reverse_with_slash('peer_grading', course_id)
+
+ return render_to_response('peer_grading/peer_grading.html', {
+ 'course': course,
+ 'course_id': course_id,
+ 'ajax_url': ajax_url,
+ 'success': success,
+ 'problem_list': problem_list,
+ 'error_text': error_text,
+ # Checked above
+ 'staff_access': False, })
+
+
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+def peer_grading_problem(request, course_id):
+ '''
+ Show individual problem interface
+ '''
+ course = get_course_with_access(request.user, course_id, 'load')
+ problem_location = request.GET.get("location")
+
+ ajax_url = _reverse_with_slash('peer_grading', course_id)
+
+ return render_to_response('peer_grading/peer_grading_problem.html', {
+ 'view_html': '',
+ 'course': course,
+ 'problem_location': problem_location,
+ 'course_id': course_id,
+ 'ajax_url': ajax_url,
+ # Checked above
+ 'staff_access': False, })
+
+
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 0516bddc56..7b8c48f4af 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -76,8 +76,8 @@ DATABASES = AUTH_TOKENS['DATABASES']
XQUEUE_INTERFACE = AUTH_TOKENS['XQUEUE_INTERFACE']
-STAFF_GRADING_INTERFACE = AUTH_TOKENS.get('STAFF_GRADING_INTERFACE')
-
+STAFF_GRADING_INTERFACE = AUTH_TOKENS.get('STAFF_GRADING_INTERFACE', STAFF_GRADING_INTERFACE)
+PEER_GRADING_INTERFACE = AUTH_TOKENS.get('PEER_GRADING_INTERFACE', PEER_GRADING_INTERFACE)
PEARSON_TEST_USER = "pearsontest"
PEARSON_TEST_PASSWORD = AUTH_TOKENS.get("PEARSON_TEST_PASSWORD")
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 1607e5e36c..6790e5b714 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -329,10 +329,29 @@ WIKI_LINK_DEFAULT_LEVEL = 2
################################# Staff grading config #####################
-STAFF_GRADING_INTERFACE = None
+#By setting up the default settings with an incorrect user name and password,
+# will get an error when attempting to connect
+STAFF_GRADING_INTERFACE = {
+ 'url': 'http://sandbox-grader-001.m.edx.org/staff_grading',
+ 'username': 'incorrect_user',
+ 'password': 'incorrect_pass',
+ }
+
# Used for testing, debugging
MOCK_STAFF_GRADING = False
+################################# Peer grading config #####################
+
+#By setting up the default settings with an incorrect user name and password,
+# will get an error when attempting to connect
+PEER_GRADING_INTERFACE = {
+ 'url': 'http://sandbox-grader-001.m.edx.org/peer_grading',
+ 'username': 'incorrect_user',
+ 'password': 'incorrect_pass',
+ }
+
+# Used for testing, debugging
+MOCK_PEER_GRADING = False
################################# Jasmine ###################################
JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee'
@@ -411,6 +430,7 @@ courseware_only_js += [
main_vendor_js = [
'js/vendor/RequireJS.js',
'js/vendor/json2.js',
+ 'js/vendor/RequireJS.js',
'js/vendor/jquery.min.js',
'js/vendor/jquery-ui.min.js',
'js/vendor/jquery.cookie.js',
@@ -421,6 +441,7 @@ main_vendor_js = [
discussion_js = sorted(glob2.glob(PROJECT_ROOT / 'static/coffee/src/discussion/**/*.coffee'))
staff_grading_js = sorted(glob2.glob(PROJECT_ROOT / 'static/coffee/src/staff_grading/**/*.coffee'))
+peer_grading_js = sorted(glob2.glob(PROJECT_ROOT / 'static/coffee/src/peer_grading/**/*.coffee'))
# Load javascript from all of the available xmodules, and
@@ -496,6 +517,7 @@ PIPELINE_JS = {
for pth in sorted(glob2.glob(PROJECT_ROOT / 'static/coffee/src/**/*.coffee'))\
if (pth not in courseware_only_js and
pth not in discussion_js and
+ pth not in peer_grading_js and
pth not in staff_grading_js)
] + [
'js/form.ext.js',
@@ -529,8 +551,11 @@ PIPELINE_JS = {
'staff_grading' : {
'source_filenames': [pth.replace(PROJECT_ROOT / 'static/', '') for pth in staff_grading_js],
'output_filename': 'js/staff_grading.js'
+ },
+ 'peer_grading' : {
+ 'source_filenames': [pth.replace(PROJECT_ROOT / 'static/', '') for pth in peer_grading_js],
+ 'output_filename': 'js/peer_grading.js'
}
-
}
PIPELINE_DISABLE_WRAPPER = True
@@ -603,6 +628,7 @@ INSTALLED_APPS = (
'util',
'certificates',
'instructor',
+ 'open_ended_grading',
'psychometrics',
'licenses',
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 0ad42f67d3..f5999bf52e 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -102,6 +102,10 @@ SUBDOMAIN_BRANDING = {
COMMENTS_SERVICE_KEY = "PUT_YOUR_API_KEY_HERE"
+################################# mitx revision string #####################
+
+MITX_VERSION_STRING = os.popen('cd %s; git describe' % REPO_ROOT).read().strip()
+
################################# Staff grading config #####################
STAFF_GRADING_INTERFACE = {
@@ -110,6 +114,13 @@ STAFF_GRADING_INTERFACE = {
'password': 'abcd',
}
+################################# Peer grading config #####################
+
+PEER_GRADING_INTERFACE = {
+ 'url': 'http://127.0.0.1:3033/peer_grading',
+ 'username': 'lms',
+ 'password': 'abcd',
+ }
################################ LMS Migration #################################
MITX_FEATURES['ENABLE_LMS_MIGRATION'] = True
MITX_FEATURES['ACCESS_REQUIRE_STAFF_FOR_COURSE'] = False # require that user be in the staff_* group to be able to enroll
diff --git a/lms/envs/test.py b/lms/envs/test.py
index c72c8b98bf..e9e4a43c6f 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -62,6 +62,7 @@ XQUEUE_WAITTIME_BETWEEN_REQUESTS = 5 # seconds
# Don't rely on a real staff grading backend
MOCK_STAFF_GRADING = True
+MOCK_PEER_GRADING = True
# TODO (cpennington): We need to figure out how envs/test.py can inject things
# into common.py so that we don't have to repeat this sort of thing
diff --git a/lms/static/coffee/src/peer_grading/peer_grading.coffee b/lms/static/coffee/src/peer_grading/peer_grading.coffee
new file mode 100644
index 0000000000..0736057df8
--- /dev/null
+++ b/lms/static/coffee/src/peer_grading/peer_grading.coffee
@@ -0,0 +1,13 @@
+# This is a simple class that just hides the error container
+# and message container when they are empty
+# Can (and should be) expanded upon when our problem list
+# becomes more sophisticated
+class PeerGrading
+ constructor: () ->
+ @error_container = $('.error-container')
+ @error_container.toggle(not @error_container.is(':empty'))
+
+ @message_container = $('.message-container')
+ @message_container.toggle(not @message_container.is(':empty'))
+
+$(document).ready(() -> new PeerGrading())
diff --git a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee
new file mode 100644
index 0000000000..e294c50f7c
--- /dev/null
+++ b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee
@@ -0,0 +1,390 @@
+##################################
+#
+# This is the JS that renders the peer grading problem page.
+# Fetches the correct problem and/or calibration essay
+# and sends back the grades
+#
+# Should not be run when we don't have a location to send back
+# to the server
+#
+# PeerGradingProblemBackend -
+# makes all the ajax requests and provides a mock interface
+# for testing purposes
+#
+# PeerGradingProblem -
+# handles the rendering and user interactions with the interface
+#
+##################################
+class PeerGradingProblemBackend
+ constructor: (ajax_url, mock_backend) ->
+ @mock_backend = mock_backend
+ @ajax_url = ajax_url
+ @mock_cnt = 0
+
+ post: (cmd, data, callback) ->
+ if @mock_backend
+ callback(@mock(cmd, data))
+ else
+ # if this post request fails, the error callback will catch it
+ $.post(@ajax_url + cmd, data, callback)
+ .error => callback({success: false, error: "Error occured while performing this operation"})
+
+ mock: (cmd, data) ->
+ if cmd == 'is_student_calibrated'
+ # change to test each version
+ response =
+ success: true
+ calibrated: @mock_cnt >= 2
+ else if cmd == 'show_calibration_essay'
+ #response =
+ # success: false
+ # error: "There was an error"
+ @mock_cnt++
+ response =
+ success: true
+ submission_id: 1
+ submission_key: 'abcd'
+ student_response: '''
+ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.
+
+The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham.
+ '''
+ prompt: '''
+
S11E3: Metal Bands
+
Shown below are schematic band diagrams for two different metals. Both diagrams appear different, yet both of the elements are undisputably metallic in nature.
+
* Why is it that both sodium and magnesium behave as metals, even though the s-band of magnesium is filled?
+
This is a self-assessed open response question. Please use as much space as you need in the box below to answer the question.
+ '''
+ rubric: '''
+
+
Metals tend to be good electronic conductors, meaning that they have a large number of electrons which are able to access empty (mobile) energy states within the material.
+
Sodium has a half-filled s-band, so there are a number of empty states immediately above the highest occupied energy levels within the band.
+
Magnesium has a full s-band, but the the s-band and p-band overlap in magnesium. Thus are still a large number of available energy states immediately above the s-band highest occupied energy level.
+
+
+
Please score your response according to how many of the above components you identified:
+ '''
+ max_score: 4
+ else if cmd == 'get_next_submission'
+ response =
+ success: true
+ submission_id: 1
+ submission_key: 'abcd'
+ student_response: '''Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nec tristique ante. Proin at mauris sapien, quis varius leo. Morbi laoreet leo nisi. Morbi aliquam lacus ante. Cras iaculis velit sed diam mattis a fermentum urna luctus. Duis consectetur nunc vitae felis facilisis eget vulputate risus viverra. Cras consectetur ullamcorper lobortis. Nam eu gravida lorem. Nulla facilisi. Nullam quis felis enim. Mauris orci lectus, dictum id cursus in, vulputate in massa.
+
+Phasellus non varius sem. Nullam commodo lacinia odio sit amet egestas. Donec ullamcorper sapien sagittis arcu volutpat placerat. Phasellus ut pretium ante. Nam dictum pulvinar nibh dapibus tristique. Sed at tellus mi, fringilla convallis justo. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus tristique rutrum nulla sed eleifend. Praesent at nunc arcu. Mauris condimentum faucibus nibh, eget commodo quam viverra sed. Morbi in tincidunt dolor. Morbi sed augue et augue interdum fermentum.
+
+Curabitur tristique purus ac arcu consequat cursus. Cras diam felis, dignissim quis placerat at, aliquet ac metus. Mauris vulputate est eu nibh imperdiet varius. Cras aliquet rhoncus elit a laoreet. Mauris consectetur erat et erat scelerisque eu faucibus dolor consequat. Nam adipiscing sagittis nisl, eu mollis massa tempor ac. Nulla scelerisque tempus blandit. Phasellus ac ipsum eros, id posuere arcu. Nullam non sapien arcu. Vivamus sit amet lorem justo, ac tempus turpis. Suspendisse pharetra gravida imperdiet. Pellentesque lacinia mi eu elit luctus pellentesque. Sed accumsan libero a magna elementum varius. Nunc eget pellentesque metus. '''
+ prompt: '''
+
S11E3: Metal Bands
+
Shown below are schematic band diagrams for two different metals. Both diagrams appear different, yet both of the elements are undisputably metallic in nature.
+
* Why is it that both sodium and magnesium behave as metals, even though the s-band of magnesium is filled?
+
This is a self-assessed open response question. Please use as much space as you need in the box below to answer the question.
+ '''
+ rubric: '''
+
+
Metals tend to be good electronic conductors, meaning that they have a large number of electrons which are able to access empty (mobile) energy states within the material.
+
Sodium has a half-filled s-band, so there are a number of empty states immediately above the highest occupied energy levels within the band.
+
Magnesium has a full s-band, but the the s-band and p-band overlap in magnesium. Thus are still a large number of available energy states immediately above the s-band highest occupied energy level.
+
+
+
Please score your response according to how many of the above components you identified:
+ '''
+ max_score: 4
+ else if cmd == 'save_calibration_essay'
+ response =
+ success: true
+ actual_score: 2
+ else if cmd == 'save_grade'
+ response =
+ success: true
+
+ return response
+
+
+class PeerGradingProblem
+ constructor: (backend) ->
+ @prompt_wrapper = $('.prompt-wrapper')
+ @backend = backend
+
+
+ # get the location of the problem
+ @location = $('.peer-grading').data('location')
+ # prevent this code from trying to run
+ # when we don't have a location
+ if(!@location)
+ return
+
+ # get the other elements we want to fill in
+ @submission_container = $('.submission-container')
+ @prompt_container = $('.prompt-container')
+ @rubric_container = $('.rubric-container')
+ @calibration_panel = $('.calibration-panel')
+ @grading_panel = $('.grading-panel')
+ @content_panel = $('.content-panel')
+ @grading_message = $('.grading-message')
+ @grading_message.hide()
+
+ @grading_wrapper =$('.grading-wrapper')
+ @calibration_feedback_panel = $('.calibration-feedback')
+ @interstitial_page = $('.interstitial-page')
+ @interstitial_page.hide()
+
+ @error_container = $('.error-container')
+
+ @submission_key_input = $("input[name='submission-key']")
+ @essay_id_input = $("input[name='essay-id']")
+ @feedback_area = $('.feedback-area')
+
+ @score_selection_container = $('.score-selection-container')
+ @score = null
+ @calibration = null
+
+ @submit_button = $('.submit-button')
+ @action_button = $('.action-button')
+ @calibration_feedback_button = $('.calibration-feedback-button')
+ @interstitial_page_button = $('.interstitial-page-button')
+
+ Collapsible.setCollapsibles(@content_panel)
+
+ # Set up the click event handlers
+ @action_button.click -> history.back()
+ @calibration_feedback_button.click =>
+ @calibration_feedback_panel.hide()
+ @grading_wrapper.show()
+ @is_calibrated_check()
+
+ @interstitial_page_button.click =>
+ @interstitial_page.hide()
+ @is_calibrated_check()
+
+ @is_calibrated_check()
+
+
+ ##########
+ #
+ # Ajax calls to the backend
+ #
+ ##########
+ is_calibrated_check: () =>
+ @backend.post('is_student_calibrated', {location: @location}, @calibration_check_callback)
+
+ fetch_calibration_essay: () =>
+ @backend.post('show_calibration_essay', {location: @location}, @render_calibration)
+
+ fetch_submission_essay: () =>
+ @backend.post('get_next_submission', {location: @location}, @render_submission)
+
+ construct_data: () ->
+ data =
+ score: @score
+ location: @location
+ submission_id: @essay_id_input.val()
+ submission_key: @submission_key_input.val()
+ feedback: @feedback_area.val()
+ return data
+
+
+ submit_calibration_essay: ()=>
+ data = @construct_data()
+ @backend.post('save_calibration_essay', data, @calibration_callback)
+
+ submit_grade: () =>
+ data = @construct_data()
+ @backend.post('save_grade', data, @submission_callback)
+
+
+ ##########
+ #
+ # Callbacks for various events
+ #
+ ##########
+
+ # called after we perform an is_student_calibrated check
+ calibration_check_callback: (response) =>
+ if response.success
+ # if we haven't been calibrating before
+ if response.calibrated and (@calibration == null or @calibration == false)
+ @calibration = false
+ @fetch_submission_essay()
+ # If we were calibrating before and no longer need to,
+ # show the interstitial page
+ else if response.calibrated and @calibration == true
+ @calibration = false
+ @render_interstitial_page()
+ else
+ @calibration = true
+ @fetch_calibration_essay()
+ else if response.error
+ @render_error(response.error)
+ else
+ @render_error("Error contacting the grading service")
+
+
+ # called after we submit a calibration score
+ calibration_callback: (response) =>
+ if response.success
+ @render_calibration_feedback(response)
+ else if response.error
+ @render_error(response.error)
+ else
+ @render_error("Error saving calibration score")
+
+ # called after we submit a submission score
+ submission_callback: (response) =>
+ if response.success
+ @is_calibrated_check()
+ @grading_message.fadeIn()
+ @grading_message.html("
Grade sent successfully.
")
+ else
+ if response.error
+ @render_error(response.error)
+ else
+ @render_error("Error occurred while submitting grade")
+
+ # called after a grade is selected on the interface
+ graded_callback: (event) =>
+ @grading_message.hide()
+ @score = event.target.value
+ @show_submit_button()
+
+
+
+ ##########
+ #
+ # Rendering methods and helpers
+ #
+ ##########
+ # renders a calibration essay
+ render_calibration: (response) =>
+ if response.success
+
+ # load in all the data
+ @submission_container.html("
Training Essay
")
+ @render_submission_data(response)
+ # TODO: indicate that we're in calibration mode
+ @calibration_panel.addClass('current-state')
+ @grading_panel.removeClass('current-state')
+
+ # Display the right text
+ # both versions of the text are written into the template itself
+ # we only need to show/hide the correct ones at the correct time
+ @calibration_panel.find('.calibration-text').show()
+ @grading_panel.find('.calibration-text').show()
+ @calibration_panel.find('.grading-text').hide()
+ @grading_panel.find('.grading-text').hide()
+
+
+ @submit_button.unbind('click')
+ @submit_button.click @submit_calibration_essay
+
+ else if response.error
+ @render_error(response.error)
+ else
+ @render_error("An error occurred while retrieving the next calibration essay")
+
+ # Renders a student submission to be graded
+ render_submission: (response) =>
+ if response.success
+ @submit_button.hide()
+ @submission_container.html("
Submitted Essay
")
+ @render_submission_data(response)
+
+ @calibration_panel.removeClass('current-state')
+ @grading_panel.addClass('current-state')
+
+ # Display the correct text
+ # both versions of the text are written into the template itself
+ # we only need to show/hide the correct ones at the correct time
+ @calibration_panel.find('.calibration-text').hide()
+ @grading_panel.find('.calibration-text').hide()
+ @calibration_panel.find('.grading-text').show()
+ @grading_panel.find('.grading-text').show()
+
+ @submit_button.unbind('click')
+ @submit_button.click @submit_grade
+ else if response.error
+ @render_error(response.error)
+ else
+ @render_error("An error occured when retrieving the next submission.")
+
+
+ make_paragraphs: (text) ->
+ paragraph_split = text.split(/\n\s*\n/)
+ new_text = ''
+ for paragraph in paragraph_split
+ new_text += "
\ No newline at end of file
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
new file mode 100644
index 0000000000..34a5dd0d79
--- /dev/null
+++ b/lms/templates/combined_open_ended_status.html
@@ -0,0 +1,28 @@
+
+ %for i in xrange(0,len(status_list)):
+ <%status=status_list[i]%>
+ %if i==len(status_list)-1:
+
+ %else:
+
+ %endif
+
+ Step ${status['task_number']} (${status['human_state']}) : ${status['score']} / ${status['max_score']}
+ % if status['state'] == 'initial':
+
+ % elif status['state'] in ['done', 'post_assessment'] and status['correct'] == 'correct':
+
+ % elif status['state'] in ['done', 'post_assessment'] and status['correct'] == 'incorrect':
+
+ % elif status['state'] == 'assessing':
+
+ % endif
+
+ %if status['type']=="openended" and status['state'] in ['done', 'post_assessment']:
+
##-----------------------------------------------------------------------------
-%if modeflag.get('Psychometrics') is None:
+##-----------------------------------------------------------------------------
+
+%if datatable and modeflag.get('Psychometrics') is None:
diff --git a/lms/templates/graphical_slider_tool.html b/lms/templates/graphical_slider_tool.html
new file mode 100644
index 0000000000..93a6761784
--- /dev/null
+++ b/lms/templates/graphical_slider_tool.html
@@ -0,0 +1,9 @@
+
\ No newline at end of file
diff --git a/lms/templates/open_ended_feedback.html b/lms/templates/open_ended_feedback.html
index cb90006456..d8aa3d1a9e 100644
--- a/lms/templates/open_ended_feedback.html
+++ b/lms/templates/open_ended_feedback.html
@@ -12,5 +12,6 @@
${ feedback | n}
+ ${rubric_feedback | n}
\ No newline at end of file
diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html
new file mode 100644
index 0000000000..9f8a2ece4e
--- /dev/null
+++ b/lms/templates/open_ended_rubric.html
@@ -0,0 +1,30 @@
+
+ % for i in range(len(rubric_categories)):
+ <% category = rubric_categories[i] %>
+
Before you can do any proper peer grading, you first need to understand how your own grading compares to that of the instrutor. Once your grades begin to match the instructor's, you will move on to grading your peers!
+
+
+
You have successfully managed to calibrate your answers to that of the instructors and have moved onto the next step in the peer grading process.
+
+
+
+
Grading
+
+
You cannot start grading until you have graded a sufficient number of training problems and have been able to demonstrate that your scores closely match that of the instructor.
+
+
+
Now that you have finished your training, you are now allowed to grade your peers. Please keep in mind that students are allowed to respond to the grades and feedback they receive.