Commit Graph

1012 Commits

Author SHA1 Message Date
Dave St.Germain
c5627b41c8 Merge pull request #3002 from edx/dcs/status-object
Convert CAPA inputtype statuses from strings to objects,
2014-04-29 10:35:05 -04:00
Oleg Marshev
0f70a997f5 Add timestamp and wait for 35 sec. 2014-04-25 10:26:46 +03:00
ichuang
d4201f028e Merge pull request #3413 from edx/bugfix/ichuang/multiple-choice-question-hints
bugfix: allow multiple choice questions to display hints

Thanks, @sarina, @pmitros
2014-04-22 12:03:43 -04:00
polesye
ca93855fcf BLD-717: MultipleChoiceResponse i18n. 2014-04-22 12:17:16 +03:00
ichuang
f91b96565d bugfix: allow multiple choice questions to display hints 2014-04-21 22:03:26 -04:00
Nick Parlante
ab7d3b526b Multiple-choice features
Features by Jeff Ericson and Nick Parlante squashed
down to one commit.

-shuffle of choices within a choicegroup (Nick)
-answer-pool subsetting within a choicegroup (Jeff)
-masking of choice names within a choicegroup, (Nick)
 used by shuffle and answer-pool
-targeted-feedback within a multiplechoiceresponse (Jeff)
-delay-between-submissions capa feature (Jeff)
2014-04-14 15:48:29 -07:00
Diana Huang
9b3d68c2b9 Add in metric tracking to xqueue.
Covers external grading and certificates.
2014-03-31 16:50:23 -04:00
Dave St.Germain
bf7aef1bcf Convert CAPA inputtype statuses from strings to objects, in order to
simplify css class management and internationalization of status strings
(potentially) displayed to the user.
2014-03-25 09:49:37 -04:00
Dave St.Germain
3539c56f89 Added image tags to the whitelist for matlab 2014-03-24 18:53:07 -04:00
Dave St.Germain
5cb145054d Fixes BLD-948 by escaping messages from xqueue, preventing malformed
html from getting onto the page. The client will then unescape the html
and display it.
2014-03-24 13:28:08 -04:00
Dave St.Germain
376b040775 Removed circuit editor setup code that had always been in
codemirror-compressed.js
2014-03-20 14:33:32 -04:00
Dave St.Germain
0773f0687d Answer checks should offer feedback to assistive tech. This commit adds
a page level javascript SR object to enable reading of alert messages.
LMS-2158
2014-03-20 09:53:44 -04:00
Dave St.Germain
2a20b3f67e This fixes LMS-2387 by removing a resize call that prevented scrolling.
It also enables syntax highlighting for matlab input fields, which
wasn't previously enabled.
2014-03-17 10:35:53 -04:00
ichuang
cac669364f more robust capa math preprocessor test, and new test for inline 2014-03-10 09:52:25 -04:00
ichuang
a35d524de2 fix text-input-dynamath_data test in test_input_templates.py 2014-03-07 22:14:22 -05:00
ichuang
8d0db64f78 fix capa textline to properly use inline if specified when using js preprocessor 2014-03-07 20:08:37 -05:00
Sarina Canelake
87495891b6 Fix some simple pep8 and pylint violations 2014-03-07 12:20:28 -05:00
Han Su Kim
bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
2014-03-06 16:56:16 -05:00
Alexander Kryklia
c7785d8f54 Allow HTML in grader messages. 2014-03-05 17:24:55 +02:00
Dave St.Germain
601b5a8ceb Merge pull request #2518 from edx/dcs/a11y-code-grader
Upgrade CodeMirror to 3.21.0
2014-03-03 17:57:46 -05:00
Gabe Mulley
94fea8e822 Add map to problem_check event with descriptions of student answers
The map contains a human readable description of the answer if
necessary. It is useful for problem like multiple choice, when the
response of the student is replaced by a moniker. For example "choice_0"
instead of the full text.

