Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
3b3cf19c
Commit
3b3cf19c
authored
May 20, 2013
by
Vik Paruchuri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests and add in jasmine test
parent
23269359
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
37 deletions
+24
-37
common/lib/xmodule/xmodule/js/fixtures/problem-with-markdown.html
+2
-1
common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee
+13
-31
common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
+7
-3
lms/djangoapps/courseware/module_render.py
+2
-2
No files found.
common/lib/xmodule/xmodule/js/fixtures/problem-with-markdown.html
View file @
3b3cf19c
<section
class=
"problem-editor editor"
>
<div
class=
"row"
>
<textarea
class=
"markdown-box"
>
[prompt]prompt[prompt]
</textarea>
<textarea
class=
"markdown-box"
>
markdown
</textarea>
<textarea
class=
"xml-box"
rows=
"8"
cols=
"40"
>
xml
</textarea>
</div>
</section>
\ No newline at end of file
common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee
View file @
3b3cf19c
...
...
@@ -106,40 +106,22 @@ describe 'OpenEndedMarkdownEditingDescriptor', ->
data
=
OpenEndedMarkdownEditingDescriptor
.
markdownToXml
(
"""[tasks]
(Self), ({1-2}AI), ({1-4}AI), ({1-2}Peer
[tasks]
"""
)
"""
,
true
)
data
=
data
.
replace
(
/[\t\n\s]/gmi
,
''
)
equality_list
=
"""
<combinedopenended>
<task>
<selfassessment/>
</task>
<task>
<openended min_score_to_attempt="1" max_score_to_attempt="2">
<openendedparam>
<initial_display>Enter essay here.</initial_display>
<answer_display>This is the answer.</answer_display>
<grader_payload>{"grader_settings" : "ml_grading.conf", "problem_id" : "6.002x/Welcome/OETest"}</grader_payload>
</openendedparam>
</openended>
</task>
<task>
<openended min_score_to_attempt="1" max_score_to_attempt="4">
<openendedparam>
<initial_display>Enter essay here.</initial_display>
<answer_display>This is the answer.</answer_display>
<grader_payload>{"grader_settings" : "ml_grading.conf", "problem_id" : "6.002x/Welcome/OETest"}</grader_payload>
</openendedparam>
</openended>
</task>
<task>
<openended min_score_to_attempt="1" max_score_to_attempt="2">
<openendedparam>
<initial_display>Enter essay here.</initial_display>
<answer_display>This is the answer.</answer_display>
<grader_payload>{"grader_settings" : "peer_grading.conf", "problem_id" : "6.002x/Welcome/OETest"}</grader_payload>
</openendedparam>
</openended>
</task>
<task>
<selfassessment/>
</task>
<task>
<openended min_score_to_attempt="1" max_score_to_attempt="2">ml_grading.conf</openended>
</task>
<task>
<openended min_score_to_attempt="1" max_score_to_attempt="4">ml_grading.conf</openended>
</task>
<task>
<openended min_score_to_attempt="1" max_score_to_attempt="2">peer_grading.conf</openended>
</task>
</combinedopenended>
"""
expect
(
data
).
toEqual
(
equality_list
.
replace
(
/[\t\n\s]/gmi
,
''
))
common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
View file @
3b3cf19c
...
...
@@ -140,8 +140,8 @@ class @OpenEndedMarkdownEditingDescriptor extends XModule.Descriptor
else
return
template
@
markdownToXml
:
(
markdown
)
->
toXml
=
`
function
(
markdown
)
{
@
markdownToXml
:
(
markdown
,
mock
=
false
)
->
toXml
=
`
function
(
markdown
,
mock
)
{
function
template
(
template_html
,
data
){
return
template_html
.
replace
(
/%(\w*)%/g
,
function
(
m
,
key
){
return
data
.
hasOwnProperty
(
key
)
?
data
[
key
]
:
""
;});
...
...
@@ -183,7 +183,11 @@ class @OpenEndedMarkdownEditingDescriptor extends XModule.Descriptor
//
group
tasks
xml
=
xml
.
replace
(
/\[tasks\]\n?([^\]]*)\[\/?tasks\]/gmi
,
function
(
match
,
p
)
{
var
open_ended_template
=
$
(
'#open-ended-template'
).
html
()
if
(
mock
==
false
){
var
open_ended_template
=
$
(
'#open-ended-template'
).
html
();
}
else
{
var
open_ended_template
=
"<openended %min_max_string%>%grading_config%</openended>"
;
}
var
groupString
=
''
;
var
options
=
p
.
split
(
","
);
for
(
var
i
=
0
;
i
<
options
.
length
;
i
++
)
{
...
...
lms/djangoapps/courseware/module_render.py
View file @
3b3cf19c
...
...
@@ -217,8 +217,8 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours
#this first checks to see if the descriptor is the correct one, and only sends settings if it is
#Get descriptor metadata fields indicating needs for various settings
needs_open_ended_interface
=
has
attr
(
descriptor
,
"needs_open_ended_interface"
,
False
)
needs_s3_interface
=
has
attr
(
descriptor
,
"needs_s3_interface"
,
False
)
needs_open_ended_interface
=
get
attr
(
descriptor
,
"needs_open_ended_interface"
,
False
)
needs_s3_interface
=
get
attr
(
descriptor
,
"needs_s3_interface"
,
False
)
#Initialize interfaces to None
open_ended_grading_interface
=
None
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment