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
84233477
Commit
84233477
authored
Mar 17, 2014
by
Will Daly
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #150 from edx/will/studio-display-name
Add display name for Studio Advanced Component menu
parents
6543b1ca
dfd446ea
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
14 deletions
+27
-14
apps/openassessment/xblock/lms_mixin.py
+26
-3
apps/openassessment/xblock/openassessmentblock.py
+1
-11
No files found.
apps/openassessment/xblock/lms_mixin.py
View file @
84233477
from
xblock.core
import
XBlock
"""
from
xblock.fields
import
Float
,
Scope
Fields and methods used by the LMS and Studio.
"""
from
xblock.fields
import
String
,
Float
,
Scope
,
DateTime
class
LmsCompatibilityMixin
(
object
):
class
LmsCompatibilityMixin
(
object
):
"""Extra methods we tack on because the LMS expects them for grading."""
"""
Extra fields and methods used by LMS/Studio.
"""
# Studio the default value for this field to show this XBlock
# in the list of "Advanced Components"
display_name
=
String
(
default
=
"Peer Assessment"
,
scope
=
Scope
.
settings
,
help
=
"Display name"
)
start
=
DateTime
(
default
=
None
,
scope
=
Scope
.
settings
,
help
=
"ISO-8601 formatted string representing the start date of this assignment."
)
due
=
DateTime
(
default
=
None
,
scope
=
Scope
.
settings
,
help
=
"ISO-8601 formatted string representing the due date of this assignment."
)
weight
=
Float
(
weight
=
Float
(
display_name
=
"Problem Weight"
,
display_name
=
"Problem Weight"
,
help
=
(
"Defines the number of points each problem is worth. "
help
=
(
"Defines the number of points each problem is worth. "
...
...
apps/openassessment/xblock/openassessmentblock.py
View file @
84233477
...
@@ -10,7 +10,7 @@ from django.template.loader import get_template
...
@@ -10,7 +10,7 @@ from django.template.loader import get_template
from
webob
import
Response
from
webob
import
Response
from
xblock.core
import
XBlock
from
xblock.core
import
XBlock
from
xblock.fields
import
DateTime
,
List
,
Scope
,
String
,
Boolean
from
xblock.fields
import
List
,
Scope
,
String
,
Boolean
from
xblock.fragment
import
Fragment
from
xblock.fragment
import
Fragment
from
openassessment.xblock.grade_mixin
import
GradeMixin
from
openassessment.xblock.grade_mixin
import
GradeMixin
...
@@ -169,16 +169,6 @@ class OpenAssessmentBlock(
...
@@ -169,16 +169,6 @@ class OpenAssessmentBlock(
LmsCompatibilityMixin
):
LmsCompatibilityMixin
):
"""Displays a question and gives an area where students can compose a response."""
"""Displays a question and gives an area where students can compose a response."""
start
=
DateTime
(
default
=
None
,
scope
=
Scope
.
settings
,
help
=
"ISO-8601 formatted string representing the start date of this assignment."
)
due
=
DateTime
(
default
=
None
,
scope
=
Scope
.
settings
,
help
=
"ISO-8601 formatted string representing the due date of this assignment."
)
submission_due
=
String
(
submission_due
=
String
(
default
=
None
,
scope
=
Scope
.
settings
,
default
=
None
,
scope
=
Scope
.
settings
,
help
=
"ISO-8601 formatted string representing the submission due date."
help
=
"ISO-8601 formatted string representing the submission due date."
...
...
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