Fixes: AN-587
2014-03-02 21:40:45 -05:00
Dave St.Germain
08fadac817 Upgrade CodeMirror to 3.21.0 (with accessibility changes from
http://bgrins.github.io/codemirror-accessible/)
LMS-1802
2014-02-28 13:44:34 -05:00
Adam Palay
97f5b25e2c i18n for self-assessment (ORA-314)
make openendedchild and open_ended_module_v1 act enough like xblocks to get xblock 18n
2014-02-14 17:27:32 -05:00
Julia Hansbrough
5131818153 Merge pull request #2597 from edx/release
Release
2014-02-13 15:17:38 -05:00
Dave St.Germain
4fa1f1163e Added labels to CAPA input types, with markdown syntax for adding them
in studio.
LMS-1895 and others
2014-02-13 13:18:24 -05:00
Calen Pennington
3a7b265c8a Add trailing commas to multiline lists, to prevent string concatenation bugs 2014-02-13 13:12:42 -05:00
ichuang
239985ef68 add message output to formulaequationinput.html (capa) 2014-02-03 16:12:20 -05:00
Jay Zoldak
bc30addfb9 Unicode changes to support QRF
fixing unit tests

fixing merge error

fixing xqueue submission issue with unicode url (trial 0.1)

fixing fotmats as commented upon

removing yaml file language selection

Unicode changes to support QRF

removed unnecessary pass in modulestore/init.py

fixing merge error

fixing fotmats as commented upon

removing yaml file language selection

fixing pep8 violations

- fixing pylint violations

pylint violation

fixing line spaces and formats

ignore pylint E1101

remove empty line

fixing pylint violations

 pep8 violations

bulk mail unicode/decode

fix migration error

fix pep8 just to push again

more unicode/decode
Final changes to comments and error messages.
2014-01-30 16:20:36 -05:00
Alexander Kryklia
9876c993c5 Fix test for isnan student answer. 2014-01-29 16:07:26 +02:00
Alexander Kryklia
2653e9634a Should not raise exception on empty answer. 2014-01-29 16:07:19 +02:00
Adam Palay
c305fc386c fix regression for stringresponse problems with unspecified case sensitivity (BLD-710)
write failing tests
2014-01-27 11:40:38 -05:00
Alexander Kryklia
688d47fb62 Give numerical response tolerance as a range (for example [5,7)) (BLD-25) 2014-01-27 14:58:19 +02:00
Sarina Canelake
0efa75d6f5 i18n of common/lib/capa/capa files
Also pep8, pylint, and style fixes
Covers:
{capa_problem, correctmap, customerender,
inputtypes, responsetypes, util, xqueue_interface}.py
LMS-1744
2014-01-17 16:39:50 -05:00
Ned Batchelder
4aa4c514ee Add i18n attribute to LoncapaSystem
[LMS-1597]
2014-01-17 11:33:09 -05:00
Ned Batchelder
d2146978ea Give LoncapaProblem its own LoncapaSystem instead of ModuleSystem
LoncapaProblem was using ModuleSystem directly, but we're about to need
i18n passed in, so this gives LoncapaProblem its own LoncapaSystem
object to better module its dependencies.  This commit simply passes
through the attributes of ModuleSystem that Loncapa needs.

[LMS-1597]
2014-01-17 11:32:54 -05:00
Ned Batchelder
3942876e0c Make a ResponseType registry.
And while I was in there, I made it a decorator, so it's nicer to use.
2014-01-16 12:25:28 -05:00
zubair-arbi
f58903a50f Merge pull request #2097 from zubair-arbi/zub/bugfix/std893-optionresponse
escape single quotes in optioninput (optionresponse) tags
2014-01-16 00:54:51 -08:00
polesye
1347645ef0 BLD-434: Add fix for negative exponents.
Set default tolerance to 1e-3% for all responsetypes.
2014-01-15 13:17:05 +02:00
polesye
ee1953b37a BLD-474: Allow multiple answers for string response. 2014-01-15 12:51:24 +02:00
zubiar-arbi
1990a412dd escape single quotes in optioninput (optionresponse) tags
STUD-893
2014-01-10 18:50:25 +05:00
David Ormsbee
b1eff059a7 Merge pull request #2014 from edx/ormsbee/grade_distribution_fix
Fix (re-implement) answer distribution report generation.
2013-12-20 12:43:33 -08:00
David Ormsbee
0565fbbfab Fix (re-implement) answer distribution report generation.
This restores functionality that has been broken since the introduction of
XModuleDescriptor/XModule proxying (part of the XBlock transition). It generates
a CSV of all answers for all content of type "problem" in a given course, with a
row per (problem part, answer). The format is:

url_name, display name, answer id, answer, count

Example values:
  url_name = "7f1b1523a55848cd9f5c93eb8cbabcf7"
  display name = "Problem 1: Something Hard"
  answer id = i4x-JediAcdmy-LTSB304-problem-7f1b1523a55848cd9f5c93eb8cbabcf7_2_1
  answer = "Use the Force"
  count = 1138

Since it only grabs things of type "problem", it will not return results for
things like self/peer-assessments. Any Loncapa problem types will show up (so
multiple choice, text input, numeric, etc.)

Instead of crawling the course tree and instantiating the appropriate CapaModule
objects to grab state, this version draws directly from StudentModule. This lets
us skip a lot of processing and most importantly lets us generate the answer
distribution without causing side-effects (since XBlocks auto-save state). It
also lets us take advantage of a read-replica database if one is available, to
minimize locking concerns.

There are minor changes to the legacy dashboard around CSV charset encoding and
a change to OptionResponseXMLFactory to make it more unicode friendly. Answer
distribution output is now also sorted, to group together answers for the same
content piece.

Note that this does not introduce celery into the process. Answer distributions
are still only available for small courses.

This was originally created to fix [LMS-922], but it also addresses [LMS-811] and
possibly other areas in the legacy dashboard where CSV downloads break due to
character encoding issues.
2013-12-20 15:05:50 -05:00
jmclaus
5478525a42 Added JSInput template to Studio and a sop attribute to JSInput. Only if it's set to false, as in JSInput's template, will JSChannel be used to bypass it. In all other cases (attribute not present or set to something else), SOP is enforced. Compatibility with jsVGL is therefore maintained. Multiple JSInput are supported in a vertical. Also, save button now functions. [BLD-523, BLD-556, BLD-568] 2013-12-20 17:03:56 +01:00
Ned Batchelder
c0c895cb47 Merge pull request #1886 from edx/ned/add-tests-for-file-uploads
Add a test for Django-based file uploads to problems.
2013-12-20 07:06:04 -08:00
polesye
4e10c72988 BLD-21: Show answer for imageresponse. 2013-12-17 13:22:08 +02:00
Valera Rozuvan
7ebeccd4bf Updating ImageInput JS code base. 2013-12-17 12:21:19 +02:00
Ned Batchelder
488923fd5c Add a test for Django-based file uploads to problems. 2013-12-07 19:53:23 -05:00
Ned Batchelder
599bdbb102 Show full diffs in ResponseType tests. 2013-12-03 14:05:33 -05:00
polesye
77c208a1cf BLD-474: Allow multiple answers for string response. 2013-11-21 16:23:33 +02:00
RobertMarks
e3b8ce708f changes to allow multiple choicetextresponses in one problem 2013-11-19 09:55:35 -08:00