Commit Graph

152 Commits

Author SHA1 Message Date
Sarina Canelake
467f2988e1 Quality cleanup 2014-09-08 12:02:31 -04:00
louyihua
63ef3bd05a i18n: More extractable & localizable strings in xmodules 2014-05-26 15:30:01 +08:00
Calen Pennington
29f7fe14fb Merge remote-tracking branch 'edx/master' into ok-merge-from-master 2014-05-23 10:05:56 -04:00
louyihua
a6bae4d238 i18n: Make static strings in xmodule files extractable
They can now be extracted.
2014-05-23 01:58:19 +08:00
Don Mitchell
c085578383 Fix student progress @sarina bug 2014-05-20 18:08:33 -04:00
Don Mitchell
f7558c40e8 Fixes ../courseware/Peer_Grading_Panel/peergrading:L12P5_grading/ reported bug 2014-05-20 11:44:51 -04:00
Calen Pennington
d654798856 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates common/lib/xmodule.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-08 20:28:53 -04:00
Calen Pennington
6430e7e98c Make GradingServices always return dictionaries, rather than sometimes returning strings 2014-04-01 14:04:16 -04:00
Valera Rozuvan
1136336fc4 Converting collapsible module to JavaScript. 2014-03-11 11:28:46 +00:00
Waheed Ahmed
4db7885336 Students not receiving credit for peer assessment.
ORA-330
2014-02-27 10:38:34 -05:00
Waheed Ahmed
d5cadf0008 Really large posts to ORA like peer grading feedback fixed.
ORA-201
2014-01-28 15:50:16 +05:00
Giulio Gratta
31caba3a2a Removed ice.min.js and removed piping code 2014-01-15 14:06:19 -08:00
Calen Pennington
46109bb3e8 Use XBlock xml serialization and deserialization
XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]
2014-01-14 13:28:47 -05:00
Ned Batchelder
b6bd293266 Clean up some pre-existing formatting. 2014-01-14 13:09:35 -05:00
Chris Rossi
831f907c79 Add individual due dates feature.
Adds a feature to the edX platform which allows instructors to set
individual due dates for students on particular coursework. This code is
meant primarily for on-campus use--it is not intended that this feature
would be used for MOOCs. It adds a new tab, "Extensions", to the beta
instructor dashboard which allows changing due dates per student. This
feature is enabled by setting FEATURES['INDIVIDUAL_DUE_DATES'] = True.
2014-01-14 10:19:02 -05:00
Calen Pennington
864d831ce3 Use XBlock handlers for handle_ajax in XModules
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.

[LMS-230] [LMS-229]
2013-11-08 11:08:48 -05:00
Calen Pennington
32af903f85 Provide access to the course_id directly on XModules/Descriptors
Fixes [BLD-456] and [LMS-1392], but making sure that we're always asking
XModules about their course_id (since the ModuleSystem has access to
that data).
2013-10-30 11:23:11 -04:00
Vik Paruchuri
9f9f5e4c2a Ensure that peer grading modules whose linked problem is removed change over to panel mode 2013-10-28 16:40:13 -04:00
Calen Pennington
6b474724ac Make XModuleDescriptor and XModule act as a single class
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
2013-10-08 15:29:17 -04:00
David Ormsbee
a2034c5bb9 Merge branch 'release' 2013-09-15 16:11:31 -04:00
Giulio Gratta
fe59a8ce62 Implementing NYT's ICE track changes to Open Ended Assessements
Squashed commits to facilitate cherry-picking.  Committers and
original commit messages are:
- ==> @caesar2164, * ==> @jrbl, ~ ==> @jbau

- Added boolean to OE problem CMS settings to turn on ICE track changes
- Added ICE init and tracking start/stop to HTML
- Conditional in Peer Grading HTML for ICE container
- CSS styling for ICE container and insertion/deletion elements
- Added class to track changes HTML
- Added ice.min.js as well as included it in the js requirements for peer grading
- Use track_changes in peer_grading_problem
* Refactor peer_grading_problem to lookup track_changes variable by problem location.
* Whitelist ICE insert, delete tags
* Adds ICE multi-user-editor insert and delete tags to the peer grading sanitize_html whitelist.
- add reset button

* Introduction ICE means we need its inline tags to get passed through
  to the feedback target, but we don't want malicious peer feedback
  providers introducing <script>, etc, so we use lxml.html.clean to
  scrub peer grading input.
* Adds feedback URL autoheating.
* Allows ICE <insert> and <delete> tags but not others.

~ add helptext re: EXPERIMENTAL FEATURES

~ address a bunch of @VikParuchuri review comments on ICE for OEE
  ~ remove extraneous code
  ~ change to new xmodule accessors
  ~ refactor filtering

~ fix broken test test_peer_grading_problem

