diff --git a/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/BookingsDataClasses.cs b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/BookingsDataClasses.cs index 2905f285..d89993f2 100644 --- a/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/BookingsDataClasses.cs +++ b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/BookingsDataClasses.cs @@ -278,6 +278,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec meeting.EndTime = b.Time.EndTime.Value; meeting.Privacy = CodecCallPrivacy.ConvertToDirectionEnum(b.Privacy.Value); + meetings.Add(meeting); + if(Debug.Level > 0) { Debug.Console(1, "Title: {0}, ID: {1}, Organizer: {2}, Agenda: {3}", meeting.Title, meeting.Id, meeting.Organizer, meeting.Agenda); diff --git a/Essentials/PepperDashEssentials/ControlSystem.cs b/Essentials/PepperDashEssentials/ControlSystem.cs index ded56878..9c7c7813 100644 --- a/Essentials/PepperDashEssentials/ControlSystem.cs +++ b/Essentials/PepperDashEssentials/ControlSystem.cs @@ -198,6 +198,12 @@ namespace PepperDash.Essentials cotija.CotijaRooms.Add(new CotijaEssentialsHuddleSpaceRoomBridge(cotija, room as EssentialsHuddleSpaceRoom)); } } + else if (room is EssentialsHuddleVtc1Room) + { + DeviceManager.AddDevice(room); + + Debug.Console(1, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion"); + } else { Debug.Console(1, "Room is NOT EssentialsHuddleSpaceRoom, attempting to add to DeviceManager w/o Fusion"); diff --git a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs index 96407661..85fbef6c 100644 --- a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs +++ b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs @@ -394,34 +394,38 @@ namespace PepperDash.Essentials if (CurrentRoom.OnFeedback.BoolValue) return; // Every 60 seconds, check meetings list for the closest, joinable meeting - var meetings = ss.CodecSchedule.Meetings; - var meeting = meetings.Aggregate((m1, m2) => m1.StartTime < m2.StartTime ? m1 : m2); - if (meeting != null && meeting.Joinable) - { - TriList.SetString(UIStringJoin.NextMeetingRibbonStartText, meeting.StartTime.ToShortTimeString()); - TriList.SetString(UIStringJoin.NextMeetingRibbonEndText, meeting.EndTime.ToShortTimeString()); - TriList.SetString(UIStringJoin.NextMeetingRibbonTitleText, meeting.Title); - TriList.SetString(UIStringJoin.NextMettingRibbonNameText, meeting.Organizer); - TriList.SetString(UIStringJoin.NextMeetingRibbonButtonLabel, "Join"); - TriList.SetSigFalseAction(UIBoolJoin.NextMeetingRibbonJoinPress, () => - { - HideNextMeetingPopup(); - RoomOnAndDialMeeting(meeting.ConferenceNumberToDial); - }); - TriList.SetString(UIStringJoin.NextMeetingSecondaryButtonLabel, "Show Schedule"); - TriList.SetSigFalseAction(UIBoolJoin.CalendarHeaderButtonPress, () => - { - HideNextMeetingPopup(); - CalendarPress(); - }); - if (meetings.Count > 1) - { - TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText, - meetings[1].StartTime.ToShortTimeString()); - } - - ShowNextMeetingPopup(); - } + var meetings = ss.CodecSchedule.Meetings; + if (meetings.Count > 0) + { + var meeting = meetings.Aggregate((m1, m2) => m1.StartTime < m2.StartTime ? m1 : m2); + if (meeting != null && meeting.Joinable) + { + TriList.SetString(UIStringJoin.NextMeetingRibbonStartText, meeting.StartTime.ToShortTimeString()); + TriList.SetString(UIStringJoin.NextMeetingRibbonEndText, meeting.EndTime.ToShortTimeString()); + TriList.SetString(UIStringJoin.NextMeetingRibbonTitleText, meeting.Title); + TriList.SetString(UIStringJoin.NextMettingRibbonNameText, meeting.Organizer); + TriList.SetString(UIStringJoin.NextMeetingRibbonButtonLabel, "Join"); + TriList.SetSigFalseAction(UIBoolJoin.NextMeetingRibbonJoinPress, () => + { + HideNextMeetingPopup(); + RoomOnAndDialMeeting(meeting.ConferenceNumberToDial); + }); + TriList.SetString(UIStringJoin.NextMeetingSecondaryButtonLabel, "Show Schedule"); + TriList.SetSigFalseAction(UIBoolJoin.CalendarHeaderButtonPress, () => + { + HideNextMeetingPopup(); + CalendarPress(); + }); + if (meetings.Count > 1) + { + TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText, + meetings[1].StartTime.ToShortTimeString()); + } + + ShowNextMeetingPopup(); + + } + } }, null, 0, 60000); } }