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
35babcf5
Commit
35babcf5
authored
Feb 08, 2013
by
Vik Paruchuri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Properly show status on combined rubric
parent
0c6ac1c7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
common/lib/xmodule/xmodule/combined_open_ended_modulev1.py
+10
-2
common/lib/xmodule/xmodule/open_ended_module.py
+1
-1
No files found.
common/lib/xmodule/xmodule/combined_open_ended_modulev1.py
View file @
35babcf5
...
@@ -534,12 +534,20 @@ class CombinedOpenEndedV1Module():
...
@@ -534,12 +534,20 @@ class CombinedOpenEndedV1Module():
"""
"""
self
.
update_task_states
()
self
.
update_task_states
()
all_responses
=
[]
all_responses
=
[]
for
i
in
xrange
(
0
,
self
.
current_task_number
+
1
):
loop_up_to_task
=
self
.
current_task_number
+
1
if
self
.
state
in
[
self
.
ASSESSING
,
self
.
INITIAL
]
and
self
.
current_task_number
>
0
:
loop_up_to_task
=
loop_up_to_task
-
1
log
.
debug
(
self
.
state
)
log
.
debug
(
self
.
current_task_number
)
log
.
debug
(
loop_up_to_task
)
for
i
in
xrange
(
0
,
loop_up_to_task
):
all_responses
.
append
(
self
.
get_last_response
(
i
))
all_responses
.
append
(
self
.
get_last_response
(
i
))
rubric_scores
=
[
rd
[
'rubric_scores'
]
for
rd
in
all_responses
if
len
(
rd
[
'rubric_scores'
])
>
0
]
rubric_scores
=
[
rd
[
'rubric_scores'
]
for
rd
in
all_responses
if
len
(
rd
[
'rubric_scores'
])
>
0
]
grader_types
=
[
rd
[
'grader_types'
]
for
rd
in
all_responses
if
len
(
rd
[
'grader_types'
])
>
0
]
grader_types
=
[
rd
[
'grader_types'
]
for
rd
in
all_responses
if
len
(
rd
[
'grader_types'
])
>
0
]
feedback_items
=
[
rd
[
'feedback_items'
]
for
rd
in
all_responses
if
len
(
rd
[
'feedback_items'
])
>
0
]
feedback_items
=
[
rd
[
'feedback_items'
]
for
rd
in
all_responses
if
len
(
rd
[
'feedback_items'
])
>
0
]
log
.
debug
(
rubric_scores
)
log
.
debug
(
grader_types
)
log
.
debug
(
feedback_items
)
rubric_html
=
self
.
rubric_renderer
.
render_combined_rubric
(
stringify_children
(
self
.
static_data
[
'rubric'
]),
rubric_scores
,
rubric_html
=
self
.
rubric_renderer
.
render_combined_rubric
(
stringify_children
(
self
.
static_data
[
'rubric'
]),
rubric_scores
,
grader_types
,
feedback_items
)
grader_types
,
feedback_items
)
...
...
common/lib/xmodule/xmodule/open_ended_module.py
View file @
35babcf5
...
@@ -429,7 +429,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
...
@@ -429,7 +429,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
correct: Correctness of submission (Boolean)
correct: Correctness of submission (Boolean)
score: Points to be assigned (numeric, can be float)
score: Points to be assigned (numeric, can be float)
"""
"""
fail
=
{
'valid'
:
False
,
'score'
:
0
,
'feedback'
:
''
,
'rubric_scores'
:
[[
0
,
0
]],
'grader_types'
:
[
''
],
'feedback_items'
:
[
''
]}
fail
=
{
'valid'
:
False
,
'score'
:
0
,
'feedback'
:
''
,
'rubric_scores'
:
[[
0
]],
'grader_types'
:
[
''
],
'feedback_items'
:
[
''
]}
try
:
try
:
score_result
=
json
.
loads
(
score_msg
)
score_result
=
json
.
loads
(
score_msg
)
except
(
TypeError
,
ValueError
):
except
(
TypeError
,
ValueError
):
...
...
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