Merge branch 'master' into mohtamba/group_allowances_by_learner

.github/workflows/ci.yml

@@ -23,6 +23,9 @@ jobs:
         toxenv:
           - django22-drf310
           - django22-drflatest
+          - django30-drflatest
+          - django31-drflatest
+          - django32-drflatest
           - quality
           - pii_check
           - version_check

CHANGELOG.rst

@@ -14,6 +14,31 @@ Change Log
 Unreleased
 ~~~~~~~~~~
 
+[3.20.6] - 2021-07-22
+~~~~~~~~~~~~~~~~~~~~~
+* Removed use of name field in proctored exam attempt admin.
+
+[3.20.5] - 2021-07-21
+~~~~~~~~~~~~~~~~~~~~~
+* No changes, gets tag and internal version in sync
+
+[3.20.4] - 2021-07-21
+~~~~~~~~~~~~~~~~~~~~~
+* Removed use of name field in proctored exam attempt.
+
+[3.20.2] - 2021-07-21
+~~~~~~~~~~~~~~~~~~~~~
+* Removed IP fields in proctored exam attempt from the DB
+* Made name field in proctored exam attempt nullable
+
+[3.20.1] - 2021-07-20
+~~~~~~~~~~~~~~~~~~~~~
+* Removed use of IP fields in proctored exam attempt.
+
+[3.20.0] - 2021-07-19
+~~~~~~~~~~~~~~~~~~~~~
+* Added Django 3.0, 3.1 & 3.2 Support
+
 [3.19.0] - 2021-07-16
 ~~~~~~~~~~~~~~~~~~~~~
 * Updated allowance modal to allow bulk allowances to be added.

docs/developing.rst

@@ -299,10 +299,10 @@ Release a new version of edx-proctoring
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 * Update the version in ``edx_proctoring/__init__.py`` and ``package.json``
+* Describe your changes in `CHANGELOG.rst`
 * Create a `new release on GitHub <https://github.com/edx/edx-proctoring/releases>`_ using the version number
-* Send an email to [email protected] announcing the new version
 * Update edx-platform to use the new version
-    * In edx-platform, create a branch and update the requirements/edx/base.in file to reflect the new tagged branch.
+    * In edx-platform, create a branch and update the requirements/edx/base.txt, development.txt, and testing.txt files to reflect the new tagged branch.
 * create a PR of this branch in edx-platform onto edx-platform:master
 * Once the PR onto edx-platform has been merged, the updated edx-proctoring will be live in production when the normally scheduled release completes.
 

edx_proctoring/__init__.py

