diff --git a/FasdCockpitCommunicationDemo/MockupTicketOverview/TicketOverviewRelations.json b/FasdCockpitCommunicationDemo/MockupTicketOverview/TicketOverviewRelations.json index 9e557d7..a5f9fc9 100644 --- a/FasdCockpitCommunicationDemo/MockupTicketOverview/TicketOverviewRelations.json +++ b/FasdCockpitCommunicationDemo/MockupTicketOverview/TicketOverviewRelations.json @@ -376,97 +376,5 @@ "StatusId": "OnHold" } ] - }, - "UnassignedTickets": { - "Personal": [ - { - "TicketId": "e2e49f85-1a81-47e8-935b-d76898c155f6", - "UserId": "76f86d28-862c-4fa2-9062-8367be7fbd92", - "DisplayName": "TCK00414", - "Summary": "Pool Notebook fuer Schulungsteilnehmer fehlt", - "UserDisplayName": "Virtual, Vera", - "UserAccount": "VV004", - "UserDomain": "CONTOSO", - "StatusId": "New" - }, - { - "TicketId": "ebe8818e-b197-411e-b56e-40b77b623ae2", - "UserId": "436e8d67-1b9b-4b1a-83e9-0b1e8fa0173b", - "DisplayName": "TCK00415", - "Summary": "Etikettendrucker im Lager meldet Papierstau", - "UserDisplayName": "Anwender, Peter", - "UserAccount": "PA010", - "UserDomain": "CONTOSO", - "StatusId": "New" - } - ], - "Role": [ - { - "TicketId": "e2e49f85-1a81-47e8-935b-d76898c155f6", - "UserId": "76f86d28-862c-4fa2-9062-8367be7fbd92", - "DisplayName": "TCK00414", - "Summary": "Pool Notebook fuer Schulungsteilnehmer fehlt", - "UserDisplayName": "Virtual, Vera", - "UserAccount": "VV004", - "UserDomain": "CONTOSO", - "StatusId": "New" - }, - { - "TicketId": "ebe8818e-b197-411e-b56e-40b77b623ae2", - "UserId": "436e8d67-1b9b-4b1a-83e9-0b1e8fa0173b", - "DisplayName": "TCK00415", - "Summary": "Etikettendrucker im Lager meldet Papierstau", - "UserDisplayName": "Anwender, Peter", - "UserAccount": "PA010", - "UserDomain": "CONTOSO", - "StatusId": "New" - }, - { - "TicketId": "9e1d5d1b-5a22-430e-99ea-59840257caab", - "UserId": "deece196-d8b6-4a9c-a2b9-3c2ae9c6d4ec", - "DisplayName": "TCK00416", - "Summary": "Ueberwachung meldet sporadische Alarme", - "UserDisplayName": "Seifert, Dominik", - "UserAccount": "DS014", - "UserDomain": "CONTOSO", - "StatusId": "New" - } - ] - }, - "UnassignedTicketsCritical": { - "Personal": [ - { - "TicketId": "9e1d5d1b-5a22-430e-99ea-59840257caab", - "UserId": "deece196-d8b6-4a9c-a2b9-3c2ae9c6d4ec", - "DisplayName": "TCK00416", - "Summary": "Ueberwachung meldet sporadische Alarme", - "UserDisplayName": "Seifert, Dominik", - "UserAccount": "DS014", - "UserDomain": "CONTOSO", - "StatusId": "InProgress" - } - ], - "Role": [ - { - "TicketId": "9e1d5d1b-5a22-430e-99ea-59840257caab", - "UserId": "deece196-d8b6-4a9c-a2b9-3c2ae9c6d4ec", - "DisplayName": "TCK00416", - "Summary": "Ueberwachung meldet sporadische Alarme", - "UserDisplayName": "Seifert, Dominik", - "UserAccount": "DS014", - "UserDomain": "CONTOSO", - "StatusId": "InProgress" - }, - { - "TicketId": "d427dc61-9842-4464-b37a-612878d3de0f", - "UserId": "a2164ecd-791f-482c-bea3-f089f14bec8a", - "DisplayName": "TCK00417", - "Summary": "Produktionsroboter steht nach Not Aus", - "UserDisplayName": "Boss, Bernd", - "UserAccount": "BB003", - "UserDomain": "CONTOSO", - "StatusId": "InProgress" - } - ] } -} \ No newline at end of file +} diff --git a/FasdDesktopUi/Basics/Models/TicketOverviewModel.cs b/FasdDesktopUi/Basics/Models/TicketOverviewModel.cs index f30bdfc..aae153a 100644 --- a/FasdDesktopUi/Basics/Models/TicketOverviewModel.cs +++ b/FasdDesktopUi/Basics/Models/TicketOverviewModel.cs @@ -62,20 +62,7 @@ namespace FasdDesktopUi.Basics.Models set { if (_incidentNewInfoSelected != value) { _incidentNewInfoSelected = value; OnPropertyChanged(nameof(IncidentNewInfoSelected)); } } } - private bool _unassignedTicketsSelected; - public bool UnassignedTicketsSelected - { - get => _unassignedTicketsSelected; - set { if (_unassignedTicketsSelected != value) { _unassignedTicketsSelected = value; OnPropertyChanged(nameof(UnassignedTicketsSelected)); } } - } - - private bool _unassignedTicketsCriticalSelected; - public bool UnassignedTicketsCriticalSelected - { - get => _unassignedTicketsCriticalSelected; - set { if (_unassignedTicketsCriticalSelected != value) { _unassignedTicketsCriticalSelected = value; OnPropertyChanged(nameof(UnassignedTicketsCriticalSelected)); } } - } - #endregion + #endregion #region Highlight-Properties private bool _ticketsNewHighlighted; @@ -102,12 +89,7 @@ namespace FasdDesktopUi.Basics.Models private bool _incidentNewInfoHighlighted; public bool IncidentNewInfoHighlighted { get => _incidentNewInfoHighlighted; set { if (_incidentNewInfoHighlighted != value) { _incidentNewInfoHighlighted = value; OnPropertyChanged(nameof(IncidentNewInfoHighlighted)); } } } - private bool _unassignedTicketsHighlighted; - public bool UnassignedTicketsHighlighted { get => _unassignedTicketsHighlighted; set { if (_unassignedTicketsHighlighted != value) { _unassignedTicketsHighlighted = value; OnPropertyChanged(nameof(UnassignedTicketsHighlighted)); } } } - - private bool _unassignedTicketsCriticalHighlighted; - public bool UnassignedTicketsCriticalHighlighted { get => _unassignedTicketsCriticalHighlighted; set { if (_unassignedTicketsCriticalHighlighted != value) { _unassignedTicketsCriticalHighlighted = value; OnPropertyChanged(nameof(UnassignedTicketsCriticalHighlighted)); } } } - #endregion + #endregion #region Change Hint Properties private string _ticketsNewChangeHint; @@ -134,12 +116,7 @@ namespace FasdDesktopUi.Basics.Models private string _incidentNewInfoChangeHint; public string IncidentNewInfoChangeHint { get => _incidentNewInfoChangeHint; set { if (_incidentNewInfoChangeHint != value) { _incidentNewInfoChangeHint = value; OnPropertyChanged(nameof(IncidentNewInfoChangeHint)); } } } - private string _unassignedTicketsChangeHint; - public string UnassignedTicketsChangeHint { get => _unassignedTicketsChangeHint; set { if (_unassignedTicketsChangeHint != value) { _unassignedTicketsChangeHint = value; OnPropertyChanged(nameof(UnassignedTicketsChangeHint)); } } } - - private string _unassignedTicketsCriticalChangeHint; - public string UnassignedTicketsCriticalChangeHint { get => _unassignedTicketsCriticalChangeHint; set { if (_unassignedTicketsCriticalChangeHint != value) { _unassignedTicketsCriticalChangeHint = value; OnPropertyChanged(nameof(UnassignedTicketsCriticalChangeHint)); } } } - #endregion + #endregion #region Ticket & Incident-Properties @@ -169,17 +146,9 @@ namespace FasdDesktopUi.Basics.Models private int _incidentNewInfo; public int IncidentNewInfo { get => _incidentNewInfo; set { _incidentNewInfo = value; OnPropertyChanged(nameof(IncidentNewInfo)); } } - // Unassigned Ticket Properties - private int _unassignedTickets; - public int UnassignedTickets { get => _unassignedTickets; set { _unassignedTickets = value; OnPropertyChanged(nameof(UnassignedTickets)); } } - - private int _unassignedTicketsCritical; - public int UnassignedTicketsCritical { get => _unassignedTicketsCritical; set { _unassignedTicketsCritical = value; OnPropertyChanged(nameof(UnassignedTicketsCritical)); } } - - - public event PropertyChangedEventHandler PropertyChanged; - protected void OnPropertyChanged(string propertyName) => - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); + public event PropertyChangedEventHandler PropertyChanged; + protected void OnPropertyChanged(string propertyName) => + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); #endregion #region Helper-Methods @@ -196,9 +165,7 @@ namespace FasdDesktopUi.Basics.Models IncidentCriticalSelected = false; IncidentNewInfoSelected = false; - UnassignedTicketsSelected = false; - UnassignedTicketsCriticalSelected = false; - } + } public void ResetHighlights() { @@ -212,10 +179,7 @@ namespace FasdDesktopUi.Basics.Models IncidentCriticalHighlighted = false; IncidentNewInfoHighlighted = false; - UnassignedTicketsHighlighted = false; - UnassignedTicketsCriticalHighlighted = false; - - TicketsNewChangeHint = null; + TicketsNewChangeHint = null; TicketsActiveChangeHint = null; TicketsCriticalChangeHint = null; TicketsNewInfoChangeHint = null; @@ -225,9 +189,7 @@ namespace FasdDesktopUi.Basics.Models IncidentCriticalChangeHint = null; IncidentNewInfoChangeHint = null; - UnassignedTicketsChangeHint = null; - UnassignedTicketsCriticalChangeHint = null; - } + } #endregion public TicketOverviewModel() diff --git a/FasdDesktopUi/Basics/Services/TicketOverviewUpdateService.cs b/FasdDesktopUi/Basics/Services/TicketOverviewUpdateService.cs index c114eac..e850f14 100644 --- a/FasdDesktopUi/Basics/Services/TicketOverviewUpdateService.cs +++ b/FasdDesktopUi/Basics/Services/TicketOverviewUpdateService.cs @@ -24,15 +24,13 @@ namespace FasdDesktopUi.Basics.Services { "TicketsNew", "TicketsActive", - "TicketsCritical", - "TicketsNewInfo", - "IncidentNew", - "IncidentActive", - "IncidentCritical", - "IncidentNewInfo", - "UnassignedTickets", - "UnassignedTicketsCritical" - }; + "TicketsCritical", + "TicketsNewInfo", + "IncidentNew", + "IncidentActive", + "IncidentCritical", + "IncidentNewInfo" + }; private const string DemoTicketDetailsKey = "Demo.HasTicketDetails"; private readonly Dispatcher _dispatcher; private readonly Dictionary _currentCounts = new Dictionary(StringComparer.OrdinalIgnoreCase); diff --git a/FasdDesktopUi/Basics/UserControls/TicketOverview.xaml b/FasdDesktopUi/Basics/UserControls/TicketOverview.xaml index 0ec7989..6bb6477 100644 --- a/FasdDesktopUi/Basics/UserControls/TicketOverview.xaml +++ b/FasdDesktopUi/Basics/UserControls/TicketOverview.xaml @@ -83,8 +83,6 @@ - - @@ -126,14 +124,14 @@ FontSize="12" /> -