-
Notifications
You must be signed in to change notification settings - Fork 86
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #727 from edx/alangsto/add_proctoring_info_panel
Add proctoring info panel UI
- Loading branch information
Showing
7 changed files
with
504 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
edx_proctoring/static/proctoring/js/models/learner_onboarding_model.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| (function(Backbone) { | ||
| 'use strict'; | ||
|
|
||
| var LearnerOnboardingModel = Backbone.Model.extend({ | ||
| url: '/api/edx_proctoring/v1/user_onboarding/status/' | ||
| }); | ||
|
|
||
| this.LearnerOnboardingModel = LearnerOnboardingModel; | ||
| }).call(this, Backbone); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
154 changes: 154 additions & 0 deletions
154
edx_proctoring/static/proctoring/js/views/proctored_exam_info.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| (function(Backbone, $) { | ||
| 'use strict'; | ||
|
|
||
| var examStatusReadableFormat, notStartedText, startedText, submittedText; | ||
|
|
||
| edx.courseware = edx.courseware || {}; | ||
| edx.courseware.proctored_exam = edx.courseware.proctored_exam || {}; | ||
|
|
||
| notStartedText = { | ||
| status: gettext('Not Started'), | ||
| message: gettext('You have not started your onboarding exam.') | ||
| }; | ||
| startedText = { | ||
| status: gettext('Started'), | ||
| message: gettext('You have started your onboarding exam.') | ||
| }; | ||
| submittedText = { | ||
| status: gettext('Submitted'), | ||
| message: gettext('You have submitted your onboarding exam.') | ||
| }; | ||
|
|
||
| examStatusReadableFormat = { | ||
| created: notStartedText, | ||
| download_software_clicked: notStartedText, | ||
| ready_to_start: notStartedText, | ||
| started: startedText, | ||
| ready_to_submit: startedText, | ||
| second_review_required: submittedText, | ||
| submitted: submittedText, | ||
| verified: { | ||
| status: gettext('Verified'), | ||
| message: gettext('You can now take proctored exams in this course.') | ||
| }, | ||
| rejected: { | ||
| status: gettext('Rejected'), | ||
| message: gettext('Your onboarding exam has been rejected. Please retry onboarding.') | ||
| }, | ||
| error: { | ||
| status: gettext('Error'), | ||
| message: gettext('An error has occurred during your onboarding exam. Please retry onboarding.') | ||
| } | ||
| }; | ||
|
|
||
| edx.courseware.proctored_exam.ProctoredExamInfo = Backbone.View.extend({ | ||
| initialize: function() { | ||
| this.course_id = this.$el.data('course-id'); | ||
| this.model.url = this.model.url + '?course_id=' + encodeURIComponent(this.course_id); | ||
| this.template_url = '/static/proctoring/templates/proctored-exam-info.underscore'; | ||
| this.status = ''; | ||
|
|
||
| this.loadTemplateData(); | ||
| }, | ||
|
|
||
| updateCss: function() { | ||
| var $el = $(this.el); | ||
| var color = '#b20610'; | ||
| if (this.status === 'verified') { | ||
| color = '#008100'; | ||
| } else if (['submitted', 'second_review_required'].includes(this.status)) { | ||
| color = '#0d4e6c'; | ||
| } | ||
|
|
||
| $el.find('.proctoring-info').css({ | ||
| padding: '10px', | ||
| border: '1px solid #e7e7e7', | ||
| 'border-top': '5px solid ' + color, | ||
| 'margin-bottom': '15px' | ||
| }); | ||
|
|
||
| $el.find('.onboarding-status').css({ | ||
| 'font-weight': 'bold', | ||
| 'margin-bottom': '15px' | ||
| }); | ||
|
|
||
| $el.find('.onboarding-status-message').css({ | ||
| 'margin-bottom': '15px' | ||
| }); | ||
|
|
||
| $el.find('.action').css({ | ||
| display: 'block', | ||
| 'font-weight': '600', | ||
| 'text-align': 'center', | ||
| 'text-decoration': 'none', | ||
| padding: '15px 20px', | ||
| border: 'none' | ||
| }); | ||
|
|
||
| $el.find('.action-onboarding').css({ | ||
| color: '#ffffff', | ||
| background: '#98050e', | ||
| 'margin-bottom': '15px' | ||
| }); | ||
|
|
||
| $el.find('.action-info-link').css({ | ||
| border: '1px solid #0d4e6c' | ||
| }); | ||
| }, | ||
|
|
||
| getExamAttemptText: function(status) { | ||
| if (status in examStatusReadableFormat) { | ||
| return examStatusReadableFormat[status]; | ||
| } else { | ||
| return {status: status || 'Not Started', message: ''}; | ||
| } | ||
| }, | ||
|
|
||
| shouldShowExamLink: function(status) { | ||
| // show the exam link if the user should retry onboarding, or if they haven't submitted the exam | ||
| var NO_SHOW_STATES = ['submitted', 'second_review_required', 'verified']; | ||
| return !NO_SHOW_STATES.includes(status); | ||
| }, | ||
|
|
||
| render: function() { | ||
| var statusText = {}; | ||
| var data = this.model.toJSON(); | ||
| if (this.template) { | ||
| this.status = data.onboarding_status; | ||
| statusText = this.getExamAttemptText(data.onboarding_status); | ||
| data = { | ||
| onboardingStatus: statusText.status, | ||
| onboardingMessage: statusText.message, | ||
| showOnboardingReminder: data.onboarding_status !== 'verified', | ||
| showOnboardingExamLink: this.shouldShowExamLink(data.onboarding_status), | ||
| onboardingLink: data.onboarding_link | ||
| }; | ||
|
|
||
| $(this.el).html(this.template(data)); | ||
| } | ||
| }, | ||
|
|
||
| loadTemplateData: function() { | ||
| var self = this; | ||
| // only load data/render if course_id is defined | ||
| if (self.course_id) { | ||
| $.ajax({url: self.template_url, dataType: 'html'}) | ||
| .done(function(templateData) { | ||
| self.template = _.template(templateData); | ||
| self.hydrate(); | ||
| }); | ||
| } | ||
| }, | ||
|
|
||
| hydrate: function() { | ||
| var self = this; | ||
| self.model.fetch({ | ||
| success: function() { | ||
| self.render(); | ||
| self.updateCss(); | ||
| } | ||
| }); | ||
| } | ||
| }); | ||
| this.edx.courseware.proctored_exam.ProctoredExamInfo = edx.courseware.proctored_exam.ProctoredExamInfo; | ||
| }).call(this, Backbone, $, _, gettext); |
Oops, something went wrong.