Merge pull request #820 from edx/bseverino/remove-exam-resume-flag

[MST-678] Roll out exam resume and grouped attempt features
openedx · Mar 31, 2021 · 7af2db0 · 7af2db0
2 parents 3aaff00 + f4e1dd8
commit 7af2db0
Show file tree

Hide file tree

Showing 12 changed files with 168 additions and 685 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -14,6 +14,10 @@ Change Log
 Unreleased
 ~~~~~~~~~~
 
+[3.8.0] - 2021-03-31
+~~~~~~~~~~~~~~~~~~~~~
+* Remove exam resume waffle flag references and fully roll out exam resume and grouped attempt features.
+
 [3.7.16] - 2021-03-30
 ~~~~~~~~~~~~~~~~~~~~~
 * Reduce time for ping interval from 120 to 30 seconds.

diff --git a/edx_proctoring/__init__.py b/edx_proctoring/__init__.py
@@ -3,6 +3,6 @@
 """
 
 # Be sure to update the version number in edx_proctoring/package.json
-__version__ = '3.7.16'
+__version__ = '3.8.0'
 
 default_app_config = 'edx_proctoring.apps.EdxProctoringConfig'  # pylint: disable=invalid-name
diff --git a/edx_proctoring/settings/common.py b/edx_proctoring/settings/common.py
@@ -19,7 +19,6 @@ def plugin_settings(settings):
             'proctoring/js/models/proctored_exam_model.js',
             'proctoring/js/models/learner_onboarding_model.js',
             'proctoring/js/collections/proctored_exam_allowance_collection.js',
-            'proctoring/js/collections/proctored_exam_attempt_collection.js',
             'proctoring/js/collections/proctored_exam_attempt_grouped_collection.js',
             'proctoring/js/collections/proctored_exam_onboarding_collection.js',
             'proctoring/js/collections/proctored_exam_collection.js',

diff --git a/edx_proctoring/static/proctoring/js/collections/proctored_exam_attempt_collection.js b/edx_proctoring/static/proctoring/js/collections/proctored_exam_attempt_collection.js
diff --git a/edx_proctoring/static/proctoring/js/views/proctored_exam_attempt_view.js b/edx_proctoring/static/proctoring/js/views/proctored_exam_attempt_view.js
@@ -45,21 +45,12 @@ edx = edx || {};
     edx.instructor_dashboard.proctoring.ProctoredExamAttemptView = Backbone.View.extend({
         initialize: function() {
             this.setElement($('.student-proctored-exam-container'));
-            this.enable_exam_resume_proctoring_improvements =
-                this.$el.data('enable-exam-resume-proctoring-improvements');
-            this.enable_exam_resume_proctoring_improvements = this.enable_exam_resume_proctoring_improvements &&
-                this.enable_exam_resume_proctoring_improvements.toLowerCase() === 'true';
             this.course_id = this.$el.data('course-id');
             this.template = null;
             this.model = new edx.instructor_dashboard.proctoring.ProctoredExamAttemptModel();
 
-            if (!this.enable_exam_resume_proctoring_improvements) {
-                this.collection = new edx.instructor_dashboard.proctoring.ProctoredExamAttemptCollection();
-                this.template_url = '/static/proctoring/templates/student-proctored-exam-attempts.underscore';
-            } else {
-                this.collection = new edx.instructor_dashboard.proctoring.ProctoredExamAttemptGroupedCollection();
-                this.template_url = '/static/proctoring/templates/student-proctored-exam-attempts-grouped.underscore';
-            }
+            this.collection = new edx.instructor_dashboard.proctoring.ProctoredExamAttemptGroupedCollection();
+            this.template_url = '/static/proctoring/templates/student-proctored-exam-attempts-grouped.underscore';
 
 
             this.initial_url = this.collection.url;
@@ -232,35 +223,21 @@ edx = edx || {};
 
             self.model.url = this.attempt_url + attemptId;
 
-            if (!self.enable_exam_resume_proctoring_improvements) {
-                self.model.fetch({
-                    headers: {
-                        'X-CSRFToken': this.getCSRFToken()
-                    },
-                    type: 'DELETE',
-                    success: function() {
-                        // fetch the attempts again.
-                        self.hydrate();
-                        $('body').css('cursor', 'auto');
-                    }
-                });
-            } else {
-                // call reset endpoint that can be used to delete all attempts for a given
-                // user and exam
-                $.ajax({
-                    url: '/api/edx_proctoring/v1/proctored_exam/exam_id/' + examId +
-                        '/user_id/' + userId + '/reset_attempts',
-                    type: 'DELETE',
-                    headers: {
-                        'X-CSRFToken': this.getCSRFToken()
-                    },
-                    success: function() {
-                        // fetch the attempts again.
-                        self.hydrate();
-                        $('body').css('cursor', 'auto');
-                    }
-                });
-            }
+            // call reset endpoint that can be used to delete all attempts for a given
+            // user and exam
+            $.ajax({
+                url: '/api/edx_proctoring/v1/proctored_exam/exam_id/' + examId +
+                    '/user_id/' + userId + '/reset_attempts',
+                type: 'DELETE',
+                headers: {
+                    'X-CSRFToken': this.getCSRFToken()
+                },
+                success: function() {
+                    // fetch the attempts again.
+                    self.hydrate();
+                    $('body').css('cursor', 'auto');
+                }
+            });
         },
         onResumeAttempt: function(event) {
             var $target, attemptId, userId;