Fix/vik/studio oe #160
Fix/vik/studio oe #160
Conversation
ghost
assigned 
|
@shnayder Any time to look at this? Fixes some crucial issues. I will get the tests fixed up tomorrow or the next day, so may make sense to look at it then. |
|
I like the problems solved... can you ping me and Diana when it's ready to On Wed, Jun 19, 2013 at 12:24 PM, Vik Paruchuri [email protected]:
|
|
Address JIRA unlimited student attempts issue: https://edx-wiki.atlassian.net/browse/OEE-3?jql=project%20%3D%20OEE%20AND%20resolution%20%3D%20Unresolved%20AND%20priority%20%3D%20CAT-2%20ORDER%20BY%20key%20DESC |
|
Build still failing. |
|
Yup. Sadly, jenkins is no longer working with my VPN. Will look at it On Fri, Jun 28, 2013 at 12:21 AM, Victor Shnayder
|
|
Jenkins is being strange, but tests are passing locally. @shnayder should be good to review. |
|
@cpennington -- can you look at the LMS / xmodule side of this? Diana doesn't want to be the only one who knows this code... @cahrens can you look at the studio side or delegate as makes sense? Thanks! |
|
@shnayder Did this get looked at? |
|
I think we should hold off on merging this until after https://github.com/edx/edx-platform/pull/270. @dmitchell would be a good person to review, as he understands how this PR overlaps with his own. |
|
@cpennington would it make sense to rebase this on top of Don's branch, or are you still changing the history around there? |
|
I am changing history around for #270. I hope to have #270 merged today -Cale On Thu, Jul 11, 2013 at 11:19 AM, Vik Paruchuri [email protected]:
|
| ready_to_reset = Boolean( | ||
| help="If the problem is ready to be reset or not.", default=False, | ||
| help="If the problem is ready to be reset or not.", | ||
| default=False, | ||
| scope=Scope.user_state | ||
| ) | ||
| attempts = Integer( |
There was a problem hiding this comment.
It may be too late to make these consistent w/ capa_module, but in that, attempts is the user's # of attempts (what you've called student_attempts) and max_attempts is this field. I might further ask if this should inherit from CapaFields, but it has a bunch of garbage which this probably doesn't want (perhaps a common superclass of fields). CapaXXX certainly has a distinct and overlapping set of logic around is graded, is resettable, and duplicates attempts, max_attempts, due, grace_period,
Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py
|
@shnayder @dmitchell Made some changes to rename variables and fix some logic around handling the due date in peer grading. Good to go? |
| @@ -304,6 +422,11 @@ class CombinedOpenEndedDescriptor(CombinedOpenEndedFields, RawDescriptor): | |||
| js_module_name = "OpenEndedMarkdownEditingDescriptor" | |||
| css = {'scss': [resource_string(__name__, 'css/editor/edit.scss'), resource_string(__name__, 'css/combinedopenended/edit.scss')]} | |||
|
|
|||
| metadata_translations = { | |||
There was a problem hiding this comment.
Do these need to be added to the parent's metadata_translations so as to not lose those? (i.e.,
super(..).metadata_translations.update({...})
There was a problem hiding this comment.
I thought that it would be safe to overwrite, as 'slug' and 'name' were never used, but you are right, it makes sense in case another field is added later.
|
Looks ok other than the overwrite of metadata_translations (which I'm not sure I'm correct about) |
cdodge/update-opaque-key: update user social stats to use the legacy cou...
Fixes 3 issues found after deploying to stage:
identical to PR openedx#113 * Adds support for objuscating last two octets of ip address in tracking logs * Cleaning up change * Fixing a couple edge case events * live oauth support (openedx#115) * Added settings import to fix tests * Fixes tests * Remove vscode folder * Fixing quality errors * simpler obfuscation method * cleanup2 simpler pr template (openedx#130) * simpler pr template * more accurate phrasing * more specific phrasing
课程详情添加视频，fix bugs
Update hyperlinks in platfrom
…re/badges-fix-badgr-integration Fixes for Badgr.io badges integration
…openedx#160) Co-authored-by: Renovate Bot <[email protected]>
Fix several issues with open ended assessment.