+
+
+
+
+
The main goal of this exercise is to start practicing the art of slow reading.
+
+
+
+
+ |87 No, those who are really responsible are Zeus and Fate [Moira] and the Fury [Erinys] who roams in the mist.
+ |88 They are the ones who
+ |100 He [= Zeus], making a formal declaration [eukhesthai], spoke up at a meeting of all the gods and said:
+ |101 “hear me, all gods and all goddesses,
+ |113 but he swore a great oath.
+ And right then and there
+
+
+
+
+
+
+
+
diff --git a/common/lib/xmodule/xmodule/js/spec/annotatable/display_spec.coffee b/common/lib/xmodule/xmodule/js/spec/annotatable/display_spec.coffee
new file mode 100644
index 0000000000..3adb028f97
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/spec/annotatable/display_spec.coffee
@@ -0,0 +1,9 @@
+describe 'Annotatable', ->
+ beforeEach ->
+ loadFixtures 'annotatable.html'
+ describe 'constructor', ->
+ el = $('.xmodule_display.xmodule_AnnotatableModule')
+ beforeEach ->
+ @annotatable = new Annotatable(el)
+ it 'works', ->
+ expect(1).toBe(1)
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/js/src/annotatable/display.coffee b/common/lib/xmodule/xmodule/js/src/annotatable/display.coffee
new file mode 100644
index 0000000000..2ad49ae6d7
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/annotatable/display.coffee
@@ -0,0 +1,197 @@
+class @Annotatable
+ _debug: false
+
+ # selectors for the annotatable xmodule
+ toggleAnnotationsSelector: '.annotatable-toggle-annotations'
+ toggleInstructionsSelector: '.annotatable-toggle-instructions'
+ instructionsSelector: '.annotatable-instructions'
+ sectionSelector: '.annotatable-section'
+ spanSelector: '.annotatable-span'
+ replySelector: '.annotatable-reply'
+
+ # these selectors are for responding to events from the annotation capa problem type
+ problemXModuleSelector: '.xmodule_CapaModule'
+ problemSelector: 'section.problem'
+ problemInputSelector: 'section.problem .annotation-input'
+ problemReturnSelector: 'section.problem .annotation-return'
+
+ constructor: (el) ->
+ console.log 'loaded Annotatable' if @_debug
+ @el = el
+ @$el = $(el)
+ @init()
+
+ $: (selector) ->
+ $(selector, @el)
+
+ init: () ->
+ @initEvents()
+ @initTips()
+
+ initEvents: () ->
+ # Initialize toggle handlers for the instructions and annotations sections
+ [@annotationsHidden, @instructionsHidden] = [false, false]
+ @$(@toggleAnnotationsSelector).bind 'click', @onClickToggleAnnotations
+ @$(@toggleInstructionsSelector).bind 'click', @onClickToggleInstructions
+
+ # Initialize handler for 'reply to annotation' events that scroll to
+ # the associated problem. The reply buttons are part of the tooltip
+ # content. It's important that the tooltips be configured to render
+ # as descendants of the annotation module and *not* the document.body.
+ @$el.delegate @replySelector, 'click', @onClickReply
+
+ # Initialize handler for 'return to annotation' events triggered from problems.
+ # 1) There are annotationinput capa problems rendered on the page
+ # 2) Each one has an embedded return link (see annotation capa problem template).
+ # Since the capa problem injects HTML content via AJAX, the best we can do is
+ # is let the click events bubble up to the body and handle them there.
+ $('body').delegate @problemReturnSelector, 'click', @onClickReturn
+
+ initTips: () ->
+ # tooltips are used to display annotations for highlighted text spans
+ @$(@spanSelector).each (index, el) =>
+ $(el).qtip(@getSpanTipOptions el)
+
+ getSpanTipOptions: (el) ->
+ content:
+ title:
+ text: @makeTipTitle(el)
+ text: @makeTipContent(el)
+ position:
+ my: 'bottom center' # of tooltip
+ at: 'top center' # of target
+ target: $(el) # where the tooltip was triggered (i.e. the annotation span)
+ container: @$el
+ adjust:
+ y: -5
+ show:
+ event: 'click mouseenter'
+ solo: true
+ hide:
+ event: 'click mouseleave'
+ delay: 500,
+ fixed: true # don't hide the tooltip if it is moused over
+ style:
+ classes: 'ui-tooltip-annotatable'
+ events:
+ show: @onShowTip
+
+ onClickToggleAnnotations: (e) => @toggleAnnotations()
+
+ onClickToggleInstructions: (e) => @toggleInstructions()
+
+ onClickReply: (e) => @replyTo(e.currentTarget)
+
+ onClickReturn: (e) => @returnFrom(e.currentTarget)
+
+ onShowTip: (event, api) =>
+ event.preventDefault() if @annotationsHidden
+
+ getSpanForProblemReturn: (el) ->
+ problem_id = $(@problemReturnSelector).index(el)
+ @$(@spanSelector).filter("[data-problem-id='#{problem_id}']")
+
+ getProblem: (el) ->
+ problem_id = @getProblemId(el)
+ $(@problemSelector).has(@problemInputSelector).eq(problem_id)
+
+ getProblemId: (el) ->
+ $(el).data('problem-id')
+
+ toggleAnnotations: () ->
+ hide = (@annotationsHidden = not @annotationsHidden)
+ @toggleAnnotationButtonText hide
+ @toggleSpans hide
+ @toggleTips hide
+
+ toggleTips: (hide) ->
+ visible = @findVisibleTips()
+ @hideTips visible
+
+ toggleAnnotationButtonText: (hide) ->
+ buttonText = (if hide then 'Show' else 'Hide')+' Annotations'
+ @$(@toggleAnnotationsSelector).text(buttonText)
+
+ toggleInstructions: () ->
+ hide = (@instructionsHidden = not @instructionsHidden)
+ @toggleInstructionsButton hide
+ @toggleInstructionsText hide
+
+ toggleInstructionsButton: (hide) ->
+ txt = (if hide then 'Expand' else 'Collapse')+' Instructions'
+ cls = (if hide then ['expanded', 'collapsed'] else ['collapsed','expanded'])
+ @$(@toggleInstructionsSelector).text(txt).removeClass(cls[0]).addClass(cls[1])
+
+ toggleInstructionsText: (hide) ->
+ slideMethod = (if hide then 'slideUp' else 'slideDown')
+ @$(@instructionsSelector)[slideMethod]()
+
+ toggleSpans: (hide) ->
+ @$(@spanSelector).toggleClass 'hide', hide, 250
+
+ replyTo: (buttonEl) ->
+ offset = -20
+ el = @getProblem buttonEl
+ if el.length > 0
+ @scrollTo(el, @afterScrollToProblem, offset)
+ else
+ console.log('problem not found. event: ', e) if @_debug
+
+ returnFrom: (buttonEl) ->
+ offset = -200
+ el = @getSpanForProblemReturn buttonEl
+ if el.length > 0
+ @scrollTo(el, @afterScrollToSpan, offset)
+ else
+ console.log('span not found. event:', e) if @_debug
+
+ scrollTo: (el, after, offset = -20) ->
+ $('html,body').scrollTo(el, {
+ duration: 500
+ onAfter: @_once => after?.call this, el
+ offset: offset
+ }) if $(el).length > 0
+
+ afterScrollToProblem: (problem_el) ->
+ problem_el.effect 'highlight', {}, 500
+
+ afterScrollToSpan: (span_el) ->
+ span_el.addClass 'selected', 400, 'swing', ->
+ span_el.removeClass 'selected', 400, 'swing'
+
+ makeTipContent: (el) ->
+ (api) =>
+ text = $(el).data('comment-body')
+ comment = @createComment(text)
+ problem_id = @getProblemId(el)
+ reply = @createReplyLink(problem_id)
+ $(comment).add(reply)
+
+ makeTipTitle: (el) ->
+ (api) =>
+ title = $(el).data('comment-title')
+ (if title then title else 'Commentary')
+
+ createComment: (text) ->
+ $("")
+
+ createReplyLink: (problem_id) ->
+ $("
Reply to Annotation")
+
+ findVisibleTips: () ->
+ visible = []
+ @$(@spanSelector).each (index, el) ->
+ api = $(el).qtip('api')
+ tip = $(api?.elements.tooltip)
+ if tip.is(':visible')
+ visible.push el
+ visible
+
+ hideTips: (elements) ->
+ $(elements).qtip('hide')
+
+ _once: (fn) ->
+ done = false
+ return =>
+ fn.call this unless done
+ done = true
diff --git a/common/lib/xmodule/xmodule/js/src/capa/display.coffee b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
index 41c9b50891..158c2b98d0 100644
--- a/common/lib/xmodule/xmodule/js/src/capa/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
@@ -76,6 +76,24 @@ class @Problem
# TODO: Some logic to dynamically adjust polling rate based on queuelen
window.queuePollerID = window.setTimeout(@poll, 1000)
+
+ # Use this if you want to make an ajax call on the input type object
+ # static method so you don't have to instantiate a Problem in order to use it
+ # Input:
+ # url: the AJAX url of the problem
+ # input_id: the input_id of the input you would like to make the call on
+ # NOTE: the id is the ${id} part of "input_${id}" during rendering
+ # If this function is passed the entire prefixed id, the backend may have trouble
+ # finding the correct input
+ # dispatch: string that indicates how this data should be handled by the inputtype
+ # callback: the function that will be called once the AJAX call has been completed.
+ # It will be passed a response object
+ @inputAjax: (url, input_id, dispatch, data, callback) ->
+ data['dispatch'] = dispatch
+ data['input_id'] = input_id
+ $.postWithPrefix "#{url}/input_ajax", data, callback
+
+
render: (content) ->
if content
@el.html(content)
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/factories.py b/common/lib/xmodule/xmodule/modulestore/tests/factories.py
index 1259da2690..f2a291d680 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/factories.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/factories.py
@@ -46,10 +46,10 @@ class XModuleCourseFactory(Factory):
new_course.metadata['start'] = stringify_time(gmtime())
new_course.tabs = [{"type": "courseware"},
- {"type": "course_info", "name": "Course Info"},
- {"type": "discussion", "name": "Discussion"},
- {"type": "wiki", "name": "Wiki"},
- {"type": "progress", "name": "Progress"}]
+ {"type": "course_info", "name": "Course Info"},
+ {"type": "discussion", "name": "Discussion"},
+ {"type": "wiki", "name": "Wiki"},
+ {"type": "progress", "name": "Progress"}]
# Update the data in the mongo datastore
store.update_metadata(new_course.location.url(), new_course.own_metadata)
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_location.py b/common/lib/xmodule/xmodule/modulestore/tests/test_location.py
index 0772951884..f0f0e8bf48 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_location.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_location.py
@@ -119,11 +119,11 @@ def test_equality():
# All the cleaning functions should do the same thing with these
general_pairs = [('', ''),
- (' ', '_'),
- ('abc,', 'abc_'),
- ('ab fg!@//\\aj', 'ab_fg_aj'),
- (u"ab\xA9", "ab_"), # no unicode allowed for now
- ]
+ (' ', '_'),
+ ('abc,', 'abc_'),
+ ('ab fg!@//\\aj', 'ab_fg_aj'),
+ (u"ab\xA9", "ab_"), # no unicode allowed for now
+ ]
def test_clean():
@@ -131,7 +131,7 @@ def test_clean():
('a:b', 'a_b'), # no colons in non-name components
('a-b', 'a-b'), # dashes ok
('a.b', 'a.b'), # dot ok
- ]
+ ]
for input, output in pairs:
assert_equals(Location.clean(input), output)
@@ -141,17 +141,17 @@ def test_clean_for_url_name():
('a:b', 'a:b'), # colons ok in names
('a-b', 'a-b'), # dashes ok in names
('a.b', 'a.b'), # dot ok in names
- ]
+ ]
for input, output in pairs:
assert_equals(Location.clean_for_url_name(input), output)
def test_clean_for_html():
pairs = general_pairs + [
- ("a:b", "a_b"), # no colons for html use
- ("a-b", "a-b"), # dashes ok (though need to be replaced in various use locations. ugh.)
- ('a.b', 'a_b'), # no dots.
- ]
+ ("a:b", "a_b"), # no colons for html use
+ ("a-b", "a-b"), # dashes ok (though need to be replaced in various use locations. ugh.)
+ ('a.b', 'a_b'), # no dots.
+ ]
for input, output in pairs:
assert_equals(Location.clean_for_html(input), output)
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore.py
index 94ea622907..469eedac05 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore.py
@@ -12,7 +12,7 @@ def check_path_to_location(modulestore):
("edX/toy/2012_Fall", "Overview", "Welcome", None)),
("i4x://edX/toy/chapter/Overview",
("edX/toy/2012_Fall", "Overview", None, None)),
- )
+ )
course_id = "edX/toy/2012_Fall"
for location, expected in should_work:
@@ -20,6 +20,6 @@ def check_path_to_location(modulestore):
not_found = (
"i4x://edX/toy/video/WelcomeX", "i4x://edX/toy/course/NotHome"
- )
+ )
for location in not_found:
assert_raises(ItemNotFoundError, path_to_location, modulestore, course_id, location)
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
index 5c3bfa5b2a..20cedaab75 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
@@ -40,14 +40,15 @@ ACCEPT_FILE_UPLOAD = False
TRUE_DICT = ["True", True, "TRUE", "true"]
HUMAN_TASK_TYPE = {
- 'selfassessment' : "Self Assessment",
- 'openended' : "edX Assessment",
- }
+ 'selfassessment': "Self Assessment",
+ 'openended': "edX Assessment",
+}
#Default value that controls whether or not to skip basic spelling checks in the controller
#Metadata overrides this
SKIP_BASIC_CHECKS = False
+
class CombinedOpenEndedV1Module():
"""
This is a module that encapsulates all open ended grading (self assessment, peer assessment, etc).
@@ -83,7 +84,7 @@ class CombinedOpenEndedV1Module():
TEMPLATE_DIR = "combinedopenended"
def __init__(self, system, location, definition, descriptor,
- instance_state=None, shared_state=None, metadata = None, static_data = None, **kwargs):
+ instance_state=None, shared_state=None, metadata=None, static_data=None, **kwargs):
"""
Definition file should have one or many task blocks, a rubric block, and a prompt block:
@@ -122,7 +123,7 @@ class CombinedOpenEndedV1Module():
self.metadata = metadata
self.display_name = metadata.get('display_name', "Open Ended")
- self.rewrite_content_links = static_data.get('rewrite_content_links',"")
+ self.rewrite_content_links = static_data.get('rewrite_content_links', "")
# Load instance state
@@ -152,10 +153,10 @@ class CombinedOpenEndedV1Module():
self.skip_basic_checks = self.metadata.get('skip_spelling_checks', SKIP_BASIC_CHECKS)
display_due_date_string = self.metadata.get('due', None)
-
+
grace_period_string = self.metadata.get('graceperiod', None)
try:
- self.timeinfo = TimeInfo(display_due_date_string, grace_period_string)
+ self.timeinfo = TimeInfo(display_due_date_string, grace_period_string)
except:
log.error("Error parsing due date information in location {0}".format(location))
raise
@@ -177,10 +178,10 @@ class CombinedOpenEndedV1Module():
'rubric': definition['rubric'],
'display_name': self.display_name,
'accept_file_upload': self.accept_file_upload,
- 'close_date' : self.timeinfo.close_date,
- 's3_interface' : self.system.s3_interface,
- 'skip_basic_checks' : self.skip_basic_checks,
- }
+ 'close_date': self.timeinfo.close_date,
+ 's3_interface': self.system.s3_interface,
+ 'skip_basic_checks': self.skip_basic_checks,
+ }
self.task_xml = definition['task_xml']
self.location = location
@@ -223,15 +224,15 @@ class CombinedOpenEndedV1Module():
child_modules = {
'openended': open_ended_module.OpenEndedModule,
'selfassessment': self_assessment_module.SelfAssessmentModule,
- }
+ }
child_descriptors = {
'openended': open_ended_module.OpenEndedDescriptor,
'selfassessment': self_assessment_module.SelfAssessmentDescriptor,
- }
+ }
children = {
'modules': child_modules,
'descriptors': child_descriptors,
- }
+ }
return children
def setup_next_task(self, reset=False):
@@ -267,7 +268,8 @@ class CombinedOpenEndedV1Module():
self.current_task_parsed_xml = self.current_task_descriptor.definition_from_xml(etree_xml, self.system)
if current_task_state is None and self.current_task_number == 0:
self.current_task = child_task_module(self.system, self.location,
- self.current_task_parsed_xml, self.current_task_descriptor, self.static_data)
+ self.current_task_parsed_xml, self.current_task_descriptor,
+ self.static_data)
self.task_states.append(self.current_task.get_instance_state())
self.state = self.ASSESSING
elif current_task_state is None and self.current_task_number > 0:
@@ -280,18 +282,20 @@ class CombinedOpenEndedV1Module():
'attempts': 0,
'created': True,
'history': [{'answer': last_response}],
- })
+ })
self.current_task = child_task_module(self.system, self.location,
- self.current_task_parsed_xml, self.current_task_descriptor, self.static_data,
- instance_state=current_task_state)
+ self.current_task_parsed_xml, self.current_task_descriptor,
+ self.static_data,
+ instance_state=current_task_state)
self.task_states.append(self.current_task.get_instance_state())
self.state = self.ASSESSING
else:
if self.current_task_number > 0 and not reset:
current_task_state = self.overwrite_state(current_task_state)
self.current_task = child_task_module(self.system, self.location,
- self.current_task_parsed_xml, self.current_task_descriptor, self.static_data,
- instance_state=current_task_state)
+ self.current_task_parsed_xml, self.current_task_descriptor,
+ self.static_data,
+ instance_state=current_task_state)
return True
@@ -307,8 +311,8 @@ class CombinedOpenEndedV1Module():
last_response_data = self.get_last_response(self.current_task_number - 1)
current_response_data = self.get_current_attributes(self.current_task_number)
- if(current_response_data['min_score_to_attempt'] > last_response_data['score']
- or current_response_data['max_score_to_attempt'] < last_response_data['score']):
+ if (current_response_data['min_score_to_attempt'] > last_response_data['score']
+ or current_response_data['max_score_to_attempt'] < last_response_data['score']):
self.state = self.DONE
self.allow_reset = True
@@ -334,8 +338,8 @@ class CombinedOpenEndedV1Module():
'display_name': self.display_name,
'accept_file_upload': self.accept_file_upload,
'location': self.location,
- 'legend_list' : LEGEND_LIST,
- }
+ 'legend_list': LEGEND_LIST,
+ }
return context
@@ -404,7 +408,7 @@ class CombinedOpenEndedV1Module():
task_parsed_xml = task_descriptor.definition_from_xml(etree_xml, self.system)
task = children['modules'][task_type](self.system, self.location, task_parsed_xml, task_descriptor,
- self.static_data, instance_state=task_state)
+ self.static_data, instance_state=task_state)
last_response = task.latest_answer()
last_score = task.latest_score()
last_post_assessment = task.latest_post_assessment(self.system)
@@ -426,10 +430,10 @@ class CombinedOpenEndedV1Module():
rubric_scores = rubric_data['rubric_scores']
grader_types = rubric_data['grader_types']
feedback_items = rubric_data['feedback_items']
- feedback_dicts = rubric_data['feedback_dicts']
+ feedback_dicts = rubric_data['feedback_dicts']
grader_ids = rubric_data['grader_ids']
- submission_ids = rubric_data['submission_ids']
- elif task_type== "selfassessment":
+ submission_ids = rubric_data['submission_ids']
+ elif task_type == "selfassessment":
rubric_scores = last_post_assessment
grader_types = ['SA']
feedback_items = ['']
@@ -446,7 +450,7 @@ class CombinedOpenEndedV1Module():
human_state = task.HUMAN_NAMES[state]
else:
human_state = state
- if len(grader_types)>0:
+ if len(grader_types) > 0:
grader_type = grader_types[0]
else:
grader_type = "IN"
@@ -468,15 +472,15 @@ class CombinedOpenEndedV1Module():
'correct': last_correctness,
'min_score_to_attempt': min_score_to_attempt,
'max_score_to_attempt': max_score_to_attempt,
- 'rubric_scores' : rubric_scores,
- 'grader_types' : grader_types,
- 'feedback_items' : feedback_items,
- 'grader_type' : grader_type,
- 'human_grader_type' : human_grader_name,
- 'feedback_dicts' : feedback_dicts,
- 'grader_ids' : grader_ids,
- 'submission_ids' : submission_ids,
- }
+ 'rubric_scores': rubric_scores,
+ 'grader_types': grader_types,
+ 'feedback_items': feedback_items,
+ 'grader_type': grader_type,
+ 'human_grader_type': human_grader_name,
+ 'feedback_dicts': feedback_dicts,
+ 'grader_ids': grader_ids,
+ 'submission_ids': submission_ids,
+ }
return last_response_dict
def update_task_states(self):
@@ -519,20 +523,27 @@ class CombinedOpenEndedV1Module():
Output: Dictionary to be rendered via ajax that contains the result html.
"""
all_responses = []
- loop_up_to_task = self.current_task_number+1
- for i in xrange(0,loop_up_to_task):
+ loop_up_to_task = self.current_task_number + 1
+ for i in xrange(0, loop_up_to_task):
all_responses.append(self.get_last_response(i))
- rubric_scores = [all_responses[i]['rubric_scores'] for i in xrange(0,len(all_responses)) if len(all_responses[i]['rubric_scores'])>0 and all_responses[i]['grader_types'][0] in HUMAN_GRADER_TYPE.keys()]
- grader_types = [all_responses[i]['grader_types'] for i in xrange(0,len(all_responses)) if len(all_responses[i]['grader_types'])>0 and all_responses[i]['grader_types'][0] in HUMAN_GRADER_TYPE.keys()]
- feedback_items = [all_responses[i]['feedback_items'] for i in xrange(0,len(all_responses)) if len(all_responses[i]['feedback_items'])>0 and all_responses[i]['grader_types'][0] in HUMAN_GRADER_TYPE.keys()]
- rubric_html = self.rubric_renderer.render_combined_rubric(stringify_children(self.static_data['rubric']), rubric_scores,
- grader_types, feedback_items)
+ rubric_scores = [all_responses[i]['rubric_scores'] for i in xrange(0, len(all_responses)) if
+ len(all_responses[i]['rubric_scores']) > 0 and all_responses[i]['grader_types'][
+ 0] in HUMAN_GRADER_TYPE.keys()]
+ grader_types = [all_responses[i]['grader_types'] for i in xrange(0, len(all_responses)) if
+ len(all_responses[i]['grader_types']) > 0 and all_responses[i]['grader_types'][
+ 0] in HUMAN_GRADER_TYPE.keys()]
+ feedback_items = [all_responses[i]['feedback_items'] for i in xrange(0, len(all_responses)) if
+ len(all_responses[i]['feedback_items']) > 0 and all_responses[i]['grader_types'][
+ 0] in HUMAN_GRADER_TYPE.keys()]
+ rubric_html = self.rubric_renderer.render_combined_rubric(stringify_children(self.static_data['rubric']),
+ rubric_scores,
+ grader_types, feedback_items)
response_dict = all_responses[-1]
context = {
'results': rubric_html,
- 'task_name' : 'Scored Rubric',
- 'class_name' : 'combined-rubric-container'
+ 'task_name': 'Scored Rubric',
+ 'class_name': 'combined-rubric-container'
}
html = self.system.render_template('{0}/combined_open_ended_results.html'.format(self.TEMPLATE_DIR), context)
return {'html': html, 'success': True}
@@ -544,8 +555,8 @@ class CombinedOpenEndedV1Module():
Output: Dictionary to be rendered via ajax that contains the result html.
"""
context = {
- 'legend_list' : LEGEND_LIST,
- }
+ 'legend_list': LEGEND_LIST,
+ }
html = self.system.render_template('{0}/combined_open_ended_legend.html'.format(self.TEMPLATE_DIR), context)
return {'html': html, 'success': True}
@@ -556,15 +567,16 @@ class CombinedOpenEndedV1Module():
Output: Dictionary to be rendered via ajax that contains the result html.
"""
self.update_task_states()
- loop_up_to_task = self.current_task_number+1
- all_responses =[]
- for i in xrange(0,loop_up_to_task):
+ loop_up_to_task = self.current_task_number + 1
+ all_responses = []
+ for i in xrange(0, loop_up_to_task):
all_responses.append(self.get_last_response(i))
context_list = []
for ri in all_responses:
- for i in xrange(0,len(ri['rubric_scores'])):
- feedback = ri['feedback_dicts'][i].get('feedback','')
- rubric_data = self.rubric_renderer.render_rubric(stringify_children(self.static_data['rubric']), ri['rubric_scores'][i])
+ for i in xrange(0, len(ri['rubric_scores'])):
+ feedback = ri['feedback_dicts'][i].get('feedback', '')
+ rubric_data = self.rubric_renderer.render_rubric(stringify_children(self.static_data['rubric']),
+ ri['rubric_scores'][i])
if rubric_data['success']:
rubric_html = rubric_data['html']
else:
@@ -572,23 +584,23 @@ class CombinedOpenEndedV1Module():
context = {
'rubric_html': rubric_html,
'grader_type': ri['grader_type'],
- 'feedback' : feedback,
- 'grader_id' : ri['grader_ids'][i],
- 'submission_id' : ri['submission_ids'][i],
+ 'feedback': feedback,
+ 'grader_id': ri['grader_ids'][i],
+ 'submission_id': ri['submission_ids'][i],
}
context_list.append(context)
feedback_table = self.system.render_template('{0}/open_ended_result_table.html'.format(self.TEMPLATE_DIR), {
- 'context_list' : context_list,
- 'grader_type_image_dict' : GRADER_TYPE_IMAGE_DICT,
- 'human_grader_types' : HUMAN_GRADER_TYPE,
+ 'context_list': context_list,
+ 'grader_type_image_dict': GRADER_TYPE_IMAGE_DICT,
+ 'human_grader_types': HUMAN_GRADER_TYPE,
'rows': 50,
'cols': 50,
})
context = {
'results': feedback_table,
- 'task_name' : "Feedback",
- 'class_name' : "result-container",
- }
+ 'task_name': "Feedback",
+ 'class_name': "result-container",
+ }
html = self.system.render_template('{0}/combined_open_ended_results.html'.format(self.TEMPLATE_DIR), context)
return {'html': html, 'success': True}
@@ -617,8 +629,8 @@ class CombinedOpenEndedV1Module():
'reset': self.reset,
'get_results': self.get_results,
'get_combined_rubric': self.get_rubric,
- 'get_status' : self.get_status_ajax,
- 'get_legend' : self.get_legend,
+ 'get_status': self.get_status_ajax,
+ 'get_legend': self.get_legend,
}
if dispatch not in handlers:
@@ -681,7 +693,7 @@ class CombinedOpenEndedV1Module():
'task_states': self.task_states,
'attempts': self.attempts,
'ready_to_reset': self.allow_reset,
- }
+ }
return json.dumps(state)
@@ -699,11 +711,12 @@ class CombinedOpenEndedV1Module():
context = {
'status_list': status,
- 'grader_type_image_dict' : GRADER_TYPE_IMAGE_DICT,
- 'legend_list' : LEGEND_LIST,
- 'render_via_ajax' : render_via_ajax,
+ 'grader_type_image_dict': GRADER_TYPE_IMAGE_DICT,
+ 'legend_list': LEGEND_LIST,
+ 'render_via_ajax': render_via_ajax,
}
- status_html = self.system.render_template("{0}/combined_open_ended_status.html".format(self.TEMPLATE_DIR), context)
+ status_html = self.system.render_template("{0}/combined_open_ended_status.html".format(self.TEMPLATE_DIR),
+ context)
return status_html
@@ -736,7 +749,7 @@ class CombinedOpenEndedV1Module():
score_dict = {
'score': score,
'total': max_score,
- }
+ }
return score_dict
@@ -793,7 +806,9 @@ class CombinedOpenEndedV1Descriptor(XmlDescriptor, EditingDescriptor):
for child in expected_children:
if len(xml_object.xpath(child)) == 0:
#This is a staff_facing_error
- raise ValueError("Combined Open Ended definition must include at least one '{0}' tag. Contact the learning sciences group for assistance.".format(child))
+ raise ValueError(
+ "Combined Open Ended definition must include at least one '{0}' tag. Contact the learning sciences group for assistance.".format(
+ child))
def parse_task(k):
"""Assumes that xml_object has child k"""
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py
index 8d1bd376fb..287aeb5c24 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py
@@ -4,24 +4,26 @@ from lxml import etree
log = logging.getLogger(__name__)
GRADER_TYPE_IMAGE_DICT = {
- 'SA' : '/static/images/self_assessment_icon.png',
- 'PE' : '/static/images/peer_grading_icon.png',
- 'ML' : '/static/images/ml_grading_icon.png',
- 'IN' : '/static/images/peer_grading_icon.png',
- 'BC' : '/static/images/ml_grading_icon.png',
- }
+ 'SA': '/static/images/self_assessment_icon.png',
+ 'PE': '/static/images/peer_grading_icon.png',
+ 'ML': '/static/images/ml_grading_icon.png',
+ 'IN': '/static/images/peer_grading_icon.png',
+ 'BC': '/static/images/ml_grading_icon.png',
+}
HUMAN_GRADER_TYPE = {
- 'SA' : 'Self-Assessment',
- 'PE' : 'Peer-Assessment',
- 'IN' : 'Instructor-Assessment',
- 'ML' : 'AI-Assessment',
- 'BC' : 'AI-Assessment',
- }
+ 'SA': 'Self-Assessment',
+ 'PE': 'Peer-Assessment',
+ 'IN': 'Instructor-Assessment',
+ 'ML': 'AI-Assessment',
+ 'BC': 'AI-Assessment',
+}
DO_NOT_DISPLAY = ['BC', 'IN']
-LEGEND_LIST = [{'name' : HUMAN_GRADER_TYPE[k], 'image' : GRADER_TYPE_IMAGE_DICT[k]} for k in GRADER_TYPE_IMAGE_DICT.keys() if k not in DO_NOT_DISPLAY ]
+LEGEND_LIST = [{'name': HUMAN_GRADER_TYPE[k], 'image': GRADER_TYPE_IMAGE_DICT[k]} for k in GRADER_TYPE_IMAGE_DICT.keys()
+ if k not in DO_NOT_DISPLAY]
+
class RubricParsingError(Exception):
def __init__(self, msg):
@@ -29,15 +31,14 @@ class RubricParsingError(Exception):
class CombinedOpenEndedRubric(object):
-
TEMPLATE_DIR = "combinedopenended/openended"
- def __init__ (self, system, view_only = False):
+ def __init__(self, system, view_only=False):
self.has_score = False
self.view_only = view_only
self.system = system
- def render_rubric(self, rubric_xml, score_list = None):
+ def render_rubric(self, rubric_xml, score_list=None):
'''
render_rubric: takes in an xml string and outputs the corresponding
html for that xml, given the type of rubric we're generating
@@ -50,11 +51,11 @@ class CombinedOpenEndedRubric(object):
success = False
try:
rubric_categories = self.extract_categories(rubric_xml)
- if score_list and len(score_list)==len(rubric_categories):
- for i in xrange(0,len(rubric_categories)):
+ if score_list and len(score_list) == len(rubric_categories):
+ for i in xrange(0, len(rubric_categories)):
category = rubric_categories[i]
- for j in xrange(0,len(category['options'])):
- if score_list[i]==j:
+ for j in xrange(0, len(category['options'])):
+ if score_list[i] == j:
rubric_categories[i]['options'][j]['selected'] = True
rubric_scores = [cat['score'] for cat in rubric_categories]
max_scores = map((lambda cat: cat['options'][-1]['points']), rubric_categories)
@@ -63,19 +64,20 @@ class CombinedOpenEndedRubric(object):
if self.view_only:
rubric_template = '{0}/open_ended_view_only_rubric.html'.format(self.TEMPLATE_DIR)
html = self.system.render_template(rubric_template,
- {'categories': rubric_categories,
- 'has_score': self.has_score,
- 'view_only': self.view_only,
- 'max_score': max_score,
- 'combined_rubric' : False
- })
+ {'categories': rubric_categories,
+ 'has_score': self.has_score,
+ 'view_only': self.view_only,
+ 'max_score': max_score,
+ 'combined_rubric': False
+ })
success = True
except:
#This is a staff_facing_error
- error_message = "[render_rubric] Could not parse the rubric with xml: {0}. Contact the learning sciences group for assistance.".format(rubric_xml)
+ error_message = "[render_rubric] Could not parse the rubric with xml: {0}. Contact the learning sciences group for assistance.".format(
+ rubric_xml)
log.exception(error_message)
raise RubricParsingError(error_message)
- return {'success' : success, 'html' : html, 'rubric_scores' : rubric_scores}
+ return {'success': success, 'html': html, 'rubric_scores': rubric_scores}
def check_if_rubric_is_parseable(self, rubric_string, location, max_score_allowed, max_score):
rubric_dict = self.render_rubric(rubric_string)
@@ -83,7 +85,8 @@ class CombinedOpenEndedRubric(object):
rubric_feedback = rubric_dict['html']
if not success:
#This is a staff_facing_error
- error_message = "Could not parse rubric : {0} for location {1}. Contact the learning sciences group for assistance.".format(rubric_string, location.url())
+ error_message = "Could not parse rubric : {0} for location {1}. Contact the learning sciences group for assistance.".format(
+ rubric_string, location.url())
log.error(error_message)
raise RubricParsingError(error_message)
@@ -101,7 +104,7 @@ class CombinedOpenEndedRubric(object):
if total != max_score:
#This is a staff_facing_error
error_msg = "The max score {0} for problem {1} does not match the total number of points in the rubric {2}. Contact the learning sciences group for assistance.".format(
- max_score, location, total)
+ max_score, location, total)
log.error(error_msg)
raise RubricParsingError(error_msg)
@@ -123,12 +126,13 @@ class CombinedOpenEndedRubric(object):
for category in element:
if category.tag != 'category':
#This is a staff_facing_error
- raise RubricParsingError("[extract_categories] Expected a
tag: got {0} instead. Contact the learning sciences group for assistance.".format(category.tag))
+ raise RubricParsingError(
+ "[extract_categories] Expected a tag: got {0} instead. Contact the learning sciences group for assistance.".format(
+ category.tag))
else:
categories.append(self.extract_category(category))
return categories
-
def extract_category(self, category):
'''
construct an individual category
@@ -150,13 +154,17 @@ class CombinedOpenEndedRubric(object):
# if we are missing the score tag and we are expecting one
elif self.has_score:
#This is a staff_facing_error
- raise RubricParsingError("[extract_category] Category {0} is missing a score. Contact the learning sciences group for assistance.".format(descriptionxml.text))
+ raise RubricParsingError(
+ "[extract_category] Category {0} is missing a score. Contact the learning sciences group for assistance.".format(
+ descriptionxml.text))
# parse description
if descriptionxml.tag != 'description':
#This is a staff_facing_error
- raise RubricParsingError("[extract_category]: expected description tag, got {0} instead. Contact the learning sciences group for assistance.".format(descriptionxml.tag))
+ raise RubricParsingError(
+ "[extract_category]: expected description tag, got {0} instead. Contact the learning sciences group for assistance.".format(
+ descriptionxml.tag))
description = descriptionxml.text
@@ -167,7 +175,9 @@ class CombinedOpenEndedRubric(object):
for option in optionsxml:
if option.tag != 'option':
#This is a staff_facing_error
- raise RubricParsingError("[extract_category]: expected option tag, got {0} instead. Contact the learning sciences group for assistance.".format(option.tag))
+ raise RubricParsingError(
+ "[extract_category]: expected option tag, got {0} instead. Contact the learning sciences group for assistance.".format(
+ option.tag))
else:
pointstr = option.get("points")
if pointstr:
@@ -177,13 +187,16 @@ class CombinedOpenEndedRubric(object):
points = int(pointstr)
except ValueError:
#This is a staff_facing_error
- raise RubricParsingError("[extract_category]: expected points to have int, got {0} instead. Contact the learning sciences group for assistance.".format(pointstr))
+ raise RubricParsingError(
+ "[extract_category]: expected points to have int, got {0} instead. Contact the learning sciences group for assistance.".format(
+ pointstr))
elif autonumbering:
# use the generated one if we're in the right mode
points = cur_points
cur_points = cur_points + 1
else:
- raise Exception("[extract_category]: missing points attribute. Cannot continue to auto-create points values after a points value is explicitly defined.")
+ raise Exception(
+ "[extract_category]: missing points attribute. Cannot continue to auto-create points values after a points value is explicitly defined.")
selected = score == points
optiontext = option.text
@@ -193,34 +206,34 @@ class CombinedOpenEndedRubric(object):
options = sorted(options, key=lambda option: option['points'])
CombinedOpenEndedRubric.validate_options(options)
- return {'description': description, 'options': options, 'score' : score}
+ return {'description': description, 'options': options, 'score': score}
- def render_combined_rubric(self,rubric_xml,scores,score_types,feedback_types):
- success, score_tuples = CombinedOpenEndedRubric.reformat_scores_for_rendering(scores,score_types,feedback_types)
+ def render_combined_rubric(self, rubric_xml, scores, score_types, feedback_types):
+ success, score_tuples = CombinedOpenEndedRubric.reformat_scores_for_rendering(scores, score_types,
+ feedback_types)
rubric_categories = self.extract_categories(rubric_xml)
max_scores = map((lambda cat: cat['options'][-1]['points']), rubric_categories)
max_score = max(max_scores)
- for i in xrange(0,len(rubric_categories)):
+ for i in xrange(0, len(rubric_categories)):
category = rubric_categories[i]
- for j in xrange(0,len(category['options'])):
+ for j in xrange(0, len(category['options'])):
rubric_categories[i]['options'][j]['grader_types'] = []
for tuple in score_tuples:
- if tuple[1] == i and tuple[2] ==j:
+ if tuple[1] == i and tuple[2] == j:
for grader_type in tuple[3]:
rubric_categories[i]['options'][j]['grader_types'].append(grader_type)
html = self.system.render_template('{0}/open_ended_combined_rubric.html'.format(self.TEMPLATE_DIR),
- {'categories': rubric_categories,
- 'has_score': True,
- 'view_only': True,
- 'max_score': max_score,
- 'combined_rubric' : True,
- 'grader_type_image_dict' : GRADER_TYPE_IMAGE_DICT,
- 'human_grader_types' : HUMAN_GRADER_TYPE,
- })
+ {'categories': rubric_categories,
+ 'has_score': True,
+ 'view_only': True,
+ 'max_score': max_score,
+ 'combined_rubric': True,
+ 'grader_type_image_dict': GRADER_TYPE_IMAGE_DICT,
+ 'human_grader_types': HUMAN_GRADER_TYPE,
+ })
return html
-
@staticmethod
def validate_options(options):
'''
@@ -228,14 +241,16 @@ class CombinedOpenEndedRubric(object):
'''
if len(options) == 0:
#This is a staff_facing_error
- raise RubricParsingError("[extract_category]: no options associated with this category. Contact the learning sciences group for assistance.")
+ raise RubricParsingError(
+ "[extract_category]: no options associated with this category. Contact the learning sciences group for assistance.")
if len(options) == 1:
return
prev = options[0]['points']
for option in options[1:]:
if prev == option['points']:
#This is a staff_facing_error
- raise RubricParsingError("[extract_category]: found duplicate point values between two different options. Contact the learning sciences group for assistance.")
+ raise RubricParsingError(
+ "[extract_category]: found duplicate point values between two different options. Contact the learning sciences group for assistance.")
else:
prev = option['points']
@@ -250,7 +265,7 @@ class CombinedOpenEndedRubric(object):
@return:
"""
success = False
- if len(scores)==0:
+ if len(scores) == 0:
#This is a dev_facing_error
log.error("Score length is 0 when trying to reformat rubric scores for rendering.")
return success, ""
@@ -264,25 +279,25 @@ class CombinedOpenEndedRubric(object):
score_lists = []
score_type_list = []
feedback_type_list = []
- for i in xrange(0,len(scores)):
+ for i in xrange(0, len(scores)):
score_cont_list = scores[i]
- for j in xrange(0,len(score_cont_list)):
+ for j in xrange(0, len(score_cont_list)):
score_list = score_cont_list[j]
score_lists.append(score_list)
score_type_list.append(score_types[i][j])
feedback_type_list.append(feedback_types[i][j])
score_list_len = len(score_lists[0])
- for i in xrange(0,len(score_lists)):
+ for i in xrange(0, len(score_lists)):
score_list = score_lists[i]
- if len(score_list)!=score_list_len:
+ if len(score_list) != score_list_len:
return success, ""
score_tuples = []
- for i in xrange(0,len(score_lists)):
- for j in xrange(0,len(score_lists[i])):
- tuple = [1,j,score_lists[i][j],[],[]]
- score_tuples, tup_ind = CombinedOpenEndedRubric.check_for_tuple_matches(score_tuples,tuple)
+ for i in xrange(0, len(score_lists)):
+ for j in xrange(0, len(score_lists[i])):
+ tuple = [1, j, score_lists[i][j], [], []]
+ score_tuples, tup_ind = CombinedOpenEndedRubric.check_for_tuple_matches(score_tuples, tuple)
score_tuples[tup_ind][0] += 1
score_tuples[tup_ind][3].append(score_type_list[i])
score_tuples[tup_ind][4].append(feedback_type_list[i])
@@ -302,18 +317,12 @@ class CombinedOpenEndedRubric(object):
category = tuple[1]
score = tuple[2]
tup_ind = -1
- for t in xrange(0,len(tuples)):
+ for t in xrange(0, len(tuples)):
if tuples[t][1] == category and tuples[t][2] == score:
tup_ind = t
break
if tup_ind == -1:
- tuples.append([0,category,score,[],[]])
- tup_ind = len(tuples)-1
+ tuples.append([0, category, score, [], []])
+ tup_ind = len(tuples) - 1
return tuples, tup_ind
-
-
-
-
-
-
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
index 1dd5c57ad4..21715c8e57 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
@@ -8,6 +8,7 @@ class ControllerQueryService(GradingService):
"""
Interface to staff grading backend.
"""
+
def __init__(self, config, system):
config['system'] = system
super(ControllerQueryService, self).__init__(config)
@@ -59,7 +60,7 @@ class ControllerQueryService(GradingService):
def get_flagged_problem_list(self, course_id):
params = {
'course_id': course_id,
- }
+ }
response = self.get(self.flagged_problem_list_url, params)
return response
@@ -70,20 +71,21 @@ class ControllerQueryService(GradingService):
'student_id': student_id,
'submission_id': submission_id,
'action_type': action_type
- }
+ }
response = self.post(self.take_action_on_flags_url, params)
return response
+
def convert_seconds_to_human_readable(seconds):
if seconds < 60:
human_string = "{0} seconds".format(seconds)
elif seconds < 60 * 60:
- human_string = "{0} minutes".format(round(seconds/60,1))
- elif seconds < (24*60*60):
- human_string = "{0} hours".format(round(seconds/(60*60),1))
+ human_string = "{0} minutes".format(round(seconds / 60, 1))
+ elif seconds < (24 * 60 * 60):
+ human_string = "{0} hours".format(round(seconds / (60 * 60), 1))
else:
- human_string = "{0} days".format(round(seconds/(60*60*24),1))
+ human_string = "{0} days".format(round(seconds / (60 * 60 * 24), 1))
eta_string = "{0}".format(human_string)
return eta_string
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py
index 8a4caa1291..0f961794d5 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py
@@ -19,6 +19,7 @@ class GradingService(object):
"""
Interface to staff grading backend.
"""
+
def __init__(self, config):
self.username = config['username']
self.password = config['password']
@@ -34,8 +35,8 @@ class GradingService(object):
Returns the decoded json dict of the response.
"""
response = self.session.post(self.login_url,
- {'username': self.username,
- 'password': self.password, })
+ {'username': self.username,
+ 'password': self.password, })
response.raise_for_status()
@@ -47,7 +48,7 @@ class GradingService(object):
"""
try:
op = lambda: self.session.post(url, data=data,
- allow_redirects=allow_redirects)
+ allow_redirects=allow_redirects)
r = self._try_with_login(op)
except (RequestException, ConnectionError, HTTPError) as err:
# reraise as promised GradingServiceError, but preserve stacktrace.
@@ -63,8 +64,8 @@ class GradingService(object):
"""
log.debug(params)
op = lambda: self.session.get(url,
- allow_redirects=allow_redirects,
- params=params)
+ allow_redirects=allow_redirects,
+ params=params)
try:
r = self._try_with_login(op)
except (RequestException, ConnectionError, HTTPError) as err:
@@ -92,7 +93,7 @@ class GradingService(object):
r = self._login()
if r and not r.get('success'):
log.warning("Couldn't log into staff_grading backend. Response: %s",
- r)
+ r)
# try again
response = operation()
response.raise_for_status()
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py
index edae69854f..6956f336a5 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py
@@ -5,6 +5,7 @@ to send them to S3.
try:
from PIL import Image
+
ENABLE_PIL = True
except:
ENABLE_PIL = False
@@ -51,6 +52,7 @@ class ImageProperties(object):
"""
Class to check properties of an image and to validate if they are allowed.
"""
+
def __init__(self, image_data):
"""
Initializes class variables
@@ -92,7 +94,7 @@ class ImageProperties(object):
g = rgb[1]
b = rgb[2]
check_r = (r > 60)
- check_g = (r * 0.4) < g < (r * 0.85)
+ check_g = (r * 0.4) < g < (r * 0.85)
check_b = (r * 0.2) < b < (r * 0.7)
colors_okay = check_r and check_b and check_g
except:
@@ -141,6 +143,7 @@ class URLProperties(object):
Checks to see if a URL points to acceptable content. Added to check if students are submitting reasonable
links to the peer grading image functionality of the external grading service.
"""
+
def __init__(self, url_string):
self.url_string = url_string
@@ -212,7 +215,7 @@ def run_image_tests(image):
success = image_properties.run_tests()
except:
log.exception("Cannot run image tests in combined open ended xmodule. May be an issue with a particular image,"
- "or an issue with the deployment configuration of PIL/Pillow")
+ "or an issue with the deployment configuration of PIL/Pillow")
return success
@@ -252,7 +255,8 @@ def upload_to_s3(file_to_upload, keyname, s3_interface):
return True, public_url
except:
#This is a dev_facing_error
- error_message = "Could not connect to S3 to upload peer grading image. Trying to utilize bucket: {0}".format(bucketname.lower())
+ error_message = "Could not connect to S3 to upload peer grading image. Trying to utilize bucket: {0}".format(
+ bucketname.lower())
log.error(error_message)
return False, error_message
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
index aa805a5290..fc53a62c06 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
@@ -10,7 +10,7 @@ import logging
from lxml import etree
import capa.xqueue_interface as xqueue_interface
-from xmodule.capa_module import ComplexEncoder
+from xmodule.capa_module import ComplexEncoder
from xmodule.editing_module import EditingDescriptor
from xmodule.progress import Progress
from xmodule.stringify import stringify_children
@@ -77,7 +77,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
self.send_to_grader(self.latest_answer(), system)
self.created = False
-
def _parse(self, oeparam, prompt, rubric, system):
'''
Parse OpenEndedResponse XML:
@@ -104,7 +103,9 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
# response types)
except TypeError, ValueError:
#This is a dev_facing_error
- log.exception("Grader payload from external open ended grading server is not a json object! Object: {0}".format(grader_payload))
+ log.exception(
+ "Grader payload from external open ended grading server is not a json object! Object: {0}".format(
+ grader_payload))
self.initial_display = find_with_default(oeparam, 'initial_display', '')
self.answer = find_with_default(oeparam, 'answer_display', 'No answer given.')
@@ -148,7 +149,9 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
for tag in ['feedback', 'submission_id', 'grader_id', 'score']:
if tag not in survey_responses:
#This is a student_facing_error
- return {'success': False, 'msg': "Could not find needed tag {0} in the survey responses. Please try submitting again.".format(tag)}
+ return {'success': False,
+ 'msg': "Could not find needed tag {0} in the survey responses. Please try submitting again.".format(
+ tag)}
try:
submission_id = int(survey_responses['submission_id'])
grader_id = int(survey_responses['grader_id'])
@@ -188,7 +191,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
}
(error, msg) = qinterface.send_to_queue(header=xheader,
- body=json.dumps(contents))
+ body=json.dumps(contents))
#Convert error to a success value
success = True
@@ -222,8 +225,8 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
str(len(self.history)))
xheader = xqueue_interface.make_xheader(lms_callback_url=system.xqueue['callback_url'],
- lms_key=queuekey,
- queue_name=self.queue_name)
+ lms_key=queuekey,
+ queue_name=self.queue_name)
contents = self.payload.copy()
@@ -241,7 +244,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
# Submit request. When successful, 'msg' is the prior length of the queue
(error, msg) = qinterface.send_to_queue(header=xheader,
- body=json.dumps(contents))
+ body=json.dumps(contents))
# State associated with the queueing request
queuestate = {'key': queuekey,
@@ -266,7 +269,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
return True
-
def get_answers(self):
"""
Gets and shows the answer for this problem.
@@ -300,7 +302,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
# 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
+ priorities = {# These go at the start of the feedback
'spelling': 0,
'grammar': 1,
# needs to be after all the other feedback
@@ -400,7 +402,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
if not response_items['success']:
return system.render_template("{0}/open_ended_error.html".format(self.TEMPLATE_DIR),
- {'errors': feedback})
+ {'errors': feedback})
feedback_template = system.render_template("{0}/open_ended_feedback.html".format(self.TEMPLATE_DIR), {
'grader_type': response_items['grader_type'],
@@ -411,7 +413,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
return feedback_template, rubric_scores
-
def _parse_score_msg(self, score_msg, system, join_feedback=True):
"""
Grader reply is a JSON-dump of the following dict
@@ -437,13 +438,13 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
'valid': False,
'score': 0,
'feedback': '',
- 'rubric_scores' : [[0]],
- 'grader_types' : [''],
- 'feedback_items' : [''],
- 'feedback_dicts' : [{}],
- 'grader_ids' : [0],
- 'submission_ids' : [0],
- }
+ 'rubric_scores': [[0]],
+ 'grader_types': [''],
+ 'feedback_items': [''],
+ 'feedback_dicts': [{}],
+ 'grader_ids': [0],
+ 'submission_ids': [0],
+ }
try:
score_result = json.loads(score_msg)
except (TypeError, ValueError):
@@ -470,7 +471,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
log.error(error_message)
fail['feedback'] = error_message
return fail
- #This is to support peer grading
+ #This is to support peer grading
if isinstance(score_result['score'], list):
feedback_items = []
rubric_scores = []
@@ -527,12 +528,12 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
'valid': True,
'score': score,
'feedback': feedback,
- 'rubric_scores' : rubric_scores,
- 'grader_types' : grader_types,
- 'feedback_items' : feedback_items,
- 'feedback_dicts' : feedback_dicts,
- 'grader_ids' : grader_ids,
- 'submission_ids' : submission_ids,
+ 'rubric_scores': rubric_scores,
+ 'grader_types': grader_types,
+ 'feedback_items': feedback_items,
+ 'feedback_dicts': feedback_dicts,
+ 'grader_ids': grader_ids,
+ 'submission_ids': submission_ids,
}
def latest_post_assessment(self, system, short_feedback=False, join_feedback=True):
@@ -545,7 +546,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
return ""
feedback_dict = self._parse_score_msg(self.history[-1].get('post_assessment', ""), system,
- join_feedback=join_feedback)
+ join_feedback=join_feedback)
if not short_feedback:
return feedback_dict['feedback'] if feedback_dict['valid'] else ''
if feedback_dict['valid']:
@@ -585,7 +586,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
#This is a dev_facing_error
log.error("Cannot find {0} in handlers in handle_ajax function for open_ended_module.py".format(dispatch))
#This is a dev_facing_error
- return json.dumps({'error': 'Error handling action. Please try again.', 'success' : False})
+ return json.dumps({'error': 'Error handling action. Please try again.', 'success': False})
before = self.get_progress()
d = handlers[dispatch](get, system)
@@ -679,7 +680,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
correct = ""
previous_answer = self.initial_display
-
context = {
'prompt': self.prompt,
'previous_answer': previous_answer,
@@ -692,7 +692,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
'child_type': 'openended',
'correct': correct,
'accept_file_upload': self.accept_file_upload,
- 'eta_message' : eta_string,
+ 'eta_message': eta_string,
}
html = system.render_template('{0}/open_ended.html'.format(self.TEMPLATE_DIR), context)
return html
@@ -723,7 +723,9 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
for child in ['openendedparam']:
if len(xml_object.xpath(child)) != 1:
#This is a staff_facing_error
- raise ValueError("Open Ended definition must include exactly one '{0}' tag. Contact the learning sciences group for assistance.".format(child))
+ raise ValueError(
+ "Open Ended definition must include exactly one '{0}' tag. Contact the learning sciences group for assistance.".format(
+ child))
def parse(k):
"""Assumes that xml_object has child k"""
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
index 31d26fd3c3..922a4f9b77 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
@@ -74,7 +74,7 @@ class OpenEndedChild(object):
'done': 'Done',
}
- def __init__(self, system, location, definition, descriptor, static_data,
+ 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:
@@ -108,15 +108,14 @@ class OpenEndedChild(object):
self._max_score = static_data['max_score']
if system.open_ended_grading_interface:
self.peer_gs = PeerGradingService(system.open_ended_grading_interface, system)
- self.controller_qs = controller_query_service.ControllerQueryService(system.open_ended_grading_interface,system)
+ self.controller_qs = controller_query_service.ControllerQueryService(system.open_ended_grading_interface,
+ system)
else:
self.peer_gs = MockPeerGradingService()
- self.controller_qs = None
-
-
+ self.controller_qs = None
self.system = system
-
+
self.location_string = location
try:
self.location_string = self.location_string.url()
@@ -152,7 +151,8 @@ class OpenEndedChild(object):
return True, {
'success': False,
#This is a student_facing_error
- 'error': 'You have attempted this problem {0} times. You are allowed {1} attempts.'.format(self.attempts, self.max_attempts)
+ 'error': 'You have attempted this problem {0} times. You are allowed {1} attempts.'.format(
+ self.attempts, self.max_attempts)
}
else:
return False, {}
@@ -180,8 +180,8 @@ class OpenEndedChild(object):
try:
answer = autolink_html(answer)
cleaner = Cleaner(style=True, links=True, add_nofollow=False, page_structure=True, safe_attrs_only=True,
- host_whitelist=open_ended_image_submission.TRUSTED_IMAGE_DOMAINS,
- whitelist_tags=set(['embed', 'iframe', 'a', 'img']))
+ host_whitelist=open_ended_image_submission.TRUSTED_IMAGE_DOMAINS,
+ whitelist_tags=set(['embed', 'iframe', 'a', 'img']))
clean_html = cleaner.clean_html(answer)
clean_html = re.sub(r'$', '', re.sub(r'^', '', clean_html))
except:
@@ -282,7 +282,7 @@ class OpenEndedChild(object):
"""
#This is a dev_facing_error
log.warning("Open ended child state out sync. state: %r, get: %r. %s",
- self.state, get, msg)
+ self.state, get, msg)
#This is a student_facing_error
return {'success': False,
'error': 'The problem state got out-of-sync. Please try reloading the page.'}
@@ -308,7 +308,7 @@ class OpenEndedChild(object):
@return: Boolean correct.
"""
correct = False
- if(isinstance(score, (int, long, float, complex))):
+ if (isinstance(score, (int, long, float, complex))):
score_ratio = int(score) / float(self.max_score())
correct = (score_ratio >= 0.66)
return correct
@@ -342,7 +342,8 @@ class OpenEndedChild(object):
try:
image_data.seek(0)
- success, s3_public_url = open_ended_image_submission.upload_to_s3(image_data, image_key, self.s3_interface)
+ success, s3_public_url = open_ended_image_submission.upload_to_s3(image_data, image_key,
+ self.s3_interface)
except:
log.exception("Could not upload image to S3.")
@@ -404,9 +405,9 @@ class OpenEndedChild(object):
#In this case, an image was submitted by the student, but the image could not be uploaded to S3. Likely
#a config issue (development vs deployment). For now, just treat this as a "success"
log.exception("Student AJAX post to combined open ended xmodule indicated that it contained an image, "
- "but the image was not able to be uploaded to S3. This could indicate a config"
- "issue with this deployment, but it could also indicate a problem with S3 or with the"
- "student image itself.")
+ "but the image was not able to be uploaded to S3. This could indicate a config"
+ "issue with this deployment, but it could also indicate a problem with S3 or with the"
+ "student image itself.")
overall_success = True
elif not has_file_to_upload:
#If there is no file to upload, probably the student has embedded the link in the answer text
@@ -445,7 +446,7 @@ class OpenEndedChild(object):
response = {}
#This is a student_facing_error
error_string = ("You need to peer grade {0} more in order to make another submission. "
- "You have graded {1}, and {2} are required. You have made {3} successful peer grading submissions.")
+ "You have graded {1}, and {2} are required. You have made {3} successful peer grading submissions.")
try:
response = self.peer_gs.get_data_for_location(self.location_string, student_id)
count_graded = response['count_graded']
@@ -454,16 +455,18 @@ class OpenEndedChild(object):
success = True
except:
#This is a dev_facing_error
- log.error("Could not contact external open ended graders for location {0} and student {1}".format(self.location_string,student_id))
+ log.error("Could not contact external open ended graders for location {0} and student {1}".format(
+ self.location_string, student_id))
#This is a student_facing_error
error_message = "Could not contact the graders. Please notify course staff."
return success, allowed_to_submit, error_message
- if count_graded>=count_required:
+ if count_graded >= count_required:
return success, allowed_to_submit, ""
else:
allowed_to_submit = False
#This is a student_facing_error
- error_message = error_string.format(count_required-count_graded, count_graded, count_required, student_sub_count)
+ error_message = error_string.format(count_required - count_graded, count_graded, count_required,
+ student_sub_count)
return success, allowed_to_submit, error_message
def get_eta(self):
@@ -478,7 +481,7 @@ class OpenEndedChild(object):
success = response['success']
if isinstance(success, basestring):
- success = (success.lower()=="true")
+ success = (success.lower() == "true")
if success:
eta = controller_query_service.convert_seconds_to_human_readable(response['eta'])
@@ -487,6 +490,3 @@ class OpenEndedChild(object):
eta_string = ""
return eta_string
-
-
-
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
index 42c54f0463..5daf1b83b5 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
@@ -14,6 +14,7 @@ class PeerGradingService(GradingService):
"""
Interface with the grading controller for peer grading
"""
+
def __init__(self, config, system):
config['system'] = system
super(PeerGradingService, self).__init__(config)
@@ -36,10 +37,11 @@ class PeerGradingService(GradingService):
def get_next_submission(self, problem_location, grader_id):
response = self.get(self.get_next_submission_url,
- {'location': problem_location, 'grader_id': grader_id})
+ {'location': problem_location, 'grader_id': grader_id})
return self.try_to_decode(self._render_rubric(response))
- def save_grade(self, location, grader_id, submission_id, score, feedback, submission_key, rubric_scores, submission_flagged):
+ def save_grade(self, location, grader_id, submission_id, score, feedback, submission_key, rubric_scores,
+ submission_flagged):
data = {'grader_id': grader_id,
'submission_id': submission_id,
'score': score,
@@ -89,6 +91,7 @@ class PeerGradingService(GradingService):
pass
return text
+
"""
This is a mock peer grading service that can be used for unit tests
without making actual service calls to the grading controller
@@ -122,7 +125,7 @@ class MockPeerGradingService(object):
'max_score': 4})
def save_calibration_essay(self, problem_location, grader_id,
- calibration_essay_id, submission_key, score,
+ calibration_essay_id, submission_key, score,
feedback, rubric_scores):
return {'success': True, 'actual_score': 2}
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
index f4be426667..8911e2890f 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
@@ -73,7 +73,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
html = system.render_template('{0}/self_assessment_prompt.html'.format(self.TEMPLATE_DIR), context)
return html
-
def handle_ajax(self, dispatch, get, system):
"""
This is called by courseware.module_render, to handle an AJAX call.
@@ -95,7 +94,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
#This is a dev_facing_error
log.error("Cannot find {0} in handlers in handle_ajax function for open_ended_module.py".format(dispatch))
#This is a dev_facing_error
- return json.dumps({'error': 'Error handling action. Please try again.', 'success' : False})
+ return json.dumps({'error': 'Error handling action. Please try again.', 'success': False})
before = self.get_progress()
d = handlers[dispatch](get, system)
@@ -159,7 +158,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
return system.render_template('{0}/self_assessment_hint.html'.format(self.TEMPLATE_DIR), context)
-
def save_answer(self, get, system):
"""
After the answer is submitted, show the rubric.
@@ -224,7 +222,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
try:
score = int(get['assessment'])
score_list = get.getlist('score_list[]')
- for i in xrange(0,len(score_list)):
+ for i in xrange(0, len(score_list)):
score_list[i] = int(score_list[i])
except ValueError:
#This is a dev_facing_error
@@ -268,7 +266,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
'allow_reset': self._allow_reset()}
def latest_post_assessment(self, system):
- latest_post_assessment = super(SelfAssessmentModule, self).latest_post_assessment(system)
+ latest_post_assessment = super(SelfAssessmentModule, self).latest_post_assessment(system)
try:
rubric_scores = json.loads(latest_post_assessment)
except:
@@ -305,7 +303,9 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
for child in expected_children:
if len(xml_object.xpath(child)) != 1:
#This is a staff_facing_error
- raise ValueError("Self assessment definition must include exactly one '{0}' tag. Contact the learning sciences group for assistance.".format(child))
+ raise ValueError(
+ "Self assessment definition must include exactly one '{0}' tag. Contact the learning sciences group for assistance.".format(
+ child))
def parse(k):
"""Assumes that xml_object has child k"""
diff --git a/common/lib/xmodule/xmodule/peer_grading_module.py b/common/lib/xmodule/xmodule/peer_grading_module.py
index 1e52dcf070..2ea8ab0db5 100644
--- a/common/lib/xmodule/xmodule/peer_grading_module.py
+++ b/common/lib/xmodule/xmodule/peer_grading_module.py
@@ -5,7 +5,7 @@ from lxml import etree
from datetime import datetime
from pkg_resources import resource_string
-from .capa_module import ComplexEncoder
+from .capa_module import ComplexEncoder
from .editing_module import EditingDescriptor
from .stringify import stringify_children
from .x_module import XModule
@@ -34,7 +34,7 @@ class PeerGradingModule(XModule):
resource_string(__name__, 'js/src/peergrading/peer_grading_problem.coffee'),
resource_string(__name__, 'js/src/collapsible.coffee'),
resource_string(__name__, 'js/src/javascript_loader.coffee'),
- ]}
+ ]}
js_module_name = "PeerGrading"
css = {'scss': [resource_string(__name__, 'css/combinedopenended/display.scss')]}
@@ -42,7 +42,7 @@ class PeerGradingModule(XModule):
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)
+ instance_state, shared_state, **kwargs)
# Load instance state
if instance_state is not None:
@@ -53,12 +53,11 @@ class PeerGradingModule(XModule):
#We need to set the location here so the child modules can use it
system.set('location', location)
self.system = system
- if(self.system.open_ended_grading_interface):
+ if (self.system.open_ended_grading_interface):
self.peer_gs = PeerGradingService(self.system.open_ended_grading_interface, self.system)
else:
self.peer_gs = MockPeerGradingService()
-
self.use_for_single_location = self.metadata.get('use_for_single_location', USE_FOR_SINGLE_LOCATION)
if isinstance(self.use_for_single_location, basestring):
self.use_for_single_location = (self.use_for_single_location in TRUE_DICT)
@@ -83,14 +82,13 @@ class PeerGradingModule(XModule):
grace_period_string = self.metadata.get('graceperiod', None)
try:
- self.timeinfo = TimeInfo(display_due_date_string, grace_period_string)
+ self.timeinfo = TimeInfo(display_due_date_string, grace_period_string)
except:
log.error("Error parsing due date information in location {0}".format(location))
raise
self.display_due_date = self.timeinfo.display_due_date
-
self.ajax_url = self.system.ajax_url
if not self.ajax_url.endswith("/"):
self.ajax_url = self.ajax_url + "/"
@@ -148,13 +146,13 @@ class PeerGradingModule(XModule):
'save_grade': self.save_grade,
'save_calibration_essay': self.save_calibration_essay,
'problem': self.peer_grading_problem,
- }
+ }
if dispatch not in handlers:
#This is a dev_facing_error
log.error("Cannot find {0} in handlers in handle_ajax function for open_ended_module.py".format(dispatch))
#This is a dev_facing_error
- return json.dumps({'error': 'Error handling action. Please try again.', 'success' : False})
+ return json.dumps({'error': 'Error handling action. Please try again.', 'success': False})
d = handlers[dispatch](get)
@@ -191,9 +189,10 @@ class PeerGradingModule(XModule):
except:
success, response = self.query_data_for_location()
if not success:
- log.exception("No instance data found and could not get data from controller for loc {0} student {1}".format(
- self.system.location.url(), self.system.anonymous_student_id
- ))
+ log.exception(
+ "No instance data found and could not get data from controller for loc {0} student {1}".format(
+ self.system.location.url(), self.system.anonymous_student_id
+ ))
return None
count_graded = response['count_graded']
count_required = response['count_required']
@@ -204,7 +203,7 @@ class PeerGradingModule(XModule):
score_dict = {
'score': int(count_graded >= count_required),
'total': self.max_grade,
- }
+ }
return score_dict
@@ -253,7 +252,7 @@ class PeerGradingModule(XModule):
.format(self.peer_gs.url, location, grader_id))
#This is a student_facing_error
return {'success': False,
- 'error': EXTERNAL_GRADER_NO_CONTACT_ERROR}
+ 'error': EXTERNAL_GRADER_NO_CONTACT_ERROR}
def save_grade(self, get):
"""
@@ -271,7 +270,8 @@ class PeerGradingModule(XModule):
error: if there was an error in the submission, this is the error message
"""
- required = set(['location', 'submission_id', 'submission_key', 'score', 'feedback', 'rubric_scores[]', 'submission_flagged'])
+ required = set(['location', 'submission_id', 'submission_key', 'score', 'feedback', 'rubric_scores[]',
+ 'submission_flagged'])
success, message = self._check_required(get, required)
if not success:
return self._err_response(message)
@@ -287,14 +287,14 @@ class PeerGradingModule(XModule):
try:
response = self.peer_gs.save_grade(location, grader_id, submission_id,
- score, feedback, submission_key, rubric_scores, submission_flagged)
+ score, feedback, submission_key, rubric_scores, submission_flagged)
return response
except GradingServiceError:
#This is a dev_facing_error
log.exception("""Error saving grade to open ended grading service. server url: {0}, location: {1}, submission_id:{2},
submission_key: {3}, score: {4}"""
.format(self.peer_gs.url,
- location, submission_id, submission_key, score)
+ location, submission_id, submission_key, score)
)
#This is a student_facing_error
return {
@@ -382,7 +382,7 @@ class PeerGradingModule(XModule):
.format(self.peer_gs.url, location))
#This is a student_facing_error
return {'success': False,
- 'error': EXTERNAL_GRADER_NO_CONTACT_ERROR}
+ 'error': EXTERNAL_GRADER_NO_CONTACT_ERROR}
# if we can't parse the rubric into HTML,
except etree.XMLSyntaxError:
#This is a dev_facing_error
@@ -390,7 +390,7 @@ class PeerGradingModule(XModule):
.format(rubric))
#This is a student_facing_error
return {'success': False,
- 'error': 'Error displaying submission. Please notify course staff.'}
+ 'error': 'Error displaying submission. Please notify course staff.'}
def save_calibration_essay(self, get):
@@ -426,11 +426,13 @@ class PeerGradingModule(XModule):
try:
response = self.peer_gs.save_calibration_essay(location, grader_id, calibration_essay_id,
- submission_key, score, feedback, rubric_scores)
+ submission_key, score, feedback, rubric_scores)
return response
except GradingServiceError:
#This is a dev_facing_error
- 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))
+ 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))
#This is a student_facing_error
return self._err_response('There was an error saving your score. Please notify course staff.')
@@ -440,7 +442,7 @@ class PeerGradingModule(XModule):
'''
html = self.system.render_template('peer_grading/peer_grading_closed.html', {
'use_for_single_location': self.use_for_single_location
- })
+ })
return html
@@ -503,12 +505,11 @@ class PeerGradingModule(XModule):
problem['closed'] = True
else:
problem['closed'] = False
- else:
- # if we can't find the due date, assume that it doesn't have one
+ else:
+ # if we can't find the due date, assume that it doesn't have one
problem['due'] = None
problem['closed'] = False
-
ajax_url = self.ajax_url
html = self.system.render_template('peer_grading/peer_grading.html', {
'course_id': self.system.course_id,
@@ -519,7 +520,7 @@ class PeerGradingModule(XModule):
# Checked above
'staff_access': False,
'use_single_location': self.use_for_single_location,
- })
+ })
return html
@@ -531,7 +532,8 @@ class PeerGradingModule(XModule):
if not self.use_for_single_location:
#This is an error case, because it must be set to use a single location to be called without get parameters
#This is a dev_facing_error
- log.error("Peer grading problem in peer_grading_module called with no get parameters, but use_for_single_location is False.")
+ log.error(
+ "Peer grading problem in peer_grading_module called with no get parameters, but use_for_single_location is False.")
return {'html': "", 'success': False}
problem_location = self.link_to_location
@@ -547,7 +549,7 @@ class PeerGradingModule(XModule):
# Checked above
'staff_access': False,
'use_single_location': self.use_for_single_location,
- })
+ })
return {'html': html, 'success': True}
@@ -560,7 +562,7 @@ class PeerGradingModule(XModule):
state = {
'student_data_for_location': self.student_data_for_location,
- }
+ }
return json.dumps(state)
@@ -596,7 +598,9 @@ class PeerGradingDescriptor(XmlDescriptor, EditingDescriptor):
for child in expected_children:
if len(xml_object.xpath(child)) == 0:
#This is a staff_facing_error
- raise ValueError("Peer grading definition must include at least one '{0}' tag. Contact the learning sciences group for assistance.".format(child))
+ raise ValueError(
+ "Peer grading definition must include at least one '{0}' tag. Contact the learning sciences group for assistance.".format(
+ child))
def parse_task(k):
"""Assumes that xml_object has child k"""
diff --git a/common/lib/xmodule/xmodule/templates/annotatable/default.yaml b/common/lib/xmodule/xmodule/templates/annotatable/default.yaml
new file mode 100644
index 0000000000..31dd489fb4
--- /dev/null
+++ b/common/lib/xmodule/xmodule/templates/annotatable/default.yaml
@@ -0,0 +1,20 @@
+---
+metadata:
+ display_name: 'Annotation'
+data: |
+
+
+ Enter your (optional) instructions for the exercise in HTML format.
+ Annotations are specified by an <annotation> tag which may may have the following attributes:
+
+ title (optional). Title of the annotation. Defaults to Commentary if omitted.body (required). Text of the annotation.problem (optional). Numeric index of the problem associated with this annotation. This is a zero-based index, so the first problem on the page would have problem="0".highlight (optional). Possible values: yellow, red, orange, green, blue, or purple. Defaults to yellow if this attribute is omitted.
+
+ Add your HTML with annotation spans here.
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut sodales laoreet est, egestas gravida felis egestas nec. Aenean at volutpat erat. Cras commodo viverra nibh in aliquam.
+ Nulla facilisi. Pellentesque id vestibulum libero. Suspendisse potenti. Morbi scelerisque nisi vitae felis dictum mattis. Nam sit amet magna elit. Nullam volutpat cursus est, sit amet sagittis odio vulputate et. Curabitur euismod, orci in vulputate imperdiet, augue lorem tempor purus, id aliquet augue turpis a est. Aenean a sagittis libero. Praesent fringilla pretium magna, non condimentum risus elementum nec. Pellentesque faucibus elementum pharetra. Pellentesque vitae metus eros.
+
+children: []
diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py
index 9474717cb2..43c2bbe24d 100644
--- a/common/lib/xmodule/xmodule/tests/__init__.py
+++ b/common/lib/xmodule/xmodule/tests/__init__.py
@@ -28,21 +28,35 @@ open_ended_grading_interface = {
'grading_controller' : 'grading_controller'
}
-test_system = ModuleSystem(
- ajax_url='courses/course_id/modx/a_location',
- track_function=Mock(),
- get_module=Mock(),
- # "render" to just the context...
- render_template=lambda template, context: str(context),
- replace_urls=Mock(),
- user=Mock(is_staff=False),
- filestore=Mock(),
- debug=True,
- xqueue={'interface': None, 'callback_url': '/', 'default_queuename': 'testqueue', 'waittime': 10},
- node_path=os.environ.get("NODE_PATH", "/usr/local/lib/node_modules"),
- anonymous_student_id='student',
- open_ended_grading_interface= open_ended_grading_interface
-)
+
+def test_system():
+ """
+ Construct a test ModuleSystem instance.
+
+ By default, the render_template() method simply returns
+ the context it is passed as a string.
+ You can override this behavior by monkey patching:
+
+ system = test_system()
+ system.render_template = my_render_func
+
+ where my_render_func is a function of the form
+ my_render_func(template, context)
+ """
+ return ModuleSystem(
+ ajax_url='courses/course_id/modx/a_location',
+ track_function=Mock(),
+ get_module=Mock(),
+ render_template=lambda template, context: str(context),
+ replace_urls=lambda html: str(html),
+ user=Mock(is_staff=False),
+ filestore=Mock(),
+ debug=True,
+ xqueue={'interface': None, 'callback_url': '/', 'default_queuename': 'testqueue', 'waittime': 10},
+ node_path=os.environ.get("NODE_PATH", "/usr/local/lib/node_modules"),
+ anonymous_student_id='student',
+ open_ended_grading_interface= open_ended_grading_interface
+ )
class ModelsTest(unittest.TestCase):
diff --git a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py
new file mode 100644
index 0000000000..30f9c9ff92
--- /dev/null
+++ b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py
@@ -0,0 +1,129 @@
+"""Module annotatable tests"""
+
+import unittest
+
+from lxml import etree
+from mock import Mock
+
+from xmodule.annotatable_module import AnnotatableModule
+from xmodule.modulestore import Location
+
+from . import test_system
+
+class AnnotatableModuleTestCase(unittest.TestCase):
+ location = Location(["i4x", "edX", "toy", "annotatable", "guided_discussion"])
+ sample_xml = '''
+
+ Read the text.
+
+ Sing,
+ O goddess,
+ the anger of Achilles son of Peleus,
+ that brought countless ills upon the Achaeans. Many a brave soul did it send
+ hurrying down to Hades, and many a hero did it yield a prey to dogs and
+
vultures, for so were the counsels
+ of Jove fulfilled from the day on which the son of Atreus, king of men, and great
+ Achilles, first fell out with one another.
+
+ The Iliad of Homer by Samuel Butler
+
+ '''
+ definition = { 'data': sample_xml }
+ descriptor = Mock()
+ instance_state = None
+ shared_state = None
+
+ def setUp(self):
+ self.annotatable = AnnotatableModule(test_system(), self.location, self.definition, self.descriptor, self.instance_state, self.shared_state)
+
+ def test_annotation_data_attr(self):
+ el = etree.fromstring('test')
+
+ expected_attr = {
+ 'data-comment-body': {'value': 'foo', '_delete': 'body' },
+ 'data-comment-title': {'value': 'bar', '_delete': 'title'},
+ 'data-problem-id': {'value': '0', '_delete': 'problem'}
+ }
+
+ actual_attr = self.annotatable._get_annotation_data_attr(0, el)
+
+ self.assertTrue(type(actual_attr) is dict)
+ self.assertDictEqual(expected_attr, actual_attr)
+
+ def test_annotation_class_attr_default(self):
+ xml = 'test'
+ el = etree.fromstring(xml)
+
+ expected_attr = { 'class': { 'value': 'annotatable-span highlight' } }
+ actual_attr = self.annotatable._get_annotation_class_attr(0, el)
+
+ self.assertTrue(type(actual_attr) is dict)
+ self.assertDictEqual(expected_attr, actual_attr)
+
+ def test_annotation_class_attr_with_valid_highlight(self):
+ xml = 'test'
+
+ for color in self.annotatable.highlight_colors:
+ el = etree.fromstring(xml.format(highlight=color))
+ value = 'annotatable-span highlight highlight-{highlight}'.format(highlight=color)
+
+ expected_attr = { 'class': {
+ 'value': value,
+ '_delete': 'highlight' }
+ }
+ actual_attr = self.annotatable._get_annotation_class_attr(0, el)
+
+ self.assertTrue(type(actual_attr) is dict)
+ self.assertDictEqual(expected_attr, actual_attr)
+
+ def test_annotation_class_attr_with_invalid_highlight(self):
+ xml = 'test'
+
+ for invalid_color in ['rainbow', 'blink', 'invisible', '', None]:
+ el = etree.fromstring(xml.format(highlight=invalid_color))
+ expected_attr = { 'class': {
+ 'value': 'annotatable-span highlight',
+ '_delete': 'highlight' }
+ }
+ actual_attr = self.annotatable._get_annotation_class_attr(0, el)
+
+ self.assertTrue(type(actual_attr) is dict)
+ self.assertDictEqual(expected_attr, actual_attr)
+
+ def test_render_annotation(self):
+ expected_html = 'z'
+ expected_el = etree.fromstring(expected_html)
+
+ actual_el = etree.fromstring('z')
+ self.annotatable._render_annotation(0, actual_el)
+
+ self.assertEqual(expected_el.tag, actual_el.tag)
+ self.assertEqual(expected_el.text, actual_el.text)
+ self.assertDictEqual(dict(expected_el.attrib), dict(actual_el.attrib))
+
+ def test_render_content(self):
+ content = self.annotatable._render_content()
+ el = etree.fromstring(content)
+
+ self.assertEqual('div', el.tag, 'root tag is a div')
+
+ expected_num_annotations = 5
+ actual_num_annotations = el.xpath('count(//span[contains(@class,"annotatable-span")])')
+ self.assertEqual(expected_num_annotations, actual_num_annotations, 'check number of annotations')
+
+ def test_get_html(self):
+ context = self.annotatable.get_html()
+ for key in ['display_name', 'element_id', 'content_html', 'instructions_html']:
+ self.assertIn(key, context)
+
+ def test_extract_instructions(self):
+ xmltree = etree.fromstring(self.sample_xml)
+
+ expected_xml = u"Read the text.
"
+ actual_xml = self.annotatable._extract_instructions(xmltree)
+ self.assertIsNotNone(actual_xml)
+ self.assertEqual(expected_xml.strip(), actual_xml.strip())
+
+ xmltree = etree.fromstring('foo')
+ actual = self.annotatable._extract_instructions(xmltree)
+ self.assertIsNone(actual)
diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py
index e84267c1e7..cb77921957 100644
--- a/common/lib/xmodule/xmodule/tests/test_capa_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py
@@ -1,13 +1,18 @@
import datetime
import json
-from mock import Mock
+from mock import Mock, MagicMock, patch
from pprint import pprint
import unittest
+import random
+import xmodule
+import capa
from xmodule.capa_module import CapaModule
from xmodule.modulestore import Location
from lxml import etree
+from django.http import QueryDict
+
from . import test_system
@@ -33,6 +38,18 @@ class CapaFactory(object):
CapaFactory.num += 1
return CapaFactory.num
+ @staticmethod
+ def input_key():
+ """ Return the input key to use when passing GET parameters """
+ return ("input_" + CapaFactory.answer_key())
+
+ @staticmethod
+ def answer_key():
+ """ Return the key stored in the capa problem answer dict """
+ return ("-".join(['i4x', 'edX', 'capa_test', 'problem',
+ 'SampleProblem%d' % CapaFactory.num]) +
+ "_2_1")
+
@staticmethod
def create(graceperiod=None,
due=None,
@@ -59,11 +76,10 @@ class CapaFactory(object):
module.
attempts: also added to instance state. Will be converted to an int.
- correct: if True, the problem will be initialized to be answered correctly.
"""
definition = {'data': CapaFactory.sample_problem_xml, }
location = Location(["i4x", "edX", "capa_test", "problem",
- "SampleProblem{0}".format(CapaFactory.next_num())])
+ "SampleProblem%d" % CapaFactory.next_num()])
metadata = {}
if graceperiod is not None:
metadata['graceperiod'] = graceperiod
@@ -89,19 +105,14 @@ class CapaFactory(object):
# since everything else is a string.
instance_state_dict['attempts'] = int(attempts)
- if correct:
- # TODO: make this actually set an answer of 3.14, and mark it correct
- #instance_state_dict['student_answers'] = {}
- #instance_state_dict['correct_map'] = {}
- pass
-
-
if len(instance_state_dict) > 0:
instance_state = json.dumps(instance_state_dict)
else:
instance_state = None
- module = CapaModule(test_system, location,
+ system = test_system()
+ system.render_template = Mock(return_value="Test Template HTML
")
+ module = CapaModule(system, location,
definition, descriptor,
instance_state, None, metadata=metadata)
@@ -135,6 +146,8 @@ class CapaModuleTest(unittest.TestCase):
"Factory should be creating unique names for each problem")
+
+
def test_correct(self):
"""
Check that the factory creates correct and incorrect problems properly.
@@ -178,6 +191,7 @@ class CapaModuleTest(unittest.TestCase):
max_attempts="1",
attempts="0",
due=self.yesterday_str)
+
self.assertTrue(after_due_date.answer_available())
@@ -282,3 +296,602 @@ class CapaModuleTest(unittest.TestCase):
due=self.yesterday_str,
graceperiod=self.two_day_delta_str)
self.assertTrue(still_in_grace.answer_available())
+
+
+ def test_closed(self):
+
+ # Attempts < Max attempts --> NOT closed
+ module = CapaFactory.create(max_attempts="1", attempts="0")
+ self.assertFalse(module.closed())
+
+ # Attempts < Max attempts --> NOT closed
+ module = CapaFactory.create(max_attempts="2", attempts="1")
+ self.assertFalse(module.closed())
+
+ # Attempts = Max attempts --> closed
+ module = CapaFactory.create(max_attempts="1", attempts="1")
+ self.assertTrue(module.closed())
+
+ # Attempts > Max attempts --> closed
+ module = CapaFactory.create(max_attempts="1", attempts="2")
+ self.assertTrue(module.closed())
+
+ # Max attempts = 0 --> closed
+ module = CapaFactory.create(max_attempts="0", attempts="2")
+ self.assertTrue(module.closed())
+
+ # Past due --> closed
+ module = CapaFactory.create(max_attempts="1", attempts="0",
+ due=self.yesterday_str)
+ self.assertTrue(module.closed())
+
+
+ def test_parse_get_params(self):
+
+ # We have to set up Django settings in order to use QueryDict
+ from django.conf import settings
+ settings.configure()
+
+ # Valid GET param dict
+ valid_get_dict = self._querydict_from_dict({'input_1': 'test',
+ 'input_1_2': 'test',
+ 'input_1_2_3': 'test',
+ 'input_[]_3': 'test',
+ 'input_4': None,
+ 'input_5': [],
+ 'input_6': 5})
+
+ result = CapaModule.make_dict_of_responses(valid_get_dict)
+
+ # Expect that we get a dict with "input" stripped from key names
+ # and that we get the same values back
+ for key in result.keys():
+ original_key = "input_" + key
+ self.assertTrue(original_key in valid_get_dict,
+ "Output dict should have key %s" % original_key)
+ self.assertEqual(valid_get_dict[original_key], result[key])
+
+
+ # Valid GET param dict with list keys
+ valid_get_dict = self._querydict_from_dict({'input_2[]': ['test1', 'test2']})
+ result = CapaModule.make_dict_of_responses(valid_get_dict)
+ self.assertTrue('2' in result)
+ self.assertEqual(['test1','test2'], result['2'])
+
+ # If we use [] at the end of a key name, we should always
+ # get a list, even if there's just one value
+ valid_get_dict = self._querydict_from_dict({'input_1[]': 'test'})
+ result = CapaModule.make_dict_of_responses(valid_get_dict)
+ self.assertEqual(result['1'], ['test'])
+
+ # If we have no underscores in the name, then the key is invalid
+ invalid_get_dict = self._querydict_from_dict({'input': 'test'})
+ with self.assertRaises(ValueError):
+ result = CapaModule.make_dict_of_responses(invalid_get_dict)
+
+
+ # Two equivalent names (one list, one non-list)
+ # One of the values would overwrite the other, so detect this
+ # and raise an exception
+ invalid_get_dict = self._querydict_from_dict({'input_1[]': 'test 1',
+ 'input_1': 'test 2' })
+ with self.assertRaises(ValueError):
+ result = CapaModule.make_dict_of_responses(invalid_get_dict)
+
+ def _querydict_from_dict(self, param_dict):
+ """ Create a Django QueryDict from a Python dictionary """
+
+ # QueryDict objects are immutable by default, so we make
+ # a copy that we can update.
+ querydict = QueryDict('')
+ copyDict = querydict.copy()
+
+ for (key, val) in param_dict.items():
+
+ # QueryDicts handle lists differently from ordinary values,
+ # so we have to specifically tell the QueryDict that
+ # this is a list
+ if type(val) is list:
+ copyDict.setlist(key, val)
+ else:
+ copyDict[key] = val
+
+ return copyDict
+
+
+ def test_check_problem_correct(self):
+
+ module = CapaFactory.create(attempts=1)
+
+ # Simulate that all answers are marked correct, no matter
+ # what the input is, by patching CorrectMap.is_correct()
+ # Also simulate rendering the HTML
+ with patch('capa.correctmap.CorrectMap.is_correct') as mock_is_correct,\
+ patch('xmodule.capa_module.CapaModule.get_problem_html') as mock_html:
+ mock_is_correct.return_value = True
+ mock_html.return_value = "Test HTML"
+
+ # Check the problem
+ get_request_dict = { CapaFactory.input_key(): '3.14' }
+ result = module.check_problem(get_request_dict)
+
+ # Expect that the problem is marked correct
+ self.assertEqual(result['success'], 'correct')
+
+ # Expect that we get the (mocked) HTML
+ self.assertEqual(result['contents'], 'Test HTML')
+
+ # Expect that the number of attempts is incremented by 1
+ self.assertEqual(module.attempts, 2)
+
+
+ def test_check_problem_incorrect(self):
+
+ module = CapaFactory.create(attempts=0)
+
+ # Simulate marking the input incorrect
+ with patch('capa.correctmap.CorrectMap.is_correct') as mock_is_correct:
+ mock_is_correct.return_value = False
+
+ # Check the problem
+ get_request_dict = { CapaFactory.input_key(): '0' }
+ result = module.check_problem(get_request_dict)
+
+ # Expect that the problem is marked correct
+ self.assertEqual(result['success'], 'incorrect')
+
+ # Expect that the number of attempts is incremented by 1
+ self.assertEqual(module.attempts, 1)
+
+
+ def test_check_problem_closed(self):
+ module = CapaFactory.create(attempts=3)
+
+ # Problem closed -- cannot submit
+ # Simulate that CapaModule.closed() always returns True
+ with patch('xmodule.capa_module.CapaModule.closed') as mock_closed:
+ mock_closed.return_value = True
+ with self.assertRaises(xmodule.exceptions.NotFoundError):
+ get_request_dict = { CapaFactory.input_key(): '3.14' }
+ module.check_problem(get_request_dict)
+
+ # Expect that number of attempts NOT incremented
+ self.assertEqual(module.attempts, 3)
+
+
+ def test_check_problem_resubmitted_with_randomize(self):
+ # Randomize turned on
+ module = CapaFactory.create(rerandomize='always', attempts=0)
+
+ # Simulate that the problem is completed
+ module.lcp.done = True
+
+ # Expect that we cannot submit
+ with self.assertRaises(xmodule.exceptions.NotFoundError):
+ get_request_dict = { CapaFactory.input_key(): '3.14' }
+ module.check_problem(get_request_dict)
+
+ # Expect that number of attempts NOT incremented
+ self.assertEqual(module.attempts, 0)
+
+
+ def test_check_problem_resubmitted_no_randomize(self):
+ # Randomize turned off
+ module = CapaFactory.create(rerandomize='never', attempts=0)
+
+ # Simulate that the problem is completed
+ module.lcp.done = True
+
+ # Expect that we can submit successfully
+ get_request_dict = { CapaFactory.input_key(): '3.14' }
+ result = module.check_problem(get_request_dict)
+
+ self.assertEqual(result['success'], 'correct')
+
+ # Expect that number of attempts IS incremented
+ self.assertEqual(module.attempts, 1)
+
+
+ def test_check_problem_queued(self):
+ module = CapaFactory.create(attempts=1)
+
+ # Simulate that the problem is queued
+ with patch('capa.capa_problem.LoncapaProblem.is_queued') \
+ as mock_is_queued,\
+ patch('capa.capa_problem.LoncapaProblem.get_recentmost_queuetime') \
+ as mock_get_queuetime:
+
+ mock_is_queued.return_value = True
+ mock_get_queuetime.return_value = datetime.datetime.now()
+
+ get_request_dict = { CapaFactory.input_key(): '3.14' }
+ result = module.check_problem(get_request_dict)
+
+ # Expect an AJAX alert message in 'success'
+ self.assertTrue('You must wait' in result['success'])
+
+ # Expect that the number of attempts is NOT incremented
+ self.assertEqual(module.attempts, 1)
+
+
+ def test_check_problem_student_input_error(self):
+ module = CapaFactory.create(attempts=1)
+
+ # Simulate a student input exception
+ with patch('capa.capa_problem.LoncapaProblem.grade_answers') as mock_grade:
+ mock_grade.side_effect = capa.responsetypes.StudentInputError('test error')
+
+ get_request_dict = { CapaFactory.input_key(): '3.14' }
+ result = module.check_problem(get_request_dict)
+
+ # Expect an AJAX alert message in 'success'
+ self.assertTrue('test error' in result['success'])
+
+ # Expect that the number of attempts is NOT incremented
+ self.assertEqual(module.attempts, 1)
+
+
+ def test_reset_problem(self):
+ module = CapaFactory.create()
+
+ # Mock the module's capa problem
+ # to simulate that the problem is done
+ mock_problem = MagicMock(capa.capa_problem.LoncapaProblem)
+ mock_problem.done = True
+ module.lcp = mock_problem
+
+ # Stub out HTML rendering
+ with patch('xmodule.capa_module.CapaModule.get_problem_html') as mock_html:
+ mock_html.return_value = "Test HTML
"
+
+ # Reset the problem
+ get_request_dict = {}
+ result = module.reset_problem(get_request_dict)
+
+ # Expect that the request was successful
+ self.assertTrue('success' in result and result['success'])
+
+ # Expect that the problem HTML is retrieved
+ self.assertTrue('html' in result)
+ self.assertEqual(result['html'], "Test HTML
")
+
+ # Expect that the problem was reset
+ mock_problem.do_reset.assert_called_once_with()
+
+
+ def test_reset_problem_closed(self):
+ module = CapaFactory.create()
+
+ # Simulate that the problem is closed
+ with patch('xmodule.capa_module.CapaModule.closed') as mock_closed:
+ mock_closed.return_value = True
+
+ # Try to reset the problem
+ get_request_dict = {}
+ result = module.reset_problem(get_request_dict)
+
+ # Expect that the problem was NOT reset
+ self.assertTrue('success' in result and not result['success'])
+
+
+ def test_reset_problem_not_done(self):
+ module = CapaFactory.create()
+
+ # Simulate that the problem is NOT done
+ module.lcp.done = False
+
+ # Try to reset the problem
+ get_request_dict = {}
+ result = module.reset_problem(get_request_dict)
+
+ # Expect that the problem was NOT reset
+ self.assertTrue('success' in result and not result['success'])
+
+
+ def test_save_problem(self):
+ module = CapaFactory.create()
+
+ # Simulate that the problem is not done (not attempted or reset)
+ module.lcp.done = False
+
+ # Save the problem
+ get_request_dict = { CapaFactory.input_key(): '3.14' }
+ result = module.save_problem(get_request_dict)
+
+ # Expect that answers are saved to the problem
+ expected_answers = { CapaFactory.answer_key(): '3.14' }
+ self.assertEqual(module.lcp.student_answers, expected_answers)
+
+ # Expect that the result is success
+ self.assertTrue('success' in result and result['success'])
+
+
+ def test_save_problem_closed(self):
+ module = CapaFactory.create()
+
+ # Simulate that the problem is NOT done (not attempted or reset)
+ module.lcp.done = False
+
+ # Simulate that the problem is closed
+ with patch('xmodule.capa_module.CapaModule.closed') as mock_closed:
+ mock_closed.return_value = True
+
+ # Try to save the problem
+ get_request_dict = { CapaFactory.input_key(): '3.14' }
+ result = module.save_problem(get_request_dict)
+
+ # Expect that the result is failure
+ self.assertTrue('success' in result and not result['success'])
+
+
+ def test_save_problem_submitted_with_randomize(self):
+ module = CapaFactory.create(rerandomize='always')
+
+ # Simulate that the problem is completed
+ module.lcp.done = True
+
+ # Try to save
+ get_request_dict = { CapaFactory.input_key(): '3.14' }
+ result = module.save_problem(get_request_dict)
+
+ # Expect that we cannot save
+ self.assertTrue('success' in result and not result['success'])
+
+
+ def test_save_problem_submitted_no_randomize(self):
+ module = CapaFactory.create(rerandomize='never')
+
+ # Simulate that the problem is completed
+ module.lcp.done = True
+
+ # Try to save
+ get_request_dict = { CapaFactory.input_key(): '3.14' }
+ result = module.save_problem(get_request_dict)
+
+ # Expect that we succeed
+ self.assertTrue('success' in result and result['success'])
+
+ def test_check_button_name(self):
+
+ # If last attempt, button name changes to "Final Check"
+ # Just in case, we also check what happens if we have
+ # more attempts than allowed.
+ attempts = random.randint(1, 10)
+ module = CapaFactory.create(attempts=attempts-1, max_attempts=attempts)
+ self.assertEqual(module.check_button_name(), "Final Check")
+
+ module = CapaFactory.create(attempts=attempts, max_attempts=attempts)
+ self.assertEqual(module.check_button_name(), "Final Check")
+
+ module = CapaFactory.create(attempts=attempts + 1, max_attempts=attempts)
+ self.assertEqual(module.check_button_name(), "Final Check")
+
+ # Otherwise, button name is "Check"
+ module = CapaFactory.create(attempts=attempts-2, max_attempts=attempts)
+ self.assertEqual(module.check_button_name(), "Check")
+
+ module = CapaFactory.create(attempts=attempts-3, max_attempts=attempts)
+ self.assertEqual(module.check_button_name(), "Check")
+
+ # If no limit on attempts, then always show "Check"
+ module = CapaFactory.create(attempts=attempts-3)
+ self.assertEqual(module.check_button_name(), "Check")
+
+ module = CapaFactory.create(attempts=0)
+ self.assertEqual(module.check_button_name(), "Check")
+
+ def test_should_show_check_button(self):
+
+ attempts = random.randint(1,10)
+
+ # If we're after the deadline, do NOT show check button
+ module = CapaFactory.create(due=self.yesterday_str)
+ self.assertFalse(module.should_show_check_button())
+
+ # If user is out of attempts, do NOT show the check button
+ module = CapaFactory.create(attempts=attempts, max_attempts=attempts)
+ self.assertFalse(module.should_show_check_button())
+
+ # If survey question (max_attempts = 0), do NOT show the check button
+ module = CapaFactory.create(max_attempts=0)
+ self.assertFalse(module.should_show_check_button())
+
+ # If user submitted a problem but hasn't reset,
+ # do NOT show the check button
+ # Note: we can only reset when rerandomize="always"
+ module = CapaFactory.create(rerandomize="always")
+ module.lcp.done = True
+ self.assertFalse(module.should_show_check_button())
+
+ # Otherwise, DO show the check button
+ module = CapaFactory.create()
+ self.assertTrue(module.should_show_check_button())
+
+ # If the user has submitted the problem
+ # and we do NOT have a reset button, then we can show the check button
+ # Setting rerandomize to "never" ensures that the reset button
+ # is not shown
+ module = CapaFactory.create(rerandomize="never")
+ module.lcp.done = True
+ self.assertTrue(module.should_show_check_button())
+
+
+ def test_should_show_reset_button(self):
+
+ attempts = random.randint(1,10)
+
+ # If we're after the deadline, do NOT show the reset button
+ module = CapaFactory.create(due=self.yesterday_str)
+ module.lcp.done = True
+ self.assertFalse(module.should_show_reset_button())
+
+ # If the user is out of attempts, do NOT show the reset button
+ module = CapaFactory.create(attempts=attempts, max_attempts=attempts)
+ module.lcp.done = True
+ self.assertFalse(module.should_show_reset_button())
+
+ # If we're NOT randomizing, then do NOT show the reset button
+ module = CapaFactory.create(rerandomize="never")
+ module.lcp.done = True
+ self.assertFalse(module.should_show_reset_button())
+
+ # If the user hasn't submitted an answer yet,
+ # then do NOT show the reset button
+ module = CapaFactory.create()
+ module.lcp.done = False
+ self.assertFalse(module.should_show_reset_button())
+
+ # Otherwise, DO show the reset button
+ module = CapaFactory.create()
+ module.lcp.done = True
+ self.assertTrue(module.should_show_reset_button())
+
+ # If survey question for capa (max_attempts = 0),
+ # DO show the reset button
+ module = CapaFactory.create(max_attempts=0)
+ module.lcp.done = True
+ self.assertTrue(module.should_show_reset_button())
+
+
+ def test_should_show_save_button(self):
+
+ attempts = random.randint(1,10)
+
+ # If we're after the deadline, do NOT show the save button
+ module = CapaFactory.create(due=self.yesterday_str)
+ module.lcp.done = True
+ self.assertFalse(module.should_show_save_button())
+
+ # If the user is out of attempts, do NOT show the save button
+ module = CapaFactory.create(attempts=attempts, max_attempts=attempts)
+ module.lcp.done = True
+ self.assertFalse(module.should_show_save_button())
+
+ # If user submitted a problem but hasn't reset, do NOT show the save button
+ module = CapaFactory.create(rerandomize="always")
+ module.lcp.done = True
+ self.assertFalse(module.should_show_save_button())
+
+ # Otherwise, DO show the save button
+ module = CapaFactory.create()
+ module.lcp.done = False
+ self.assertTrue(module.should_show_save_button())
+
+ # If we're not randomizing, then we can re-save
+ module = CapaFactory.create(rerandomize="never")
+ module.lcp.done = True
+ self.assertTrue(module.should_show_save_button())
+
+ # If survey question for capa (max_attempts = 0),
+ # DO show the save button
+ module = CapaFactory.create(max_attempts=0)
+ module.lcp.done = False
+ self.assertTrue(module.should_show_save_button())
+
+ def test_should_show_save_button_force_save_button(self):
+ # If we're after the deadline, do NOT show the save button
+ # even though we're forcing a save
+ module = CapaFactory.create(due=self.yesterday_str,
+ force_save_button="true")
+ module.lcp.done = True
+ self.assertFalse(module.should_show_save_button())
+
+ # If the user is out of attempts, do NOT show the save button
+ attempts = random.randint(1,10)
+ module = CapaFactory.create(attempts=attempts,
+ max_attempts=attempts,
+ force_save_button="true")
+ module.lcp.done = True
+ self.assertFalse(module.should_show_save_button())
+
+ # Otherwise, if we force the save button,
+ # then show it even if we would ordinarily
+ # require a reset first
+ module = CapaFactory.create(force_save_button="true",
+ rerandomize="always")
+ module.lcp.done = True
+ self.assertTrue(module.should_show_save_button())
+
+ def test_no_max_attempts(self):
+ module = CapaFactory.create(max_attempts='')
+ html = module.get_problem_html()
+ # assert that we got here without exploding
+
+
+ def test_get_problem_html(self):
+ module = CapaFactory.create()
+
+ # We've tested the show/hide button logic in other tests,
+ # so here we hard-wire the values
+ show_check_button = bool(random.randint(0,1) % 2)
+ show_reset_button = bool(random.randint(0,1) % 2)
+ show_save_button = bool(random.randint(0,1) % 2)
+
+ module.should_show_check_button = Mock(return_value=show_check_button)
+ module.should_show_reset_button = Mock(return_value=show_reset_button)
+ module.should_show_save_button = Mock(return_value=show_save_button)
+
+ # Mock the system rendering function
+ module.system.render_template = Mock(return_value="Test Template HTML
")
+
+ # Patch the capa problem's HTML rendering
+ with patch('capa.capa_problem.LoncapaProblem.get_html') as mock_html:
+ mock_html.return_value = "Test Problem HTML
"
+
+ # Render the problem HTML
+ html = module.get_problem_html(encapsulate=False)
+
+ # Also render the problem encapsulated in a
+ html_encapsulated = module.get_problem_html(encapsulate=True)
+
+ # Expect that we get the rendered template back
+ self.assertEqual(html, "
Test Template HTML
")
+
+ # Check the rendering context
+ render_args,_ = module.system.render_template.call_args
+ self.assertEqual(len(render_args), 2)
+
+ template_name = render_args[0]
+ self.assertEqual(template_name, "problem.html")
+
+ context = render_args[1]
+ self.assertEqual(context['problem']['html'], "
Test Problem HTML
")
+ self.assertEqual(bool(context['check_button']), show_check_button)
+ self.assertEqual(bool(context['reset_button']), show_reset_button)
+ self.assertEqual(bool(context['save_button']), show_save_button)
+
+ # Assert that the encapsulated html contains the original html
+ self.assertTrue(html in html_encapsulated)
+
+
+ def test_get_problem_html_error(self):
+ """
+ In production, when an error occurs with the problem HTML
+ rendering, a "dummy" problem is created with an error
+ message to display to the user.
+ """
+ module = CapaFactory.create()
+
+ # Save the original problem so we can compare it later
+ original_problem = module.lcp
+
+ # Simulate throwing an exception when the capa problem
+ # is asked to render itself as HTML
+ module.lcp.get_html = Mock(side_effect=Exception("Test"))
+
+ # Stub out the test_system rendering function
+ module.system.render_template = Mock(return_value="
Test Template HTML
")
+
+ # Turn off DEBUG
+ module.system.DEBUG = False
+
+ # Try to render the module with DEBUG turned off
+ html = module.get_problem_html()
+
+ # Check the rendering context
+ render_args,_ = module.system.render_template.call_args
+ context = render_args[1]
+ self.assertTrue("error" in context['problem']['html'])
+
+ # Expect that the module has created a new dummy problem with the error
+ self.assertNotEqual(original_problem, module.lcp)
diff --git a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
index 5f6496f823..8a14e03ded 100644
--- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
+++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
@@ -14,6 +14,7 @@ from datetime import datetime
from . import test_system
import test_util_open_ended
+
"""
Tests for the various pieces of the CombinedOpenEndedGrading system
@@ -39,40 +40,37 @@ class OpenEndedChildTest(unittest.TestCase):
max_score = 1
static_data = {
- 'max_attempts': 20,
- 'prompt': prompt,
- 'rubric': rubric,
- 'max_score': max_score,
- 'display_name': 'Name',
- 'accept_file_upload': False,
- 'close_date': None,
- 's3_interface' : "",
- 'open_ended_grading_interface' : {},
- 'skip_basic_checks' : False,
- }
+ 'max_attempts': 20,
+ 'prompt': prompt,
+ 'rubric': rubric,
+ 'max_score': max_score,
+ 'display_name': 'Name',
+ 'accept_file_upload': False,
+ 'close_date': None,
+ 's3_interface': "",
+ 'open_ended_grading_interface': {},
+ 'skip_basic_checks': False,
+ }
definition = Mock()
descriptor = Mock()
def setUp(self):
- self.openendedchild = OpenEndedChild(test_system, self.location,
- self.definition, self.descriptor, self.static_data, self.metadata)
-
+ self.test_system = test_system()
+ self.openendedchild = OpenEndedChild(self.test_system, self.location,
+ self.definition, self.descriptor, self.static_data, self.metadata)
def test_latest_answer_empty(self):
answer = self.openendedchild.latest_answer()
self.assertEqual(answer, "")
-
def test_latest_score_empty(self):
answer = self.openendedchild.latest_score()
self.assertEqual(answer, None)
-
def test_latest_post_assessment_empty(self):
- answer = self.openendedchild.latest_post_assessment(test_system)
+ answer = self.openendedchild.latest_post_assessment(self.test_system)
self.assertEqual(answer, "")
-
def test_new_history_entry(self):
new_answer = "New Answer"
self.openendedchild.new_history_entry(new_answer)
@@ -98,7 +96,6 @@ class OpenEndedChildTest(unittest.TestCase):
score = self.openendedchild.latest_score()
self.assertEqual(score, 4)
-
def test_record_latest_post_assessment(self):
new_answer = "New Answer"
self.openendedchild.new_history_entry(new_answer)
@@ -106,7 +103,7 @@ class OpenEndedChildTest(unittest.TestCase):
post_assessment = "Post assessment"
self.openendedchild.record_latest_post_assessment(post_assessment)
self.assertEqual(post_assessment,
- self.openendedchild.latest_post_assessment(test_system))
+ self.openendedchild.latest_post_assessment(self.test_system))
def test_get_score(self):
new_answer = "New Answer"
@@ -123,24 +120,22 @@ class OpenEndedChildTest(unittest.TestCase):
self.assertEqual(score['score'], new_score)
self.assertEqual(score['total'], self.static_data['max_score'])
-
def test_reset(self):
- self.openendedchild.reset(test_system)
+ self.openendedchild.reset(self.test_system)
state = json.loads(self.openendedchild.get_instance_state())
self.assertEqual(state['state'], OpenEndedChild.INITIAL)
-
def test_is_last_response_correct(self):
new_answer = "New Answer"
self.openendedchild.new_history_entry(new_answer)
self.openendedchild.record_latest_score(self.static_data['max_score'])
self.assertEqual(self.openendedchild.is_last_response_correct(),
- 'correct')
+ 'correct')
self.openendedchild.new_history_entry(new_answer)
self.openendedchild.record_latest_score(0)
self.assertEqual(self.openendedchild.is_last_response_correct(),
- 'incorrect')
+ 'incorrect')
class OpenEndedModuleTest(unittest.TestCase):
@@ -158,18 +153,18 @@ class OpenEndedModuleTest(unittest.TestCase):
max_score = 4
static_data = {
- 'max_attempts': 20,
- 'prompt': prompt,
- 'rubric': rubric,
- 'max_score': max_score,
- 'display_name': 'Name',
- 'accept_file_upload': False,
- 'rewrite_content_links' : "",
- 'close_date': None,
- 's3_interface' : test_util_open_ended.S3_INTERFACE,
- 'open_ended_grading_interface' : test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
- 'skip_basic_checks' : False,
- }
+ 'max_attempts': 20,
+ 'prompt': prompt,
+ 'rubric': rubric,
+ 'max_score': max_score,
+ 'display_name': 'Name',
+ 'accept_file_upload': False,
+ 'rewrite_content_links': "",
+ 'close_date': None,
+ 's3_interface': test_util_open_ended.S3_INTERFACE,
+ 'open_ended_grading_interface': test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
+ 'skip_basic_checks': False,
+ }
oeparam = etree.XML('''
@@ -182,30 +177,33 @@ class OpenEndedModuleTest(unittest.TestCase):
descriptor = Mock()
def setUp(self):
- test_system.location = self.location
+ self.test_system = test_system()
+
+ self.test_system.location = self.location
self.mock_xqueue = MagicMock()
self.mock_xqueue.send_to_queue.return_value = (None, "Message")
- test_system.xqueue = {'interface': self.mock_xqueue, 'callback_url': '/', 'default_queuename': 'testqueue', 'waittime': 1}
- self.openendedmodule = OpenEndedModule(test_system, self.location,
- self.definition, self.descriptor, self.static_data, self.metadata)
+ self.test_system.xqueue = {'interface': self.mock_xqueue, 'callback_url': '/', 'default_queuename': 'testqueue',
+ 'waittime': 1}
+ self.openendedmodule = OpenEndedModule(self.test_system, self.location,
+ self.definition, self.descriptor, self.static_data, self.metadata)
def test_message_post(self):
get = {'feedback': 'feedback text',
- 'submission_id': '1',
- 'grader_id': '1',
- 'score': 3}
+ 'submission_id': '1',
+ 'grader_id': '1',
+ 'score': 3}
qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
- student_info = {'anonymous_student_id': test_system.anonymous_student_id,
- 'submission_time': qtime}
+ student_info = {'anonymous_student_id': self.test_system.anonymous_student_id,
+ 'submission_time': qtime}
contents = {
- 'feedback': get['feedback'],
- 'submission_id': int(get['submission_id']),
- 'grader_id': int(get['grader_id']),
- 'score': get['score'],
- 'student_info': json.dumps(student_info)
- }
+ 'feedback': get['feedback'],
+ 'submission_id': int(get['submission_id']),
+ 'grader_id': int(get['grader_id']),
+ 'score': get['score'],
+ 'student_info': json.dumps(student_info)
+ }
- result = self.openendedmodule.message_post(get, test_system)
+ result = self.openendedmodule.message_post(get, self.test_system)
self.assertTrue(result['success'])
# make sure it's actually sending something we want to the queue
self.mock_xqueue.send_to_queue.assert_called_with(body=json.dumps(contents), header=ANY)
@@ -216,56 +214,56 @@ class OpenEndedModuleTest(unittest.TestCase):
def test_send_to_grader(self):
submission = "This is a student submission"
qtime = datetime.strftime(datetime.now(), xqueue_interface.dateformat)
- student_info = {'anonymous_student_id': test_system.anonymous_student_id,
- 'submission_time': qtime}
+ student_info = {'anonymous_student_id': self.test_system.anonymous_student_id,
+ 'submission_time': qtime}
contents = self.openendedmodule.payload.copy()
contents.update({
'student_info': json.dumps(student_info),
'student_response': submission,
'max_score': self.max_score
- })
- result = self.openendedmodule.send_to_grader(submission, test_system)
+ })
+ result = self.openendedmodule.send_to_grader(submission, self.test_system)
self.assertTrue(result)
self.mock_xqueue.send_to_queue.assert_called_with(body=json.dumps(contents), header=ANY)
def update_score_single(self):
self.openendedmodule.new_history_entry("New Entry")
score_msg = {
- 'correct': True,
- 'score': 4,
- 'msg': 'Grader Message',
- 'feedback': "Grader Feedback"
- }
+ 'correct': True,
+ 'score': 4,
+ 'msg': 'Grader Message',
+ 'feedback': "Grader Feedback"
+ }
get = {'queuekey': "abcd",
- 'xqueue_body': score_msg}
- self.openendedmodule.update_score(get, test_system)
+ 'xqueue_body': score_msg}
+ self.openendedmodule.update_score(get, self.test_system)
def update_score_single(self):
self.openendedmodule.new_history_entry("New Entry")
feedback = {
- "success": True,
- "feedback": "Grader Feedback"
- }
+ "success": True,
+ "feedback": "Grader Feedback"
+ }
score_msg = {
- 'correct': True,
- 'score': 4,
- 'msg': 'Grader Message',
- 'feedback': json.dumps(feedback),
- 'grader_type': 'IN',
- 'grader_id': '1',
- 'submission_id': '1',
- 'success': True,
- 'rubric_scores': [0],
- 'rubric_scores_complete': True,
- 'rubric_xml': etree.tostring(self.rubric)
- }
+ 'correct': True,
+ 'score': 4,
+ 'msg': 'Grader Message',
+ 'feedback': json.dumps(feedback),
+ 'grader_type': 'IN',
+ 'grader_id': '1',
+ 'submission_id': '1',
+ 'success': True,
+ 'rubric_scores': [0],
+ 'rubric_scores_complete': True,
+ 'rubric_xml': etree.tostring(self.rubric)
+ }
get = {'queuekey': "abcd",
- 'xqueue_body': json.dumps(score_msg)}
- self.openendedmodule.update_score(get, test_system)
+ 'xqueue_body': json.dumps(score_msg)}
+ self.openendedmodule.update_score(get, self.test_system)
def test_latest_post_assessment(self):
self.update_score_single()
- assessment = self.openendedmodule.latest_post_assessment(test_system)
+ assessment = self.openendedmodule.latest_post_assessment(self.test_system)
self.assertFalse(assessment == '')
# check for errors
self.assertFalse('errors' in assessment)
@@ -293,18 +291,18 @@ class CombinedOpenEndedModuleTest(unittest.TestCase):
metadata = {'attempts': '10', 'max_score': max_score}
static_data = {
- 'max_attempts': 20,
- 'prompt': prompt,
- 'rubric': rubric,
- 'max_score': max_score,
- 'display_name': 'Name',
- 'accept_file_upload' : False,
- 'rewrite_content_links' : "",
- 'close_date' : "",
- 's3_interface' : test_util_open_ended.S3_INTERFACE,
- 'open_ended_grading_interface' : test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
- 'skip_basic_checks' : False,
- }
+ 'max_attempts': 20,
+ 'prompt': prompt,
+ 'rubric': rubric,
+ 'max_score': max_score,
+ 'display_name': 'Name',
+ 'accept_file_upload': False,
+ 'rewrite_content_links': "",
+ 'close_date': "",
+ 's3_interface': test_util_open_ended.S3_INTERFACE,
+ 'open_ended_grading_interface': test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
+ 'skip_basic_checks': False,
+ }
oeparam = etree.XML('''
@@ -326,17 +324,23 @@ class CombinedOpenEndedModuleTest(unittest.TestCase):
'''
task_xml2 = '''
-
- Enter essay here.
- This is the answer.
- {"grader_settings" : "ml_grading.conf", "problem_id" : "6.002x/Welcome/OETest"}
-
- '''
+
+ Enter essay here.
+ This is the answer.
+ {"grader_settings" : "ml_grading.conf", "problem_id" : "6.002x/Welcome/OETest"}
+
+ '''
definition = {'prompt': etree.XML(prompt), 'rubric': etree.XML(rubric), 'task_xml': [task_xml1, task_xml2]}
descriptor = Mock()
def setUp(self):
- self.combinedoe = CombinedOpenEndedV1Module(test_system, self.location, self.definition, self.descriptor, static_data = self.static_data, metadata=self.metadata)
+ self.test_system = test_system()
+ self.combinedoe = CombinedOpenEndedV1Module(self.test_system,
+ self.location,
+ self.definition,
+ self.descriptor,
+ static_data=self.static_data,
+ metadata=self.metadata)
def test_get_tag_name(self):
name = self.combinedoe.get_tag_name("Tag")
diff --git a/common/lib/xmodule/xmodule/tests/test_conditional.py b/common/lib/xmodule/xmodule/tests/test_conditional.py
index 361a6ea785..16bd222b9e 100644
--- a/common/lib/xmodule/xmodule/tests/test_conditional.py
+++ b/common/lib/xmodule/xmodule/tests/test_conditional.py
@@ -56,6 +56,9 @@ class ConditionalModuleTest(unittest.TestCase):
'''Get a dummy system'''
return DummySystem(load_error_modules)
+ def setUp(self):
+ self.test_system = test_system()
+
def get_course(self, name):
"""Get a test course by directory name. If there's more than one, error."""
print "Importing {0}".format(name)
@@ -85,14 +88,14 @@ class ConditionalModuleTest(unittest.TestCase):
location = descriptor.location
instance_state = instance_states.get(location.category, None)
print "inner_get_module, location=%s, inst_state=%s" % (location, instance_state)
- return descriptor.xmodule_constructor(test_system)(instance_state, shared_state)
+ return descriptor.xmodule_constructor(self.test_system)(instance_state, shared_state)
location = Location(["i4x", "edX", "cond_test", "conditional", "condone"])
def replace_urls(text, staticfiles_prefix=None, replace_prefix='/static/', course_namespace=None):
return text
- test_system.replace_urls = replace_urls
- test_system.get_module = inner_get_module
+ self.test_system.replace_urls = replace_urls
+ self.test_system.get_module = inner_get_module
module = inner_get_module(location)
print "module: ", module
diff --git a/common/lib/xmodule/xmodule/tests/test_self_assessment.py b/common/lib/xmodule/xmodule/tests/test_self_assessment.py
index b9c3076b7c..a7f2a9fdfe 100644
--- a/common/lib/xmodule/xmodule/tests/test_self_assessment.py
+++ b/common/lib/xmodule/xmodule/tests/test_self_assessment.py
@@ -10,8 +10,8 @@ from . import test_system
import test_util_open_ended
-class SelfAssessmentTest(unittest.TestCase):
+class SelfAssessmentTest(unittest.TestCase):
rubric = '''
Response Quality
@@ -24,7 +24,7 @@ class SelfAssessmentTest(unittest.TestCase):
'prompt': prompt,
'submitmessage': 'Shall we submit now?',
'hintprompt': 'Consider this...',
- }
+ }
location = Location(["i4x", "edX", "sa_test", "selfassessment",
"SampleQuestion"])
@@ -41,37 +41,38 @@ class SelfAssessmentTest(unittest.TestCase):
'attempts': 2})
static_data = {
- 'max_attempts': 10,
- 'rubric': etree.XML(self.rubric),
- 'prompt': self.prompt,
- 'max_score': 1,
- 'display_name': "Name",
- 'accept_file_upload': False,
- 'close_date': None,
- 's3_interface' : test_util_open_ended.S3_INTERFACE,
- 'open_ended_grading_interface' : test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
- 'skip_basic_checks' : False,
- }
+ 'max_attempts': 10,
+ 'rubric': etree.XML(self.rubric),
+ 'prompt': self.prompt,
+ 'max_score': 1,
+ 'display_name': "Name",
+ 'accept_file_upload': False,
+ 'close_date': None,
+ 's3_interface': test_util_open_ended.S3_INTERFACE,
+ 'open_ended_grading_interface': test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
+ 'skip_basic_checks': False,
+ }
- self.module = SelfAssessmentModule(test_system, self.location,
- self.definition, self.descriptor,
- static_data,
- state, metadata=self.metadata)
+ self.module = SelfAssessmentModule(test_system(), self.location,
+ self.definition, self.descriptor,
+ static_data,
+ state, metadata=self.metadata)
def test_get_html(self):
- html = self.module.get_html(test_system)
+ html = self.module.get_html(self.module.system)
self.assertTrue("This is sample prompt text" in html)
def test_self_assessment_flow(self):
responses = {'assessment': '0', 'score_list[]': ['0', '0']}
+
def get_fake_item(name):
return responses[name]
- def get_data_for_location(self,location,student):
+ def get_data_for_location(self, location, student):
return {
- 'count_graded' : 0,
- 'count_required' : 0,
- 'student_sub_count': 0,
+ 'count_graded': 0,
+ 'count_required': 0,
+ 'student_sub_count': 0,
}
mock_query_dict = MagicMock()
@@ -82,19 +83,20 @@ class SelfAssessmentTest(unittest.TestCase):
self.assertEqual(self.module.get_score()['score'], 0)
- self.module.save_answer({'student_answer': "I am an answer"}, test_system)
+ self.module.save_answer({'student_answer': "I am an answer"},
+ self.module.system)
self.assertEqual(self.module.state, self.module.ASSESSING)
- self.module.save_assessment(mock_query_dict, test_system)
+ self.module.save_assessment(mock_query_dict, self.module.system)
self.assertEqual(self.module.state, self.module.DONE)
-
d = self.module.reset({})
self.assertTrue(d['success'])
self.assertEqual(self.module.state, self.module.INITIAL)
# if we now assess as right, skip the REQUEST_HINT state
- self.module.save_answer({'student_answer': 'answer 4'}, test_system)
+ self.module.save_answer({'student_answer': 'answer 4'},
+ self.module.system)
responses['assessment'] = '1'
- self.module.save_assessment(mock_query_dict, test_system)
+ self.module.save_assessment(mock_query_dict, self.module.system)
self.assertEqual(self.module.state, self.module.DONE)
diff --git a/common/lib/xmodule/xmodule/tests/test_util_open_ended.py b/common/lib/xmodule/xmodule/tests/test_util_open_ended.py
index 8d1fcd30ce..db580f1e0e 100644
--- a/common/lib/xmodule/xmodule/tests/test_util_open_ended.py
+++ b/common/lib/xmodule/xmodule/tests/test_util_open_ended.py
@@ -1,14 +1,14 @@
OPEN_ENDED_GRADING_INTERFACE = {
- 'url' : 'http://127.0.0.1:3033/',
- 'username' : 'incorrect',
- 'password' : 'incorrect',
- 'staff_grading' : 'staff_grading',
- 'peer_grading' : 'peer_grading',
- 'grading_controller' : 'grading_controller'
+ 'url': 'http://127.0.0.1:3033/',
+ 'username': 'incorrect',
+ 'password': 'incorrect',
+ 'staff_grading': 'staff_grading',
+ 'peer_grading': 'peer_grading',
+ 'grading_controller': 'grading_controller'
}
S3_INTERFACE = {
- 'aws_access_key' : "",
- 'aws_secret_key' : "",
- "aws_bucket_name" : "",
+ 'aws_access_key': "",
+ 'aws_secret_key': "",
+ "aws_bucket_name": "",
}
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/xml_module.py b/common/lib/xmodule/xmodule/xml_module.py
index 773531c528..7087a03759 100644
--- a/common/lib/xmodule/xmodule/xml_module.py
+++ b/common/lib/xmodule/xmodule/xml_module.py
@@ -379,7 +379,11 @@ class XmlDescriptor(XModuleDescriptor):
if attr not in self.metadata_to_strip and attr not in self.metadata_to_export_to_policy:
val = val_for_xml(attr)
#logging.debug('location.category = {0}, attr = {1}'.format(self.location.category, attr))
- xml_object.set(attr, val)
+ try:
+ xml_object.set(attr, val)
+ except Exception, e:
+ logging.exception('Failed to serialize metadata attribute {0} with value {1}. This could mean data loss!!! Exception: {2}'.format(attr, val, e))
+ pass
if self.export_to_file():
# Write the definition to a file
diff --git a/common/static/coffee/src/discussion/content.coffee b/common/static/coffee/src/discussion/content.coffee
index 4e612dfc40..00c34df686 100644
--- a/common/static/coffee/src/discussion/content.coffee
+++ b/common/static/coffee/src/discussion/content.coffee
@@ -79,6 +79,17 @@ if Backbone?
@getContent(id).updateInfo(info)
$.extend @contentInfos, infos
+ pinThread: ->
+ pinned = @get("pinned")
+ @set("pinned",pinned)
+ @trigger "change", @
+
+ unPinThread: ->
+ pinned = @get("pinned")
+ @set("pinned",pinned)
+ @trigger "change", @
+
+
class @Thread extends @Content
urlMappers:
'retrieve' : -> DiscussionUtil.urlFor('retrieve_single_thread', @discussion.id, @id)
@@ -91,6 +102,8 @@ if Backbone?
'delete' : -> DiscussionUtil.urlFor('delete_thread', @id)
'follow' : -> DiscussionUtil.urlFor('follow_thread', @id)
'unfollow' : -> DiscussionUtil.urlFor('unfollow_thread', @id)
+ 'pinThread' : -> DiscussionUtil.urlFor("pin_thread", @id)
+ 'unPinThread' : -> DiscussionUtil.urlFor("un_pin_thread", @id)
initialize: ->
@set('thread', @)
diff --git a/common/static/coffee/src/discussion/discussion.coffee b/common/static/coffee/src/discussion/discussion.coffee
index 9cee068b74..83e25e1da7 100644
--- a/common/static/coffee/src/discussion/discussion.coffee
+++ b/common/static/coffee/src/discussion/discussion.coffee
@@ -58,10 +58,31 @@ if Backbone?
@current_page = response.page
sortByDate: (thread) ->
- thread.get("created_at")
+ #
+ #The comment client asks each thread for a value by which to sort the collection
+ #and calls this sort routine regardless of the order returned from the LMS/comments service
+ #so, this takes advantage of this per-thread value and returns tomorrow's date
+ #for pinned threads, ensuring that they appear first, (which is the intent of pinned threads)
+ #
+ if thread.get('pinned')
+ #use tomorrow's date
+ today = new Date();
+ new Date(today.getTime() + (24 * 60 * 60 * 1000));
+ else
+ thread.get("created_at")
+
sortByDateRecentFirst: (thread) ->
- -(new Date(thread.get("created_at")).getTime())
+ #
+ #Same as above
+ #but negative to flip the order (newest first)
+ #
+ if thread.get('pinned')
+ #use tomorrow's date
+ today = new Date();
+ -(new Date(today.getTime() + (24 * 60 * 60 * 1000)));
+ else
+ -(new Date(thread.get("created_at")).getTime())
#return String.fromCharCode.apply(String,
# _.map(thread.get("created_at").split(""),
# ((c) -> return 0xffff - c.charChodeAt()))
diff --git a/common/static/coffee/src/discussion/discussion_module_view.coffee b/common/static/coffee/src/discussion/discussion_module_view.coffee
index 2e58b2c0b8..3dde9bf950 100644
--- a/common/static/coffee/src/discussion/discussion_module_view.coffee
+++ b/common/static/coffee/src/discussion/discussion_module_view.coffee
@@ -88,7 +88,7 @@ if Backbone?
if @$('section.discussion').length
@$('section.discussion').replaceWith($discussion)
else
- $(".discussion-module").append($discussion)
+ @$el.append($discussion)
@newPostForm = $('.new-post-article')
@threadviews = @discussion.map (thread) ->
new DiscussionThreadInlineView el: @$("article#thread_#{thread.id}"), model: thread
diff --git a/common/static/coffee/src/discussion/utils.coffee b/common/static/coffee/src/discussion/utils.coffee
index 6b2714dc54..41f52f1711 100644
--- a/common/static/coffee/src/discussion/utils.coffee
+++ b/common/static/coffee/src/discussion/utils.coffee
@@ -50,6 +50,8 @@ class @DiscussionUtil
delete_thread : "/courses/#{$$course_id}/discussion/threads/#{param}/delete"
upvote_thread : "/courses/#{$$course_id}/discussion/threads/#{param}/upvote"
downvote_thread : "/courses/#{$$course_id}/discussion/threads/#{param}/downvote"
+ pin_thread : "/courses/#{$$course_id}/discussion/threads/#{param}/pin"
+ un_pin_thread : "/courses/#{$$course_id}/discussion/threads/#{param}/unpin"
undo_vote_for_thread : "/courses/#{$$course_id}/discussion/threads/#{param}/unvote"
follow_thread : "/courses/#{$$course_id}/discussion/threads/#{param}/follow"
unfollow_thread : "/courses/#{$$course_id}/discussion/threads/#{param}/unfollow"
diff --git a/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
index 6320c3d1e3..a5a1deac10 100644
--- a/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
@@ -3,6 +3,7 @@ if Backbone?
events:
"click .discussion-vote": "toggleVote"
+ "click .admin-pin": "togglePin"
"click .action-follow": "toggleFollowing"
"click .action-edit": "edit"
"click .action-delete": "delete"
@@ -24,6 +25,7 @@ if Backbone?
@delegateEvents()
@renderDogear()
@renderVoted()
+ @renderPinned()
@renderAttrs()
@$("span.timeago").timeago()
@convertMath()
@@ -41,8 +43,20 @@ if Backbone?
else
@$("[data-role=discussion-vote]").removeClass("is-cast")
+ renderPinned: =>
+ if @model.get("pinned")
+ @$("[data-role=thread-pin]").addClass("pinned")
+ @$("[data-role=thread-pin]").removeClass("notpinned")
+ @$(".discussion-pin .pin-label").html("Pinned")
+ else
+ @$("[data-role=thread-pin]").removeClass("pinned")
+ @$("[data-role=thread-pin]").addClass("notpinned")
+ @$(".discussion-pin .pin-label").html("Pin Thread")
+
+
updateModelDetails: =>
@renderVoted()
+ @renderPinned()
@$("[data-role=discussion-vote] .votes-count-number").html(@model.get("votes")["up_count"])
convertMath: ->
@@ -99,6 +113,34 @@ if Backbone?
delete: (event) ->
@trigger "thread:delete", event
+ togglePin: (event) ->
+ event.preventDefault()
+ if @model.get('pinned')
+ @unPin()
+ else
+ @pin()
+
+ pin: ->
+ url = @model.urlFor("pinThread")
+ DiscussionUtil.safeAjax
+ $elem: @$(".discussion-pin")
+ url: url
+ type: "POST"
+ success: (response, textStatus) =>
+ if textStatus == 'success'
+ @model.set('pinned', true)
+
+ unPin: ->
+ url = @model.urlFor("unPinThread")
+ DiscussionUtil.safeAjax
+ $elem: @$(".discussion-pin")
+ url: url
+ type: "POST"
+ success: (response, textStatus) =>
+ if textStatus == 'success'
+ @model.set('pinned', false)
+
+
toggleClosed: (event) ->
$elem = $(event.target)
url = @model.urlFor('close')
@@ -137,3 +179,5 @@ if Backbone?
if @model.get('username')?
params = $.extend(params, user:{username: @model.username, user_url: @model.user_url})
Mustache.render(@template, params)
+
+
\ No newline at end of file
diff --git a/common/static/images/partially-correct-icon.png b/common/static/images/partially-correct-icon.png
new file mode 100644
index 0000000000..9ac0fd32f7
Binary files /dev/null and b/common/static/images/partially-correct-icon.png differ
diff --git a/common/static/js/capa/annotationinput.js b/common/static/js/capa/annotationinput.js
new file mode 100644
index 0000000000..4353fd262a
--- /dev/null
+++ b/common/static/js/capa/annotationinput.js
@@ -0,0 +1,97 @@
+(function () {
+ var debug = false;
+
+ var module = {
+ debug: debug,
+ inputSelector: '.annotation-input',
+ tagSelector: '.tag',
+ tagsSelector: '.tags',
+ commentSelector: 'textarea.comment',
+ valueSelector: 'input.value', // stash tag selections and comment here as a JSON string...
+
+ singleSelect: true,
+
+ init: function() {
+ var that = this;
+
+ if(this.debug) { console.log('annotation input loaded: '); }
+
+ $(this.inputSelector).each(function(index, el) {
+ if(!$(el).data('listening')) {
+ $(el).delegate(that.tagSelector, 'click', $.proxy(that.onClickTag, that));
+ $(el).delegate(that.commentSelector, 'change', $.proxy(that.onChangeComment, that));
+ $(el).data('listening', 'yes');
+ }
+ });
+ },
+ onChangeComment: function(e) {
+ var value_el = this.findValueEl(e.target);
+ var current_value = this.loadValue(value_el);
+ var target_value = $(e.target).val();
+
+ current_value.comment = target_value;
+ this.storeValue(value_el, current_value);
+ },
+ onClickTag: function(e) {
+ var target_el = e.target, target_value, target_index;
+ var value_el, current_value;
+
+ value_el = this.findValueEl(e.target);
+ current_value = this.loadValue(value_el);
+ target_value = $(e.target).data('id');
+
+ if(!$(target_el).hasClass('selected')) {
+ if(this.singleSelect) {
+ current_value.options = [target_value]
+ } else {
+ current_value.options.push(target_value);
+ }
+ } else {
+ if(this.singleSelect) {
+ current_value.options = []
+ } else {
+ target_index = current_value.options.indexOf(target_value);
+ if(target_index !== -1) {
+ current_value.options.splice(target_index, 1);
+ }
+ }
+ }
+
+ this.storeValue(value_el, current_value);
+
+ if(this.singleSelect) {
+ $(target_el).closest(this.tagsSelector)
+ .find(this.tagSelector)
+ .not(target_el)
+ .removeClass('selected')
+ }
+ $(target_el).toggleClass('selected');
+ },
+ findValueEl: function(target_el) {
+ var input_el = $(target_el).closest(this.inputSelector);
+ return $(this.valueSelector, input_el);
+ },
+ loadValue: function(value_el) {
+ var json = $(value_el).val();
+
+ var result = JSON.parse(json);
+ if(result === null) {
+ result = {};
+ }
+ if(!result.hasOwnProperty('options')) {
+ result.options = [];
+ }
+ if(!result.hasOwnProperty('comment')) {
+ result.comment = '';
+ }
+
+ return result;
+ },
+ storeValue: function(value_el, new_value) {
+ var json = JSON.stringify(new_value);
+ $(value_el).val(json);
+ }
+ }
+
+ module.init();
+}).call(this);
diff --git a/common/static/js/capa/chemical_equation_preview.js b/common/static/js/capa/chemical_equation_preview.js
index 90ce27ad11..10a6b54655 100644
--- a/common/static/js/capa/chemical_equation_preview.js
+++ b/common/static/js/capa/chemical_equation_preview.js
@@ -11,9 +11,14 @@
}
prev_id = "#" + this.id + "_preview";
- preview_div = $(prev_id)
+ preview_div = $(prev_id);
- $.get("/preview/chemcalc/", {"formula" : this.value}, create_handler(preview_div));
+ // find the closest parent problems-wrapper and use that url
+ url = $(this).closest('.problems-wrapper').data('url');
+ // grab the input id from the input
+ input_id = $(this).data('input-id')
+
+ Problem.inputAjax(url, input_id, 'preview_chemcalc', {"formula" : this.value}, create_handler(preview_div));
}
inputs = $('.chemicalequationinput input');
diff --git a/common/static/js/capa/edit-a-gene.js b/common/static/js/capa/edit-a-gene.js
index 48753e507d..bd6d10cc64 100644
--- a/common/static/js/capa/edit-a-gene.js
+++ b/common/static/js/capa/edit-a-gene.js
@@ -1,27 +1,44 @@
(function () {
var timeout = 1000;
- function initializeApplet(applet) {
- console.log("Initializing " + applet);
- waitForApplet(applet);
- }
+ waitForGenex();
- function waitForApplet(applet) {
- if (applet.isActive && applet.isActive()) {
- console.log("Applet is ready.");
- var answerStr = applet.checkAnswer();
- console.log(answerStr);
- var input = $('.editageneinput input');
- console.log(input);
- input.val(answerStr);
- } else if (timeout > 30 * 1000) {
- console.error("Applet did not load on time.");
- } else {
- console.log("Waiting for applet...");
- setTimeout(function() { waitForApplet(applet); }, timeout);
+ function waitForGenex() {
+ if (typeof(genex) !== "undefined" && genex) {
+ genex.onInjectionDone("genex");
+ }
+ else {
+ setTimeout(function() { waitForGenex(); }, timeout);
}
}
- var applets = $('.editageneinput object');
- applets.each(function(i, el) { initializeApplet(el); });
+ //NOTE:
+ // Genex uses six global functions:
+ // genexSetDNASequence (exported from GWT)
+ // genexSetClickEvent (exported from GWT)
+ // genexSetKeyEvent (exported from GWT)
+ // genexSetProblemNumber (exported from GWT)
+ //
+ // It calls genexIsReady with a deferred command when it has finished
+ // initialization and has drawn itself
+ // genexStoreAnswer(answer) is called when the GWT [Store Answer] button
+ // is clicked
+
+ genexIsReady = function() {
+ //Load DNA sequence
+ var dna_sequence = $('#dna_sequence').val();
+ genexSetDNASequence(dna_sequence);
+ //Now load mouse and keyboard handlers
+ genexSetClickEvent();
+ genexSetKeyEvent();
+ //Now load problem
+ var genex_problem_number = $('#genex_problem_number').val();
+ genexSetProblemNumber(genex_problem_number);
+ };
+ genexStoreAnswer = function(ans) {
+ var problem = $('#genex_container').parents('.problem');
+ var input_field = problem.find('input[type="hidden"][name!="dna_sequence"][name!="genex_problem_number"]');
+ input_field.val(ans);
+ };
}).call(this);
+
diff --git a/common/static/js/capa/genex/3F4ADBED36D589545A9300A1EA686D36.cache.html b/common/static/js/capa/genex/3F4ADBED36D589545A9300A1EA686D36.cache.html
new file mode 100644
index 0000000000..c5ad0d1b89
--- /dev/null
+++ b/common/static/js/capa/genex/3F4ADBED36D589545A9300A1EA686D36.cache.html
@@ -0,0 +1,639 @@
+
+
+
+
\ No newline at end of file
diff --git a/common/static/js/capa/genex/73F4B6D6D466BAD6850A60128DF5B80D.cache.html b/common/static/js/capa/genex/73F4B6D6D466BAD6850A60128DF5B80D.cache.html
new file mode 100644
index 0000000000..d5441b656e
--- /dev/null
+++ b/common/static/js/capa/genex/73F4B6D6D466BAD6850A60128DF5B80D.cache.html
@@ -0,0 +1,649 @@
+
+
+
+
\ No newline at end of file
diff --git a/common/static/js/capa/genex/BA18AC23ACC5016C5D0799E864BBDFFE.cache.html b/common/static/js/capa/genex/BA18AC23ACC5016C5D0799E864BBDFFE.cache.html
new file mode 100644
index 0000000000..261aa02849
--- /dev/null
+++ b/common/static/js/capa/genex/BA18AC23ACC5016C5D0799E864BBDFFE.cache.html
@@ -0,0 +1,639 @@
+
+
+
+
\ No newline at end of file
diff --git a/common/static/js/capa/genex/C7B18436BA03373FB13ED589C2CCF417.cache.html b/common/static/js/capa/genex/C7B18436BA03373FB13ED589C2CCF417.cache.html
new file mode 100644
index 0000000000..13d25ddf09
--- /dev/null
+++ b/common/static/js/capa/genex/C7B18436BA03373FB13ED589C2CCF417.cache.html
@@ -0,0 +1,649 @@
+
+
+
+
\ No newline at end of file
diff --git a/common/static/js/capa/genex/E1A9A95677AFC620CAD5759B7ACC3E67.cache.html b/common/static/js/capa/genex/E1A9A95677AFC620CAD5759B7ACC3E67.cache.html
new file mode 100644
index 0000000000..7078dee4f8
--- /dev/null
+++ b/common/static/js/capa/genex/E1A9A95677AFC620CAD5759B7ACC3E67.cache.html
@@ -0,0 +1,625 @@
+
+
+
\ No newline at end of file
diff --git a/common/static/js/capa/genex/FF175D5583BDD5ACF40C7F0AFF9A374B.cache.html b/common/static/js/capa/genex/FF175D5583BDD5ACF40C7F0AFF9A374B.cache.html
new file mode 100644
index 0000000000..ca07bf3292
--- /dev/null
+++ b/common/static/js/capa/genex/FF175D5583BDD5ACF40C7F0AFF9A374B.cache.html
@@ -0,0 +1,651 @@
+
+
+
+
\ No newline at end of file
diff --git a/common/static/js/capa/genex/clear.cache.gif b/common/static/js/capa/genex/clear.cache.gif
new file mode 100644
index 0000000000..e565824aaf
Binary files /dev/null and b/common/static/js/capa/genex/clear.cache.gif differ
diff --git a/common/static/js/capa/genex/genex.css b/common/static/js/capa/genex/genex.css
new file mode 100644
index 0000000000..459c854f92
--- /dev/null
+++ b/common/static/js/capa/genex/genex.css
@@ -0,0 +1,122 @@
+.genex-button {
+ margin-right: -8px;
+ height: 40px !important;
+}
+
+.genex-label {
+ /*font: normal normal normal 10pt/normal 'Open Sans', Verdana, Geneva, sans-serif !important;*/
+ /*padding: 4px 0px 0px 10px !important;*/
+ font-family: sans-serif !important;
+ font-size: 13px !important;
+ font-style: normal !important;
+ font-variant: normal !important;
+ font-weight: bold !important;
+ padding-top: 6px !important;
+ margin-left: 18px;
+}
+
+.gwt-HTML {
+ cursor: default;
+ overflow-x: auto !important;
+ overflow-y: auto !important;
+ background-color: rgb(248, 248, 248) !important;
+}
+
+.genex-scrollpanel {
+ word-wrap: normal !important;
+ white-space: pre !important;
+}
+
+pre, #dna-strand {
+ font-family: 'courier new', courier !important;
+ font-size: 13px !important;
+ font-style: normal !important;
+ font-variant: normal !important;
+ font-weight: normal !important;
+ border-style: none !important;
+ background-color: rgb(248, 248, 248) !important;
+ word-wrap: normal !important;
+ white-space: pre !important;
+ overflow-x: visible !important;
+ overflow-y: visible !important;
+}
+
+.gwt-DialogBox .Caption {
+ background: #F1F1F1;
+ padding: 4px 8px 4px 4px;
+ cursor: default;
+ font-family: Arial Unicode MS, Arial, sans-serif;
+ font-weight: bold;
+ border-bottom: 1px solid #bbbbbb;
+ border-top: 1px solid #D2D2D2;
+}
+.gwt-DialogBox .dialogContent {
+}
+.gwt-DialogBox .dialogMiddleCenter {
+ padding: 3px;
+ background: white;
+}
+.gwt-DialogBox .dialogBottomCenter {
+ background: url(images/hborder.png) repeat-x 0px -2945px;
+ -background: url(images/hborder_ie6.png) repeat-x 0px -2144px;
+}
+.gwt-DialogBox .dialogMiddleLeft {
+ background: url(images/vborder.png) repeat-y -31px 0px;
+}
+.gwt-DialogBox .dialogMiddleRight {
+ background: url(images/vborder.png) repeat-y -32px 0px;
+ -background: url(images/vborder_ie6.png) repeat-y -32px 0px;
+}
+.gwt-DialogBox .dialogTopLeftInner {
+ width: 10px;
+ height: 8px;
+ zoom: 1;
+}
+.gwt-DialogBox .dialogTopRightInner {
+ width: 12px;
+ zoom: 1;
+}
+.gwt-DialogBox .dialogBottomLeftInner {
+ width: 10px;
+ height: 12px;
+ zoom: 1;
+}
+.gwt-DialogBox .dialogBottomRightInner {
+ width: 12px;
+ height: 12px;
+ zoom: 1;
+}
+.gwt-DialogBox .dialogTopLeft {
+ background: url(images/circles.png) no-repeat -20px 0px;
+ -background: url(images/circles_ie6.png) no-repeat -20px 0px;
+}
+.gwt-DialogBox .dialogTopRight {
+ background: url(images/circles.png) no-repeat -28px 0px;
+ -background: url(images/circles_ie6.png) no-repeat -28px 0px;
+}
+.gwt-DialogBox .dialogBottomLeft {
+ background: url(images/circles.png) no-repeat 0px -36px;
+ -background: url(images/circles_ie6.png) no-repeat 0px -36px;
+}
+.gwt-DialogBox .dialogBottomRight {
+ background: url(images/circles.png) no-repeat -8px -36px;
+ -background: url(images/circles_ie6.png) no-repeat -8px -36px;
+}
+* html .gwt-DialogBox .dialogTopLeftInner {
+ width: 10px;
+ overflow: hidden;
+}
+* html .gwt-DialogBox .dialogTopRightInner {
+ width: 12px;
+ overflow: hidden;
+}
+* html .gwt-DialogBox .dialogBottomLeftInner {
+ width: 10px;
+ height: 12px;
+ overflow: hidden;
+}
+* html .gwt-DialogBox .dialogBottomRightInner {
+ width: 12px;
+ height: 12px;
+ overflow: hidden;
+}
\ No newline at end of file
diff --git a/common/static/js/capa/genex/genex.nocache.js b/common/static/js/capa/genex/genex.nocache.js
new file mode 100644
index 0000000000..fe892a53dc
--- /dev/null
+++ b/common/static/js/capa/genex/genex.nocache.js
@@ -0,0 +1,18 @@
+function genex(){var P='',xb='" for "gwt:onLoadErrorFn"',vb='" for "gwt:onPropertyErrorFn"',ib='"><\/script>',Z='#',Xb='.cache.html',_='/',lb='//',Qb='3F4ADBED36D589545A9300A1EA686D36',Rb='73F4B6D6D466BAD6850A60128DF5B80D',Wb=':',pb='::',dc='
+
+This html file is for Development Mode support.
+