Commit Graph

7197 Commits

Author SHA1 Message Date
Adam Palay
b923521a47 corrects typo in legacy.py (LMS-1675) 2013-12-23 09:43:57 -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
Calen Pennington
8e98c8cbb7 Merge pull request #2015 from cpennington/image-response-acceptance-tests
Add acceptance test of image response
2013-12-20 11:03:15 -08:00
Calen Pennington
32fa35c8f4 Merge pull request #2007 from cpennington/gst-acceptance-tests
Add acceptance tests of GST module
2013-12-20 11:01:27 -08:00
Calen Pennington
3bb67a8b0e Merge pull request #1996 from cpennington/conditional-module-acceptance-tests
Add acceptance tests of the conditional module
2013-12-20 11:01:07 -08:00
Calen Pennington
a0b8577ac3 Merge pull request #1988 from cpennington/annotation-module-acceptance-tests
Add acceptance tests of Annotatable module
2013-12-20 11:00:41 -08:00
Brian Talbot
6d6bcb7938 Merge pull request #1968 from edx/talbs/lms-fonts
LMS: Use Open Sans Typeface via Google Web Fonts
2013-12-20 10:21:41 -08:00
Ned Batchelder
dfb04bc4c9 Merge pull request #2017 from edx/ned/i18n-minor-improvements
Minor i18n improvements
2013-12-20 10:03:06 -08:00
Calen Pennington
194e0e973f Add acceptance tests of capa image input 2013-12-20 12:32:15 -05:00
Calen Pennington
0e237a85e6 Add acceptance test of the Graphical Slider Tool [LMS-1641] 2013-12-20 12:32:15 -05:00
Calen Pennington
268c4fa01b Add acceptance tests of the conditional module [LMS-1639] 2013-12-20 12:32:15 -05:00
Calen Pennington
a9a8dcf882 Allow acceptance test problem functions to work without hardcoded course name 2013-12-20 12:32:15 -05:00
Calen Pennington
7e91ba63ab Add acceptance tests of the annotatable module [LMS-1638] 2013-12-20 12:32:14 -05:00
Ned Batchelder
c37ab38599 Remove needless non-package non-specs from urls.py 2013-12-20 10:26:34 -05: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
Calen Pennington
7f76517ea3 Cleanup courseware acceptance tests 2013-12-20 09:29:23 -05:00
Sarina Canelake
f330b1e65f Tweak language surrounding grade download button 2013-12-19 18:16:07 -08:00
e0d
86e3391b41 fixing merge conflict from release 2013-12-19 16:34:25 -05:00
Will Daly
1081786c6f Merge pull request #1965 from edx/will/fake-server-refactor
Stub Server Port Conflicts and Refactor
2013-12-19 06:55:24 -08:00
Will Daly
0fd03cfb02 Moved stub servers to terrain
Refactored stub services for style and DRY

Added unit tests for stub implementations

Updated acceptance tests that depend on stubs.

Updated Studio acceptance tests to use YouTube stub server; fixed failing tests in devstack.
2013-12-19 09:12:41 -05:00
Julia Hansbrough
f351b05031 Fixing email link injection bug
Several templates used a variable set by the user (the request host header).  This led to a vulnerability where an attacker could inject their domain name into these templates (i.e., activation emails).  This patch fixes this vulnerability.

