Calen Pennington
c5e3380b71
WIP: Save student state via StudentModule. Inheritance doesn't work
2012-12-28 14:45:46 -05:00
Calen Pennington
cbfc7b201a
WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms
2012-12-28 14:44:31 -05:00
Calen Pennington
8ba4163557
WIP. Data loads, but not all of it
2012-12-28 14:39:13 -05:00
Chris Dodge
46870f4391
be sure to always pass in a course namespace - which can be just the location of the module itself since it has the same org/course pair - when rewriting links. Also, allow for an option parameter in get_module() to disable the wrapping of the module's HTML with the xmodule_display.html. This is needed for ancillary course content such as 'about', 'course info', which are now stored as xmodules, but should not be wrapped in xmodule_display.html as it breaks some styling
2012-11-29 15:09:28 -05:00
Chris Dodge
55c69a1e13
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
...
Conflicts:
lms/djangoapps/courseware/module_render.py
2012-11-06 14:20:59 -05:00
Calen Pennington
0bfa443520
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2012-11-02 11:09:19 -04:00
Chris Dodge
b788b9d659
add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc.
2012-11-01 15:08:26 -04:00
Chris Dodge
ba9a03410b
remove unneeded debugging traces
2012-10-30 15:56:02 -04:00
Chris Dodge
743f2b56dd
make course about view methods render the about content as a module, so we get all the url rewriting goodness. Also, since we're now handling the url re-writing via the module get_html pipelines, we can remove the link rewriting inside the xmodules itself - which is good because there's a wierd bug in lxml.html rewriting
2012-10-30 15:12:13 -04:00
Chris Dodge
f4822c23de
lots of tweeks to better support importing of existing courseware
2012-10-30 11:52:31 -04:00
Victor Shnayder
a155265409
minor whitespace + comment fixes
2012-10-29 23:44:38 -04:00
Chris Dodge
ba15735214
implement static tabs. rejigger .tar.gz import to do the re-namespacing as a post-processing step as we need to retain the original url_name during the import. Also, migrate the presentation tier to use module_render.py::get_module() to better unify HTML'ifying stuff
2012-10-25 14:27:26 -04:00
Vik Paruchuri
dba04ab6d8
added docstrings
2012-10-24 15:14:06 -04:00
Vik Paruchuri
a75acffe01
made requested changes to statsd names, score bucket
2012-10-24 15:11:41 -04:00
Calen Pennington
2802302162
Make LMS access depend on which course run the access is occurring in, so that permissions can be based on the course run, rather than the whole course
2012-10-24 11:51:25 -04:00
Vik Paruchuri
952b3468cf
pep8 in views, remove instance state check
2012-10-23 19:07:06 -04:00
Vik Paruchuri
7dec1b3c3f
bugfix
2012-10-23 19:00:26 -04:00
Vik Paruchuri
57a78637f2
pep8 fixes and score bucketing
2012-10-23 18:58:11 -04:00
Vik Paruchuri
64b117a7c2
changed metric names, added into render page
2012-10-23 18:14:16 -04:00
Victor Shnayder
19d3cb3870
Add a chemicalequationinput with live preview
...
- architecturally slightly questionable: the preview ajax calls goes to an LMS view instead of an input type specific one. This needs to be fixed during the grand capa re-org, but there isn't time to do it right now.
- also, I kind of like having a generic turn-a-formula-into-a-preview service available
2012-10-12 13:52:48 -04:00
Bridger Maxwell
fd43e94318
If an problem was updated and had a new max score it wasn't recached. Now it is fixed.
2012-09-28 23:38:49 -04:00
David Ormsbee
7a6eedb3f1
Make it so we don't require HTTP basic auth to talk to the queue server
2012-09-27 19:02:34 -04:00
Victor Shnayder
27cd9c9f82
Remove unused 'module' parameter from replace_{static,course}_urls
2012-09-20 01:12:33 -04:00
ichuang
ab0a58fb7a
add psychometrics - grade histograms, check time diffs, and IRT plots
2012-09-08 22:31:45 -04:00
Victor Shnayder
4481adb041
Track current chapter.
...
- courseware index view now redirects to most recent chapter, or first
- simplify the view a bit
2012-09-05 16:15:53 -04:00
kimth
8c0780bcdc
Adjust comments
2012-08-31 18:05:54 -04:00
kimth
e482a32d27
Accordion distinguishes items to be graded
2012-08-31 18:05:54 -04:00
Victor Shnayder
22aa325d83
Enable linking into the middle of sequences
...
* add a url that has an extra /{position} at the end
* pass it through to get_module
2012-08-30 16:37:40 -04:00
kimth
fb5501855c
Merge master
2012-08-28 12:37:24 -04:00
David Ormsbee
231b8c6aa4
Merge pull request #548 from MITx/kimth/limit-queue-dos
...
Kimth/limit queue dos
2012-08-28 08:03:02 -07:00
Victor Shnayder
bd2374b6fe
Remove trailing slash from ajax url in ModuleSystem
...
* also add a check for valid location in modx_dispatch
2012-08-28 10:22:08 -04:00
kimth
26051f9939
Waittime passed through ModuleSystem.xqueue
2012-08-27 19:39:33 -04:00
Victor Shnayder
9102c7609c
Fix latent bug in access checks in get_module
...
* All access checks now done for the "user" param, ignoring request.user
- This matters for xqueue callbacks and for instructor view of student progress
* An effect of this change is that if a student couldn't see their own 'progress' tab,
the course instructor won't be able to see it either
2012-08-27 10:20:16 -04:00
kimth
25ea8b2990
Use LMS secret key to seed anonymizer
2012-08-25 09:18:10 -04:00
kimth
f7c87aa7a1
Anonymous student id is a property of ModuleSystem
2012-08-25 09:03:47 -04:00
kimth
1dcaf21f81
Send idhash
2012-08-25 07:57:17 -04:00
Victor Shnayder
7a6fa1dd41
Fix access control for impersonation case
...
- only relevant in tests due to start dates
- still irritatingly intricate logic...
2012-08-24 16:52:19 -04:00
Calen Pennington
f2c5a064aa
Pull the http or https from the forwarded proto for the xqueue callback url
2012-08-23 11:49:23 -04:00
David Ormsbee
0b309ea40a
Can't return Http404, have to raise it.
2012-08-23 11:27:54 -04:00
Victor Shnayder
365495521e
Catch errors in module load
...
* if error is in xmodule_constructor(), catch and return an ErrorModule
* if error is somewhere else in get_module(), return None
2012-08-22 12:58:46 -04:00
kimth
f83169f12d
Protect asciimath2jax in seq_contents, fix choiceresponse on CS169x
2012-08-21 17:54:21 -04:00
Victor Shnayder
f44d794e63
Add course_id to StudentModule
...
* Update all uses.
2012-08-21 15:01:54 -04:00
David Ormsbee
eb96497cff
Merge branch 'master' into feature/bk_forum_int
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
requirements.txt
2012-08-20 18:57:46 -04:00
Victor Shnayder
5f612c7819
Oops. Make modx_dispatch and xqueue callback work again.
...
- use get_instance, not get_item
- finish the id->location rename for modx_dispatch arg
2012-08-20 16:04:16 -04:00
Victor Shnayder
c6c95c63ac
Keep each course's descriptors separate
...
* apply policy per-course, even if multiple courses share course and org fields
* keep descriptors separate in xml store, so that if two such courses
change the same module in different ways, it works. Such edits will need to
merged on CMS import...
* add get_instance(course_id, location) method to replace get_item(location).
Update all the call sites
* tests, including a 2nd toy course with same course and org.
2012-08-20 09:26:16 -04:00
kimth
2f63a9b403
Limit number of files that can be uploaded at once
2012-08-19 20:12:01 -04:00
Rocky Duan
6164c87074
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-19 10:08:00 -07:00
kimth
d2cb645834
Multiple file submissions
2012-08-19 09:26:03 -04:00
Rocky Duan
028bd23c1c
Merge branch 'master' of github.com:MITx/mitx into profile
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
2012-08-18 16:57:00 -07:00
ichuang
6e3eff304e
{} -> {0} etc in .format statements
2012-08-16 16:22:26 -04:00