zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-475: Increased timeouts for Zoom proctoring integration and removed controls like mute and rename in participants overview.

Browse source
This commit is contained in:
Damian Büchel 2021-07-05 13:21:11 +02:00
parent a87e0c88a7
commit b67716b724
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
SafeExamBrowser.Proctoring/ProctoringController.cs
View file

@ -9,6 +9,7 @@
using System; using System;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Threading;
using System.Windows; using System.Windows;
using Microsoft.Web.WebView2.Wpf; using Microsoft.Web.WebView2.Wpf;
using SafeExamBrowser.Configuration.Contracts; using SafeExamBrowser.Configuration.Contracts;
@ -223,6 +224,8 @@ namespace SafeExamBrowser.Proctoring
control.ExecuteScriptAsync("ZoomMtg.leaveMeeting({});"); control.ExecuteScriptAsync("ZoomMtg.leaveMeeting({});");
} }
Thread.Sleep(2000);
window.Close(); window.Close();
control = default(ProctoringControl); control = default(ProctoringControl);
window = default(IProctoringWindow); window = default(IProctoringWindow);

12
SafeExamBrowser.Proctoring/Zoom/index.html
View file

@ -14,8 +14,6 @@
<script src="https://source.zoom.us/zoom-meeting-1.9.1.min.js"></script> <script src="https://source.zoom.us/zoom-meeting-1.9.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.9/crypto-js.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.9/crypto-js.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
const ATTENDEE = 0;
var audioJoin = 0; var audioJoin = 0;
var videoJoin = 0; var videoJoin = 0;
@ -24,11 +22,12 @@
var audioContainer = document.getElementsByClassName('join-audio-container')[0]; var audioContainer = document.getElementsByClassName('join-audio-container')[0];
var leave = document.getElementsByClassName('footer__leave-btn-container')[0]; var leave = document.getElementsByClassName('footer__leave-btn-container')[0];
var more = document.getElementsByClassName('more-button')[0]; var more = document.getElementsByClassName('more-button')[0];
var participantControls = document.getElementsByClassName('participants-item__buttons')[0];
var raiseHandContainer = document.getElementsByClassName('participants-section-container__participants-footer')[0]; var raiseHandContainer = document.getElementsByClassName('participants-section-container__participants-footer')[0];
var videoButton = document.getElementsByClassName('send-video-container__btn')[0]; var videoButton = document.getElementsByClassName('send-video-container__btn')[0];
var videoContainer = document.getElementsByClassName('send-video-container')[0]; var videoContainer = document.getElementsByClassName('send-video-container')[0];
if (audioButton && !'%_AUDIO_MUTED_%' && audioJoin < 100) { if (audioButton && !'%_AUDIO_MUTED_%' && audioJoin < 500) {
audioButton.click(); audioButton.click();
audioJoin++; audioJoin++;
} }
@ -45,11 +44,15 @@
more.style.visibility = 'hidden'; more.style.visibility = 'hidden';
} }
if (participantControls) {
participantControls.style.visibility = 'hidden';
}
if (raiseHandContainer && !'%_ALLOW_RAISE_HAND_%') { if (raiseHandContainer && !'%_ALLOW_RAISE_HAND_%') {
raiseHandContainer.style.visibility = 'hidden'; raiseHandContainer.style.visibility = 'hidden';
} }
if (videoButton && !'%_VIDEO_MUTED_%' && videoJoin < 100) { if (videoButton && !'%_VIDEO_MUTED_%' && videoJoin < 500) {
videoButton.click(); videoButton.click();
videoJoin++; videoJoin++;
} }
@ -62,6 +65,7 @@
} }
function startMeeting(credentials) { function startMeeting(credentials) {
const ATTENDEE = 0;
var signature = credentials.signature; var signature = credentials.signature;
if (!ZoomMtg.checkSystemRequirements()) { if (!ZoomMtg.checkSystemRequirements()) {

2
SafeExamBrowser.UserInterface.Desktop/Windows/ProctoringWindow.xaml.cs
View file

@ -63,7 +63,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
public void HideWithDelay() public void HideWithDelay()
{ {
Dispatcher.Invoke(() => this.MoveToBackground()); Dispatcher.Invoke(() => this.MoveToBackground());
Task.Delay(10000).ContinueWith(_ => Hide()); Task.Delay(15000).ContinueWith(_ => Hide());
} }
public void SetTitle(string title) public void SetTitle(string title)

2
SafeExamBrowser.UserInterface.Mobile/Windows/ProctoringWindow.xaml.cs
View file

@ -63,7 +63,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
public void HideWithDelay() public void HideWithDelay()
{ {
Dispatcher.Invoke(() => this.MoveToBackground()); Dispatcher.Invoke(() => this.MoveToBackground());
Task.Delay(10000).ContinueWith(_ => Hide()); Task.Delay(15000).ContinueWith(_ => Hide());
} }
public void SetTitle(string title) public void SetTitle(string title)