Meik/C4IT-F4SD-Client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aktueller Stand

Browse Source
This commit is contained in:
Meik
2026-02-04 21:39:44 +01:00
parent 101572d35f
commit 3d055ac2ba
7 changed files with 53 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
FasdCockpitCommunicationDemo/MockupTicketOverview/TicketOverviewRelations.json
View File

@@ -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"
}
]
}
}
}

56
FasdDesktopUi/Basics/Models/TicketOverviewModel.cs
View File

@@ -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()

16
FasdDesktopUi/Basics/Services/TicketOverviewUpdateService.cs
View File

@@ -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<string, TileCounts> _currentCounts = new Dictionary<string, TileCounts>(StringComparer.OrdinalIgnoreCase);

61
FasdDesktopUi/Basics/UserControls/TicketOverview.xaml
View File

@@ -83,8 +83,6 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
@@ -126,14 +124,14 @@
FontSize="12" />
<!-- Tickets -->
<Label Grid.Row="2"
<Label Grid.Row="1"
Grid.Column="0"
Foreground="{DynamicResource FontColor.DetailsPage.TitleSection.Header}"
Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=TicketOverview.Row.Heading.Tickets}"
FontWeight="Bold"
FontSize="12" />
<Label Grid.Row="2"
<Label Grid.Row="1"
Grid.Column="1"
Content="{Binding TicketsNew}"
Style="{StaticResource RoundedSelectedLabelStyle}"
@@ -149,7 +147,7 @@
HorizontalAlignment="Center"
Cursor="Hand" />
<Label Grid.Row="2"
<Label Grid.Row="1"
Grid.Column="2"
Content="{Binding TicketsActive}"
Style="{StaticResource RoundedSelectedLabelStyle}"
@@ -165,7 +163,7 @@
HorizontalAlignment="Center"
Cursor="Hand" />
<Label Grid.Row="2"
<Label Grid.Row="1"
Grid.Column="3"
Content="{Binding TicketsCritical}"
Style="{StaticResource RoundedSelectedLabelStyle}"
@@ -181,7 +179,7 @@
HorizontalAlignment="Center"
Cursor="Hand" />
<Label Grid.Row="2"
<Label Grid.Row="1"
Grid.Column="4"
Content="{Binding TicketsNewInfo}"
Style="{StaticResource RoundedSelectedLabelStyle}"
@@ -198,14 +196,14 @@
Cursor="Hand" />
<!-- Incidents -->
<Label Grid.Row="3"
<Label Grid.Row="2"
Grid.Column="0"
Foreground="{DynamicResource FontColor.DetailsPage.TitleSection.Header}"
Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=TicketOverview.Row.Heading.Incidents}"
FontWeight="Bold"
FontSize="12" />
<Label Grid.Row="3"
<Label Grid.Row="2"
Grid.Column="1"
Content="{Binding IncidentNew}"
Style="{StaticResource RoundedSelectedLabelStyle}"
@@ -221,7 +219,7 @@
HorizontalAlignment="Center"
Cursor="Hand" />
<Label Grid.Row="3"
<Label Grid.Row="2"
Grid.Column="2"
Content="{Binding IncidentActive}"
Style="{StaticResource RoundedSelectedLabelStyle}"
@@ -237,7 +235,7 @@
HorizontalAlignment="Center"
Cursor="Hand" />
<Label Grid.Row="3"
<Label Grid.Row="2"
Grid.Column="3"
Content="{Binding IncidentCritical}"
Style="{StaticResource RoundedSelectedLabelStyle}"
@@ -253,7 +251,7 @@
HorizontalAlignment="Center"
Cursor="Hand" />
<Label Grid.Row="3"
<Label Grid.Row="2"
Grid.Column="4"
Content="{Binding IncidentNewInfo}"
Style="{StaticResource RoundedSelectedLabelStyle}"
@@ -269,45 +267,6 @@
HorizontalAlignment="Center"
Cursor="Hand" />
<!-- Unassigned -->
<Label Grid.Row="4"
Grid.Column="0"
Foreground="{DynamicResource FontColor.DetailsPage.TitleSection.Header}"
Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=TicketOverview.Row.Heading.UnassignedTickets}"
FontWeight="Bold"
FontSize="12" />
<Label Grid.Row="4"
Grid.Column="1"
Content="{Binding UnassignedTickets}"
Style="{StaticResource RoundedSelectedLabelStyle}"
local:TicketOverview.IsSelected="{Binding UnassignedTicketsSelected, Mode=TwoWay}"
local:TicketOverview.IsHighlighted="{Binding UnassignedTicketsHighlighted}"
ToolTip="{Binding UnassignedTicketsChangeHint}"
Tag="UnassignedTicketsSelected"
MouseLeftButtonUp="Label_MouseLeftButtonUp"
FontWeight="Medium"
Foreground="{DynamicResource Color.Orange}"
FontSize="12"
VerticalAlignment="Center"
HorizontalAlignment="Center"
Cursor="Hand" />
<Label Grid.Row="4"
Grid.Column="3"
Content="{Binding UnassignedTicketsCritical}"
Style="{StaticResource RoundedSelectedLabelStyle}"
local:TicketOverview.IsSelected="{Binding UnassignedTicketsCriticalSelected, Mode=TwoWay}"
local:TicketOverview.IsHighlighted="{Binding UnassignedTicketsCriticalHighlighted}"
ToolTip="{Binding UnassignedTicketsCriticalChangeHint}"
Tag="UnassignedTicketsCriticalSelected"
MouseLeftButtonUp="Label_MouseLeftButtonUp"
FontWeight="Medium"
Foreground="{DynamicResource Color.Red}"
FontSize="12"
VerticalAlignment="Center"
HorizontalAlignment="Center"
Cursor="Hand" />
</Grid>
</Border>
</UserControl>

