Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish refactor of rubric templates, redo some margins

Browse Source
This commit is contained in:
Vik Paruchuri
2013-02-09 00:30:25 -05:00
parent efe5e491ef
commit 4dc0859fbd
3 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
View File

@@ -48,26 +48,26 @@ class CombinedOpenEndedRubric(object):
html: the html that corresponds to the xml given
'''
success = False
try:
rubric_categories = self.extract_categories(rubric_xml)
rubric_scores = [cat['score'] for cat in rubric_categories]
max_scores = map((lambda cat: cat['options'][-1]['points']), rubric_categories)
max_score = max(max_scores)
rubric_template = 'open_ended_rubric.html'
if self.view_only:
rubric_template = 'open_ended_view_only_rubric.html'
html = self.system.render_template(rubric_template,
{'categories': rubric_categories,
'has_score': self.has_score,
'view_only': self.view_only,
'max_score': max_score,
'combined_rubric' : False
})
success = True
except:
error_message = "[render_rubric] Could not parse the rubric with xml: {0}".format(rubric_xml)
log.error(error_message)
raise RubricParsingError(error_message)
#try:
rubric_categories = self.extract_categories(rubric_xml)
rubric_scores = [cat['score'] for cat in rubric_categories]
max_scores = map((lambda cat: cat['options'][-1]['points']), rubric_categories)
max_score = max(max_scores)
rubric_template = 'open_ended_rubric.html'
if self.view_only:
rubric_template = 'open_ended_view_only_rubric.html'
html = self.system.render_template(rubric_template,
{'categories': rubric_categories,
'has_score': self.has_score,
'view_only': self.view_only,
'max_score': max_score,
'combined_rubric' : False
})
success = True
#except:
# error_message = "[render_rubric] Could not parse the rubric with xml: {0}".format(rubric_xml)
# log.error(error_message)
# raise RubricParsingError(error_message)
return {'success' : success, 'html' : html, 'rubric_scores' : rubric_scores}
def check_if_rubric_is_parseable(self, rubric_string, location, max_score_allowed, max_score):

15
common/lib/xmodule/xmodule/css/combinedopenended/display.scss
View File

@@ -51,6 +51,7 @@ section.legend-container {
display: inline;
width: 20%;
}
margin-bottom: 5px;
}
section.combined-open-ended-status {
@@ -106,6 +107,20 @@ section.combined-open-ended-status {
}
}
div.combined-rubric-container {
ul.rubric-list{
list-style-type: none;
padding:0;
margin:0;
li {
&.rubric-list-item{
margin-bottom: 2px;
padding: 0px;
}
}
}
}
div.result-container {
.evaluation {

1
lms/templates/open_ended_view_only_rubric.html
View File

@@ -6,6 +6,7 @@
<% option = category['options'][j] %>
% if option['selected']:
${category['description']} : ${option['points']} points
% endif
% endfor
% endfor
</div>