Skip to content

E
edx-ora2
Commit 315bda57 by Joe Blaylock
Options

TIM-420: Format default prompts with long lines 

* Format the default prompts and options with long lines so that they
  don't look like they have weird wrapping in narrow edit displays.
* Remove some unused UI mockups
* Silence a small number of nitpicky pylint warnings
parent 86c20003
Showing with 82 additions and 157 deletions
apps/openassessment/xblock/defaults.py 0 → 100644
"""Default data initializations for the XBlock, with formatting preserved."""
# -*- coding: utf-8 -*-
# pylint: disable=line-too-long
DEFAULT_PROMPT = """
Censorship in the Libraries
'All of us can think of a book that we hope none of our children or any other children have taken off the shelf. But if I have the right to remove that book from the shelf -- that work I abhor -- then you also have exactly the same right and so does everyone else. And then we have no books left on the shelf for any of us.' --Katherine Paterson, Author
Write a persuasive essay to a newspaper reflecting your views on censorship in libraries. Do you believe that certain materials, such as books, music, movies, magazines, etc., should be removed from the shelves if they are found offensive? Support your position with convincing arguments from your own experience, observations, and/or reading.
Read for conciseness, clarity of thought, and form.
"""
DEFAULT_RUBRIC_CRITERIA = [
{
'name': "Ideas",
'prompt': "Determine if there is a unifying theme or main idea.",
'order_num': 0,
'options': [
{
'order_num': 0, 'points': 0, 'name': 'Poor',
'explanation': """Difficult for the reader to discern the main idea. Too brief or too repetitive to establish or maintain a focus."""
},
{
'order_num': 1, 'points': 3, 'name': 'Fair',
'explanation': """Presents a unifying theme or main idea, but may include minor tangents. Stays somewhat focused on topic and task."""
},
{
'order_num': 2, 'points': 5, 'name': 'Good',
'explanation': """Presents a unifying theme or main idea without going off on tangents. Stays completely focused on topic and task."""
},
],
},
{
'name': "Content",
'prompt': "Assess the content of the submission",
'order_num': 1,
'options': [
{
'order_num': 0, 'points': 0, 'name': 'Poor',
'explanation': """Includes little information with few or no details or unrelated details. Unsuccessful in attempts to explore any facets of the topic."""
},
{
'order_num': 1, 'points': 1, 'name': 'Fair',
'explanation': """Includes little information and few or no details. Explores only one or two facets of the topic."""
},
{
'order_num': 2, 'points': 3, 'name': 'Good',
'explanation': """Includes sufficient information and supporting details. (Details may not be fully developed; ideas may be listed.) Explores some facets of the topic."""
},
{
'order_num': 3, 'points': 3, 'name': 'Excellent',
'explanation': """Includes in-depth information and exceptional supporting details that are fully developed. Explores all facets of the topic."""
},
],
},
]
# The Default Peer Assessment is created as an example of how this XBlock can be
# configured. If no configuration is specified, this is the default assessment
# module(s) associated with the XBlock.
DEFAULT_PEER_ASSESSMENT = {
"name": "peer-assessment",
"start": None,
"due": None,
"must_grade": 5,
"must_be_graded_by": 3,
}
DEFAULT_SELF_ASSESSMENT = {
"name": "self-assessment",
"due": None,
}
DEFAULT_ASSESSMENT_MODULES = [
DEFAULT_PEER_ASSESSMENT,
DEFAULT_SELF_ASSESSMENT,
]
apps/openassessment/xblock/openassessmentblock.py
......@@ -16,6 +16,7 @@ from xblock.fields import List, Scope, String, Boolean
from xblock.fragment import Fragment
from openassessment.xblock.grade_mixin import GradeMixin
from openassessment.xblock.defaults import * # pylint: disable=wildcard-import, unused-wildcard-import
from openassessment.xblock.peer_assessment_mixin import PeerAssessmentMixin
from openassessment.xblock.lms_mixin import LmsCompatibilityMixin
from openassessment.xblock.self_assessment_mixin import SelfAssessmentMixin
......@@ -31,80 +32,6 @@ from openassessment.xblock.resolve_dates import resolve_dates
logger = logging.getLogger(__name__)
DEFAULT_PROMPT = """
Censorship in the Libraries
'All of us can think of a book that we hope none of our children or any
other children have taken off the shelf. But if I have the right to remove
that book from the shelf -- that work I abhor -- then you also have exactly
the same right and so does everyone else. And then we have no books left on
the shelf for any of us.' --Katherine Paterson, Author
Write a persuasive essay to a newspaper reflecting your views on censorship
in libraries. Do you believe that certain materials, such as books, music,
movies, magazines, etc., should be removed from the shelves if they are
found offensive? Support your position with convincing arguments from your
own experience, observations, and/or reading.
Read for conciseness, clarity of thought, and form.
"""
DEFAULT_RUBRIC_CRITERIA = [
{
'name': "Ideas",
'prompt': "Determine if there is a unifying theme or main idea.",
'order_num': 0,
'options': [
{
'order_num': 0, 'points': 0, 'name': 'Poor',
'explanation': """Difficult for the reader to discern the main idea.
Too brief or too repetitive to establish or maintain a focus."""
},
{
'order_num': 1, 'points': 3, 'name': 'Fair',
'explanation': """Presents a unifying theme or main idea, but may
include minor tangents. Stays somewhat focused on topic and
task."""
},
{
'order_num': 2, 'points': 5, 'name': 'Good',
'explanation': """Presents a unifying theme or main idea without going
off on tangents. Stays completely focused on topic and task."""
},
],
},
{
'name': "Content",
'prompt': "Assess the content of the submission",
'order_num': 1,
'options': [
{
'order_num': 0, 'points': 0, 'name': 'Poor',
'explanation': """Includes little information with few or no details or
unrelated details. Unsuccessful in attempts to explore any
facets of the topic."""
},
{
'order_num': 1, 'points': 1, 'name': 'Fair',
'explanation': """Includes little information and few or no details.
Explores only one or two facets of the topic."""
},
{
'order_num': 2, 'points': 3, 'name': 'Good',
'explanation': """Includes sufficient information and supporting
details. (Details may not be fully developed; ideas may be
listed.) Explores some facets of the topic."""
},
{
'order_num': 3, 'points': 3, 'name': 'Excellent',
'explanation': """Includes in-depth information and exceptional
supporting details that are fully developed. Explores all
facets of the topic."""
},
],
},
]
UI_MODELS = {
"submission": {
"name": "submission",
......@@ -132,30 +59,6 @@ UI_MODELS = {
}
}
"""
The Default Peer Assessment is created as an example of how this XBlock can be
configured. If no configuration is specified, this is the default assessment
module(s) associated with the XBlock.
"""
DEFAULT_PEER_ASSESSMENT = {
"name": "peer-assessment",
"start": None,
"due": None,
"must_grade": 5,
"must_be_graded_by": 3,
}
DEFAULT_SELF_ASSESSMENT = {
"name": "self-assessment",
"due": None,
}
DEFAULT_ASSESSMENT_MODULES = [
DEFAULT_PEER_ASSESSMENT,
DEFAULT_SELF_ASSESSMENT,
]
DATE_FORMAT = "%A, %B %d, %Y"
DATETIME_FORMAT = "%A, %B %d, %Y %X"
......@@ -382,9 +285,6 @@ class OpenAssessmentBlock(
Inherited by XBlock core.
"""
def unknown_handler(block, child):
"""Recursively embed xblocks for nodes we don't recognize"""
block.runtime.add_node_as_child(block, child, id_generator)
block = runtime.construct_xblock_from_class(cls, keys)
return update_from_xml(block, node, validator=validator(block, strict_post_release=False))
......
apps/openassessment/xblock/static/html/t-messages.html deleted 100644 → 0
<!-- if the problem is closed and incomplete -->
<div id="openassessment__message" class="openassessment__message message message--incomplete">
<h3 class="message__title">Response Submissions Are Closed</h3>
<div class="message__content">
<p>This assignment’s due date has passed and you can no longer submit a response. Your grade for this assignment is <a data-behavior="ui-scroll" href="#openassessment__grade">Incomplete</a>.</p>
</div>
</div>
<!-- if response has been submitted -->
<div id="openassessment__message" class="openassessment__message message">
<h3 class="message__title">Your Response Has Been Submitted for Peer Assessment</h3>
<div class="message__content">
<p>You'll receive your grade after the required number of your peers have assessed your response and you complete the <a data-behavior="ui-scroll" href="#openassessment__peer-assessment">peer assessment</a> and <a data-behavior="ui-scroll" href="#openassessment__self-assessment">self assessment</a> steps.</p>
</div>
</div>
<!-- if response has been graded -->
<div id="openassessment__message" class="openassessment__message message">
<h3 class="message__title">Your Response Has Been Graded</h3>
<div class="message__content">
<p>Your peers have completed their assessments of your response. You'll receive your grade after you complete both the <a data-behavior="ui-scroll" href="#openassessment__peer-assessment">peer assessment</a> and the <a data-behavior="ui-scroll" href="#openassessment__self-assessment">self assessment</a> steps.</p>
</div>
</div>
<!-- if the problem's due date is approaching and tasks remain -->
<div id="openassessment__message" class="openassessment__message message message--warning">
<h3 class="message__title">Two Tasks Are Incomplete</h3>
<div class="message__content">
<p>This assignment will close soon. To receive a grade, you have to complete both the <a data-behavior="ui-scroll" href="#openassessment__peer-assessment">peer assessment</a> and the <a data-behavior="ui-scroll" href="#openassessment__self-assessment">self assessment</a> steps before their due dates.</p>
</div>
</div>
<!-- if no peer assessments remain for student to grade -->
<div id="openassessment__message" class="openassessment__message message">
<h3 class="message__title">Waiting for Peer Responses</h3>
<div class="message__content">
<p>All submitted peer responses have been assessed. Check back later to see if more students have submitted responses. You'll receive your grade after you complete the <a data-behavior="ui-scroll" href="#openassessment__peer-assessment">peer assessment</a> and <a data-behavior="ui-scroll" href="#openassessment__self-assessment">self assessment</a> steps, and after your peers have assessed your response.</p>
</div>
</div>
<!-- if student has completed the entire problem and received a grade -->
<div id="openassessment__message" class="openassessment__message message message--complete">
<h3 class="message__title">You Have Completed This Assignment</h3>
<div class="message__content">
<p>Review <a data-behavior="ui-scroll" href="#openassessment__grade">your grade and your assessment details</a>.</p>
</div>
</div>
<!-- if student has completed the entire problem and not yet received a grade (from peers) -->
<div id="openassessment__message" class="openassessment__message message message--complete">
<h3 class="message__title">You Have Completed This Assignment</h3>
<div class="message__content">
<p>Your grade will be available when your peers have completed their assessments of your response.</p>
</div>
</div>
\ No newline at end of file
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