ecs-464 recent calls list, no deletion or confirmation

This commit is contained in:
Heath Volmer
2017-10-02 16:10:46 -06:00
parent 6bbd11c59b
commit 183112987e
5 changed files with 31 additions and 28 deletions

View File

@@ -15,7 +15,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
void RemoveCallHistoryEntry(CodecCallHistory.CallHistoryEntry entry); void RemoveCallHistoryEntry(CodecCallHistory.CallHistoryEntry entry);
} }
public enum eCodecOccurrenctType public enum eCodecOccurrenceType
{ {
Unknown = 0, Unknown = 0,
Placed, Placed,
@@ -28,7 +28,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
/// </summary> /// </summary>
public class CodecCallHistory public class CodecCallHistory
{ {
event EventHandler<EventArgs> RecentCallsListHasChanged; public event EventHandler<EventArgs> RecentCallsListHasChanged;
public List<CallHistoryEntry> RecentCalls { get; private set; } public List<CallHistoryEntry> RecentCalls { get; private set; }
@@ -78,7 +78,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
public class CallHistoryEntry : CodecActiveCallItem public class CallHistoryEntry : CodecActiveCallItem
{ {
public DateTime StartTime { get; set; } public DateTime StartTime { get; set; }
public eCodecOccurrenctType OccurenceType { get; set; } public eCodecOccurrenceType OccurenceType { get; set; }
public string OccurrenceHistoryId { get; set; } public string OccurrenceHistoryId { get; set; }
} }
@@ -115,24 +115,24 @@ namespace PepperDash.Essentials.Devices.Common.Codec
/// Takes the Cisco occurence type and converts it to the matching enum /// Takes the Cisco occurence type and converts it to the matching enum
/// </summary> /// </summary>
/// <param name="s"></para /// <param name="s"></para
public eCodecOccurrenctType ConvertToOccurenceTypeEnum(string s) public eCodecOccurrenceType ConvertToOccurenceTypeEnum(string s)
{ {
switch (s) switch (s)
{ {
case "Placed": case "Placed":
{ {
return eCodecOccurrenctType.Placed; return eCodecOccurrenceType.Placed;
} }
case "Received": case "Received":
{ {
return eCodecOccurrenctType.Received; return eCodecOccurrenceType.Received;
} }
case "NoAnswer": case "NoAnswer":
{ {
return eCodecOccurrenctType.NoAnswer; return eCodecOccurrenceType.NoAnswer;
} }
default: default:
return eCodecOccurrenctType.Unknown; return eCodecOccurrenceType.Unknown;
} }
} }

View File

@@ -47,12 +47,12 @@ namespace PepperDash.Essentials.UIDrivers.VC
/// <summary> /// <summary>
/// For the different staging bars: Active, inactive /// For the different staging bars: Active, inactive
/// </summary> /// </summary>
JoinedSigInterlock StagingBarInterlock; JoinedSigInterlock StagingBarsInterlock;
/// <summary> /// <summary>
/// For the staging button feedbacks /// For the staging button feedbacks
/// </summary> /// </summary>
JoinedSigInterlock StagingButtonFeedbackInterlock; JoinedSigInterlock StagingButtonsFeedbackInterlock;
SmartObjectNumeric DialKeypad; SmartObjectNumeric DialKeypad;
@@ -100,11 +100,11 @@ namespace PepperDash.Essentials.UIDrivers.VC
VCControlsInterlock = new JoinedSigInterlock(triList); VCControlsInterlock = new JoinedSigInterlock(triList);
VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadVisible); VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadVisible);
StagingBarInterlock = new JoinedSigInterlock(triList); StagingBarsInterlock = new JoinedSigInterlock(triList);
StagingBarInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverVisible); StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverVisible);
StagingButtonFeedbackInterlock = new JoinedSigInterlock(triList); StagingButtonsFeedbackInterlock = new JoinedSigInterlock(triList);
StagingButtonFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCRecentsVisible); StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
// Return formatted when dialing, straight digits when in call // Return formatted when dialing, straight digits when in call
DialStringFeedback = new StringFeedback(() => DialStringFeedback = new StringFeedback(() =>
@@ -156,6 +156,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
DialStringFeedback.FireUpdate(); DialStringFeedback.FireUpdate();
TriList.SetBool(UIBoolJoin.VCKeypadBackspaceVisible, false); TriList.SetBool(UIBoolJoin.VCKeypadBackspaceVisible, false);
Parent.ShowNotificationRibbon("Connected", 2000); Parent.ShowNotificationRibbon("Connected", 2000);
StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCKeypadVisible);
break; break;
case eCodecCallStatus.Connecting: case eCodecCallStatus.Connecting:
// fire at SRL item // fire at SRL item
@@ -199,7 +201,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
break; break;
} }
TriList.UShortInput[UIUshortJoin.VCStagingConnectButtonMode].UShortValue = (ushort)(Codec.IsInCall ? 1 : 0); TriList.UShortInput[UIUshortJoin.VCStagingConnectButtonMode].UShortValue = (ushort)(Codec.IsInCall ? 1 : 0);
StagingBarInterlock.ShowInterlocked(Codec.IsInCall ? StagingBarsInterlock.ShowInterlocked(Codec.IsInCall ?
UIBoolJoin.VCStagingActivePopoverVisible : UIBoolJoin.VCStagingInactivePopoverVisible); UIBoolJoin.VCStagingActivePopoverVisible : UIBoolJoin.VCStagingInactivePopoverVisible);
// Set mode of header button // Set mode of header button
@@ -271,7 +273,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
public override void Show() public override void Show()
{ {
VCControlsInterlock.Show(); VCControlsInterlock.Show();
StagingBarInterlock.Show(); StagingBarsInterlock.Show();
DialStringFeedback.FireUpdate(); DialStringFeedback.FireUpdate();
base.Show(); base.Show();
} }
@@ -282,7 +284,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
public override void Hide() public override void Hide()
{ {
VCControlsInterlock.Hide(); VCControlsInterlock.Hide();
StagingBarInterlock.Hide(); StagingBarsInterlock.Hide();
base.Hide(); base.Hide();
} }
@@ -342,6 +344,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
void SetupRecentCallsList() void SetupRecentCallsList()
{ {
var codec = Codec as IHasCallHistory; var codec = Codec as IHasCallHistory;
codec.CallHistory.RecentCallsListHasChanged += (o, a) => RefreshRecentCallsList();
if (codec != null) if (codec != null)
{ {
// EVENT??????????????? Pointed at refresh // EVENT??????????????? Pointed at refresh
@@ -421,20 +424,20 @@ namespace PepperDash.Essentials.UIDrivers.VC
void ShowCameraControls() void ShowCameraControls()
{ {
VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCCameraVisible); VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCCameraVisible);
StagingButtonFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingCameraPress); StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingCameraPress);
} }
void ShowKeypad() void ShowKeypad()
{ {
VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCKeypadVisible); VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCKeypadVisible);
StagingButtonFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress); StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
} }
void ShowDirectory() void ShowDirectory()
{ {
// populate directory // populate directory
VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCDirectoryVisible); VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCDirectoryVisible);
StagingButtonFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingDirectoryPress); StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingDirectoryPress);
} }
@@ -442,7 +445,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
{ {
//populate recents //populate recents
VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCRecentsVisible); VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCRecentsVisible);
StagingButtonFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingRecentsPress); StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingRecentsPress);
} }
/// <summary> /// <summary>