LMS-532
2013-12-18 13:38:36 -05:00
Brian Talbot
64fc9cdce8 LMS: changing Open Sans font reference
* uses Google Web Fonts reference rather than local files
* removes unused local font files
* adds in semi-bold weight support
2013-12-17 15:53:02 -05:00
Don Mitchell
5f2517978d Move default DOC_STORE_CONFIG to common 2013-12-17 13:09:38 -05:00
Oleg Marshev
cc2e4bfeae Fix lis_outcome_service_url sending. 2013-12-17 18:53:21 +02:00
Valera Rozuvan
f6867da502 LTI additional Python tests. LTI must use HTTPS for lis_outcome_service_url.
BLD-564.
2013-12-17 18:52:01 +02:00
Alexander Kryklia
946c615047 Merge pull request #1859 from edx/oleg/fix_outcome_url_sending
Make LTI module not send grade_back_url if has_score=False
2013-12-17 08:14:42 -08:00
Carson Gee
149a188e30 Merge pull request #1547 from carsongee/bugfix/cg/beta_user_none
Corrects a bug experienced with external auth enabled
2013-12-17 07:55:59 -08:00
Oleg Marshev
59d18134b2 Fix lis_outcome_service_url sending. 2013-12-17 17:33:02 +02:00
Anton Stupak
8554c3f0ab Merge pull request #1914 from edx/anton/show-answer-imageresponse
Show answer for imageresponse
2013-12-17 07:12:25 -08:00
Jay Zoldak
7add01462d Merge pull request #1969 from edx/zoldak/fix-test-name
Remove dot from a scenario name so the results roll up in Jenkins
2013-12-17 05:48:35 -08:00
polesye
6e01ce50c9 Add unit tests. 2013-12-17 13:22:08 +02:00
Valera Rozuvan
0079243746 LTI additional Python tests. LTI must use HTTPS for lis_outcome_service_url.
BLD-564.
2013-12-17 12:47:49 +02:00
Adam Palay
146562f3f5 re-remove ora message as part of merge conflict resolution 2013-12-16 17:13:11 -05:00
Jay Zoldak
599388397a Remove dot from a scenario name so the results roll up in Jenkins 2013-12-16 17:07:26 -05:00
e0d
d52b959ff1 fixing merge conflicts 2013-12-16 15:02:14 -05:00
Don Mitchell
3cf75198c5 Merge pull request #1954 from edx/dhm/loc_mapper_memoize
loc mapper memoize
2013-12-16 10:34:12 -08:00
Don Mitchell
f6de4f2186 Location map uses a separate cache and defaults to general 2013-12-16 12:31:19 -05:00
Will Daly
7bf68907f3 Merge pull request #1935 from edx/will/ignore-symlink-staticfiles
Add ignore patterns for staticfiles to avoid processing symlink dirs
2013-12-16 09:01:17 -08:00
Carson Gee
a00335edd3 Merge pull request #1942 from carsongee/feature/mitx/sysadmin-dashboard
Add sysadmin dashboard
2013-12-16 08:01:38 -08:00
Stephen Sanchez
f4e95c6a7f Fix typo in peer grading messages. 2013-12-16 10:24:19 -05:00
Carson Gee
ccc87337d6 Add sysadmin dashboard
For seeing overview of system status, for deleting and loading
courses, for seeing log of git imports of courseware.  Includes command
for importing course XML from git repositories.

Added a lot of tests for additional coverage with some minor fixes
those tests discovered
2013-12-15 19:06:05 -05:00
Carson Gee
cbb6e5e686 Changed default user to be anonymous in both has_access and student.views.index
Replaced existing test_none_user_index_access_with_startdate_fails
test with new test now that the tested function has changed and
was causing the original test to fail.
2013-12-15 09:56:37 -05:00
Sarina Canelake
bd04ab5a08 Merge pull request #1953 from edx/sarina/bugfix-instdash-acceptance
Fix data dash acceptance test to wait for text
2013-12-13 11:49:24 -08:00
David Baumgold
3d2ad59c51 Merge pull request #1907 from edx/db/whitespace-fixes
whitespace-only changes
2013-12-13 11:40:54 -08:00
Don Mitchell
f4beb8b8c3 Reduce sql queries for groupname tests.
Conflicts:
	cms/djangoapps/auth/authz.py
2013-12-13 14:33:11 -05:00
Sarina Canelake
b2fee69c08 Fix acceptance test to wait for text area to be populated 2013-12-13 13:13:21 -05:00
Christina Roberts
258d3227ee Merge pull request #1938 from edx/christina/common-location
Create explicit Locations.
2013-12-13 09:15:21 -08:00
Diana Huang
6952aec870 Merge pull request #1941 from edx/diana/openid-fullname
Return the full name of the student as part of the OpenId response.
2013-12-13 07:32:34 -08:00
Diana Huang
0057f460ec Return the full name of the student as part of the OpenId response.
LMS-750
2013-12-12 17:33:33 -05:00