pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-16 13:15:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with AdHoc meeting creation to close ECS-315

Browse Source
This commit is contained in:
Neil Dorin
2017-05-18 10:59:11 -06:00
parent 520f7fa639
commit 86c54ca9e6
5 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo
View File

Binary file not shown.

BIN
Essentials DM/Essentials_DM/Essentials_DM.projectinfo
View File

Binary file not shown.

BIN
Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo
View File

Binary file not shown.

33
Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs
View File

@@ -45,10 +45,19 @@ namespace PepperDash.Essentials.Fusion
Event CurrentMeeting; Event CurrentMeeting;
string RoomGuid; string RoomGuid
{
get
{
return GUIDs.RoomGuid;
}
}
uint IpId; uint IpId;
FusionRoomGuids GUIDs;
bool GuidFileExists; bool GuidFileExists;
bool IsRegisteredForSchedulePushNotifications = false; bool IsRegisteredForSchedulePushNotifications = false;
@@ -75,6 +84,7 @@ namespace PepperDash.Essentials.Fusion
StaticAssets = new List<StaticAsset>(); StaticAssets = new List<StaticAsset>();
GUIDs = new FusionRoomGuids();
var mac = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, 0); var mac = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, 0);
@@ -94,7 +104,7 @@ namespace PepperDash.Essentials.Fusion
Guid roomGuid = Guid.NewGuid(); Guid roomGuid = Guid.NewGuid();
RoomGuid = string.Format("{0}-{1}-{2}", slot, mac, roomGuid.ToString()); GUIDs.RoomGuid = string.Format("{0}-{1}-{2}", slot, mac, roomGuid.ToString());
} }
CreateSymbolAndBasicSigs(IpId); CreateSymbolAndBasicSigs(IpId);
@@ -159,7 +169,7 @@ namespace PepperDash.Essentials.Fusion
Debug.Console(1, this, "Writing GUIDs to file"); Debug.Console(1, this, "Writing GUIDs to file");
var GUIDs = new FusionRoomGuids(Room.Name, IpId, RoomGuid, StaticAssets); GUIDs = new FusionRoomGuids(Room.Name, IpId, RoomGuid, StaticAssets);
var JSON = JsonConvert.SerializeObject(GUIDs, Newtonsoft.Json.Formatting.Indented); var JSON = JsonConvert.SerializeObject(GUIDs, Newtonsoft.Json.Formatting.Indented);
@@ -208,12 +218,10 @@ namespace PepperDash.Essentials.Fusion
{ {
var JSON = File.ReadToEnd(filePath, Encoding.ASCII); var JSON = File.ReadToEnd(filePath, Encoding.ASCII);
var GUIDs = JsonConvert.DeserializeObject<FusionRoomGuids>(JSON); GUIDs = JsonConvert.DeserializeObject<FusionRoomGuids>(JSON);
IpId = GUIDs.IpId; IpId = GUIDs.IpId;
RoomGuid = GUIDs.RoomGuid;
StaticAssets = GUIDs.StaticAssets; StaticAssets = GUIDs.StaticAssets;
} }
@@ -452,7 +460,7 @@ namespace PepperDash.Essentials.Fusion
string.Format("<dtEnd>{0}</dtEnd>", dtEnd.ToString("s")) + string.Format("<dtEnd>{0}</dtEnd>", dtEnd.ToString("s")) +
"<Subject>AdHoc Meeting</Subject>" + "<Subject>AdHoc Meeting</Subject>" +
"<Organizer>Room User</Organizer>" + "<Organizer>Room User</Organizer>" +
"<Body></Body>" + "<WelcomMsg>Example Message</WelcomMsg>" +
"</Event>" + "</Event>" +
"</CreateSchedule>"; "</CreateSchedule>";
@@ -460,6 +468,10 @@ namespace PepperDash.Essentials.Fusion
FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.CreateMeeting.StringValue = createMeetingRequest; FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.CreateMeeting.StringValue = createMeetingRequest;
//Debug.Console(1, this, "Sending CreateMeeting Request: \n{0}", command);
//FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.CreateMeeting.StringValue = command;
} }
/// <summary> /// <summary>
@@ -616,7 +628,7 @@ namespace PepperDash.Essentials.Fusion
} }
else if (element.Name == "Event") else if (element.Name == "Event")
{ {
Debug.Console(1, this, "Event Found:\n{0}", element.OuterXml); Debug.Console(2, this, "Event Found:\n{0}", element.OuterXml);
XmlReader reader = new XmlReader(element.OuterXml); XmlReader reader = new XmlReader(element.OuterXml);
@@ -1071,6 +1083,11 @@ namespace PepperDash.Essentials.Fusion
public string RoomGuid { get; set; } public string RoomGuid { get; set; }
public List<StaticAsset> StaticAssets { get; set; } public List<StaticAsset> StaticAssets { get; set; }
public FusionRoomGuids()
{
StaticAssets = new List<StaticAsset>();
}
public FusionRoomGuids(string roomName, uint ipId, string roomGuid, List<StaticAsset> staticAssets) public FusionRoomGuids(string roomName, uint ipId, string roomGuid, List<StaticAsset> staticAssets)
{ {
RoomName = roomName; RoomName = roomName;

BIN
Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo
View File

Binary file not shown.