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
2b822399
Commit
2b822399
authored
Apr 07, 2014
by
Sylvia Pearce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UI and error message text updates
parent
46d0e021
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
apps/openassessment/xblock/resolve_dates.py
+2
-2
apps/openassessment/xblock/static/js/spec/oa_server.js
+1
-1
apps/openassessment/xblock/submission_mixin.py
+1
-1
apps/openassessment/xblock/xml.py
+2
-2
No files found.
apps/openassessment/xblock/resolve_dates.py
View file @
2b822399
...
...
@@ -185,13 +185,13 @@ def resolve_dates(start, end, date_ranges):
step_end
=
_parse_date
(
step_end
)
if
step_end
is
not
None
else
prev_end
if
step_start
<
prev_start
:
msg
=
_
(
u"This step's start date '{start}' cannot be
before
the previous step's start date '{prev}'."
)
.
format
(
msg
=
_
(
u"This step's start date '{start}' cannot be
earlier than
the previous step's start date '{prev}'."
)
.
format
(
start
=
step_start
,
prev
=
prev_start
)
raise
DateValidationError
(
msg
)
if
step_end
>
prev_end
:
msg
=
_
(
u"This step's due date '{due}' cannot be
after
the next step's due date '{prev}'."
)
.
format
(
msg
=
_
(
u"This step's due date '{due}' cannot be
later than
the next step's due date '{prev}'."
)
.
format
(
due
=
step_end
,
prev
=
prev_end
)
raise
DateValidationError
(
msg
)
...
...
apps/openassessment/xblock/static/js/spec/oa_server.js
View file @
2b822399
...
...
@@ -346,7 +346,7 @@ describe("OpenAssessment.Server", function() {
receivedMsg
=
errMsg
;
});
expect
(
receivedMsg
).
toContain
(
"Th
e server could not be contact
ed"
);
expect
(
receivedMsg
).
toContain
(
"Th
is problem could not be sav
ed"
);
});
...
...
apps/openassessment/xblock/submission_mixin.py
View file @
2b822399
...
...
@@ -74,7 +74,7 @@ class SubmissionMixin(object):
status_tag
=
'EBADFORM'
status_text
=
unicode
(
err
.
field_errors
)
except
(
api
.
SubmissionError
,
workflow_api
.
AssessmentWorkflowError
):
logger
.
exception
(
"
An error occurred while submitting
."
)
logger
.
exception
(
"
This response was not submitted
."
)
status_tag
=
'EUNKNOWN'
else
:
status
=
True
...
...
apps/openassessment/xblock/xml.py
View file @
2b822399
...
...
@@ -466,7 +466,7 @@ def update_from_xml(oa_block, root, validator=DEFAULT_VALIDATOR):
# Check that the root has the correct tag
if
root
.
tag
!=
'openassessment'
:
raise
UpdateFromXmlError
(
_
(
'
XML content must contain an "openassessment" root
element.'
))
raise
UpdateFromXmlError
(
_
(
'
Every open assessment problem must contain an "openassessment"
element.'
))
# Retrieve the start date for the submission
# Set it to None by default; we will update it to the latest start date later on
...
...
@@ -474,7 +474,7 @@ def update_from_xml(oa_block, root, validator=DEFAULT_VALIDATOR):
if
'submission_start'
in
root
.
attrib
:
submission_start
=
_parse_date
(
unicode
(
root
.
attrib
[
'submission_start'
]))
if
submission_start
is
None
:
raise
UpdateFromXmlError
(
_
(
'
Invalid date format for submission start date
'
))
raise
UpdateFromXmlError
(
_
(
'
The format for the submission start date is invalid. Make sure the date is formatted as YYYY-MM-DDTHH:MM:SS.
'
))
# Retrieve the due date for the submission
# Set it to None by default; we will update it to the earliest deadline later on
...
...
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