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

SEBWIN-448: Fixed mapping error for proctoring settings.

Browse source
This commit is contained in:
Damian Büchel 2021-03-26 15:55:13 +01:00
parent 28ee48f433
commit d4f9a9cc17
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
SafeExamBrowser.Configuration/ConfigurationData/DataMapping/ProctoringDataMapper.cs
View file

@ -6,8 +6,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
using System;
using System.Collections.Generic;
using SafeExamBrowser.Settings; using SafeExamBrowser.Settings;
using SafeExamBrowser.Settings.Proctoring; using SafeExamBrowser.Settings.Proctoring;
@ -19,6 +17,9 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
{ {
switch (key) switch (key)
{ {
case Keys.Proctoring.JitsiMeet.Enabled:
MapJitsiMeetEnabled(settings, value);
break;
case Keys.Proctoring.JitsiMeet.RoomName: case Keys.Proctoring.JitsiMeet.RoomName:
MapJitsiMeetRoomName(settings, value); MapJitsiMeetRoomName(settings, value);
break; break;
@ -37,20 +38,18 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
case Keys.Proctoring.WindowVisibility: case Keys.Proctoring.WindowVisibility:
MapWindowVisibility(settings, value); MapWindowVisibility(settings, value);
break; break;
case Keys.Proctoring.Zoom.Enabled:
MapZoomEnabled(settings, value);
break;
} }
} }
internal override void MapGlobal(IDictionary<string, object> rawData, AppSettings settings) private void MapJitsiMeetEnabled(AppSettings settings, object value)
{ {
MapProctoringEnabled(rawData, settings); if (value is bool enabled)
}
private void MapProctoringEnabled(IDictionary<string, object> rawData, AppSettings settings)
{ {
var jitsiEnabled = rawData.TryGetValue(Keys.Proctoring.JitsiMeet.Enabled, out var v) && v is bool b && b; settings.Proctoring.JitsiMeet.Enabled = enabled;
var zoomEnabled = rawData.TryGetValue(Keys.Proctoring.Zoom.Enabled, out v) && v is bool b2 && b2; }
settings.Proctoring.Enabled = jitsiEnabled || zoomEnabled;
} }
private void MapJitsiMeetRoomName(AppSettings settings, object value) private void MapJitsiMeetRoomName(AppSettings settings, object value)
@ -119,5 +118,13 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
} }
} }
} }
private void MapZoomEnabled(AppSettings settings, object value)
{
if (value is bool enabled)
{
settings.Proctoring.Zoom.Enabled = enabled;
}
}
} }
} }

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

@ -61,7 +61,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
public void SetTitle(string title) public void SetTitle(string title)
{ {
Dispatcher.Invoke(() => Title = title); Dispatcher.Invoke(() => Title = title ?? "");
} }
public new void Show() public new void Show()