Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions common/lib/xmodule/xmodule/combined_open_ended_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,14 +250,18 @@ class CombinedOpenEndedFields(object):
default=False,
scope=Scope.settings
)
track_changes = Boolean(
display_name="Peer Track Changes",
help=("EXPERIMENTAL FEATURE FOR PEER GRADING ONLY: "
"If set to 'True', peer graders will be able to make changes to the student "
"submission and those changes will be tracked and shown along with the graded feedback."),
default=False,
scope=Scope.settings
)
###
# Only reenable this if you have the ICE library downloaded somewhere in your codebase.
#
# track_changes = Boolean(
# display_name="Peer Track Changes",
# help=("EXPERIMENTAL FEATURE FOR PEER GRADING ONLY: "
# "If set to 'True', peer graders will be able to make changes to the student "
# "submission and those changes will be tracked and shown along with the graded feedback."),
# default=False,
# scope=Scope.settings
# )
###
due = Date(
help="Date that this problem is due by",
scope=Scope.settings
Expand Down
9 changes: 0 additions & 9 deletions common/lib/xmodule/xmodule/js/src/peergrading/ice.min.js

This file was deleted.

4 changes: 2 additions & 2 deletions common/lib/xmodule/xmodule/peer_grading_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ class PeerGradingModule(PeerGradingFields, XModule):

js = {
'js': [
resource_string(__name__, 'js/src/peergrading/ice.min.js'),
# resource_string(__name__, 'js/src/peergrading/ice.min.js'), This was removed because the ICE library has a somewhat incompatible license to be hosted directly in this code repo.
],
'coffee': [
resource_string(__name__, 'js/src/peergrading/peer_grading.coffee'),
resource_string(__name__, 'js/src/peergrading/peer_grading_problem.coffee'),
resource_string(__name__, 'js/src/peergrading/track_changes.coffee'),
# resource_string(__name__, 'js/src/peergrading/track_changes.coffee'), Enable this code only if you also download the ICE library
resource_string(__name__, 'js/src/collapsible.coffee'),
resource_string(__name__, 'js/src/javascript_loader.coffee'),
]
Expand Down
24 changes: 14 additions & 10 deletions common/lib/xmodule/xmodule/tests/test_peer_grading.py
Original file line number Diff line number Diff line change
Expand Up @@ -407,13 +407,17 @@ def setUp(self):
self.setup_modulestore(COURSE)
self.peer_grading = self.get_module_from_location(self.pgm_location, COURSE)

def test_tracking_peer_eval_problem(self):
"""
Tests rendering of peer eval problem with track changes set. With the test_system render_template
this test becomes a bit tautological, but oh well.
@return:
"""
self.peer_grading._find_corresponding_module_for_location = self.mock_track_changes_problem
response = self.peer_grading.peer_grading_problem({'location': 'mocked'})
self.assertTrue(response['success'])
self.assertIn("'track_changes': True", response['html'])
###
# Commented out because Track Changes feature is disabled and the ICE library has been removed for license issues.
# Before you re-enable this test make sure you re-install the ICE library and re-enable the Track Changes feature.
#
# def test_tracking_peer_eval_problem(self):
# """
# Tests rendering of peer eval problem with track changes set. With the test_system render_template
# this test becomes a bit tautological, but oh well.
# @return:
# """
# self.peer_grading._find_corresponding_module_for_location = self.mock_track_changes_problem
# response = self.peer_grading.peer_grading_problem({'location': 'mocked'})
# self.assertTrue(response['success'])
# self.assertIn("'track_changes': True", response['html'])