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
44a68e69
Commit
44a68e69
authored
Feb 27, 2013
by
Arthur Barrett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added partially correct icon from marco
parent
b84d0ba8
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
13 deletions
+28
-13
common/lib/capa/capa/inputtypes.py
+8
-6
common/lib/capa/capa/responsetypes.py
+1
-1
common/lib/capa/capa/templates/annotationinput.html
+4
-4
common/lib/capa/capa/tests/test_responsetypes.py
+4
-0
common/lib/xmodule/xmodule/css/capa/display.scss
+11
-2
common/static/images/partially-correct-icon.png
+0
-0
No files found.
common/lib/capa/capa/inputtypes.py
View file @
44a68e69
...
...
@@ -950,15 +950,17 @@ class AnnotationInput(InputTypeBase):
<annotationinput>
<title>Annotation Exercise</title>
<text>They are the ones who, at the public assembly, had put savage derangement [atē] into my thinking [phre
nes] |89 on that day when I myself deprived Achilles of his honorific portion [geras]</text>
<comment>Agamemnon says that atē or ‘derangement’ was the cause of his actions: why could Zeus say the same thing?</comment>
<text>
They are the ones who, at the public assembly, had put savage derangement [ate] into my thinking
[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>
<tag_prompt>Select one or more tags:</tag_prompt>
<options>
<option choice="correct">at
ē
- both a cause and an effect</option>
<option choice="incorrect">at
ē
- a cause</option>
<option choice="partial">at
ē
- an effect</option>
<option choice="correct">at
e
- both a cause and an effect</option>
<option choice="incorrect">at
e
- a cause</option>
<option choice="partial">at
e
- an effect</option>
</options>
</annotationinput>
...
...
common/lib/capa/capa/responsetypes.py
View file @
44a68e69
...
...
@@ -1854,7 +1854,7 @@ class AnnotationResponse(LoncapaResponse):
response_tag
=
'annotationresponse'
allowed_inputfields
=
[
'annotationinput'
]
max_inputfields
=
1
default_scoring
=
{
'incorrect'
:
0
,
'partial'
:
1
,
'correct'
:
2
}
default_scoring
=
{
'incorrect'
:
0
,
'partial
ly-correct
'
:
1
,
'correct'
:
2
}
def
setup_response
(
self
):
xml
=
self
.
xml
self
.
scoring_map
=
self
.
_get_scoring_map
()
...
...
common/lib/capa/capa/templates/annotationinput.html
View file @
44a68e69
...
...
@@ -21,11 +21,11 @@
% for option in options:
<li>
% if all([c == 'correct' for c in option['choice'], status]):
<span
class=
"status correct"
id=
"status_${id}"
></span>
% elif all([c == 'partial' for c in option['choice'], status]):
<span
class=
"
status partially_correct"
id=
"status_${id}"
>
P
</span>
<span
class=
"
tag-
status correct"
id=
"status_${id}"
></span>
% elif all([c == 'partial
ly-correct
' for c in option['choice'], status]):
<span
class=
"
tag-status partially-correct"
id=
"status_${id}"
>
</span>
% 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
<span
class=
"tag
...
...
common/lib/capa/capa/tests/test_responsetypes.py
View file @
44a68e69
...
...
@@ -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
(
correct_answers
)
.
get_correctness
(
'1_2_1'
),
'correct'
)
class
AnnotationResponseTest
(
unittest
.
TestCase
):
pass
\ No newline at end of file
common/lib/xmodule/xmodule/css/capa/display.scss
View file @
44a68e69
...
...
@@ -231,6 +231,15 @@ section.problem {
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
{
@include
inline-block
();
background
:
url('../images/incorrect-icon.png')
center
center
no-repeat
;
...
...
@@ -853,11 +862,11 @@ section.problem {
background-color
:
$yellow
;
}
}
.status
{
.
tag-
status
{
position
:
absolute
;
left
:
0
;
}
.tag
,
.status
{
padding
:
.25em
.5em
;
}
.tag
-status
,
.tag
{
padding
:
.25em
.5em
;
}
}
}
textarea
.comment
{
width
:
100%
;
}
...
...
common/static/images/partially-correct-icon.png
0 → 100644
View file @
44a68e69
1.2 KB
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