~ Create track_changes.coffee and remove <script> from
  peer_grading_problem.html
~ Remove all reliance on id in favor of local scoping and classes

~ bring up test coverage somewhat

~ remove superflous $.scrollTo

~ TODO: Filtering
2013-09-15 09:49:28 -07:00
Vik Paruchuri
6e8c8a647c Remove due date setting 2013-09-15 12:34:46 -04:00
Vik Paruchuri
c6e5e67483 Fix linking problem for peer grading, add in a test
Conflicts:
	common/lib/xmodule/xmodule/tests/test_peer_grading.py
2013-09-13 11:09:06 -04:00
Vik Paruchuri
00050a08a4 Address review comments 2013-09-13 11:07:36 -04:00
Vik Paruchuri
640b7fe6b5 Fix problem with peer grading list not rendering, test 2013-09-13 11:07:22 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Calen Pennington
407b02b358 Centralize startup code, and execute in all contexts
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
2013-08-27 12:12:20 -04:00
Vik Paruchuri
a6cc30d1fe Fix tests, address review feedback 2013-08-22 13:51:27 -04:00
Vik Paruchuri
f17987c13a Fix flagging, select rubric labels in peer grading 2013-08-16 17:37:53 -04:00
Vik Paruchuri
8248c33138 Grab the correct location to report data for 2013-08-16 14:48:11 -04:00
Vik Paruchuri
e4bcfa5c21 Fix indents and copy behavior 2013-08-08 19:31:34 -04:00
Vik Paruchuri
687ab3ddae Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	lms/templates/combinedopenended/combined_open_ended.html
	lms/templates/combinedopenended/combined_open_ended_status.html
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/combinedopenended/openended/open_ended_rubric.html
	lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html
2013-08-08 19:03:46 -04:00
Vik Paruchuri
45d94c17f7 Add in next button, get rid of error with deleted peer grading module 2013-08-08 12:46:43 -04:00
Vik Paruchuri
17c77dd157 Merge pull request #392 from edx/fix/vik/answer-unknown
Simplify save_grade and pass through answer_unknown
2013-08-08 07:28:03 -07:00
Vik Paruchuri
c9ddcd7868 Fix some pep8 violations 2013-08-08 08:34:40 -04:00
Vik Paruchuri
62c7255ac4 Use getlist 2013-08-08 08:34:40 -04:00
Vik Paruchuri
8b228dd64b Fix bad key naming 2013-08-08 08:34:39 -04:00
Vik Paruchuri
018601777b Simplify peer grading service calibration 2013-08-08 08:34:39 -04:00
Vik Paruchuri
dadb128bf8 Simplify save_grade and pass through answer_unknown 2013-08-08 08:34:39 -04:00
Vik Paruchuri
ea2b9191c1 Allow student to switch between rubrics, tell user once peer grading required amount is done 2013-08-02 15:30:17 -04:00
Sef Kloninger
0246339819 fix crash in peer eval xmodule
As documented in Jira LMS-806:

Steps to reproduce:
* as one user, for a peer evaluated problem, enter something that needs
  peer grading
* as another user, log in and fire up the peer grading panel. You should
  see something that needs attention, a yellow exclamation badge
* clicking on the "do grading" panel will fail with a 500, stacktrace
  attached.
* it's possible that the question where this is being done must first have
  professor calibration done in order for peers to be able to actually get
  work to grade.

Don Mitchell debugged this with me and saw some problems in the ways
that the peer_evaluation xmodule code was accessing dates. Instead of
using the normal lms accessors, by going straight into the _module_data
it would be bypassing some important code (caching?). Fixing this to be
more standard did the trick.
2013-07-31 13:31:25 -07:00
Vik Paruchuri
77eb35a75f Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui 2013-07-19 13:35:37 -04:00
Vik Paruchuri
a478fa9ff7 Change error class 2013-07-18 16:56:38 -04:00
Vik Paruchuri
2a4976cf8a Cleanup how peer grading handles due date 2013-07-18 15:36:42 -04:00
Vik Paruchuri
480e97a3fd Cleanup and change attribute names 2013-07-18 14:55:59 -04:00
Vik Paruchuri
0ef6bc9043 Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui 2013-07-18 12:03:48 -04:00
Vik Paruchuri
915f815c63 Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
2013-07-18 11:55:37 -04:00
Don Mitchell
3722685e1a No longer persist XModule templates
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
2013-07-16 14:33:58 -04:00
Don Mitchell
8c904f31a9 Move defaults from yaml templates to field definitions.
This standardizes the XModule field default values to be the same as the
values that are presented by studio when a component is added to a
course.
2013-07-16 14:24:41 -04:00
Vik Paruchuri
ffad965536 fix some combinedopenended ui and data routing 2013-07-12 15:06:11 -04:00