Commit 44a68e69 by Arthur Barrett

added partially correct icon from marco

parent b84d0ba8
...@@ -950,15 +950,17 @@ class AnnotationInput(InputTypeBase): ...@@ -950,15 +950,17 @@ class AnnotationInput(InputTypeBase):
<annotationinput> <annotationinput>
<title>Annotation Exercise</title> <title>Annotation Exercise</title>
<text>They are the ones who, at the public assembly, had put savage derangement [atē] into my thinking [phre <text>
nes] |89 on that day when I myself deprived Achilles of his honorific portion [geras]</text> They are the ones who, at the public assembly, had put savage derangement [ate] into my thinking
<comment>Agamemnon says that atē or ‘derangement’ was the cause of his actions: why could Zeus say the same thing?</comment> [phrenes] |89 on that day when I myself deprived Achilles of his honorific portion [geras]
</text>
<comment>Agamemnon says that ate or 'derangement' was the cause of his actions: why could Zeus say the same thing?</comment>
<comment_prompt>Type a commentary below:</comment_prompt> <comment_prompt>Type a commentary below:</comment_prompt>
<tag_prompt>Select one or more tags:</tag_prompt> <tag_prompt>Select one or more tags:</tag_prompt>
<options> <options>
<option choice="correct">atē - both a cause and an effect</option> <option choice="correct">ate - both a cause and an effect</option>
<option choice="incorrect">atē - a cause</option> <option choice="incorrect">ate - a cause</option>
<option choice="partial">atē - an effect</option> <option choice="partial">ate - an effect</option>
</options> </options>
</annotationinput> </annotationinput>
......
...@@ -1854,7 +1854,7 @@ class AnnotationResponse(LoncapaResponse): ...@@ -1854,7 +1854,7 @@ class AnnotationResponse(LoncapaResponse):
response_tag = 'annotationresponse' response_tag = 'annotationresponse'
allowed_inputfields = ['annotationinput'] allowed_inputfields = ['annotationinput']
max_inputfields = 1 max_inputfields = 1
default_scoring = {'incorrect': 0, 'partial': 1, 'correct': 2 } default_scoring = {'incorrect': 0, 'partially-correct': 1, 'correct': 2 }
def setup_response(self): def setup_response(self):
xml = self.xml xml = self.xml
self.scoring_map = self._get_scoring_map() self.scoring_map = self._get_scoring_map()
......
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
% for option in options: % for option in options:
<li> <li>
% if all([c == 'correct' for c in option['choice'], status]): % if all([c == 'correct' for c in option['choice'], status]):
<span class="status correct" id="status_${id}"></span> <span class="tag-status correct" id="status_${id}"></span>
% elif all([c == 'partial' for c in option['choice'], status]): % elif all([c == 'partially-correct' for c in option['choice'], status]):
<span class="status partially_correct" id="status_${id}">P</span> <span class="tag-status partially-correct" id="status_${id}"></span>
% elif all([c == 'incorrect' for c in option['choice'], status]): % elif all([c == 'incorrect' for c in option['choice'], status]):
<span class="status incorrect" id="status_${id}"></span> <span class="tag-status incorrect" id="status_${id}"></span>
% endif % endif
<span class="tag <span class="tag
......
...@@ -426,3 +426,6 @@ class JavascriptResponseTest(unittest.TestCase): ...@@ -426,3 +426,6 @@ class JavascriptResponseTest(unittest.TestCase):
self.assertEquals(test_lcp.grade_answers(incorrect_answers).get_correctness('1_2_1'), 'incorrect') self.assertEquals(test_lcp.grade_answers(incorrect_answers).get_correctness('1_2_1'), 'incorrect')
self.assertEquals(test_lcp.grade_answers(correct_answers).get_correctness('1_2_1'), 'correct') self.assertEquals(test_lcp.grade_answers(correct_answers).get_correctness('1_2_1'), 'correct')
class AnnotationResponseTest(unittest.TestCase):
pass
\ No newline at end of file
...@@ -231,6 +231,15 @@ section.problem { ...@@ -231,6 +231,15 @@ section.problem {
width: 25px; width: 25px;
} }
&.partially-correct {
@include inline-block();
background: url('../images/partially-correct-icon.png') center center no-repeat;
height: 20px;
position: relative;
top: 6px;
width: 25px;
}
&.incorrect, &.ui-icon-close { &.incorrect, &.ui-icon-close {
@include inline-block(); @include inline-block();
background: url('../images/incorrect-icon.png') center center no-repeat; background: url('../images/incorrect-icon.png') center center no-repeat;
...@@ -853,11 +862,11 @@ section.problem { ...@@ -853,11 +862,11 @@ section.problem {
background-color: $yellow; background-color: $yellow;
} }
} }
.status { .tag-status {
position: absolute; position: absolute;
left: 0; left: 0;
} }
.tag, .status { padding: .25em .5em; } .tag-status, .tag { padding: .25em .5em; }
} }
} }
textarea.comment { width: 100%; } textarea.comment { width: 100%; }
......
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