Adam Palay
a04539af5d
change models to filter by course
2013-07-19 11:03:25 -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
Calen Pennington
e791e84ea7
Remove the stores_state field from XModule
...
stores_state is now only used in a single test, in conjunction with
has_score. In practice, it's never the case that stores_state is false
when has_score is true, so we can delete stores_state entirely, and just
use has_score for the grading test.
2013-06-13 14:38:59 -04:00
Don Mitchell
d7194e6bec
struct_time to datetime conversion.
2013-06-10 17:16:34 -04:00
Julian Arni
198d63db86
Update docstring for get_score
2013-06-03 12:13:05 -04:00
Julian Arni
c639bbc6f0
Add partial credit for foldit
2013-06-03 11:15:45 -04:00
Chris Dodge
8ece663284
more drive by violation fixes
2013-04-12 15:45:27 -04:00
cahrens
f802ac2098
Remove string default value.
2013-04-02 15:21:09 -04:00
cahrens
16f4a3f9c1
Convert due date to a Date (vs. a string with no year).
2013-04-01 11:37:05 -04:00
Calen Pennington
531eb80eb2
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-13 12:18:04 -04:00
Calen Pennington
92e99d7a8b
Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields
2013-03-13 11:35:50 -04:00
Calen Pennington
f01c7f9469
Merge pull request #1649 from MITx/feature/jkarni/folditxblockupdate
...
readding Julian Arni's update to definition
2013-03-13 07:07:25 -07:00
Julian Arni
830e08db1c
Have definition_from_xml return (definition, children)
2013-03-12 14:34:34 -04:00
Julian Arni
1058b552f2
Table order fix (again)
2013-03-12 11:30:14 -04:00
Calen Pennington
2113541632
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
.ruby-version
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/models/settings/course_metadata.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/modulestore/tests/factories.py
2013-03-12 07:23:28 -04:00
John Hess
d44e7272d2
readding Julian Arni's update to definition
2013-03-11 18:17:12 -04:00
John Hess
ad92eb4d02
whitespace back to original. for real though.
2013-03-11 18:05:34 -04:00
John Hess
00c35c95a4
whitespace back to original
2013-03-11 18:05:10 -04:00
John Hess
cc2c26b924
reverted change to definition to/from xml
2013-03-11 18:04:21 -04:00
Julian Arni
588b27c9dc
Added Descriptor method, fixed order issue.
2013-03-11 11:17:12 -04:00
Victor Shnayder
84f05f9f61
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/foldit_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_conditional.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
2013-03-08 00:40:18 -05:00
Calen Pennington
cec3475c9d
Remove references to .definition and .metadata in modules
2013-03-06 18:07:56 -05:00
Julian Arni
fb08942b63
Add 'get' default string
2013-03-06 14:49:36 -05:00
Julian Arni
dfa590e71c
Make exception a little more specific
2013-03-06 11:10:13 -05:00
Julian Arni
5682e02f53
Fix indendation that was causing only first submission to be saved
2013-03-06 11:05:10 -05:00
Julian Arni
b6f3042c1d
Incorporate Victor's suggestions
2013-02-26 12:38:09 -05:00
Julian Arni
edba0978cf
Included styling and template
2013-02-25 18:18:46 -05:00
Julian Arni
26eaf8985c
Allow progress without leaderboard and vice-versa
2013-02-25 17:28:22 -05:00
Julian Arni
da2d0ed6ec
Foldit with puzzle leaderboard
2013-02-25 11:16:37 -05:00
Julian Arni
e5294591dc
Foldit leaderboard w/o tests
2013-02-22 11:12:26 -05:00
Victor Shnayder
1108137dc3
Address Cale's comment--make property a simple class var
2013-02-14 13:24:21 -05:00
Victor Shnayder
5e44846596
Foldit integration.
...
- ops view for the desktop app to talk to
- xmodule that talks to the foldit model and displays the student's state
- grading tweak to make grade updates from an external service work:
- Add an always_recalculate_grades property to XModuleDescriptor.
2013-02-14 12:45:06 -05:00