@@ -3,6 +3,6 @@
 """
 
 # Be sure to update the version number in edx_proctoring/package.json
-__version__ = '3.19.0'
+__version__ = '3.20.6'
 
 default_app_config = 'edx_proctoring.apps.EdxProctoringConfig'  # pylint: disable=invalid-name

edx_proctoring/admin.py

@@ -428,14 +428,11 @@ class ProctoredExamStudentAttemptAdmin(admin.ModelAdmin):
         'proctored_exam',
         'started_at',
         'completed_at',
-        'last_poll_timestamp',
-        'last_poll_ipaddr',
         'attempt_code',
         'external_id',
         'allowed_time_limit_mins',
         'taking_as_proctored',
         'is_sample_attempt',
-        'student_name',
         'review_policy_id',
         'is_status_acknowledged',
         'time_remaining_seconds'

edx_proctoring/api.py

@@ -850,8 +850,6 @@ def update_exam_attempt(attempt_id, **kwargs):
         # only allow a limit set of fields to update
         # namely because status transitions can trigger workflow
         if key not in [
-                'last_poll_timestamp',
-                'last_poll_ipaddr',
                 'is_status_acknowledged',
                 'time_remaining_seconds',
         ]:
@@ -1062,7 +1060,6 @@ def create_exam_attempt(exam_id, user_id, taking_as_proctored=False):
     attempt = ProctoredExamStudentAttempt.create_exam_attempt(
         exam_id,
         user_id,
-        '',  # student name is TBD
         attempt_code,
         taking_as_proctored,
         exam['is_practice_exam'],

edx_proctoring/locale/ar/LC_MESSAGES/django.po

@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-proctoring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-04 18:34+0000\n"
+"POT-Creation-Date: 2021-07-18 18:35+0000\n"
 "PO-Revision-Date: 2016-12-20 19:52+0000\n"
 "Last-Translator: Karam Hawari <[email protected]>, 2021\n"
 "Language-Team: Arabic (https://www.transifex.com/open-edx/teams/6205/ar/)\n"
@@ -120,75 +120,75 @@ msgstr ""
 msgid "Onboarding Expired"
 msgstr ""
 
-#: api.py:770 views.py:1151
+#: api.py:803 views.py:1091
 #, python-brace-format
 msgid "you have {remaining_time} remaining"
 msgstr "بقي لديك  {remaining_time} "
 
-#: api.py:1501
+#: api.py:1534
 msgid "your course"
 msgstr "دورتك التعليمية"
 
-#: api.py:1570
+#: api.py:1603
 #, python-brace-format
 msgid "Proctoring Results For {course_name} {exam_name}"
 msgstr ""
 
-#: api.py:1579
+#: api.py:1612
 #, python-brace-format
 msgid "Proctoring Review In Progress For {course_name} {exam_name}"
 msgstr ""
 
-#: api.py:1613
+#: api.py:1646
 #, python-brace-format
 msgid "Proctored exam {exam_name} in {course_name} for user {username}"
 msgstr ""
 
-#: api.py:2095
+#: api.py:2128
 msgid "Taking As Proctored Exam"
 msgstr "امتحان مراقب"
 
-#: api.py:2100
+#: api.py:2133
 msgid "Proctored Option Available"
 msgstr "خيار المراقبة متاح"
 
-#: api.py:2105
+#: api.py:2138
 msgid "Taking As Open Exam"
 msgstr "امتحان مفتوح"
 
-#: api.py:2110 api.py:2115
+#: api.py:2143 api.py:2148
 msgid "Pending Session Review"
 msgstr "مراجعة جلسة المعلقة"
 
-#: api.py:2120
+#: api.py:2153
 msgid "Passed Proctoring"
 msgstr "عبر المراقبة"
 
-#: api.py:2125 api.py:2130
+#: api.py:2158 api.py:2163
 msgid "Failed Proctoring"
 msgstr "فشل المراقبة"
 
-#: api.py:2135
+#: api.py:2168
 msgid "Proctored Option No Longer Available"
 msgstr "خيار المراقبة لم يعد متوفراً"
 
-#: api.py:2144
+#: api.py:2177
 msgid "Ungraded Practice Exam"
 msgstr "امتحان تمرين دون علامة"
 
-#: api.py:2149
+#: api.py:2182
 msgid "Practice Exam Completed"
 msgstr "امتحان تمرين مكتمل"
 
-#: api.py:2154
+#: api.py:2187
 msgid "Practice Exam Failed"
 msgstr "امتحان تمرين راسب"
 
-#: api.py:2162
+#: api.py:2195
 msgid "Timed Exam"
 msgstr "امتحان موقوت"
 
-#: api.py:2742
+#: api.py:2775
 msgid "Onboarding status question"
 msgstr ""
 
@@ -1396,101 +1396,109 @@ msgid ""
 "            "
 msgstr ""
 
-#: utils.py:76
+#: utils.py:79
 #, python-brace-format
 msgid "{num_of_hours} hour"
 msgstr "{num_of_hours} الساعات"
 
-#: utils.py:79
+#: utils.py:82
 #, python-brace-format
 msgid "{num_of_hours} hours"
 msgstr "{num_of_hours} الساعات"
 
-#: utils.py:87 utils.py:97
+#: utils.py:90 utils.py:100
 #, python-brace-format
 msgid "{num_of_minutes} minutes"
 msgstr "{num_of_minutes} الدقائق"
 
-#: utils.py:90
+#: utils.py:93
 #, python-brace-format
 msgid " and {num_of_minutes} minute"
 msgstr "و{num_of_minutes} دقائق"
 
-#: utils.py:92
+#: utils.py:95
 #, python-brace-format
 msgid "{num_of_minutes} minute"
 msgstr "{num_of_minutes} دقائق"
 
-#: utils.py:95
+#: utils.py:98
 #, python-brace-format
 msgid " and {num_of_minutes} minutes"
 msgstr "و  {num_of_minutes} دقائق"
 
-#: utils.py:310
+#: utils.py:313
 msgid "a proctored exam"
 msgstr ""
 
-#: utils.py:313
+#: utils.py:316
 msgid "a timed exam"
 msgstr ""
 
-#: utils.py:316
+#: utils.py:319
 msgid "an onboarding exam"
 msgstr ""
 
-#: utils.py:318
+#: utils.py:321
 msgid "a practice exam"
 msgstr ""
 
-#: views.py:147
+#: views.py:146
 msgid "could not determine the course_id"
 msgstr "لم نتمكن من تحديد معرف الدورة التعليمية"
 
-#: views.py:156 views.py:545 views.py:1629
+#: views.py:155 views.py:535
 msgid "Must be a Staff User to Perform this request."
 msgstr "يجب أن تكون عضو طاقم من أجل القيام بهذا الطلب."
 
-#: views.py:535
+#: views.py:525
 msgid "Missing required query parameter course_id"
 msgstr ""
 
-#: views.py:553 views.py:770
+#: views.py:543 views.py:710
 msgid "There is no onboarding exam related to this course id."
 msgstr ""
 
-#: views.py:585
+#: views.py:571
 msgid "There is no onboarding exam accessible to this user."
 msgstr ""
 
-#: views.py:635
+#: views.py:621
 #, python-brace-format
 msgid "No onboarding status API for {proctor_service}"
 msgstr ""
 
-#: views.py:819
+#: views.py:759
 msgid ""
 "The onboarding service is temporarily unavailable. Please try again later."
 msgstr ""
 
-#: views.py:1157
+#: views.py:1097
 msgid "you have less than a minute remaining"
 msgstr "بقي لديك أقل من دقيقة"
 
-#: views.py:1716
+#: views.py:1563
+msgid "Enter a valid username or email"
+msgstr ""
+
+#: views.py:1576
+msgid "Enter a valid positive value number"
+msgstr ""
+
+#: views.py:1663
 msgid "Cannot update attempt review status"
 msgstr ""
 
-#: views.py:1998
+#: views.py:1945
 #, python-brace-format
 msgid "No exams in course {course_id}."
 msgstr ""
 
-#: views.py:2004
+#: views.py:1951
 #, python-brace-format
 msgid "No proctored exams in course {course_id}"
 msgstr ""
 
-#: views.py:2023
+#: views.py:1970
 #, python-brace-format
 msgid "No instructor dashboard for {proctor_service}"
 msgstr ""