12
FasdDesktopUi/Basics/UserControls/TicketOverview.xaml.cs
View File

@@ -28,9 +28,7 @@ namespace FasdDesktopUi.Basics.UserControls
("IncidentNew", new Action<TicketOverviewModel, int>((vm, value) => { vm.IncidentNew = value; })),
("IncidentActive", new Action<TicketOverviewModel, int>((vm, value) => { vm.IncidentActive = value; })),
("IncidentCritical", new Action<TicketOverviewModel, int>((vm, value) => { vm.IncidentCritical = value; })),
("IncidentNewInfo", new Action<TicketOverviewModel, int>((vm, value) => { vm.IncidentNewInfo = value; })),
("UnassignedTickets", new Action<TicketOverviewModel, int>((vm, value) => { vm.UnassignedTickets = value; })),
("UnassignedTicketsCritical", new Action<TicketOverviewModel, int>((vm, value) => { vm.UnassignedTicketsCritical = value; }))
("IncidentNewInfo", new Action<TicketOverviewModel, int>((vm, value) => { vm.IncidentNewInfo = value; }))
};
private static readonly (string Key, Action<TicketOverviewModel, bool> Setter)[] HighlightSetters = new[]
{
@@ -41,9 +39,7 @@ namespace FasdDesktopUi.Basics.UserControls
("IncidentNew", new Action<TicketOverviewModel, bool>((vm, value) => { vm.IncidentNewHighlighted = value; })),
("IncidentActive", new Action<TicketOverviewModel, bool>((vm, value) => { vm.IncidentActiveHighlighted = value; })),
("IncidentCritical", new Action<TicketOverviewModel, bool>((vm, value) => { vm.IncidentCriticalHighlighted = value; })),
("IncidentNewInfo", new Action<TicketOverviewModel, bool>((vm, value) => { vm.IncidentNewInfoHighlighted = value; })),
("UnassignedTickets", new Action<TicketOverviewModel, bool>((vm, value) => { vm.UnassignedTicketsHighlighted = value; })),
("UnassignedTicketsCritical", new Action<TicketOverviewModel, bool>((vm, value) => { vm.UnassignedTicketsCriticalHighlighted = value; }))
("IncidentNewInfo", new Action<TicketOverviewModel, bool>((vm, value) => { vm.IncidentNewInfoHighlighted = value; }))
};
private static readonly (string Key, Action<TicketOverviewModel, string> Setter)[] ChangeHintSetters = new[]
{
@@ -54,9 +50,7 @@ namespace FasdDesktopUi.Basics.UserControls
("IncidentNew", new Action<TicketOverviewModel, string>((vm, value) => { vm.IncidentNewChangeHint = value; })),
("IncidentActive", new Action<TicketOverviewModel, string>((vm, value) => { vm.IncidentActiveChangeHint = value; })),
("IncidentCritical", new Action<TicketOverviewModel, string>((vm, value) => { vm.IncidentCriticalChangeHint = value; })),
("IncidentNewInfo", new Action<TicketOverviewModel, string>((vm, value) => { vm.IncidentNewInfoChangeHint = value; })),
("UnassignedTickets", new Action<TicketOverviewModel, string>((vm, value) => { vm.UnassignedTicketsChangeHint = value; })),
("UnassignedTicketsCritical", new Action<TicketOverviewModel, string>((vm, value) => { vm.UnassignedTicketsCriticalChangeHint = value; }))
("IncidentNewInfo", new Action<TicketOverviewModel, string>((vm, value) => { vm.IncidentNewInfoChangeHint = value; }))
};
private readonly Dictionary<string, HighlightInfo> _personalHighlightStates = new Dictionary<string, HighlightInfo>(StringComparer.OrdinalIgnoreCase);
private readonly Dictionary<string, HighlightInfo> _roleHighlightStates = new Dictionary<string, HighlightInfo>(StringComparer.OrdinalIgnoreCase);

