pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-04-12 03:57:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated UI drivers to make sure modal shutdown warning is shown when vacancy shutdown is triggered

Browse source
This commit is contained in:
Neil Dorin 2018-08-29 11:56:41 -06:00
parent d563a6224b
commit 6afe1729bf
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PepperDashEssentials/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs
View file

@ -50,7 +50,7 @@ namespace PepperDash.Essentials.Room.Behaviours
FeatureEventGroup.RetrieveAllEvents(); FeatureEventGroup.RetrieveAllEvents();
// Add to the global class for tracking // Add to the global class for tracking
//Global.Scheduler.AddEventGroup(FeatureEventGroup); Scheduler.AddEventGroup(FeatureEventGroup);
AddPostActivationAction(() => AddPostActivationAction(() =>
{ {

6
PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs
View file

@ -590,9 +590,9 @@ namespace PepperDash.Essentials
// Do we need to check where the UI is? No? // Do we need to check where the UI is? No?
var timer = CurrentRoom.ShutdownPromptTimer; var timer = CurrentRoom.ShutdownPromptTimer;
EndMeetingButtonSig.BoolValue = true; EndMeetingButtonSig.BoolValue = true;
ShareButtonSig.BoolValue = false; ShareButtonSig.BoolValue = false;
if (CurrentRoom.ShutdownType == eShutdownType.Manual) if (CurrentRoom.ShutdownType == eShutdownType.Manual || CurrentRoom.ShutdownType == eShutdownType.Vacancy)
{ {
PowerDownModal = new ModalDialog(TriList); PowerDownModal = new ModalDialog(TriList);
var message = string.Format("Meeting will end in {0} seconds", CurrentRoom.ShutdownPromptSeconds); var message = string.Format("Meeting will end in {0} seconds", CurrentRoom.ShutdownPromptSeconds);

2
PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
View file

@ -763,7 +763,7 @@ namespace PepperDash.Essentials
var timer = CurrentRoom.ShutdownPromptTimer; var timer = CurrentRoom.ShutdownPromptTimer;
SetActivityFooterFeedbacks(); SetActivityFooterFeedbacks();
if (CurrentRoom.ShutdownType == eShutdownType.Manual) if (CurrentRoom.ShutdownType == eShutdownType.Manual || CurrentRoom.ShutdownType == eShutdownType.Vacancy)
{ {
PowerDownModal = new ModalDialog(TriList); PowerDownModal = new ModalDialog(TriList);
var message = string.Format("Meeting will end in {0} seconds", CurrentRoom.ShutdownPromptSeconds); var message = string.Format("Meeting will end in {0} seconds", CurrentRoom.ShutdownPromptSeconds);

2
essentials-framework

@ -1 +1 @@
Subproject commit 03a1cef777fb8e57ddd88e9ab4bfdbc867a8769d Subproject commit 5c2202723fd8d3d5b5a3d17e600c47f0e10b61c2