SEBWIN-516: Added missing data mapping for raise hand feature and ens…

…ured that message panel is closed upon server confirmation.
SafeExamBrowser · Oct 21, 2021 · 05db975 · 05db975
1 parent 0da587e
commit 05db975
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 0 deletions.
diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataMapping/ProctoringDataMapper.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataMapping/ProctoringDataMapper.cs
@@ -17,6 +17,9 @@ internal override void Map(string key, object value, AppSettings settings)
 		{
 			switch (key)
 			{
+				case Keys.Proctoring.ForceRaiseHandMessage:
+					MapForceRaiseHandMessage(settings, value);
+					break;
 				case Keys.Proctoring.JitsiMeet.AllowChat:
 					MapJitsiMeetAllowChat(settings, value);
 					break;
@@ -71,6 +74,9 @@ internal override void Map(string key, object value, AppSettings settings)
 				case Keys.Proctoring.JitsiMeet.VideoMuted:
 					MapJitsiMeetVideoMuted(settings, value);
 					break;
+				case Keys.Proctoring.ShowRaiseHand:
+					MapShowRaiseHand(settings, value);
+					break;
 				case Keys.Proctoring.ShowTaskbarNotification:
 					MapShowTaskbarNotification(settings, value);
 					break;
@@ -128,6 +134,14 @@ internal override void Map(string key, object value, AppSettings settings)
 			}
 		}
 
+		private void MapForceRaiseHandMessage(AppSettings settings, object value)
+		{
+			if (value is bool force)
+			{
+				settings.Proctoring.ForceRaiseHandMessage = force;
+			}
+		}
+
 		private void MapJitsiMeetAllowChat(AppSettings settings, object value)
 		{
 			if (value is bool allow)
@@ -272,6 +286,14 @@ private void MapJitsiMeetVideoMuted(AppSettings settings, object value)
 			}
 		}
 
+		private void MapShowRaiseHand(AppSettings settings, object value)
+		{
+			if (value is bool show)
+			{
+				settings.Proctoring.ShowRaiseHandNotification = show;
+			}
+		}
+
 		private void MapShowTaskbarNotification(AppSettings settings, object value)
 		{
 			if (value is bool show)

diff --git a/SafeExamBrowser.Configuration/ConfigurationData/Keys.cs b/SafeExamBrowser.Configuration/ConfigurationData/Keys.cs
@@ -225,6 +225,8 @@ internal static class Certificates
 
 		internal static class Proctoring
 		{
+			internal const string ForceRaiseHandMessage = "raiseHandButtonAlwaysPromptMessage";
+			internal const string ShowRaiseHand = "raiseHandButtonShow";
 			internal const string ShowTaskbarNotification = "showProctoringViewButton";
 			internal const string WindowVisibility = "remoteProctoringViewShow";
 

diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/RaiseHandControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenter/RaiseHandControl.xaml.cs
@@ -117,6 +117,7 @@ private void ShowLowered()
 			Icon.Content = IconResourceLoader.Load(LoweredIcon);
 			Message.IsEnabled = true;
 			NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered);
+			Popup.IsOpen = false;
 			Text.Text = text.Get(TextKey.Notification_ProctoringHandLowered);
 		}
 

diff --git a/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/RaiseHandControl.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Controls/Taskbar/RaiseHandControl.xaml.cs
@@ -123,6 +123,7 @@ private void ShowLowered()
 			Icon.Content = IconResourceLoader.Load(LoweredIcon);
 			Message.IsEnabled = true;
 			NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered);
+			Popup.IsOpen = false;
 		}
 
 		private void ShowRaised()

diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/RaiseHandControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/RaiseHandControl.xaml.cs
@@ -117,6 +117,7 @@ private void ShowLowered()
 			Icon.Content = IconResourceLoader.Load(LoweredIcon);
 			Message.IsEnabled = true;
 			NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered);
+			Popup.IsOpen = false;
 			Text.Text = text.Get(TextKey.Notification_ProctoringHandLowered);
 		}
 

diff --git a/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/RaiseHandControl.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/RaiseHandControl.xaml.cs
@@ -124,6 +124,7 @@ private void ShowLowered()
 			Icon.Content = IconResourceLoader.Load(LoweredIcon);
 			Message.IsEnabled = true;
 			NotificationButton.ToolTip = text.Get(TextKey.Notification_ProctoringHandLowered);
+			Popup.IsOpen = false;
 		}
 
 		private void ShowRaised()