41
FasdDesktopUi/Config/LanguageDefinitions.xml
View File

@@ -508,30 +508,20 @@
<Language Lang="DE">Eigene Tickets</Language>
</UIItem>
<UIItem Name="TicketOverview.ScopeRow.Personal.Incidents">
<Language Lang="EN">My incidents</Language>
<Language Lang="DE">Eigene Störungen</Language>
</UIItem>
<UIItem Name="TicketOverview.ScopeRow.Personal.UnassignedTickets">
<Language Lang="EN">My unassigned</Language>
<Language Lang="DE">Eigener Eingang</Language>
</UIItem>
<UIItem Name="TicketOverview.ScopeRow.Personal.Incidents">
<Language Lang="EN">My incidents</Language>
<Language Lang="DE">Eigene Störungen</Language>
</UIItem>
<UIItem Name="TicketOverview.ScopeRow.Role.Tickets">
<Language Lang="EN">Role tickets</Language>
<Language Lang="DE">Rollentickets</Language>
</UIItem>
<UIItem Name="TicketOverview.ScopeRow.Role.Incidents">
<Language Lang="EN">Role incidents</Language>
<Language Lang="DE">Rollenstörungen</Language>
</UIItem>
<UIItem Name="TicketOverview.ScopeRow.Role.UnassignedTickets">
<Language Lang="EN">Role unassigned</Language>
<Language Lang="DE">Rolleneingang</Language>
</UIItem>
<UIItem Name="TicketOverview.ScopeRow.Role.Incidents">
<Language Lang="EN">Role incidents</Language>
<Language Lang="DE">Rollenstörungen</Language>
</UIItem>
<!--Menu-->
<UIItem Name="Menu.About">
@@ -1720,13 +1710,8 @@
<Language Lang="DE">Tickets</Language>
</UIItem>
<UIItem Name="TicketOverview.Row.Heading.Incidents">
<Language Lang="EN">Incidents</Language>
<Language Lang="DE">Störungen</Language>
</UIItem>
<UIItem Name="TicketOverview.Row.Heading.UnassignedTickets">
<Language Lang="EN">Unassigned</Language>
<Language Lang="DE">Eingang</Language>
</UIItem>
</UILanguage>
<UIItem Name="TicketOverview.Row.Heading.Incidents">
<Language Lang="EN">Incidents</Language>
<Language Lang="DE">Störungen</Language>
</UIItem>
</UILanguage>

24
FasdDesktopUi/Pages/SearchPage/SearchPageView.xaml.cs
View File

@@ -1043,8 +1043,8 @@ namespace FasdDesktopUi.Pages.SearchPage
var isIncident = IsIncidentRelation(relation, out var activityType);
var openExternally = isIncident
? ticketConfig.TicketOverviewOpenIncidentsExternally
: ticketConfig.TicketOverviewOpenTicketsExternally;
? ticketConfig.OverviewOpenIncidentsExternally
: ticketConfig.OverviewOpenTicketsExternally;
if (!openExternally)
return false;
@@ -1426,14 +1426,12 @@ namespace FasdDesktopUi.Pages.SearchPage
var normalized = key.ToLowerInvariant();
if (normalized.StartsWith("tickets"))
rowKey = "TicketOverview.Row.Heading.Tickets";
else if (normalized.StartsWith("incident"))
rowKey = "TicketOverview.Row.Heading.Incidents";
else if (normalized.StartsWith("unassigned"))
rowKey = "TicketOverview.Row.Heading.UnassignedTickets";
else
return false;
if (normalized.StartsWith("tickets"))
rowKey = "TicketOverview.Row.Heading.Tickets";
else if (normalized.StartsWith("incident"))
rowKey = "TicketOverview.Row.Heading.Incidents";
else
return false;
columnKey = ResolveColumnTranslationKey(normalized);
return columnKey != null;
@@ -1455,10 +1453,8 @@ namespace FasdDesktopUi.Pages.SearchPage
string suffix = null;
if (string.Equals(rowKey, "TicketOverview.Row.Heading.Tickets", StringComparison.OrdinalIgnoreCase))
suffix = "Tickets";
else if (string.Equals(rowKey, "TicketOverview.Row.Heading.Incidents", StringComparison.OrdinalIgnoreCase))
suffix = "Incidents";
else if (string.Equals(rowKey, "TicketOverview.Row.Heading.UnassignedTickets", StringComparison.OrdinalIgnoreCase))
suffix = "UnassignedTickets";
else if (string.Equals(rowKey, "TicketOverview.Row.Heading.Incidents", StringComparison.OrdinalIgnoreCase))
suffix = "Incidents";
var translationKey = scope == TileScope.Role
? $"TicketOverview.ScopeRow.Role.{suffix}"