Diana Huang
0e54592175
Add skip button logic to the LMS
2012-12-11 14:40:30 -05:00
Diana Huang
33f2d55a37
new test for problem lists
2012-12-11 14:40:30 -05:00
Chris Dodge
0e3a022086
fix broken tests from master -> CMS-master merge. Namely the change to unicode strings when reading files off disk. Also there was some work collisions on course_loads which removed Mongo testing. Make it so that explicitly test both XMLFilestores as well as Mongo
2012-12-11 11:21:08 -05:00
Kevin Chugh
6e108c7531
fix conflict
2012-12-10 19:30:04 -05:00
Victor Shnayder
85b5190c29
fix login hack. Uses new return-error-msg-if-not-logged-in behavior
2012-12-10 10:41:40 -05:00
Diana Huang
76f76a4ff8
Update tests and mock objects to work with the new API
2012-12-07 17:30:03 -05:00
JM Van Thong
27b8f01ffa
Added the following analyzers: StudentsActive, OverallGradeDistribution, StudentsDropoffPerDay.
2012-12-07 17:26:33 -05:00
Diana Huang
4ccf7c351d
Fix service errors so that individual problems can now be displayed
...
and graded
2012-12-07 17:01:27 -05:00
Diana Huang
7f9fcfffdf
Add support for the new staff grading views on the backend
2012-12-07 17:01:27 -05:00
Kevin Chugh
368b59a9e6
updated tooltips
2012-12-07 15:39:53 -05:00
David Ormsbee
7596deb40a
Merge pull request #1094 from MITx/feature/victor/instructor-grading
...
Feature/victor/instructor grading
2012-12-07 08:44:58 -08:00
Calen Pennington
47ed02c9ea
Remove more merge badness
2012-12-07 11:30:21 -05:00
Calen Pennington
c917725ff0
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/xmodule/xmodule/seq_module.py
common/lib/xmodule/xmodule/template_module.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/courseware/views.py
lms/static/sass/course.scss
requirements.txt
2012-12-07 11:17:41 -05:00
Victor Shnayder
44a8f31d06
Change are-we-logged-in detection to be less hackish.
...
- has matching changes in controller staff_grading view.
2012-12-07 10:35:45 -05:00
Victor Shnayder
730cdd3b4f
minor changes from pull request comments
...
- comments
- more info in log msg
- better error
2012-12-07 10:35:44 -05:00
Kevin Chugh
258b1fe9a5
thread responses create fixed
2012-12-06 22:12:17 -05:00
Kevin Chugh
14b0cc019f
remove debug placeholders, finalize render of comments, flagging working on posts, replies, and comments
2012-12-06 16:26:08 -05:00
Kevin Chugh
deb3888a84
thread response flagging
2012-12-06 14:13:54 -05:00
Kevin Chugh
70b0b5beb8
update models
2012-12-06 10:43:51 -05:00
Kevin Chugh
4139f702ff
debugging thread
2012-12-06 10:30:06 -05:00
Kevin Chugh
28e86f9602
Merge branch 'master' into feature/kevin/flagging
2012-12-06 09:31:39 -05:00
JM Van Thong
b10b6e2b3f
Added more analytics to instructor dashboard.
2012-12-05 23:21:00 -05:00
Kevin Chugh
50db11a647
urls and views for comment flagging
2012-12-05 17:08:29 -05:00
Victor Shnayder
d4a3e4d044
fix logger name
2012-12-04 14:44:23 -05:00
Brian Wilson
70f35b2e15
remove skipped tests that use mongo
2012-12-04 13:46:32 -05:00
Brian Wilson
cde20758f8
cosmetic cleanup
2012-12-04 13:25:04 -05:00
JM Van Thong
39d48b1966
Change daily activity to be course specific.
2012-12-04 12:00:27 -05:00
Brian Wilson
dfb9913100
clean up lms tests, and fix export/import
2012-12-04 11:52:35 -05:00
Brian Wilson
1d44ebb10c
Add more non-ascii characters to full dataset, and make fixes in xmodule code.
2012-12-03 16:22:25 -05:00
Victor Shnayder
97fbd02cb5
Merge pull request #1090 from MITx/vik/modify_open_ended
...
Vik/modify open ended
2012-12-03 06:10:01 -08:00
Kevin Chugh
4dee832f35
convert flagging to one flag
2012-12-02 13:04:27 -05:00
Brian Wilson
0c1ebd8dfb
add toylab test data and test changes, including fix to jump_to
2012-11-30 19:05:26 -05:00
Vik Paruchuri
bcd3022320
Add in import for reverse in staff grading (wouldn't work without it)
2012-11-30 15:26:52 -05:00
Victor Shnayder
32d8a6e922
Pass through course_id, location to openendedresponse
...
- set default queue in response type--don't use the default per-course one
2012-11-30 14:11:11 -05:00
Victor Shnayder
052807d7f6
Change the unique student id calculation to match the id we send to xqueue
...
- can't change the xqueue one because there's data that uses it
- we checked, and no one has sent out survey links that use the old sha1() format
doing this because we'll need the LMS to be able to send the anon student id to backend services e.g. for peer grading, and passing two different anon student ids to xmodule (one for xqueue, one for other uses) is just asking for confusion.
2012-11-30 11:30:02 -05:00
Victor Shnayder
835f18795a
Make tests pass again
2012-11-30 10:27:34 -05:00
Victor Shnayder
d28cd4f429
use a dict for backend config. Load it on aws.
2012-11-30 10:03:31 -05:00
Victor Shnayder
b48b389a56
implement login into staff grading service.
2012-11-30 10:03:31 -05:00
Victor Shnayder
edd3277597
Tweaks to actually work with the backend.
...
- specify mime type
- right urls
2012-11-30 10:03:31 -05:00
Victor Shnayder
a584f06bac
Add support for varying max_score.
2012-11-30 10:03:30 -05:00
Victor Shnayder
d0e2b85e3c
Refactor testing code, hook up frontend.
...
- now getting requests from js to server and back, with mocked service.
2012-11-30 10:02:20 -05:00
Victor Shnayder
ff11926570
Initial impl and basic access tests for staff grading service
2012-11-30 10:00:01 -05:00
Victor Shnayder
055aeae0b6
fix comment in access.py
2012-11-30 09:52:34 -05:00
Victor Shnayder
4b8708c2e4
move a comment
2012-11-30 09:52:34 -05:00
Victor Shnayder
5bf39fef96
Cherry pick the test-cleanup parts of e2826cb.
...
- look up test courses by id, not name
2012-11-30 09:52:34 -05:00
Victor Shnayder
ed6a8f68ac
starting to stub out the backend staff grading service [wip]
2012-11-30 09:51:35 -05:00
Victor Shnayder
f5d9e963cc
Initial wiring of a staff grading tab.
...
- no actual functionality, but have a tab that renders static html via a view
2012-11-30 09:51:33 -05:00
Victor Shnayder
6b5125c4df
fix typos, logger configs
2012-11-30 09:51:33 -05:00
Chris Dodge
2aceb2e44a
make sure when defining the course namespace in the replace url methods that we explicitly state the parameter name. There are some optional parameters and if we don't define the parameter name, it'll end put being interpreted as a different parameter
2012-11-29 15:56:03 -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
