From 380b16341809ff6c07149beeb844265f986296bc Mon Sep 17 00:00:00 2001 From: "Dave St.Germain" Date: Tue, 27 Nov 2018 16:59:02 -0500 Subject: [PATCH] Added proctor backend dashboard to the instructor dashboard --- lms/envs/common.py | 3 ++- lms/static/js/instructor_dashboard/instructor_dashboard.js | 3 +++ lms/static/js/instructor_dashboard/proctoring.js | 6 ------ .../instructor/instructor_dashboard_2/special_exams.html | 4 ++++ 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lms/envs/common.py b/lms/envs/common.py index e5fa962a13..954d1b6917 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1361,7 +1361,8 @@ proctoring_js = ( 'proctoring/js/views/proctored_exam_add_allowance_view.js', 'proctoring/js/views/proctored_exam_allowance_view.js', 'proctoring/js/views/proctored_exam_attempt_view.js', - 'proctoring/js/views/proctored_exam_view.js' + 'proctoring/js/views/proctored_exam_view.js', + 'proctoring/js/views/proctored_exam_instructor_launch.js', ] + [ 'proctoring/js/proctored_app.js' diff --git a/lms/static/js/instructor_dashboard/instructor_dashboard.js b/lms/static/js/instructor_dashboard/instructor_dashboard.js index 58c65d2c5d..c58e7610e9 100644 --- a/lms/static/js/instructor_dashboard/instructor_dashboard.js +++ b/lms/static/js/instructor_dashboard/instructor_dashboard.js @@ -206,6 +206,9 @@ such that the value can be defined later than this assignment (file load order). }, { constructor: edx.instructor_dashboard.proctoring.ProctoredExamAttemptView, $element: idashContent.find('.' + CSS_IDASH_SECTION + '#special_exams') + }, { + constructor: edx.instructor_dashboard.proctoring.ProctoredExamDashboardView, + $element: idashContent.find('.' + CSS_IDASH_SECTION + '#special_exams') } ]); } diff --git a/lms/static/js/instructor_dashboard/proctoring.js b/lms/static/js/instructor_dashboard/proctoring.js index 22a44b5500..9ef274f9de 100644 --- a/lms/static/js/instructor_dashboard/proctoring.js +++ b/lms/static/js/instructor_dashboard/proctoring.js @@ -7,15 +7,9 @@ $(function() { $proctoringAccordionPane.accordion( { heightStyle: 'content', - activate: function(event, ui) { - var active = $proctoringAccordionPane.accordion('option', 'active'); - $.cookie('saved_index', null); - $.cookie('saved_index', active); - }, animate: 400, header: '> .wrap > .hd', icons: icons, - active: isNaN(parseInt($.cookie('saved_index'))) ? 0 : parseInt($.cookie('saved_index')), collapsible: true } ); diff --git a/lms/templates/instructor/instructor_dashboard_2/special_exams.html b/lms/templates/instructor/instructor_dashboard_2/special_exams.html index a878a94207..f823ea9628 100644 --- a/lms/templates/instructor/instructor_dashboard_2/special_exams.html +++ b/lms/templates/instructor/instructor_dashboard_2/special_exams.html @@ -14,5 +14,9 @@ import pytz

${_('Student Special Exam Attempts')}

+
+

${_('Review Dashboard')}

+
+