Skip to content

E
edx-platform
Commit 6d0af139 by Vik Paruchuri
Options

Fix respond to feedback

parent 3eb18a9e
Showing with 88 additions and 53 deletions
common/lib/xmodule/xmodule/combined_open_ended_modulev1.py
...@@ -600,12 +600,16 @@ class CombinedOpenEndedV1Module(): ...@@ -600,12 +600,16 @@ class CombinedOpenEndedV1Module():
'rubric_html': rubric_html, 'rubric_html': rubric_html,
'grader_type': ri['grader_type'], 'grader_type': ri['grader_type'],
'feedback' : feedback, 'feedback' : feedback,
'grader_id' : ri['grader_ids'][i],
'submission_id' : ri['submission_ids'][i],
} }
context_list.append(context) context_list.append(context)
feedback_table = self.system.render_template('open_ended_result_table.html', { feedback_table = self.system.render_template('open_ended_result_table.html', {
'context_list' : context_list, 'context_list' : context_list,
'grader_type_image_dict' : GRADER_TYPE_IMAGE_DICT, 'grader_type_image_dict' : GRADER_TYPE_IMAGE_DICT,
'human_grader_types' : HUMAN_GRADER_TYPE, 'human_grader_types' : HUMAN_GRADER_TYPE,
'rows': 50,
'cols': 50,
}) })
context = { context = {
'results': feedback_table, 'results': feedback_table,
......
common/lib/xmodule/xmodule/css/combinedopenended/display.scss
...@@ -137,9 +137,8 @@ div.result-container { ...@@ -137,9 +137,8 @@ div.result-container {
} }
.evaluation-response { .evaluation-response {
margin-bottom: 10px; margin-bottom: 2px;
header { header {
text-align: right;
a { a {
font-size: .85em; font-size: .85em;
} }
...@@ -253,10 +252,15 @@ div.result-container { ...@@ -253,10 +252,15 @@ div.result-container {
} }
} }
} }
.rubric-result { .rubric-result-container {
font-size: .9em; .rubric-result {
font-size: .9em;
padding: 2px;
display: inline-table;
}
padding: 2px; padding: 2px;
display: inline-table; margin: 0px;
display : inline;
} }
} }
......
lms/templates/open_ended_combined_rubric.html
<section class="rubric-template" id="inputtype_${id}"> <div class="rubric">
<div class="rubric"> % for i in range(len(categories)):
% for i in range(len(categories)): <% category = categories[i] %>
<% category = categories[i] %> <b class="rubric-category">${category['description']}</b> <br/>
<b class="rubric-category">${category['description']}</b> <br/> <ul class="rubric-list">
<ul class="rubric-list"> % for j in range(len(category['options'])):
% for j in range(len(category['options'])): <% option = category['options'][j] %>
<% option = category['options'][j] %> <li class="rubric-list-item">
<li class="rubric-list-item"> <div class="rubric-label">
<div class="rubric-label"> %for grader_type in category['options'][j]['grader_types']:
%for grader_type in category['options'][j]['grader_types']: % if grader_type in grader_type_image_dict:
% if grader_type in grader_type_image_dict: <% grader_image = grader_type_image_dict[grader_type] %>
<% grader_image = grader_type_image_dict[grader_type] %> % if grader_type in human_grader_types:
% if grader_type in human_grader_types: <% human_title = human_grader_types[grader_type] %>
<% human_title = human_grader_types[grader_type] %> % else:
% else: <% human_title = grader_type %>
<% human_title = grader_type %>
% endif
<img src="${grader_image}" title="${human_title}"/>
% endif % endif
%endfor <img src="${grader_image}" title="${human_title}"/>
${option['points']} points : ${option['text']} % endif
</div> %endfor
</li> ${option['points']} points : ${option['text']}
% endfor </div>
</ul> </li>
% endfor % endfor
</div> </ul>
</section> % endfor
</div>
lms/templates/open_ended_result_table.html
...@@ -7,15 +7,43 @@ ...@@ -7,15 +7,43 @@
% else: % else:
<% human_title = grader_type %> <% human_title = grader_type %>
% endif % endif
<div class="rubric-result"> <section class="rubric-result-container">
<img src="${grader_image}" title="${human_title}"/> <div class="rubric-result">
</div> <img src="${grader_image}" title="${human_title}"/>
<div class="rubric-result"> </div>
${co['rubric_html']} <div class="rubric-result">
</div> ${co['rubric_html']}
<div class="rubric-result"> </div>
${co['feedback']} <div class="rubric-result">
</div> ${co['feedback']}
</div>
%if grader_type!="SA":
<div class="rubric-result">
<input type="hidden" value="${co['grader_id']}" class="grader_id" />
<input type="hidden" value="${co['submission_id']}" class=submission_id" />
<div class="collapsible evaluation-response">
<header>
<a href="#">Respond to Feedback</a>
</header>
<section id="evaluation" class="evaluation">
<p>How accurate do you find this feedback?</p>
<div class="evaluation-scoring">
<ul class="scoring-list">
<li><input type="radio" name="evaluation-score" id="evaluation-score-5" value="5" /> <label for="evaluation-score-5"> Correct</label></li>
<li><input type="radio" name="evaluation-score" id="evaluation-score-4" value="4" /> <label for="evaluation-score-4"> Partially Correct</label></li>
<li><input type="radio" name="evaluation-score" id="evaluation-score-3" value="3" /> <label for="evaluation-score-3"> No Opinion</label></li>
<li><input type="radio" name="evaluation-score" id="evaluation-score-2" value="2" /> <label for="evaluation-score-2"> Partially Incorrect</label></li>
<li><input type="radio" name="evaluation-score" id="evaluation-score-1" value="1" /> <label for="evaluation-score-1"> Incorrect</label></li>
</ul>
</div>
<p>Additional comments:</p>
<textarea rows="${rows}" cols="${cols}" name="feedback" class="feedback-on-feedback" id="feedback"></textarea>
<input type="button" value="Submit Feedback" class="submit-evaluation-button" name="reset"/>
</section>
</div>
</div>
%endif
</section>
<br/> <br/>
%endif %endif
%endfor %endfor
\ No newline at end of file
lms/templates/open_ended_view_only_rubric.html
<section class="rubric-template" id="inputtype_${id}"> <div class="rubric">
<div class="rubric"> % for i in range(len(categories)):
% for i in range(len(categories)): <% category = categories[i] %>
<% category = categories[i] %> % for j in range(len(category['options'])):
% for j in range(len(category['options'])): <% option = category['options'][j] %>
<% option = category['options'][j] %> % if option['selected']:
% if option['selected']: ${category['description']} : ${option['points']} |
${category['description']} : ${option['points']} points | % endif
% endif
% endfor
% endfor % endfor
</div> % endfor
</section> </div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment