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

Compare commits

base: Meik:86ce7e89e1fe6ffa7b1b730418f7c5750c6d48ed
Branches Tags
Meik:main
...
compare: Meik:e6968e29eb32aed05932557e3a65d72f3e9a0f1d
Branches Tags
Meik:main

3 Commits
86ce7e89e1 ... e6968e29eb

Author SHA1 Message Date
Meik
e6968e29eb aktueller stand 2026-02-19 13:22:30 +01:00
Meik
610e479e69 diff 2026-02-19 11:20:53 +01:00
Meik
b132755215 aktueller stand 2026-02-13 11:32:06 +01:00
28 changed files with 2380 additions and 1612 deletions
Expand all files Collapse all files

2
FasdCockpitBase/FasdCockpitCommunicationBase.cs
View File

@@ -47,7 +47,7 @@ namespace C4IT.FASD.Cockpit.Communication
public abstract Task<bool> KeepAliveSession(Guid sessionId); public abstract Task<bool> KeepAliveSession(Guid sessionId);
public abstract Task<bool> ReportQuickAction(cF4SDQuickActionParameters quickActionParameters); public abstract Task<bool> ReportQuickAction(cF4SDQuickActionParameters quickActionParameters);
public abstract Task<cCollectorStatusInfo> CheckCollectorStatusAsync();
public static bool Debug_apiValues = false; public static bool Debug_apiValues = false;
public static bool Debug_apiTiming = false; public static bool Debug_apiTiming = false;

33
FasdCockpitCommunication/FasdCockpitCommunicationWeb.cs
View File

@@ -25,6 +25,7 @@ using Newtonsoft.Json.Linq;
using static C4IT.Logging.cLogManager; using static C4IT.Logging.cLogManager;
using C4IT.Configuration; using C4IT.Configuration;
using System.Runtime.InteropServices.WindowsRuntime;
namespace C4IT.FASD.Cockpit.Communication namespace C4IT.FASD.Cockpit.Communication
{ {
@@ -566,6 +567,38 @@ namespace C4IT.FASD.Cockpit.Communication
return false; return false;
} }
public override async Task<cCollectorStatusInfo> CheckCollectorStatusAsync()
{
var CM = MethodBase.GetCurrentMethod();
LogMethodBegin(CM);
var apiError = 0;
var timeStart = DateTime.UtcNow;
try
{
var http = GetHttpHelper(false);
var result = await http.GetHttpJson("api/CheckCollectorStatus", 15000, CancellationToken.None);
if (!result.IsOk)
{
apiError = (int)result.Status;
return null;
}
var strXml = JsonConvert.DeserializeObject<cCollectorStatusInfo>(result.Result);
return strXml;
}
catch (Exception E)
{
apiError = E.HResult;
LogException(E);
}
finally
{
if (Debug_apiTiming) SaveApiTimingEntry("Check Collector Status", timeStart, apiError);
LogMethodEnd(CM);
}
return null;
}
public override async Task<cFasdBaseConfig> GetConfiguration(enumFasdConfigurationType configType) public override async Task<cFasdBaseConfig> GetConfiguration(enumFasdConfigurationType configType)
{ {

4
FasdCockpitCommunicationDemo/F4SDCockpitCommunicationDemo.cs
View File

@@ -1862,5 +1862,9 @@ namespace C4IT.FASD.Cockpit.Communication
return null; return null;
} }
public override Task<cCollectorStatusInfo> CheckCollectorStatusAsync()
{
throw new NotImplementedException();
}
} }
} }

472
FasdCockpitCommunicationDemo/MockupTicketOverview/TicketOverviewRelations.json Normal file
View File

@@ -0,0 +1,472 @@
{
"TicketsNew": {
"Personal": [
{
"TicketId": "2e9cb83d-ecb7-c93b-e8e4-08daaa97265f",
"UserId": "42c760d6-90e8-469f-b2fe-ac7d4cc6cb0a",
"DisplayName": "TCK00186",
"Summary": "Mein OneDrive synchronisiert nicht mehr",
"UserDisplayName": "Ticket, Timo",
"UserAccount": "TT007",
"UserDomain": "CONTOSO",
"StatusId": "New"
}
],
"Role": [
{
"TicketId": "bb2e4a9d-2c1e-4b32-8f75-6e7c9f99f2d4",
"UserId": "42c760d6-90e8-469f-b2fe-ac7d4cc6cb0a",
"DisplayName": "TCK00761",
"Summary": "VPN-Verbindung bricht nach wenigen Minuten ab",
"UserDisplayName": "Ticket, Timo",
"UserAccount": "TT007",
"UserDomain": "CONTOSO",
"StatusId": "New"
},
{
"TicketId": "d63e5ea1-0785-4998-82ad-9a9e5a0f8c37",
"UserId": "42c760d6-90e8-469f-b2fe-ac7d4cc6cb0a",
"DisplayName": "TCK00765",
"Summary": "Teams-Benachrichtigungen kommen verzögert an",
"UserDisplayName": "Ticket, Timo",
"UserAccount": "TT007",
"UserDomain": "CONTOSO",
"StatusId": "New"
},
{
"TicketId": "f7771fde-33ba-421a-8d9b-cdf468e7541c",
"UserId": "a2164ecd-791f-482c-bea3-f089f14bec8a",
"DisplayName": "TCK00403",
"Summary": "Neuer Monitor fuer Hotline Arbeitsplatz",
"UserDisplayName": "Busch, Andrea",
"UserAccount": "AB014",
"UserDomain": "CONTOSO",
"StatusId": "New"
},
{
"TicketId": "6294eec7-fb80-42f3-8ce8-7f7982ae200c",
"UserId": "436e8d67-1b9b-4b1a-83e9-0b1e8fa0173b",
"DisplayName": "TCK00404",
"Summary": "Monitor flackert seit Firmware Update",
"UserDisplayName": "Anwender, Peter",
"UserAccount": "PA010",
"UserDomain": "CONTOSO",
"StatusId": "New"
}
]
},
"TicketsActive": {
"Personal": [
{
"TicketId": "75e08a29-4103-41d6-962c-009c3342bc46",
"UserId": "6180aa17-ba2d-455a-bf2f-ec4a075c2d64",
"DisplayName": "TCK00406",
"Summary": "CAD Software startet nach Update nicht mehr",
"UserDisplayName": "Kohl, Carlos",
"UserAccount": "CK102",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
}
],
"Role": [
{
"TicketId": "2e9cb83d-ecb7-c93b-e8e4-08daaa97265f",
"UserId": "42c760d6-90e8-469f-b2fe-ac7d4cc6cb0a",
"DisplayName": "TCK00405",
"Summary": "OneDrive Synchronisation bleibt haengen",
"UserDisplayName": "Ticket, Timo",
"UserAccount": "TT007",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
},
{
"TicketId": "ff62a3e2-5004-4a8c-b71c-7ebb1877d1a4",
"UserId": "0fad5e21-5a29-44c6-b532-46f862ea8694",
"DisplayName": "TCK00407",
"Summary": "Netzlaufwerk Projekt X nicht erreichbar",
"UserDisplayName": "Hanova, Hans",
"UserAccount": "HH101",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
}
]
},
"TicketsCritical": {
"Personal": [
{
"TicketId": "1507691c-6d47-4ae3-83b3-ef483d84a246",
"UserId": "deece196-d8b6-4a9c-a2b9-3c2ae9c6d4ec",
"DisplayName": "TCK00408",
"Summary": "VPN Konzentrator in Aussenstelle offline",
"UserDisplayName": "Seifert, Dominik",
"UserAccount": "DS014",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
},
{
"TicketId": "5c6d981e-9e67-4fde-b249-8c6288d325a7",
"UserId": "a2164ecd-791f-482c-bea3-f089f14bec8a",
"DisplayName": "TCK00409",
"Summary": "SAP Produktionsauftrag bricht ab",
"UserDisplayName": "Boss, Bernd",
"UserAccount": "BB003",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
}
],
"Role": [
{
"TicketId": "1507691c-6d47-4ae3-83b3-ef483d84a246",
"UserId": "deece196-d8b6-4a9c-a2b9-3c2ae9c6d4ec",
"DisplayName": "TCK00408",
"Summary": "VPN Konzentrator in Aussenstelle offline",
"UserDisplayName": "Seifert, Dominik",
"UserAccount": "DS014",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
},
{
"TicketId": "9b7710d4-72da-4b2a-9d0c-be02575d2c52",
"UserId": "a2c35ad1-7cc7-4b2b-9aa5-d03fdaecd155",
"DisplayName": "TCK00410",
"Summary": "WLAN im Lager faellt minutenweise aus",
"UserDisplayName": "Kiefer, Maximilian",
"UserAccount": "MK009",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
},
{
"TicketId": "5c6d981e-9e67-4fde-b249-8c6288d325a7",
"UserId": "a2164ecd-791f-482c-bea3-f089f14bec8a",
"DisplayName": "TCK00409",
"Summary": "SAP Produktionsauftrag bricht ab",
"UserDisplayName": "Boss, Bernd",
"UserAccount": "BB003",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
}
]
},
"TicketsNewInfo": {
"Personal": [
{
"TicketId": "de403992-98cb-4476-9e04-d645ab22e6de",
"UserId": "42c760d6-90e8-469f-b2fe-ac7d4cc6cb0a",
"DisplayName": "TCK00411",
"Summary": "Rueckfrage zur Passwort Ruecksetzung beantworten",
"UserDisplayName": "Ticket, Timo",
"UserAccount": "TT007",
"UserDomain": "CONTOSO",
"StatusId": "OnHold"
},
{
"TicketId": "7c29dd33-1247-453c-9db6-f7a59107d276",
"UserId": "436e8d67-1b9b-4b1a-83e9-0b1e8fa0173b",
"DisplayName": "TCK00412",
"Summary": "Techniker bittet um Rueckmeldung zum Notebook",
"UserDisplayName": "Anwender, Peter",
"UserAccount": "PA010",
"UserDomain": "CONTOSO",
"StatusId": "OnHold"
}
],
"Role": [
{
"TicketId": "de403992-98cb-4476-9e04-d645ab22e6de",
"UserId": "42c760d6-90e8-469f-b2fe-ac7d4cc6cb0a",
"DisplayName": "TCK00411",
"Summary": "Rueckfrage zur Passwort Ruecksetzung beantworten",
"UserDisplayName": "Ticket, Timo",
"UserAccount": "TT007",
"UserDomain": "CONTOSO",
"StatusId": "OnHold"
},
{
"TicketId": "b207822d-7e1c-42a7-b8c9-4246f711dd18",
"UserId": "deece196-d8b6-4a9c-a2b9-3c2ae9c6d4ec",
"DisplayName": "TCK00413",
"Summary": "Wartungsfenster fuer Firewall verschieben",
"UserDisplayName": "Seifert, Dominik",
"UserAccount": "DS014",
"UserDomain": "CONTOSO",
"StatusId": "OnHold"
}
]
},
"IncidentNew": {
"Personal": [
{
"TicketId": "e0ba7c81-f9b1-4e99-a4d6-efecc5e4312e",
"UserId": "f69dd1a9-591f-4004-b950-264238663bf0",
"DisplayName": "INC00401",
"Summary": "Teams Telefonie ist fuer Standort Sued offline",
"UserDisplayName": "Ottmann, Thomas",
"UserAccount": "TO011",
"UserDomain": "CONTOSO",
"StatusId": "New"
},
{
"TicketId": "a8deb50d-9f15-4371-9ebc-a28791f27d5c",
"UserId": "76f86d28-862c-4fa2-9062-8367be7fbd92",
"DisplayName": "INC00402",
"Summary": "SharePoint Bereich Vertrieb laedt extrem langsam",
"UserDisplayName": "Virtual, Vera",
"UserAccount": "VV004",
"UserDomain": "CONTOSO",
"StatusId": "New"
}
],
"Role": [
{
"TicketId": "fe15284f-f553-4434-8b59-7d8b9f481bf7",
"UserId": "deece196-d8b6-4a9c-a2b9-3c2ae9c6d4ec",
"DisplayName": "INC00403",
"Summary": "Firewall Cluster meldet Sync Fehler",
"UserDisplayName": "Seifert, Dominik",
"UserAccount": "DS014",
"UserDomain": "CONTOSO",
"StatusId": "New"
},
{
"TicketId": "9cdddacf-9395-476b-811a-09c5f1491d4b",
"UserId": "436e8d67-1b9b-4b1a-83e9-0b1e8fa0173b",
"DisplayName": "INC00404",
"Summary": "CRM Anmeldung liefert Timeout fuer Kundencenter",
"UserDisplayName": "Anwender, Peter",
"UserAccount": "PA010",
"UserDomain": "CONTOSO",
"StatusId": "New"
}
]
},
"IncidentActive": {
"Personal": [
{
"TicketId": "7e852bb9-420b-4caa-b79a-9178d793fc06",
"UserId": "a2c35ad1-7cc7-4b2b-9aa5-d03fdaecd155",
"DisplayName": "INC00405",
"Summary": "Windows Rollout haengt auf mehreren Clients",
"UserDisplayName": "Kiefer, Maximilian",
"UserAccount": "MK009",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
},
{
"TicketId": "3c3c70cf-5c60-4ecc-9313-b5f9c1968fc7",
"UserId": "a2164ecd-791f-482c-bea3-f089f14bec8a",
"DisplayName": "INC00406",
"Summary": "Remotedesktop Sitzung trennt nach wenigen Minuten",
"UserDisplayName": "Busch, Andrea",
"UserAccount": "AB014",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
}
],
"Role": [
{
"TicketId": "486df93d-15b6-41d4-b902-2c1e1838c74b",
"UserId": "deece196-d8b6-4a9c-a2b9-3c2ae9c6d4ec",
"DisplayName": "INC00407",
"Summary": "Firewall Cluster meldet weiterhin Sync Fehler",
"UserDisplayName": "Seifert, Dominik",
"UserAccount": "DS014",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
},
{
"TicketId": "86da28b0-013b-4542-bcff-175044d5bb02",
"UserId": "a2164ecd-791f-482c-bea3-f089f14bec8a",
"DisplayName": "INC00408",
"Summary": "Produktionslinie meldet keine Sensordaten",
"UserDisplayName": "Zufall, Rainer",
"UserAccount": "RZ011",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
},
{
"TicketId": "a1cf6635-a5c4-4401-b4f0-60b9c65b4d75",
"UserId": "0fad5e21-5a29-44c6-b532-46f862ea8694",
"DisplayName": "INC00409",
"Summary": "Exchange Transportdienst setzt Mails in Warteschlange",
"UserDisplayName": "Hanova, Hans",
"UserAccount": "HH101",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
}
]
},
"IncidentCritical": {
"Personal": [
{
"TicketId": "9aae7eca-39d7-441e-8b33-5fc6f34765c8",
"UserId": "deece196-d8b6-4a9c-a2b9-3c2ae9c6d4ec",
"DisplayName": "INC00410",
"Summary": "Kuehlung im Rechenzentrum U3 ausgefallen",
"UserDisplayName": "Seifert, Dominik",
"UserAccount": "DS014",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
}
],
"Role": [
{
"TicketId": "9aae7eca-39d7-441e-8b33-5fc6f34765c8",
"UserId": "deece196-d8b6-4a9c-a2b9-3c2ae9c6d4ec",
"DisplayName": "INC00410",
"Summary": "Kuehlung im Rechenzentrum U3 ausgefallen",
"UserDisplayName": "Seifert, Dominik",
"UserAccount": "DS014",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
},
{
"TicketId": "130ec52f-dac3-427d-803e-e7cf67e4a744",
"UserId": "f69dd1a9-591f-4004-b950-264238663bf0",
"DisplayName": "INC00411",
"Summary": "Kartenzahlung in den Filialen nicht moeglich",
"UserDisplayName": "Ottmann, Thomas",
"UserAccount": "TO011",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
},
{
"TicketId": "b7d22b65-c11e-459c-ac31-5b1c08e4118d",
"UserId": "8c3ca0fb-f18c-4893-ad83-290e6e02f352",
"DisplayName": "INC00412",
"Summary": "Datenbank Cluster benoetigt manuellen Failover",
"UserDisplayName": "Perschmann, Paul",
"UserAccount": "PP201",
"UserDomain": "CONTOSO",
"StatusId": "InProgress"
}
]
},
"IncidentNewInfo": {
"Personal": [
{
"TicketId": "d1a2c544-4f59-4f2b-875f-3621a23d4228",
"UserId": "a2164ecd-791f-482c-bea3-f089f14bec8a",
"DisplayName": "INC00413",
"Summary": "Backup Team hat Rueckfrage zur Sicherung",
"UserDisplayName": "Busch, Andrea",
"UserAccount": "AB014",
"UserDomain": "CONTOSO",
"StatusId": "OnHold"
}
],
"Role": [
{
"TicketId": "74846c1b-9a97-420f-8bf2-91e88aa0516a",
"UserId": "436e8d67-1b9b-4b1a-83e9-0b1e8fa0173b",
"DisplayName": "INC00415",
"Summary": "Lieferant bittet um Rueckmeldung zu Offsite Backup",
"UserDisplayName": "Anwender, Peter",
"UserAccount": "PA010",
"UserDomain": "CONTOSO",
"StatusId": "OnHold"
},
{
"TicketId": "1372b3cf-5d87-4099-ab83-ec0cccf7194e",
"UserId": "a2164ecd-791f-482c-bea3-f089f14bec8a",
"DisplayName": "INC00416",
"Summary": "Fernwartung benoetigt Zugangsdaten zur SPS",
"UserDisplayName": "Zufall, Rainer",
"UserAccount": "RZ011",
"UserDomain": "CONTOSO",
"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"
}
]
}
}

2
FasdCockpitCommunicationDemo/TicketModel.cs
View File

@@ -48,7 +48,7 @@ namespace FasdCockpitCommunicationDemo
public string Description { get; set; } public string Description { get; set; }
public string DescriptionHtml { get; set; } public string DescriptionHtml { get; set; }
public int Priority { get; set; } public int Priority { get; set; }
public string Category { get; set; } //todo: replace with tree structure public string Category { get; set; }
public string ActivityType { get; set; } public string ActivityType { get; set; }
public string Solution { get; set; } public string Solution { get; set; }
public string SolutionHtml { get; set; } public string SolutionHtml { get; set; }

16
FasdCockpitCommunicationDemo/TicketOverviewRelationDefinition.cs Normal file
View File

@@ -0,0 +1,16 @@
using System;
namespace FasdCockpitCommunicationDemo
{
public class TicketOverviewRelationDefinition
{
public Guid TicketId { get; set; }
public Guid UserId { get; set; }
public string DisplayName { get; set; }
public string Summary { get; set; }
public string StatusId { get; set; }
public string UserDisplayName { get; set; }
public string UserAccount { get; set; }
public string UserDomain { get; set; }
}
}

2
FasdDesktopUi/AppStartUp.cs
View File

@@ -669,7 +669,7 @@ namespace FasdDesktopUi
{ {
userInfo = cFasdCockpitCommunicationBase.CockpitUserInfo; userInfo = cFasdCockpitCommunicationBase.CockpitUserInfo;
} }
if (!string.IsNullOrEmpty(cCockpitConfiguration.Instance?.m42ServerConfiguration?.Server)) if (cFasdCockpitConfig.Instance.HasM42Configuration())
if (userInfo?.possibleLogons != null) if (userInfo?.possibleLogons != null)
{ {
if (userInfo.possibleLogons.Contains(enumAdditionalAuthentication.M42WinLogon)) if (userInfo.possibleLogons.Contains(enumAdditionalAuthentication.M42WinLogon))

3
FasdDesktopUi/Basics/Services/SupportCase/Controllers/SupportCaseController.cs
View File

@@ -110,6 +110,9 @@ namespace FasdDesktopUi.Basics.Services.SupportCase.Controllers
{ {
try try
{ {
if (_focusedRelation == relation)
return;
_selectedHealthcard = _supportCaseProcessor.GetHealthcardFor(relation); _selectedHealthcard = _supportCaseProcessor.GetHealthcardFor(relation);
HashSet<string> requiredTables = cHealthCard.GetRequiredTables(_selectedHealthcard); HashSet<string> requiredTables = cHealthCard.GetRequiredTables(_selectedHealthcard);
_ = Task.Run(async () => await _supportCaseProcessor.LoadSupportCaseDataAsync(relation, requiredTables)); _ = Task.Run(async () => await _supportCaseProcessor.LoadSupportCaseDataAsync(relation, requiredTables));

18
FasdDesktopUi/Basics/Services/SupportCase/SupportCase.cs
View File

@@ -16,6 +16,8 @@ namespace FasdDesktopUi.Basics.Services.SupportCase
private readonly Dictionary<string, Dictionary<cF4sdApiSearchResultRelation, cF4SDHealthCardRawData.cHealthCardTable>> _supportCaseDataCache = new Dictionary<string, Dictionary<cF4sdApiSearchResultRelation, cF4SDHealthCardRawData.cHealthCardTable>>(); private readonly Dictionary<string, Dictionary<cF4sdApiSearchResultRelation, cF4SDHealthCardRawData.cHealthCardTable>> _supportCaseDataCache = new Dictionary<string, Dictionary<cF4sdApiSearchResultRelation, cF4SDHealthCardRawData.cHealthCardTable>>();
private readonly Dictionary<cF4sdApiSearchResultRelation, cF4SDHealthCardRawData> _rawDataCache = new Dictionary<cF4sdApiSearchResultRelation, cF4SDHealthCardRawData>(); // todo remove, currently only used for SupportCaseDataProviderArtifact private readonly Dictionary<cF4sdApiSearchResultRelation, cF4SDHealthCardRawData> _rawDataCache = new Dictionary<cF4sdApiSearchResultRelation, cF4SDHealthCardRawData>(); // todo remove, currently only used for SupportCaseDataProviderArtifact
private readonly ICollection<cF4sdApiSearchResultRelation> _relationsCurrentlyLoadingData = new HashSet<cF4sdApiSearchResultRelation>();
internal readonly Guid Id; internal readonly Guid Id;
private readonly IRelationService _relationService; private readonly IRelationService _relationService;
public cSupportCaseDataProvider SupportCaseDataProviderArtifact { get; } public cSupportCaseDataProvider SupportCaseDataProviderArtifact { get; }
@@ -67,14 +69,13 @@ namespace FasdDesktopUi.Basics.Services.SupportCase
foreach (var relationType in relations) foreach (var relationType in relations)
{ {
//TODO Max fragen obs passt! Bug: in den Ticketrelations (Header Ticketauswahl) sind nur zwei Tickets sichtbar anstatt 5 oder mehr..
if (_caseRelations.TryGetValue(relationType.Key, out var caseRelation)) if (_caseRelations.TryGetValue(relationType.Key, out var caseRelation))
_caseRelations[relationType.Key] = caseRelation.Union(relationType).ToList(); caseRelation = caseRelation.Union(relationType).ToList();
else else
_caseRelations.Add(relationType.Key, relationType.ToList()); _caseRelations.Add(relationType.Key, relationType.ToList());
if (SupportCaseDataProviderArtifact?.CaseRelations?.TryGetValue(relationType.Key, out var caseRelations) ?? false) if (SupportCaseDataProviderArtifact?.CaseRelations?.TryGetValue(relationType.Key, out var caseRelations) ?? false)
SupportCaseDataProviderArtifact.CaseRelations[relationType.Key] = caseRelations.Union(relationType).ToList(); caseRelations = caseRelations.Union(relationType).ToList();
else else
SupportCaseDataProviderArtifact?.CaseRelations?.Add(relationType.Key, relationType.ToList()); SupportCaseDataProviderArtifact?.CaseRelations?.Add(relationType.Key, relationType.ToList());
} }
@@ -91,6 +92,11 @@ namespace FasdDesktopUi.Basics.Services.SupportCase
{ {
try try
{ {
if (_relationsCurrentlyLoadingData.Contains(relation))
return;
_relationsCurrentlyLoadingData.Add(relation);
cF4SDHealthCardRawData rawData = null; cF4SDHealthCardRawData rawData = null;
// todo this is only a temporary fix. Currently the tablesToLoad contain also detail tables // todo this is only a temporary fix. Currently the tablesToLoad contain also detail tables
@@ -131,11 +137,17 @@ namespace FasdDesktopUi.Basics.Services.SupportCase
.Where(table => table.Key.StartsWith("Computation_") == false) .Where(table => table.Key.StartsWith("Computation_") == false)
.All(table => !table.Value.IsIncomplete && !table.Value.Columns.Values.Any(c => c.IsIncomplete)) ?? false; .All(table => !table.Value.IsIncomplete && !table.Value.Columns.Values.Any(c => c.IsIncomplete)) ?? false;
} }
SupportCaseDataProviderArtifact.HealthCardDataHelper.LoadingHelper.LastDataRequest = DateTime.Now;
} }
catch (Exception ex) catch (Exception ex)
{ {
LogException(ex); LogException(ex);
} }
finally
{
_relationsCurrentlyLoadingData.Remove(relation);
}
bool IsRawDataCacheComplete() bool IsRawDataCacheComplete()
{ {

3
FasdDesktopUi/Basics/Services/SupportCase/SupportCaseProcessor.cs
View File

@@ -140,6 +140,9 @@ namespace FasdDesktopUi.Basics.Services.SupportCase
{ {
var status = enumActualizeStatus.unknown; var status = enumActualizeStatus.unknown;
if (!agentUserId.HasValue && !agentDeviceId.HasValue)
return status;
try try
{ {
TimeSpan refreshDelay = TimeSpan.FromMilliseconds(500); TimeSpan refreshDelay = TimeSpan.FromMilliseconds(500);

124
FasdDesktopUi/Basics/SupportCaseDataProvider.cs
View File

@@ -7,7 +7,6 @@ using System.Windows.Documents;
using System.Linq; using System.Linq;
using System.Windows.Input; using System.Windows.Input;
using System.Diagnostics; using System.Diagnostics;
using System.Windows.Threading;
using C4IT.FASD.Base; using C4IT.FASD.Base;
using C4IT.Logging; using C4IT.Logging;
@@ -114,8 +113,6 @@ namespace FasdDesktopUi.Basics
return null; return null;
} }
await EnsureUserIdentityForTicketAsync(selectedRelation);
// get the identities of the selected relation // get the identities of the selected relation
var Identities = selectedRelation.Identities.Clone(); var Identities = selectedRelation.Identities.Clone();
@@ -158,8 +155,6 @@ namespace FasdDesktopUi.Basics
DataProviders.Add(MainIdentity.Id, _result); DataProviders.Add(MainIdentity.Id, _result);
} }
await EnsureSupportCasePagesAsync();
_result.NamedParameterEntries = new cNamedParameterList(_result); _result.NamedParameterEntries = new cNamedParameterList(_result);
_result.StartCase(MainIdentity.Id); _result.StartCase(MainIdentity.Id);
@@ -171,12 +166,6 @@ namespace FasdDesktopUi.Basics
supportCaseProcessor.SetSupportCase(supportCase); supportCaseProcessor.SetSupportCase(supportCase);
supportCaseController.SetSupportCaseProcessor(supportCaseProcessor, Identities); supportCaseController.SetSupportCaseProcessor(supportCaseProcessor, Identities);
if (cSupportCaseDataProvider.detailsPage == null || cSupportCaseDataProvider.slimPage == null)
{
LogEntry("Support case pages are not initialized; aborting case start.", LogLevels.Error);
return null;
}
cSupportCaseDataProvider.detailsPage.SetSupportCaseController(supportCaseController); cSupportCaseDataProvider.detailsPage.SetSupportCaseController(supportCaseController);
cSupportCaseDataProvider.slimPage.SetSupportCaseController(supportCaseController); cSupportCaseDataProvider.slimPage.SetSupportCaseController(supportCaseController);
@@ -188,30 +177,23 @@ namespace FasdDesktopUi.Basics
if (!Status) if (!Status)
return null; return null;
var selectedHealthCard = _result.HealthCardDataHelper?.SelectedHealthCard; HashSet<string> requiredTables = cHealthCard.GetRequiredTables(_result.HealthCardDataHelper.SelectedHealthCard); // todo the healthcard is not selected at this point
if (selectedHealthCard != null)
_ = cHealthCard.GetRequiredTables(selectedHealthCard); // todo the healthcard is not selected at this point
if (detailsPage?.WidgetCollection != null)
detailsPage.WidgetCollection.WidgetDataList = supportCaseController.GetWidgetData(); detailsPage.WidgetCollection.WidgetDataList = supportCaseController.GetWidgetData();
if (detailsPage?.DataHistoryCollectionUserControl != null)
detailsPage.DataHistoryCollectionUserControl.HistoryDataList = supportCaseController.GetHistoryData(); detailsPage.DataHistoryCollectionUserControl.HistoryDataList = supportCaseController.GetHistoryData();
if (detailsPage?.CustomizableSectionUc != null)
detailsPage.CustomizableSectionUc.ContainerCollections = supportCaseController.GetContainerData(); detailsPage.CustomizableSectionUc.ContainerCollections = supportCaseController.GetContainerData();
CurrentProvider = _result; CurrentProvider = _result;
// start the slim or detaild page // start the slim or detaild page
bool shouldSkipSlimView = (Identities?.Any(identity => identity.Class is enumFasdInformationClass.Ticket) ?? false) bool shouldSkipSlimView = Identities.Any(identity => identity.Class is enumFasdInformationClass.Ticket) || cFasdCockpitConfig.Instance.Global.ShouldSkipSlimView;
|| (cFasdCockpitConfig.Instance?.Global?.ShouldSkipSlimView ?? false);
if (shouldSkipSlimView) if (shouldSkipSlimView)
{ {
cSupportCaseDataProvider.detailsPage?.Show(); cSupportCaseDataProvider.detailsPage?.Show();
cSupportCaseDataProvider.slimPage?.Hide(); cSupportCaseDataProvider.slimPage.Hide();
} }
else else
{ {
cSupportCaseDataProvider.slimPage?.Show(); cSupportCaseDataProvider.slimPage.Show();
cSupportCaseDataProvider.detailsPage?.Hide(); cSupportCaseDataProvider.detailsPage?.Hide();
} }
@@ -298,104 +280,6 @@ namespace FasdDesktopUi.Basics
} }
} }
private static async Task EnsureSupportCasePagesAsync()
{
if (detailsPage != null && slimPage != null)
return;
if (Application.Current == null)
return;
await Application.Current.Dispatcher.InvokeAsync(() =>
{
if (slimPage == null)
slimPage = new Pages.SlimPage.SlimPageView();
if (detailsPage == null)
detailsPage = new Pages.DetailsPage.DetailsPageView();
}, DispatcherPriority.Normal);
}
private static async Task EnsureUserIdentityForTicketAsync(cF4sdApiSearchResultRelation relation)
{
if (relation == null || relation.Type != enumF4sdSearchResultClass.Ticket)
return;
if (relation.Identities == null)
relation.Identities = new cF4sdIdentityList();
var existingUsers = relation.Identities
.Where(identity => identity.Class == enumFasdInformationClass.User)
.ToList();
Guid userId = Guid.Empty;
if (relation.Infos != null)
{
if (relation.Infos.TryGetValue("Sids", out var sidsValue) ||
relation.Infos.TryGetValue("UserSid", out sidsValue))
{
var sids = sidsValue?.Split(',')
.Select(v => v.Trim())
.Where(v => !string.IsNullOrWhiteSpace(v))
.ToList();
if (sids != null && sids.Count > 0)
{
var communication = cFasdCockpitCommunicationBase.Instance;
if (communication != null)
{
relation.Infos.TryGetValue("UserDisplayName", out var userDisplayName);
var result = await communication.GetUserSearchResults(userDisplayName, sids);
var user = result?.Values?.FirstOrDefault()?.FirstOrDefault();
if (user != null)
userId = user.id;
}
}
}
if (userId == Guid.Empty && relation.Infos.TryGetValue("UserAccount", out var userAccount))
{
relation.Infos.TryGetValue("UserDomain", out var userDomain);
if (!string.IsNullOrWhiteSpace(userAccount))
{
var communication = cFasdCockpitCommunicationBase.Instance;
if (communication != null)
{
userId = await communication.GetUserIdByAccount(userAccount, userDomain ?? string.Empty);
}
}
}
if (userId == Guid.Empty)
{
if (relation.Infos.TryGetValue("UserId", out var userIdString) ||
relation.Infos.TryGetValue("UserGuid", out userIdString) ||
relation.Infos.TryGetValue("UserIdentityId", out userIdString))
{
Guid.TryParse(userIdString, out userId);
}
}
}
if (userId == Guid.Empty)
return;
if (existingUsers.Count == 0 || existingUsers.Any(identity => identity.Id != userId))
{
relation.Identities.RemoveAll(identity => identity.Class == enumFasdInformationClass.User);
relation.Identities.Add(new cF4sdIdentityEntry
{
Class = enumFasdInformationClass.User,
Id = userId
});
}
if (relation.Infos == null)
relation.Infos = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
relation.Infos["UserId"] = userId.ToString();
relation.Infos["UserGuid"] = userId.ToString();
}
public async Task CloseCaseAsync() public async Task CloseCaseAsync()
{ {
var CM = MethodBase.GetCurrentMethod(); var CM = MethodBase.GetCurrentMethod();

4
FasdDesktopUi/Basics/UserControls/Badge.xaml
View File

@@ -10,7 +10,7 @@
d:DesignWidth="40" d:DesignWidth="40"
x:Name="BadgeControl"> x:Name="BadgeControl">
<Border Background="{DynamicResource Color.F4SD}" <Border Background="{DynamicResource Color.SoftContrast}"
CornerRadius="5"> CornerRadius="5">
<StackPanel HorizontalAlignment="Center" <StackPanel HorizontalAlignment="Center"
@@ -19,7 +19,7 @@
Margin="7.5 2.5"> Margin="7.5 2.5">
<TextBlock FontSize="12" <TextBlock FontSize="12"
FontWeight="Bold" FontWeight="Bold"
Foreground="White" Foreground="{DynamicResource FontColor.DetailsPage.DataHistory.Value}"
Text="{Binding ElementName=BadgeControl, Path=Text}" /> Text="{Binding ElementName=BadgeControl, Path=Text}" />
</StackPanel> </StackPanel>

6
FasdDesktopUi/Basics/UserControls/Badge.xaml.cs
View File

@@ -1,9 +1,5 @@
using F4SD_AdaptableIcon; using System.Windows;
using FasdDesktopUi.Basics.Helper;
using System;
using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using static C4IT.Logging.cLogManager;
namespace FasdDesktopUi.Basics.UserControls namespace FasdDesktopUi.Basics.UserControls
{ {

43
FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml.cs
View File

@@ -555,7 +555,7 @@ namespace FasdDesktopUi.Basics.UserControls
parentWindow.Closing -= ParentWindow_Closing; parentWindow.Closing -= ParentWindow_Closing;
} }
} }
private void ParentWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e) private void ParentWindow_Closing(object sender, CancelEventArgs e)
{ {
foreach (SelectionPill pill in NewOrExistingOrNoneTicketWrap.Children.OfType<SelectionPill>()) foreach (SelectionPill pill in NewOrExistingOrNoneTicketWrap.Children.OfType<SelectionPill>())
{ {
@@ -1097,11 +1097,9 @@ namespace FasdDesktopUi.Basics.UserControls
if (!dataTable.Columns.TryGetValue("Name", out var nameColumn)) if (!dataTable.Columns.TryGetValue("Name", out var nameColumn))
yield break; yield break;
cF4SDHealthCardRawData.cHealthCardTableColumn parentIdColumn = null; if (!dataTable.Columns.TryGetValue("parentValue", out cF4SDHealthCardRawData.cHealthCardTableColumn parentIdColumn))
cF4SDHealthCardRawData.cHealthCardTableColumn parentNameColumn = null;
if (!dataTable.Columns.TryGetValue("parentValue", out parentIdColumn))
dataTable.Columns.TryGetValue("Parent_Value", out parentIdColumn); dataTable.Columns.TryGetValue("Parent_Value", out parentIdColumn);
if (!dataTable.Columns.TryGetValue("parent", out parentNameColumn)) if (!dataTable.Columns.TryGetValue("parent", out cF4SDHealthCardRawData.cHealthCardTableColumn parentNameColumn))
dataTable.Columns.TryGetValue("Parent", out parentNameColumn); dataTable.Columns.TryGetValue("Parent", out parentNameColumn);
for (int index = 0; index < idColumn.Values.Count; index++) for (int index = 0; index < idColumn.Values.Count; index++)
@@ -2198,7 +2196,6 @@ namespace FasdDesktopUi.Basics.UserControls
break; break;
case ValidationPropertyNames.TicketStatusCombobox: case ValidationPropertyNames.TicketStatusCombobox:
validateComboboxNotEmpty(TicketStatusCombobox);
if (!(TicketStatusCombobox.SelectedItem is ComboBoxItem a)) if (!(TicketStatusCombobox.SelectedItem is ComboBoxItem a))
break; break;
@@ -2534,30 +2531,6 @@ namespace FasdDesktopUi.Basics.UserControls
ValidateProperty(ValidationPropertyNames.ErrorTypeValue); ValidateProperty(ValidationPropertyNames.ErrorTypeValue);
} }
private static void validateComboboxNotEmpty(object sender)
{
//var comboBox = sender as ComboBox;
//if (comboBox != null)
//{
// if (!(comboBox.SelectedItem is ComboBoxItem selectedItem))
// return;
// // Überprüfe den Inhalt und setze die Hintergrundfarbe entsprechend
// if (selectedItem.Tag == null)
// {
// // Setze die Hintergrundfarbe auf Rot, um einen Validierungsfehler anzuzeigen
// comboBox.BorderBrush = SharedValidationBorderBrush;
// }
// else
// {
// // Setze die ursprüngliche Hintergrundfarbe zurück, wenn die Validierung erfolgreich ist
// comboBox.BorderBrush = (SolidColorBrush)new BrushConverter().ConvertFromString("#DEE2E6");
// }
//}
}
private void TicketSelectionBorder_Click() private void TicketSelectionBorder_Click()
{ {
var _h = Dispatcher.Invoke(async () => var _h = Dispatcher.Invoke(async () =>
@@ -2608,7 +2581,6 @@ namespace FasdDesktopUi.Basics.UserControls
if (string.IsNullOrWhiteSpace(CaseNotesPreview.Text)) if (string.IsNullOrWhiteSpace(CaseNotesPreview.Text))
CaseNotesPreview.Text = string.Empty; CaseNotesPreview.Text = string.Empty;
SelectedTicket.Infos[TicketInfoKeys.Summary] = CaseNotesPreview.Text;
ValidateProperty(ValidationPropertyNames.CaseNotesPreview); ValidateProperty(ValidationPropertyNames.CaseNotesPreview);
} }
catch (Exception E) catch (Exception E)
@@ -2655,13 +2627,10 @@ namespace FasdDesktopUi.Basics.UserControls
private static void setTextboxErrorState(object sender, bool hasError) private static void setTextboxErrorState(object sender, bool hasError)
{ {
var textBox = sender as TextBox; if (!(sender is TextBox textBox))
if (textBox == null)
return; return;
textBox.BorderBrush = hasError textBox.BorderBrush = hasError ? SharedValidationBorderBrush : DefaultTextBoxBorderBrush;
? SharedValidationBorderBrush
: DefaultTextBoxBorderBrush;
} }
private void UpdateCategoryValidationVisualState(bool hasError) => private void UpdateCategoryValidationVisualState(bool hasError) =>
@@ -2681,7 +2650,7 @@ namespace FasdDesktopUi.Basics.UserControls
if (defaultBrush == null) if (defaultBrush == null)
{ {
var borderBrush = border.BorderBrush; var borderBrush = border.BorderBrush;
defaultBrush = borderBrush != null ? borderBrush.CloneCurrentValue() : null; defaultBrush = borderBrush?.CloneCurrentValue();
} }
if (!defaultThickness.HasValue) if (!defaultThickness.HasValue)

8
FasdDesktopUi/F4SD-Cockpit-Client.csproj
View File

@@ -281,7 +281,9 @@
<Compile Include="Basics\UserControls\ComboBoxPageAble.xaml.cs"> <Compile Include="Basics\UserControls\ComboBoxPageAble.xaml.cs">
<DependentUpon>ComboBoxPageAble.xaml</DependentUpon> <DependentUpon>ComboBoxPageAble.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Pages\DesktopWidgetPage\DesktopWidgetPageView.xaml.cs">
<DependentUpon>DesktopWidgetPageView.xaml</DependentUpon>
</Compile>
<Compile Include="Basics\UserControls\HierarchicalSelectionControl.xaml.cs"> <Compile Include="Basics\UserControls\HierarchicalSelectionControl.xaml.cs">
<DependentUpon>HierarchicalSelectionControl.xaml</DependentUpon> <DependentUpon>HierarchicalSelectionControl.xaml</DependentUpon>
</Compile> </Compile>
@@ -499,6 +501,10 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Pages\DesktopWidgetPage\DesktopWidgetPageView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Basics\UserControls\HierarchicalSelectionControl.xaml"> <Page Include="Basics\UserControls\HierarchicalSelectionControl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>

221
FasdDesktopUi/Pages/DesktopWidgetPage/DesktopWidgetPageView.xaml Normal file
View File

@@ -0,0 +1,221 @@
<Window x:Class="FasdDesktopUi.Pages.DesktopWidgetPage.DesktopWidgetPageView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:FasdDesktopUi.Pages.DesktopWidgetPage"
xmlns:vc="clr-namespace:FasdDesktopUi.Basics.Converter"
xmlns:ico="clr-namespace:FasdDesktopUi.Basics.UserControls.AdaptableIcon;assembly=F4SD-AdaptableIcon"
mc:Ignorable="d"
Title="DesktopWidgetPageView"
AllowsTransparency="True"
WindowStyle="None"
Background="Transparent"
VerticalAlignment="Bottom"
ResizeMode="NoResize"
WindowState="Maximized"
ShowInTaskbar="False"
Topmost="True"
x:Name="DesktopWidgetWindow">
<Window.Resources>
<BooleanToVisibilityConverter x:Key="BoolToVisibility" />
<vc:LanguageDefinitionsConverter x:Key="LanguageConverter" />
<Style x:Key="DesktopWidget.Grid"
TargetType="Grid">
<Setter Property="Visibility" Value="{Binding ElementName=DesktopWidgetWindow, Path=AreAllWidgetsVisible, Converter={StaticResource BoolToVisibility}}" />
<Style.Triggers>
<DataTrigger Binding="{Binding IsMouseOver, ElementName=F4SDWidget}" Value="True">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
<Style x:Key="DesktopWidget.WidgetIcon"
TargetType="ico:AdaptableIcon">
<Setter Property="IconBackgroundColor" Value="{DynamicResource Color.AppBackground}"/>
<Setter Property="PrimaryIconColor" Value="{DynamicResource Color.Menu.Icon}"/>
<Setter Property="IconWidth" Value="50"/>
<Setter Property="IconHeight" Value="50"/>
<Setter Property="IconCornerRadius" Value="25"/>
<Setter Property="BorderPadding" Value="10"/>
<Setter Property="Margin" Value="-1"/>
<Setter Property="Cursor" Value="Hand"/>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="PrimaryIconColor" Value="{DynamicResource Color.Menu.Icon.Hover}" />
<Setter Property="IconBackgroundColor" Value="{DynamicResource Background.Menu.Icon.Hover}" />
</Trigger>
</Style.Triggers>
<!--<Setter Property="BorderThickness" Value="10"/>
<Setter Property="BorderBrush" Value="{DynamicResource Color.Menu.Icon}"/>-->
</Style>
<Style x:Key="DesktopWidget.F4SDIcon"
TargetType="ico:AdaptableIcon">
<Setter Property="IconBackgroundColor" Value="{DynamicResource Color.AppBackground}"/>
<Setter Property="Cursor" Value="Hand"/>
<Setter Property="Margin" Value="-1"/>
<Setter Property="IconHeight" Value="70"/>
<Setter Property="IconWidth" Value="70"/>
<Setter Property="IconCornerRadius" Value="35"/>
<Setter Property="BorderPadding" Value="15"/>
<Setter Property="PrimaryIconColor" Value="{DynamicResource Color.F4SD}"/>
<Setter Property="SecondaryIconColor" Value="{DynamicResource Color.AppBackground}"/>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="PrimaryIconColor" Value="{DynamicResource Color.Menu.Icon.Hover}" />
<Setter Property="IconBackgroundColor" Value="{DynamicResource Background.Menu.Icon.Hover}" />
<Setter Property="SecondaryIconColor" Value="{DynamicResource Background.Menu.Icon.Hover}" />
</Trigger>
</Style.Triggers>
</Style>
</Window.Resources>
<Border x:Name="MainBorder"
Background="Transparent"
Padding="10"
HorizontalAlignment="Right"
VerticalAlignment="Bottom"
Visibility="{Binding ElementName=DesktopWidgetWindow, Path=IsWindowVisible, Converter={StaticResource BoolToVisibility}}">
<Grid VerticalAlignment="Bottom"
Background="Transparent">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid x:Name="RestartGrid"
Style="{DynamicResource DesktopWidget.Grid}"
Grid.Row="0">
<Border BorderBrush="{DynamicResource Color.Menu.Icon}"
BorderThickness="5"
CornerRadius="25"
Margin="0,10,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<ico:AdaptableIcon x:Name="RestartWidget"
Style="{DynamicResource DesktopWidget.WidgetIcon}"
Grid.Row="0"
SelectedMaterialIcon="ic_power_settings_new"
MouseLeftButtonUp="RestartWidget_MouseLeftButtonUp"/>
</Border>
</Grid>
<Grid x:Name="SettingsGrid"
Style="{DynamicResource DesktopWidget.Grid}"
Grid.Row="1">
<Border BorderBrush="{DynamicResource Color.Menu.Icon}"
BorderThickness="5"
CornerRadius="25"
Margin="0,10,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<ico:AdaptableIcon x:Name="SettingsWidget"
Style="{DynamicResource DesktopWidget.WidgetIcon}"
Grid.Row="0"
SelectedInternIcon="menuBar_settings"
MouseLeftButtonUp="SettingsWidget_MouseLeftButtonUp"/>
</Border>
</Grid>
<Grid x:Name="TicketNotifyGrid"
Grid.Row="2"
Style="{DynamicResource DesktopWidget.Grid}">
<Border BorderBrush="{DynamicResource Color.Menu.Icon}"
BorderThickness="5"
CornerRadius="25"
Margin="0,10,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<ico:AdaptableIcon x:Name="TicketNotifyWidget"
Style="{DynamicResource DesktopWidget.WidgetIcon}"
Grid.Row="0"
SelectedInternIcon="misc_ticket"
MouseLeftButtonUp="TicketNotifyWidget_MouseLeftButtonUp"/>
</Border>
<Border Background="{DynamicResource Color.Red}"
Height="15"
Width="20"
CornerRadius="5"
Margin="0 -25 -35 0">
<TextBlock VerticalAlignment="Center"
HorizontalAlignment="Center">
1
</TextBlock>
</Border>
</Grid>
<Grid x:Name="SearchGrid"
Grid.Row="3"
Style="{DynamicResource DesktopWidget.Grid}">
<Border BorderBrush="{DynamicResource Color.Menu.Icon}"
BorderThickness="5"
CornerRadius="25"
Margin="0,10,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<ico:AdaptableIcon x:Name="SearchWidget"
Style="{DynamicResource DesktopWidget.WidgetIcon}"
Grid.Row="1"
SelectedInternIcon="menuBar_search"
BorderPadding="5,5,12,12"
MouseLeftButtonUp="SearchWidget_MouseLeftButtonUp"/>
</Border>
</Grid>
<Grid Grid.Row="4">
<Border BorderBrush="{DynamicResource Color.Menu.Icon}"
BorderThickness="5"
CornerRadius="35"
Margin="0,10,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<ico:AdaptableIcon x:Name="F4SDWidget"
Style="{DynamicResource DesktopWidget.F4SDIcon}"
SelectedInternIcon="f4sd"
MouseLeftButtonUp="F4SDWidget_MouseLeftButtonUp"/>
</Border>
<Border Background="{DynamicResource Color.Red}"
Height="15"
Width="20"
CornerRadius="5"
Margin="0 -35 -50 0"
Visibility="{Binding ElementName=DesktopWidgetWindow, Path=ShowMainNotification, Converter={StaticResource BoolToVisibility}}">
<TextBlock VerticalAlignment="Center"
HorizontalAlignment="Center">
1
</TextBlock>
</Border>
</Grid>
</Grid>
</Border>
</Window>

179
FasdDesktopUi/Pages/DesktopWidgetPage/DesktopWidgetPageView.xaml.cs Normal file
View File

@@ -0,0 +1,179 @@
using C4IT.MultiLanguage;
using FasdDesktopUi.Basics;
using FasdDesktopUi.Pages.SearchPage;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Forms;
using System.Windows.Input;
using System.Windows.Interop;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using ContextMenu = System.Windows.Controls.ContextMenu;
using MenuItem = System.Windows.Controls.MenuItem;
using MessageBox = System.Windows.MessageBox;
namespace FasdDesktopUi.Pages.DesktopWidgetPage
{
/// <summary>
/// Interaction logic for DesktopWidgetPageView.xaml
/// </summary>
public partial class DesktopWidgetPageView : Window
{
public bool IsWindowVisible
{
get { return (bool)GetValue(IsWindowVisibleProperty); }
set { SetValue(IsWindowVisibleProperty, value); }
}
// Using a DependencyProperty as the backing store for IsWindowVisible. This enables animation, styling, binding, etc...
public static readonly DependencyProperty IsWindowVisibleProperty =
DependencyProperty.Register(nameof(IsWindowVisible), typeof(bool), typeof(DesktopWidgetPageView), new PropertyMetadata(true));
public bool AreAllWidgetsVisible
{
get { return (bool)GetValue(AreAllWidgetsVisibleProperty); }
set { SetValue(AreAllWidgetsVisibleProperty, value); }
}
// Using a DependencyProperty as the backing store for AreAllWidgetsVisible. This enables animation, styling, binding, etc...
public static readonly DependencyProperty AreAllWidgetsVisibleProperty =
DependencyProperty.Register(nameof(AreAllWidgetsVisible), typeof(bool), typeof(DesktopWidgetPageView), new PropertyMetadata(false));
public bool ShowMainNotification
{
get { return (bool)GetValue(ShowMainNotificationProperty); }
set { SetValue(ShowMainNotificationProperty, value); }
}
// Using a DependencyProperty as the backing store for ShowMainNotification. This enables animation, styling, binding, etc...
public static readonly DependencyProperty ShowMainNotificationProperty =
DependencyProperty.Register(nameof(ShowMainNotification), typeof(bool), typeof(DesktopWidgetPageView), new PropertyMetadata(true));
public DesktopWidgetPageView()
{
InitializeComponent();
SourceInitialized += (s, e) =>
{
IntPtr handle = new WindowInteropHelper(this).Handle;
HwndSource.FromHwnd(handle).AddHook(new HwndSourceHook(cUtility.WindowProc));
};
}
private bool IsAnyOtherVisible() => cSupportCaseDataProvider.detailsPage.IsVisible || SearchPageView.Instance.IsVisible;
protected override void OnInitialized(EventArgs e)
{
cSupportCaseDataProvider.detailsPage.IsVisibleChanged += (sender, args) =>
{
this.Visibility = IsAnyOtherVisible() ? Visibility.Collapsed : Visibility.Visible;
};
SearchPageView.Instance.IsVisibleChanged += (sender, args) =>
{
this.Visibility = IsAnyOtherVisible() ? Visibility.Collapsed : Visibility.Visible;
};
base.OnInitialized(e);
}
private void F4SDWidget_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
AreAllWidgetsVisible = !AreAllWidgetsVisible;
ShowMainNotification = !ShowMainNotification;
}
private void SearchWidget_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
SearchPageView.Instance.ActivateSearchView();
}
private void SettingsWidget_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
ContextMenu menu = SetupSettingsContextMenu();
SettingsWidget.ContextMenu = menu;
SettingsWidget.ContextMenu.IsOpen = true;
}
private ContextMenu SetupSettingsContextMenu()
{
ContextMenu menu = new ContextMenu();
MenuItem languageItem = new MenuItem();
languageItem.Header = cMultiLanguageSupport.GetItem("Menu.SelectLanguage");
languageItem.Items.Add(new MenuItem { Header = "DE" });
languageItem.Items.Add(new MenuItem { Header = "EN" });
menu.Items.Add(languageItem);
MenuItem optionsItem = new MenuItem();
optionsItem.Header = cMultiLanguageSupport.GetItem("Menu.Options");
optionsItem.Click += (s, e) => MessageBox.Show(cMultiLanguageSupport.GetItem("Menu.Options"));
menu.Items.Add(optionsItem);
MenuItem m42Item = new MenuItem();
m42Item.Header = cMultiLanguageSupport.GetItem("M42Settings.SystemTray");
m42Item.Click += (s, e) => MessageBox.Show(cMultiLanguageSupport.GetItem("M42Settings.SystemTray"));
menu.Items.Add(m42Item);
MenuItem phoneItem = new MenuItem();
phoneItem.Header = cMultiLanguageSupport.GetItem("PhoneSettings.SystemTray");
phoneItem.Click += (s, e) => MessageBox.Show(cMultiLanguageSupport.GetItem("PhoneSettings.SystemTray"));
menu.Items.Add(phoneItem);
return menu;
}
private void ShowMessageBox(string message)
{
MessageBox.Show(message);
}
private void RestartWidget_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
ContextMenu menu = SetupRestartContextMenu();
RestartWidget.ContextMenu = menu;
RestartWidget.ContextMenu.IsOpen = true;
}
private ContextMenu SetupRestartContextMenu()
{
ContextMenu menu = new ContextMenu();
MenuItem restartItem = new MenuItem();
restartItem.Header = cMultiLanguageSupport.GetItem("Menu.Restart");
restartItem.Click += (s, e) => MessageBox.Show(cMultiLanguageSupport.GetItem("Menu.Restart"));
menu.Items.Add(restartItem);
MenuItem quitItem = new MenuItem();
quitItem.Header = cMultiLanguageSupport.GetItem("Menu.Quit");
quitItem.Click += (s, e) => MessageBox.Show(cMultiLanguageSupport.GetItem("Menu.Quit"));
menu.Items.Add(quitItem);
return menu;
}
private void TicketNotifyWidget_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
MessageBox.Show("Dies wurde leider noch nicht implementiert, sollte dich das stören setze es doch gerne selber um.");
}
}
}

1
FasdDesktopUi/Pages/DetailsPage/DetailsPageView.xaml.cs
View File

@@ -390,6 +390,7 @@ namespace FasdDesktopUi.Pages.DetailsPage
BlurInvoker.BlurInvokerVisibilityChanged += (obj, e) => UpdateBlurStatus(obj); BlurInvoker.BlurInvokerVisibilityChanged += (obj, e) => UpdateBlurStatus(obj);
NavigationHeadingUc.HeadingIconClickedEvent += NavigationHeadingUc_HeadingIconClickedEvent; NavigationHeadingUc.HeadingIconClickedEvent += NavigationHeadingUc_HeadingIconClickedEvent;
NavigationHeadingUc.EmptySpaceClicked += (obj, e) => BlurBorder_Click();
RefreshControl.RefreshButtonClicked += RefreshButtonClickedEvent; RefreshControl.RefreshButtonClicked += RefreshButtonClickedEvent;

51
FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageNavigationHeading.xaml
View File

@@ -23,6 +23,15 @@
Handler="HeadingIcon_TouchDown" /> Handler="HeadingIcon_TouchDown" />
</Style> </Style>
<Style x:Key="DetailsPage.TitleSection.Border.NotSelected"
TargetType="Border"
BasedOn="{StaticResource DetailsPage.TitleSection.Border.NotSelected}">
<EventSetter Event="MouseLeftButtonUp"
Handler="HeadingIcon_MouseLeftButtonUp" />
<EventSetter Event="TouchDown"
Handler="HeadingIcon_TouchDown" />
</Style>
<Style x:Key="SwapIconStyleBase" <Style x:Key="SwapIconStyleBase"
x:Name="SwapIconStyleBase" x:Name="SwapIconStyleBase"
TargetType="ico:AdaptableIcon" TargetType="ico:AdaptableIcon"
@@ -35,6 +44,18 @@
Value="{x:Null}" /> Value="{x:Null}" />
<Setter Property="SelectedInternIcon" <Setter Property="SelectedInternIcon"
Value="misc_chevron_down" /> Value="misc_chevron_down" />
<Setter Property="IconWidth"
Value="40" />
<Setter Property="IconHeight"
Value="42" />
<Setter Property="BorderPadding"
Value="10 0 10 0" />
<Setter Property="BorderThickness"
Value="3 0 0 0" />
<Setter Property="Margin"
Value="0" />
<Setter Property="IconCornerRadius"
Value="10" />
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorLevel=1, AncestorType=Border}, Path=IsMouseOver}" <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorLevel=1, AncestorType=Border}, Path=IsMouseOver}"
Value="True"> Value="True">
@@ -87,6 +108,9 @@
</UserControl.Resources> </UserControl.Resources>
<Border x:Name="HeadingBorder"
MouseLeftButtonUp="HeadingBorder_Clicked"
TouchDown="HeadingBorder_Clicked">
<ScrollViewer x:Name="HeadingScroller" <ScrollViewer x:Name="HeadingScroller"
x:FieldModifier="private" x:FieldModifier="private"
HorizontalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
@@ -151,9 +175,7 @@
<ico:AdaptableIcon x:Name="ComputerSwapIcon" <ico:AdaptableIcon x:Name="ComputerSwapIcon"
Style="{DynamicResource SwapIconStyle}" Style="{DynamicResource SwapIconStyle}"
Visibility="Visible" Visibility="Visible"
BorderBrush="{DynamicResource Color.SoftContrast}" BorderBrush="{DynamicResource Color.SoftContrast}" />
BorderThickness="2 0 0 0"
Padding="5 0 0 0" />
</StackPanel> </StackPanel>
</Border> </Border>
@@ -186,7 +208,8 @@
Grid.Column="2" Grid.Column="2"
Margin="10 0" Margin="10 0"
Background="#01000000" Background="#01000000"
Padding="5 0"> Padding="5 0"
x:Name="VirtualSessionBorder">
<StackPanel x:Name="VirtualSessionStack" <StackPanel x:Name="VirtualSessionStack"
Orientation="Horizontal"> Orientation="Horizontal">
<Border x:Name="VirtualSessionStackHighlightBorder" <Border x:Name="VirtualSessionStackHighlightBorder"
@@ -201,9 +224,7 @@
<ico:AdaptableIcon x:Name="VirtualSessionSwapIcon" <ico:AdaptableIcon x:Name="VirtualSessionSwapIcon"
Style="{DynamicResource SwapIconStyle}" Style="{DynamicResource SwapIconStyle}"
Visibility="Visible" Visibility="Visible"
BorderBrush="{DynamicResource Color.SoftContrast}" BorderBrush="{DynamicResource Color.SoftContrast}" />
BorderThickness="2 0 0 0"
Padding="5 0 0 0" />
</StackPanel> </StackPanel>
</Border> </Border>
@@ -236,7 +257,8 @@
Grid.Column="3" Grid.Column="3"
Margin="10 0" Margin="10 0"
Background="#01000000" Background="#01000000"
Padding="5 0"> Padding="5 0"
x:Name="MobileDeviceBorder">
<StackPanel x:Name="MobileDeviceStack" <StackPanel x:Name="MobileDeviceStack"
Orientation="Horizontal"> Orientation="Horizontal">
<Border x:Name="MobileDeviceStackHighlightBorder" <Border x:Name="MobileDeviceStackHighlightBorder"
@@ -251,9 +273,7 @@
<ico:AdaptableIcon x:Name="MobileDeviceSwapIcon" <ico:AdaptableIcon x:Name="MobileDeviceSwapIcon"
Style="{DynamicResource SwapIconStyle}" Style="{DynamicResource SwapIconStyle}"
Visibility="Visible" Visibility="Visible"
BorderBrush="{DynamicResource Color.SoftContrast}" BorderBrush="{DynamicResource Color.SoftContrast}" />
BorderThickness="2 0 0 0"
Padding="5 0 0 0" />
</StackPanel> </StackPanel>
</Border> </Border>
@@ -285,7 +305,8 @@
Grid.Column="4" Grid.Column="4"
Margin="10 0" Margin="10 0"
Background="#01000000" Background="#01000000"
Padding="5 0"> Padding="5 0"
x:Name="TicketBorder">
<StackPanel x:Name="TicketStack" <StackPanel x:Name="TicketStack"
Orientation="Horizontal"> Orientation="Horizontal">
<Border x:Name="TicketStackHighlightBorder" <Border x:Name="TicketStackHighlightBorder"
@@ -301,9 +322,7 @@
<ico:AdaptableIcon x:Name="TicketSwapIcon" <ico:AdaptableIcon x:Name="TicketSwapIcon"
Style="{DynamicResource SwapIconStyle}" Style="{DynamicResource SwapIconStyle}"
Visibility="Visible" Visibility="Visible"
BorderBrush="{DynamicResource Color.SoftContrast}" BorderBrush="{DynamicResource Color.SoftContrast}" />
BorderThickness="2 0 0 0"
Padding="5 0 0 0" />
</StackPanel> </StackPanel>
</Border> </Border>
@@ -356,5 +375,5 @@
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
</Border>
</UserControl> </UserControl>

64
FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageNavigationHeading.xaml.cs
View File

@@ -37,7 +37,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
if (value != null) if (value != null)
{ {
UpdateHeaderHighlights(); UpdateHeaderHighlights();
SetTicketHeadingVisibility(); SetHeadingVisibility();
} }
} }
} }
@@ -100,11 +100,9 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
else if (DataProvider.HealthCardDataHelper.SelectedHealthCard.InformationClasses.Any(identity => identity is enumFasdInformationClass.User)) else if (DataProvider.HealthCardDataHelper.SelectedHealthCard.InformationClasses.Any(identity => identity is enumFasdInformationClass.User))
highlightedBorder = UserStackHighlightBorder; highlightedBorder = UserStackHighlightBorder;
if (highlightedBorder != null) highlightedBorder?.SetResourceReference(BackgroundProperty, "BackgroundColor.Menu.MainCategory");
highlightedBorder.SetResourceReference(BackgroundProperty, "BackgroundColor.Menu.MainCategory");
if (swapIcon != null) swapIcon?.SetResourceReference(AdaptableIcon.IconBackgroundColorProperty, "BackgroundColor.Menu.MainCategory");
swapIcon.SetResourceReference(AdaptableIcon.IconBackgroundColorProperty, "BackgroundColor.Menu.MainCategory");
} }
catch (Exception E) catch (Exception E)
{ {
@@ -112,16 +110,25 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
} }
} }
private void SetTicketHeadingVisibility() private async Task SetHeadingVisibility()
{ {
try try
{ {
if (DataProvider is null) if (DataProvider is null)
return; return;
cCollectorStatusInfo modules = await cFasdCockpitConfig.Instance.CheckCollectorStatusAsync();
if (modules != null)
{
TicketStack.Visibility = modules.HasM42Config ? Visibility.Visible : Visibility.Collapsed;
MobileDeviceStack.Visibility = modules.HasMobileDeviceConfig ? Visibility.Visible : Visibility.Collapsed;
VirtualSessionStack.Visibility = modules.HasCitrixConfig ? Visibility.Visible : Visibility.Collapsed;
TicketBorder.Visibility = modules.HasM42Config ? Visibility.Visible : Visibility.Collapsed;
MobileDeviceBorder.Visibility = modules.HasMobileDeviceConfig ? Visibility.Visible : Visibility.Collapsed;
VirtualSessionBorder.Visibility = modules.HasCitrixConfig ? Visibility.Visible : Visibility.Collapsed;
}
//bool isTicketIntegrationActive = cFasdCockpitCommunicationBase.CockpitUserInfo?.Roles?.Any(role => string.Equals(role, "Cockpit.TicketAgent", StringComparison.OrdinalIgnoreCase)) ?? false;
bool isTicketIntegrationActive = cF4SDCockpitXmlConfig.Instance.HealthCardConfig.HealthCards.Values.Any(_e => _e.InformationClasses.Contains(enumFasdInformationClass.Ticket));
TicketStack.Visibility = isTicketIntegrationActive ? Visibility.Visible : Visibility.Collapsed;
} }
catch (Exception E) catch (Exception E)
{ {
@@ -144,7 +151,6 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
return; return;
_me.ResetControl(); _me.ResetControl();
_me.SetTicketHeadingVisibility();
_me.InitializeHeadings(); _me.InitializeHeadings();
_me.UpdateHeaderHighlights(); _me.UpdateHeaderHighlights();
} }
@@ -260,10 +266,11 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
VirtualSessionSwapIcon.Tag = virtualSessionDataEmpty; VirtualSessionSwapIcon.Tag = virtualSessionDataEmpty;
MobileDeviceSwapIcon.Tag = mobileDeviceDataEmpty; MobileDeviceSwapIcon.Tag = mobileDeviceDataEmpty;
ComputerStackHighlightBorder.Tag = computerDataEmpty; UserStackHighlightBorder.Tag = userDataEmpty.InformationClass;
TicketStackHighlightBorder.Tag = ticketDataEmpty; ComputerStackHighlightBorder.Tag = computerDataEmpty.InformationClass;
VirtualSessionStackHighlightBorder.Tag = virtualSessionDataEmpty; TicketStackHighlightBorder.Tag = ticketDataEmpty.InformationClass;
MobileDeviceStackHighlightBorder.Tag = mobileDeviceDataEmpty; VirtualSessionStackHighlightBorder.Tag = virtualSessionDataEmpty.InformationClass;
MobileDeviceStackHighlightBorder.Tag = mobileDeviceDataEmpty.InformationClass;
ComputerSwapIcon.Style = (Style)FindResource("SwapIconStyle"); ComputerSwapIcon.Style = (Style)FindResource("SwapIconStyle");
TicketSwapIcon.Style = (Style)FindResource("SwapIconStyle"); TicketSwapIcon.Style = (Style)FindResource("SwapIconStyle");
@@ -300,16 +307,6 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
MobileDeviceStackHighlightBorder.ClearValue(OpacityProperty); MobileDeviceStackHighlightBorder.ClearValue(OpacityProperty);
SetEditMode(false); SetEditMode(false);
if (!cFasdCockpitCommunicationBase.Instance.IsDemo())
{
if (MobileDeviceStack.Parent is UIElement mobileParent)
mobileParent.Visibility = Visibility.Collapsed;
//if (VirtualSessionStack.Parent is UIElement virtualParent)
// virtualParent.Visibility = Visibility.Collapsed;
}
ResetSelectors(); ResetSelectors();
} }
catch (Exception E) catch (Exception E)
@@ -424,6 +421,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
headingIcon = UserIcon; headingIcon = UserIcon;
headingTextBlock = UserTextBlock; headingTextBlock = UserTextBlock;
copyIcon = UserCopyIcon; copyIcon = UserCopyIcon;
highlightBoder = UserStackHighlightBorder;
hasValue = heading.HeadingText != cMultiLanguageSupport.GetItem("Header.Select.User"); hasValue = heading.HeadingText != cMultiLanguageSupport.GetItem("Header.Select.User");
if (!hasValue) if (!hasValue)
@@ -482,6 +480,9 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
if (highlightBoder != null) if (highlightBoder != null)
{ {
if (hasValue)
highlightBoder.Tag = heading.Realtion;
else
highlightBoder.Tag = new cSwapCaseInfo() { SelectedCaseInformationClass = heading.InformationClass, HeadingDatas = HeadingData }; highlightBoder.Tag = new cSwapCaseInfo() { SelectedCaseInformationClass = heading.InformationClass, HeadingDatas = HeadingData };
} }
@@ -603,7 +604,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
#region SwapIcon Click #region SwapIcon Click
private void SwapIcon_Click(object sender) private void SwapIcon_Click(object sender, RoutedEventArgs e)
{ {
try try
@@ -639,7 +640,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
ShowsRelations = true; ShowsRelations = true;
cUiActionBase.RaiseEvent(new cShowHeadingSelectionMenuAction(), this, sender); cUiActionBase.RaiseEvent(new cShowHeadingSelectionMenuAction(), this, sender);
DoShowRelations(swapCaseData, location, SupportCaseController); DoShowRelations(swapCaseData, location, SupportCaseController);
//Dispatcher.Invoke(async () => await action.RunUiActionAsync(sender, location, false, DataProvider)); e.Handled = true;
} }
catch (Exception E) catch (Exception E)
{ {
@@ -710,12 +711,12 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
private void SwapIcon_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) private void SwapIcon_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{ {
SwapIcon_Click(sender); SwapIcon_Click(sender, e);
} }
private void SwapIcon_TouchDown(object sender, TouchEventArgs e) private void SwapIcon_TouchDown(object sender, TouchEventArgs e)
{ {
SwapIcon_Click(sender); SwapIcon_Click(sender, e);
} }
#endregion #endregion
@@ -826,10 +827,17 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
UndoTicketIcon_Click(); UndoTicketIcon_Click();
} }
#endregion #endregion
#endregion #endregion
// todo hacky solution to toggle blurr border. Think about better solution
public event EventHandler EmptySpaceClicked;
private void HeadingBorder_Clicked(object sender, EventArgs e)
{
EmptySpaceClicked?.Invoke(this, EventArgs.Empty);
}
} }
} }

5
FasdDesktopUi/Pages/SearchPage/SearchPageView.xaml
View File

@@ -123,7 +123,8 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Text="Beta"> Text="Beta">
<buc:Badge.LayoutTransform> <buc:Badge.LayoutTransform>
<ScaleTransform ScaleX="0.85" ScaleY="0.85" /> <ScaleTransform ScaleX="0.85"
ScaleY="0.85" />
</buc:Badge.LayoutTransform> </buc:Badge.LayoutTransform>
</buc:Badge> </buc:Badge>
</StackPanel> </StackPanel>
@@ -168,7 +169,7 @@
<ScrollViewer VerticalScrollBarVisibility="Auto"> <ScrollViewer VerticalScrollBarVisibility="Auto">
<buc:CustomSearchResultCollection x:Name="ResultMenu" <buc:CustomSearchResultCollection x:Name="ResultMenu"
x:FieldModifier="private" x:FieldModifier="private"
PreviewMouseWheel="ResultMenu_PreviewMouseWheel"/> PreviewMouseWheel="ResultMenu_PreviewMouseWheel" />
</ScrollViewer> </ScrollViewer>
</Border> </Border>
</Grid> </Grid>

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

@@ -162,20 +162,27 @@ namespace FasdDesktopUi.Pages.SearchPage
private void SetSearchResultVisibility(bool isVisible) private void SetSearchResultVisibility(bool isVisible)
{ {
SearchResultBorder.Visibility = isVisible ? Visibility.Visible : Visibility.Collapsed; SearchResultBorder.Visibility = isVisible ? Visibility.Visible : Visibility.Collapsed;
BodyStack_SearchResults.Visibility = (isVisible || SearchResultBorder.IsVisible) ? Visibility.Visible : Visibility.Collapsed; BodyStack_SearchResults.Visibility =
(SearchResultBorder.Visibility == Visibility.Visible || SearchHistoryBorder.Visibility == Visibility.Visible)
? Visibility.Visible
: Visibility.Collapsed;
ScheduleSearchResultMaxHeightUpdate(); ScheduleSearchResultMaxHeightUpdate();
} }
public void SetSearchHistoryVisibility(bool isVisible) public void SetSearchHistoryVisibility(bool isVisible)
{ {
SearchHistoryBorder.Visibility = isVisible && !SearchHistory.IsEmpty() ? Visibility.Visible : Visibility.Collapsed; SearchHistoryBorder.Visibility = isVisible && !SearchHistory.IsEmpty() ? Visibility.Visible : Visibility.Collapsed;
BodyStack_SearchResults.Visibility = (isVisible || SearchResultBorder.IsVisible) ? Visibility.Visible : Visibility.Collapsed; BodyStack_SearchResults.Visibility =
(SearchResultBorder.Visibility == Visibility.Visible || SearchHistoryBorder.Visibility == Visibility.Visible)
? Visibility.Visible
: Visibility.Collapsed;
ScheduleSearchResultMaxHeightUpdate(); ScheduleSearchResultMaxHeightUpdate();
} }
public void ShowLoadingTextItem(string itemText) public void ShowLoadingTextItem(string itemText)
{ {
SetSearchHistoryVisibility(false); SetSearchHistoryVisibility(false);
ResultMenu.ShowLoadingTextItem(itemText); ResultMenu.ShowLoadingTextItem(itemText);
BodyStack_SearchResults.Visibility = Visibility.Visible;
} }
public void ShowSearchRelations(cSearchHistorySearchResultEntry searchHistoryEntry, IRelationService relationService, ISearchUiProvider searchUiProvider) public void ShowSearchRelations(cSearchHistorySearchResultEntry searchHistoryEntry, IRelationService relationService, ISearchUiProvider searchUiProvider)
@@ -318,17 +325,16 @@ namespace FasdDesktopUi.Pages.SearchPage
{ {
await SearchBarUc.SetFixedSearchResultAsync(Class, strInfo, result); await SearchBarUc.SetFixedSearchResultAsync(Class, strInfo, result);
if (result.AutoContinue && result.Results?.Count == 1)
{
ResultMenu.IndexOfSelectedResultItem = 0;
ResultMenu.SelectCurrentResultItem();
}
if (!suppressUi && !_ticketOverviewAutoContinueActive) if (!suppressUi && !_ticketOverviewAutoContinueActive)
{ {
Show(); Show();
Activate(); Activate();
} }
if (result.AutoContinue && result.Results?.Count == 1)
{
ResultMenu.IndexOfSelectedResultItem = 0;
ResultMenu.SelectCurrentResultItem();
}
} }
catch (Exception E) catch (Exception E)
{ {
@@ -437,14 +443,14 @@ namespace FasdDesktopUi.Pages.SearchPage
LogMethodBegin(CM); LogMethodBegin(CM);
try try
{ {
var _h = Task.Run(async () => _ = Task.Run(async () =>
{ {
try try
{ {
var lstSids = searchInfo.sids.Split(',').Select((v) => v.Trim()).ToList(); var lstSids = searchInfo.sids.Split(',').Select((v) => v.Trim()).ToList();
var _result = await cFasdCockpitCommunicationBase.Instance.GetUserSearchResults(searchInfo.name, lstSids); var searchResult = await cFasdCockpitCommunicationBase.Instance.GetUserSearchResults(searchInfo.name, lstSids);
var strInfo = string.Format(cMultiLanguageSupport.GetItem("Searchbar.UserSearch.Info"), searchInfo.name); var strInfo = string.Format(cMultiLanguageSupport.GetItem("Searchbar.UserSearch.Info"), searchInfo.name);
ShowExternalSearchInfo(strInfo, _result, enumF4sdSearchResultClass.User); ShowExternalSearchInfo(strInfo, searchResult, enumF4sdSearchResultClass.User);
} }
catch (Exception E) catch (Exception E)
{ {
@@ -807,8 +813,12 @@ namespace FasdDesktopUi.Pages.SearchPage
private bool CheckTicketOverviewAvailability() private bool CheckTicketOverviewAvailability()
{ {
if (cFasdCockpitCommunicationBase.Instance?.IsDemo() == true)
return true;
return cFasdCockpitConfig.Instance?.Global?.TicketConfiguration?.ShowOverview == true return cFasdCockpitConfig.Instance?.Global?.TicketConfiguration?.ShowOverview == true
&& IsTicketIntegrationActive(); && IsTicketIntegrationActive()
&& cFasdCockpitConfig.Instance.HasM42Configuration();
} }
private bool IsTicketIntegrationActive() private bool IsTicketIntegrationActive()
@@ -862,16 +872,15 @@ namespace FasdDesktopUi.Pages.SearchPage
private void SetTicketOverviewVisibility(bool isVisible) private void SetTicketOverviewVisibility(bool isVisible)
{ {
var b = isVisible;
if (!CheckTicketOverviewAvailability()) if (!CheckTicketOverviewAvailability())
b = false; isVisible = false;
BodyStack_TicketOverview.Visibility = b ? Visibility.Visible : Visibility.Collapsed; BodyStack_TicketOverview.Visibility = isVisible ? Visibility.Visible : Visibility.Collapsed;
TicketOverviewBorder.Visibility = b ? Visibility.Visible : Visibility.Collapsed; TicketOverviewBorder.Visibility = isVisible ? Visibility.Visible : Visibility.Collapsed;
FilterCheckbox.Visibility = b ? Visibility.Visible : Visibility.Collapsed; FilterCheckbox.Visibility = isVisible ? Visibility.Visible : Visibility.Collapsed;
RoleLabel.Visibility = b ? Visibility.Visible : Visibility.Collapsed; RoleLabel.Visibility = isVisible ? Visibility.Visible : Visibility.Collapsed;
OwnTicketsLabel.Visibility = b ? Visibility.Visible : Visibility.Collapsed; OwnTicketsLabel.Visibility = isVisible ? Visibility.Visible : Visibility.Collapsed;
TicketOverviewLabel.Visibility = b ? Visibility.Visible : Visibility.Collapsed; TicketOverviewLabel.Visibility = isVisible ? Visibility.Visible : Visibility.Collapsed;
ScheduleSearchResultMaxHeightUpdate(); ScheduleSearchResultMaxHeightUpdate();
} }
@@ -1427,7 +1436,6 @@ namespace FasdDesktopUi.Pages.SearchPage
SetPendingInformationClasses(new HashSet<enumFasdInformationClass> { enumFasdInformationClass.Ticket }); SetPendingInformationClasses(new HashSet<enumFasdInformationClass> { enumFasdInformationClass.Ticket });
var relations = await LoadRelationsForTileAsync(e.Key, e.UseRoleScope, Math.Max(0, e.Count)); var relations = await LoadRelationsForTileAsync(e.Key, e.UseRoleScope, Math.Max(0, e.Count));
await PopulateTicketOverviewRelationUsersAsync(relations);
var firstRelation = relations.FirstOrDefault(); var firstRelation = relations.FirstOrDefault();
string displayText = header; string displayText = header;
if (firstRelation != null) if (firstRelation != null)
@@ -1587,106 +1595,6 @@ namespace FasdDesktopUi.Pages.SearchPage
} }
} }
private async Task PopulateTicketOverviewRelationUsersAsync(List<cF4sdApiSearchResultRelation> relations)
{
if (relations == null || relations.Count == 0)
return;
foreach (var relation in relations)
{
if (relation == null || relation.Type != enumF4sdSearchResultClass.Ticket)
continue;
if (relation.Identities == null)
relation.Identities = new cF4sdIdentityList();
var existingUsers = relation.Identities
.Where(identity => identity.Class == enumFasdInformationClass.User)
.ToList();
Guid userId = Guid.Empty;
if (relation.Infos != null)
{
if (relation.Infos.TryGetValue("Sids", out var sidsValue) ||
relation.Infos.TryGetValue("UserSid", out sidsValue))
{
var sids = sidsValue?.Split(',')
.Select(v => v.Trim())
.Where(v => !string.IsNullOrWhiteSpace(v))
.ToList();
if (sids != null && sids.Count > 0)
{
var communication = cFasdCockpitCommunicationBase.Instance;
if (communication != null)
{
relation.Infos.TryGetValue("UserDisplayName", out var userDisplayName);
var result = await communication.GetUserSearchResults(userDisplayName, sids);
var user = result?.Values?.FirstOrDefault()?.FirstOrDefault();
if (user != null)
userId = user.id;
}
}
}
if (userId == Guid.Empty && relation.Infos.TryGetValue("UserAccount", out var userAccount))
{
relation.Infos.TryGetValue("UserDomain", out var userDomain);
if (!string.IsNullOrWhiteSpace(userAccount))
{
var communication = cFasdCockpitCommunicationBase.Instance;
if (communication != null)
{
userId = await communication.GetUserIdByAccount(userAccount, userDomain ?? string.Empty);
}
}
}
if (userId == Guid.Empty)
{
if (relation.Infos.TryGetValue("UserId", out var userIdString) ||
relation.Infos.TryGetValue("UserGuid", out userIdString) ||
relation.Infos.TryGetValue("UserIdentityId", out userIdString))
{
Guid.TryParse(userIdString, out userId);
}
}
}
if (userId == Guid.Empty)
{
if (existingUsers.Count == 0)
continue;
if (relation.Infos != null)
{
if (!relation.Infos.ContainsKey("UserId"))
relation.Infos["UserId"] = existingUsers[0].Id.ToString();
if (!relation.Infos.ContainsKey("UserGuid"))
relation.Infos["UserGuid"] = existingUsers[0].Id.ToString();
}
continue;
}
if (existingUsers.Count == 0 || existingUsers.Any(identity => identity.Id != userId))
{
relation.Identities.RemoveAll(identity => identity.Class == enumFasdInformationClass.User);
relation.Identities.Add(new cF4sdIdentityEntry
{
Class = enumFasdInformationClass.User,
Id = userId
});
}
if (relation.Infos == null)
relation.Infos = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
relation.Infos["UserId"] = userId.ToString();
relation.Infos["UserGuid"] = userId.ToString();
}
}
#endregion #endregion
#region Click-Through fuer transparente SearchView-Bereiche #region Click-Through fuer transparente SearchView-Bereiche

21
FasdDesktopUi/Pages/SettingsPage/SettingsPageView.xaml
View File

@@ -210,9 +210,10 @@
<ico:AdaptableIcon x:Name="ShouldSkipSlimViewPolicy" <ico:AdaptableIcon x:Name="ShouldSkipSlimViewPolicy"
SelectedInternIcon="lock_closed" SelectedInternIcon="lock_closed"
PrimaryIconColor="{DynamicResource Color.Menu.Icon}" PrimaryIconColor="{DynamicResource Color.Menu.Icon}"
Margin="-25,-5,0,0" BorderPadding="0"
IconWidth="23" Margin="-20 0 0 0"
IconHeight="23" IconWidth="12"
IconHeight="12"
Visibility="Collapsed" /> Visibility="Collapsed" />
</StackPanel> </StackPanel>
@@ -229,9 +230,10 @@
<ico:AdaptableIcon x:Name="PositionOfSmallViewsPolicy" <ico:AdaptableIcon x:Name="PositionOfSmallViewsPolicy"
SelectedInternIcon="lock_closed" SelectedInternIcon="lock_closed"
PrimaryIconColor="{DynamicResource Color.Menu.Icon}" PrimaryIconColor="{DynamicResource Color.Menu.Icon}"
Margin="-25,-5,0,0" BorderPadding="0"
IconWidth="23" Margin="-20 0 0 0"
IconHeight="23" IconWidth="12"
IconHeight="12"
Visibility="Collapsed" /> Visibility="Collapsed" />
</StackPanel> </StackPanel>
@@ -290,9 +292,10 @@
<ico:AdaptableIcon x:Name="PositionOfFavouriteBarPolicy" <ico:AdaptableIcon x:Name="PositionOfFavouriteBarPolicy"
SelectedInternIcon="lock_closed" SelectedInternIcon="lock_closed"
PrimaryIconColor="{DynamicResource Color.Menu.Icon}" PrimaryIconColor="{DynamicResource Color.Menu.Icon}"
Margin="-25,-5,0,0" BorderPadding="0"
IconWidth="23" Margin="-20 0 0 0"
IconHeight="23" IconWidth="12"
IconHeight="12"
Visibility="Collapsed" /> Visibility="Collapsed" />
</StackPanel> </StackPanel>

30
FasdDesktopUi/cFasdCockpitConfig.cs
View File

@@ -315,6 +315,36 @@ namespace FasdDesktopUi
return false; return false;
} }
public async Task<cCollectorStatusInfo> CheckCollectorStatusAsync()
{
try
{
var _res = await cFasdCockpitCommunicationBase.Instance.CheckCollectorStatusAsync();
if(_res != null)
return _res;
}
catch (Exception E)
{
LogException(E);
}
return null;
}
public bool HasM42Configuration()
{
try
{
return !string.IsNullOrWhiteSpace(cCockpitConfiguration.Instance?.m42ServerConfiguration?.Server);
}
catch (Exception E)
{
LogException(E);
}
return false;
}
public async Task InstantiateAnalyticsAsync(Guid SessionId) public async Task InstantiateAnalyticsAsync(Guid SessionId)
{ {
try try

2
Setup_Client/Product.wxs
View File

@@ -4,7 +4,7 @@
<Product Id="*" <Product Id="*"
Name="First Aid Service Desk (F4SD) Cockpit Client" Name="First Aid Service Desk (F4SD) Cockpit Client"
Language="1033" Language="1033"
Version="2.6.1.2" Version="2.7.0.2"
Manufacturer="Consulting4IT GmbH, Germany" Manufacturer="Consulting4IT GmbH, Germany"
UpgradeCode="42C65B2F-5482-4A02-9A4F-07F97C8BB008"> UpgradeCode="42C65B2F-5482-4A02-9A4F-07F97C8BB008">

6
Shared/SharedAssemblyInfo.cs
View File

@@ -5,7 +5,7 @@
[assembly: AssemblyCopyright("Copyright © 2026, Consulting4IT GmbH, Germany")] [assembly: AssemblyCopyright("Copyright © 2026, Consulting4IT GmbH, Germany")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("2.6.*")] [assembly: AssemblyVersion("2.7.*")]
[assembly: AssemblyInformationalVersion("2.6.1.2")] [assembly: AssemblyInformationalVersion("2.7.0.2")]
[assembly: AssemblyMinServerVersion("2.6.1.1")] [assembly: AssemblyMinServerVersion("2.7.0.0")]