Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-ora2
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-ora2
Commits
b72532bf
Commit
b72532bf
authored
Feb 28, 2014
by
Stephen Sanchez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleaning up some files that should have never made it to master
parent
e44b501c
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
10 additions
and
54 deletions
+10
-54
apps/openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html
+1
-1
apps/openassessment/templates/openassessmentblock/peer/oa_peer_assessment_collapsed.html
+0
-6
apps/openassessment/templates/openassessmentblock/response/oa_response_collapsed.html
+0
-8
apps/openassessment/templates/openassessmentblock/self/oa_self_assessment_collapsed.html
+0
-8
apps/openassessment/xblock/openassessmentblock.py
+7
-13
apps/openassessment/xblock/peer_assessment_mixin.py
+2
-1
apps/openassessment/xblock/self_assessment_mixin.py
+0
-1
apps/openassessment/xblock/static/js/src/oa_base.js
+0
-16
No files found.
apps/openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html
View file @
b72532bf
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
<article
class=
"peer-assessment"
id=
"peer-assessment--001"
>
<article
class=
"peer-assessment"
id=
"peer-assessment--001"
>
<header
class=
"peer-assessment__header"
>
<header
class=
"peer-assessment__header"
>
<h3
class=
"peer-assessment__title"
>
Assessment #
<h3
class=
"peer-assessment__title"
>
Assessment #
<span
class=
"peer-assessment__number--current"
>
{{
graded
}}
</span>
of
<span
class=
"peer-assessment__number--current"
>
{{
review_num
}}
</span>
of
<span
class=
"peer-assessment__number--required"
>
{{ must_grade }}
</span>
<span
class=
"peer-assessment__number--required"
>
{{ must_grade }}
</span>
</h3>
</h3>
...
...
apps/openassessment/templates/openassessmentblock/peer/oa_peer_assessment_collapsed.html
deleted
100644 → 0
View file @
e44b501c
{% extends "openassessmentblock/peer/oa_peer_assessment.html" %}
{% block list_item %}
<li
id=
"openassessment__peer-assessment"
class=
"openassessment__steps__step step--peer-assessment is--collapsed ui-toggle-visibility"
>
{% endblock %}
{% block body %}
{% endblock %}
apps/openassessment/templates/openassessmentblock/response/oa_response_collapsed.html
deleted
100644 → 0
View file @
e44b501c
{% extends "openassessmentblock/response/oa_response.html" %}
{% block list_item %}
<li
id=
"openassessment__response"
class=
"openassessment__steps__step step--response ui-toggle-visibility"
>
{% endblock %}
{% block body %}
{% endblock %}
apps/openassessment/templates/openassessmentblock/self/oa_self_assessment_collapsed.html
deleted
100644 → 0
View file @
e44b501c
{% extends "openassessmentblock/self/oa_self_assessment.html" %}
{% block list_item %}
<li
id=
"openassessment__self-assessment"
class=
"openassessment__steps__step step--self-assessment"
>
{% endblock %}
{% block body %}
{% endblock %}
apps/openassessment/xblock/openassessmentblock.py
View file @
b72532bf
...
@@ -113,6 +113,12 @@ UI_MODELS = {
...
@@ -113,6 +113,12 @@ UI_MODELS = {
"class_id"
:
"openassessment__self-assessment"
,
"class_id"
:
"openassessment__self-assessment"
,
"navigation_text"
:
"Your assessment of your response"
,
"navigation_text"
:
"Your assessment of your response"
,
"title"
:
"Assess Your Response"
"title"
:
"Assess Your Response"
},
"grade"
:
{
"name"
:
"grade"
,
"class_id"
:
"openassessment__grade"
,
"navigation_text"
:
"Your grade for this problem"
,
"title"
:
"Your grade for this problem"
}
}
}
}
...
@@ -233,7 +239,6 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
...
@@ -233,7 +239,6 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
"""
"""
trace
=
self
.
get_xblock_trace
()
trace
=
self
.
get_xblock_trace
()
ui_models
=
self
.
_create_ui_models
()
ui_models
=
self
.
_create_ui_models
()
grade_state
=
self
.
get_grade_state
()
# All data we intend to pass to the front end.
# All data we intend to pass to the front end.
context_dict
=
{
context_dict
=
{
"xblock_trace"
:
trace
,
"xblock_trace"
:
trace
,
...
@@ -241,7 +246,6 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
...
@@ -241,7 +246,6 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
"question"
:
self
.
prompt
,
"question"
:
self
.
prompt
,
"rubric_criteria"
:
self
.
rubric_criteria
,
"rubric_criteria"
:
self
.
rubric_criteria
,
"rubric_assessments"
:
ui_models
,
"rubric_assessments"
:
ui_models
,
"grade_state"
:
grade_state
,
}
}
template
=
get_template
(
"openassessmentblock/oa_base.html"
)
template
=
get_template
(
"openassessmentblock/oa_base.html"
)
...
@@ -265,6 +269,7 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
...
@@ -265,6 +269,7 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
for
assessment
in
self
.
rubric_assessments
:
for
assessment
in
self
.
rubric_assessments
:
ui_model
=
UI_MODELS
[
assessment
[
"name"
]]
ui_model
=
UI_MODELS
[
assessment
[
"name"
]]
ui_models
.
append
(
dict
(
assessment
,
**
ui_model
))
ui_models
.
append
(
dict
(
assessment
,
**
ui_model
))
ui_models
.
append
(
UI_MODELS
[
"grade"
])
return
ui_models
return
ui_models
@staticmethod
@staticmethod
...
@@ -302,17 +307,6 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
...
@@ -302,17 +307,6 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
block
=
sparser
.
parse
()
block
=
sparser
.
parse
()
return
block
return
block
def
get_grade_state
(
self
):
# TODO: Placeholder for workflow state.
grade_state
=
{
"style_class"
:
"is--incomplete"
,
"value"
:
"Incomplete"
,
"title"
:
"Your Grade:"
,
"message"
:
"You have not started this problem"
,
}
return
grade_state
def
render_assessment
(
self
,
path
,
context_dict
=
None
):
def
render_assessment
(
self
,
path
,
context_dict
=
None
):
"""Render an Assessment Module's HTML
"""Render an Assessment Module's HTML
...
...
apps/openassessment/xblock/peer_assessment_mixin.py
View file @
b72532bf
...
@@ -86,6 +86,7 @@ class PeerAssessmentMixin(object):
...
@@ -86,6 +86,7 @@ class PeerAssessmentMixin(object):
assessment
[
"must_grade"
]
assessment
[
"must_grade"
]
)
)
context_dict
[
"graded"
]
=
count
context_dict
[
"graded"
]
=
count
context_dict
[
"review_num"
]
=
count
+
1
if
finished
:
if
finished
:
path
=
"openassessmentblock/peer/oa_peer_complete.html"
path
=
"openassessmentblock/peer/oa_peer_complete.html"
elif
student_submission
:
elif
student_submission
:
...
@@ -97,7 +98,7 @@ class PeerAssessmentMixin(object):
...
@@ -97,7 +98,7 @@ class PeerAssessmentMixin(object):
if
assessment
[
"must_grade"
]
-
count
==
1
:
if
assessment
[
"must_grade"
]
-
count
==
1
:
context_dict
[
"submit_button_text"
]
=
"Submit your assessment & move onto next step."
context_dict
[
"submit_button_text"
]
=
"Submit your assessment & move onto next step."
else
:
else
:
context_dict
[
"submit_button_text"
]
=
"Submit your assessment & move to response #{}"
.
format
(
count
+
1
)
context_dict
[
"submit_button_text"
]
=
"Submit your assessment & move to response #{}"
.
format
(
count
+
2
)
problem_open
,
date
=
self
.
is_open
()
problem_open
,
date
=
self
.
is_open
()
if
not
problem_open
and
date
==
"due"
and
not
finished
:
if
not
problem_open
and
date
==
"due"
and
not
finished
:
...
...
apps/openassessment/xblock/self_assessment_mixin.py
View file @
b72532bf
...
@@ -23,7 +23,6 @@ class SelfAssessmentMixin(object):
...
@@ -23,7 +23,6 @@ class SelfAssessmentMixin(object):
if
student_submission
:
if
student_submission
:
path
=
'openassessmentblock/self/oa_self_assessment.html'
path
=
'openassessmentblock/self/oa_self_assessment.html'
context_dict
=
{
context_dict
=
{
"rubric_instructions"
:
self
.
rubric_instructions
,
"rubric_criteria"
:
self
.
rubric_criteria
,
"rubric_criteria"
:
self
.
rubric_criteria
,
"estimated_time"
:
"20 minutes"
,
# TODO: Need to configure this.
"estimated_time"
:
"20 minutes"
,
# TODO: Need to configure this.
"self_submission"
:
student_submission
,
"self_submission"
:
student_submission
,
...
...
apps/openassessment/xblock/static/js/src/oa_base.js
View file @
b72532bf
...
@@ -122,22 +122,6 @@ function OpenAssessmentBlock(runtime, element) {
...
@@ -122,22 +122,6 @@ function OpenAssessmentBlock(runtime, element) {
$
.
ajax
({
$
.
ajax
({
type
:
"POST"
,
type
:
"POST"
,
url
:
renderPeerCollapseUrl
,
success
:
function
(
data
)
{
$
(
'#openassessment__peer-assessment'
,
element
).
replaceWith
(
data
);
}
});
$
.
ajax
({
type
:
"POST"
,
url
:
renderSelfCollapseUrl
,
success
:
function
(
data
)
{
$
(
'#openassessment__self-assessment'
,
element
).
replaceWith
(
data
);
}
});
$
.
ajax
({
type
:
"POST"
,
url
:
renderPeerUrl
,
url
:
renderPeerUrl
,
success
:
function
(
data
)
{
success
:
function
(
data
)
{
$
(
peerListItem
,
element
).
replaceWith
(
data
);
$
(
peerListItem
,
element
).
replaceWith
(
data
);
...
...
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