Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: allow learner resubmissions in ora assignment #2187

Merged
merged 29 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
07cd427
feat: allow learner resubmissions in ora assignment
BryanttV Feb 29, 2024
ae8d623
refactor: unify grace period fields
BryanttV May 2, 2024
83be764
chore: update translations
BryanttV May 2, 2024
3ecf027
test: update unit test
BryanttV May 2, 2024
f586684
refactor: validate only if current datetime is greater than deadline …
BryanttV May 6, 2024
e929512
test: add unit test for has_been_graded function
BryanttV May 6, 2024
551bae7
chore: format code
BryanttV May 6, 2024
ecb52bb
chore: generate translations for es_419
mariajgrimaldi May 7, 2024
4e4fea8
chore: update translations
BryanttV May 7, 2024
00c8486
fix: validate if allow_resubmission in handler
BryanttV May 8, 2024
baf8c56
refactor: use settings scope instead of content scope
BryanttV May 8, 2024
7a81aac
fix: correct typo
BryanttV May 8, 2024
1a66613
chore: update help text of grace period field
BryanttV May 8, 2024
20b3b3e
feat: show message depending if resubmission feature is enabled
BryanttV May 8, 2024
71fda94
chore: build statics
BryanttV May 8, 2024
6a2a02e
chore: update translations
BryanttV May 8, 2024
5afe41d
test: update unit tests
BryanttV May 8, 2024
3d96d4e
fix: use student_submission instead of submission_data
BryanttV May 9, 2024
43d24d5
chore: update unit tests
BryanttV May 9, 2024
c9e9657
chore: update en-eo translations
BryanttV May 9, 2024
04653b4
chore: update es_ES translations
BryanttV May 9, 2024
1d71fe6
chore: build statics
BryanttV May 9, 2024
786d51c
chore: update es_ES translations
BryanttV May 9, 2024
72546ec
chore: update en-eo translations
BryanttV May 9, 2024
538ecaa
chore: update es_419 translations
BryanttV May 9, 2024
50dab45
chore: update es_419 translations .po files
mariajgrimaldi May 9, 2024
be72758
chore: update translations
BryanttV May 9, 2024
e03f408
test: update unit tests
BryanttV May 9, 2024
da484f3
chore: bump version to 6.11.0
BryanttV May 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion openassessment/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Initialization Information for Open Assessment Module
"""

__version__ = '6.10.0'
__version__ = '6.11.0'
64 changes: 56 additions & 8 deletions openassessment/conf/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: edx-ora2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-07 14:52-0400\n"
"POT-Creation-Date: 2024-05-09 08:22-0500\n"
"PO-Revision-Date: 2014-06-04 15:41-0400\n"
"Last-Translator: Muhammad Ayub khan <[email protected]>\n"
"Language-Team: openedx-translation <[email protected]>\n"
Expand Down Expand Up @@ -224,6 +224,7 @@ msgstr ""
#: templates/legacy/edit/oa_edit_basic_settings_list.html:93
#: templates/legacy/edit/oa_edit_basic_settings_list.html:131
#: templates/legacy/edit/oa_edit_basic_settings_list.html:157
#: templates/legacy/edit/oa_edit_basic_settings_list.html:169
#: templates/legacy/edit/oa_edit_peer_assessment.html:45
msgid "False"
msgstr ""
Expand All @@ -232,6 +233,7 @@ msgstr ""
#: templates/legacy/edit/oa_edit_basic_settings_list.html:94
#: templates/legacy/edit/oa_edit_basic_settings_list.html:132
#: templates/legacy/edit/oa_edit_basic_settings_list.html:158
#: templates/legacy/edit/oa_edit_basic_settings_list.html:170
#: templates/legacy/edit/oa_edit_peer_assessment.html:46
msgid "True"
msgstr ""
Expand Down Expand Up @@ -331,6 +333,28 @@ msgid ""
"response."
msgstr ""

#: templates/legacy/edit/oa_edit_basic_settings_list.html:167
msgid "Allow Learner Resubmissions"
msgstr ""

#: templates/legacy/edit/oa_edit_basic_settings_list.html:174
msgid ""
"Set to TRUE to allow learners to resubmit ungraded work. Set to FALSE if "
"resubmissions are not allowed."
msgstr ""

#: templates/legacy/edit/oa_edit_basic_settings_list.html:178
msgid "Resubmission Grace Period"
msgstr ""

#: templates/legacy/edit/oa_edit_basic_settings_list.html:187
msgid ""
"Specify the maximum period during which resubmissions are allowed. If left "
"blank, learners will be able to reset their submission as long as it has not "
"been graded. The grace period starts once the learner has submitted their "
"response."
msgstr ""

#: templates/legacy/edit/oa_edit_criterion.html:6
#: templates/legacy/staff_area/oa_student_info.html:122
#: templates/legacy/staff_area/oa_student_info_assessment_detail.html:25
Expand Down Expand Up @@ -1600,7 +1624,7 @@ msgstr ""
msgid "We could not submit your response"
msgstr ""

#: templates/legacy/response/oa_response.html:332
#: templates/legacy/response/oa_response.html:333
msgid "Submit your response and move to the next step"
msgstr ""

Expand Down Expand Up @@ -1700,6 +1724,14 @@ msgid ""
" "
msgstr ""

#: templates/legacy/response/oa_response_submitted.html:63
msgid "We could not reset your response"
msgstr ""

#: templates/legacy/response/oa_response_submitted.html:69
msgid "Reset response and submit again"
msgstr ""

#: templates/legacy/response/oa_response_team_already_submitted.html:15
msgid "Error"
msgstr ""
Expand Down Expand Up @@ -2354,6 +2386,22 @@ msgstr ""
msgid "Self Assessment to Staff Assessment"
msgstr ""

#: xblock/openassessmentblock.py:1358
msgid "You can't reset your submission."
msgstr ""

#: xblock/openassessmentblock.py:1371
msgid "The user does not exist."
msgstr ""

#: xblock/openassessmentblock.py:1374
msgid "There is no submission to reset."
msgstr ""

#: xblock/openassessmentblock.py:1376
msgid "Submission reset successfully."
msgstr ""

#: xblock/rubric_reuse_mixin.py:62
msgid "You must specify a block id from which to copy a rubric."
msgstr ""
Expand Down Expand Up @@ -2454,30 +2502,30 @@ msgid ""
"allow the team to resubmit a response."
msgstr ""

#: xblock/studio_mixin.py:244 xblock/studio_mixin.py:256
#: xblock/studio_mixin.py:246 xblock/studio_mixin.py:258
msgid "Error updating XBlock configuration"
msgstr ""

#: xblock/studio_mixin.py:261
#: xblock/studio_mixin.py:263
msgid "Error: Text Response and File Upload Response cannot both be disabled"
msgstr ""

#: xblock/studio_mixin.py:265
#: xblock/studio_mixin.py:267
msgid ""
"Error: When Text Response is disabled, File Upload Response must be Required"
msgstr ""

#: xblock/studio_mixin.py:268
#: xblock/studio_mixin.py:270
msgid ""
"Error: When File Upload Response is disabled, Text Response must be Required"
msgstr ""

#: xblock/studio_mixin.py:292
#: xblock/studio_mixin.py:294
#, python-brace-format
msgid "Validation error: {error}"
msgstr ""

#: xblock/studio_mixin.py:324
#: xblock/studio_mixin.py:328
msgid "Successfully updated OpenAssessment XBlock"
msgstr ""

Expand Down
Loading
Loading