diff --git a/C4IT_DataHistoryProvider_Base/F4SD-Cockpit-Server.csproj b/C4IT_DataHistoryProvider_Base/F4SD-Cockpit-Server.csproj
index fc6aba2..6fa295a 100644
--- a/C4IT_DataHistoryProvider_Base/F4SD-Cockpit-Server.csproj
+++ b/C4IT_DataHistoryProvider_Base/F4SD-Cockpit-Server.csproj
@@ -62,39 +62,45 @@
prompt
+
+ ..\packages\C4IT.F4SD.DisplayFormatting.1.0.0\lib\netstandard2.0\C4IT.F4SD.DisplayFormatting.dll
+
+
+ ..\packages\C4IT.F4SD.SupportCaseProtocoll.1.0.0\lib\netstandard2.0\C4IT.F4SD.SupportCaseProtocoll.dll
+
..\packages\MaterialIcons.1.0.3\lib\MaterialIcons.dll
-
- ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.7\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
+
+ ..\packages\Microsoft.Bcl.AsyncInterfaces.10.0.2\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
-
- ..\packages\Microsoft.Bcl.TimeProvider.9.0.7\lib\net462\Microsoft.Bcl.TimeProvider.dll
+
+ ..\packages\Microsoft.Bcl.TimeProvider.10.0.2\lib\net462\Microsoft.Bcl.TimeProvider.dll
-
- ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.7\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+
+ ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.10.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll
-
- ..\packages\Microsoft.Extensions.Logging.Abstractions.9.0.7\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll
+
+ ..\packages\Microsoft.Extensions.Logging.Abstractions.10.0.2\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll
-
- ..\packages\Microsoft.IdentityModel.Abstractions.8.13.0\lib\net472\Microsoft.IdentityModel.Abstractions.dll
+
+ ..\packages\Microsoft.IdentityModel.Abstractions.8.15.0\lib\net472\Microsoft.IdentityModel.Abstractions.dll
-
- ..\packages\Microsoft.IdentityModel.JsonWebTokens.8.13.0\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll
+
+ ..\packages\Microsoft.IdentityModel.JsonWebTokens.8.15.0\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll
-
- ..\packages\Microsoft.IdentityModel.Logging.8.13.0\lib\net472\Microsoft.IdentityModel.Logging.dll
+
+ ..\packages\Microsoft.IdentityModel.Logging.8.15.0\lib\net472\Microsoft.IdentityModel.Logging.dll
-
- ..\packages\Microsoft.IdentityModel.Tokens.8.13.0\lib\net472\Microsoft.IdentityModel.Tokens.dll
+
+ ..\packages\Microsoft.IdentityModel.Tokens.8.15.0\lib\net472\Microsoft.IdentityModel.Tokens.dll
False
.\Microsoft.Web.Administration.dll
- ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll
@@ -102,18 +108,18 @@
-
- ..\packages\System.Diagnostics.DiagnosticSource.9.0.7\lib\net462\System.Diagnostics.DiagnosticSource.dll
+
+ ..\packages\System.Diagnostics.DiagnosticSource.10.0.2\lib\net462\System.Diagnostics.DiagnosticSource.dll
-
- ..\packages\System.IdentityModel.Tokens.Jwt.8.13.0\lib\net472\System.IdentityModel.Tokens.Jwt.dll
+
+ ..\packages\System.IdentityModel.Tokens.Jwt.8.15.0\lib\net472\System.IdentityModel.Tokens.Jwt.dll
-
- ..\packages\System.IO.Pipelines.9.0.7\lib\net462\System.IO.Pipelines.dll
+
+ ..\packages\System.IO.Pipelines.10.0.2\lib\net462\System.IO.Pipelines.dll
..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll
@@ -125,11 +131,11 @@
..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll
-
- ..\packages\System.Text.Encodings.Web.9.0.7\lib\net462\System.Text.Encodings.Web.dll
+
+ ..\packages\System.Text.Encodings.Web.10.0.2\lib\net462\System.Text.Encodings.Web.dll
-
- ..\packages\System.Text.Json.9.0.7\lib\net462\System.Text.Json.dll
+
+ ..\packages\System.Text.Json.10.0.2\lib\net462\System.Text.Json.dll
..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll
@@ -321,6 +327,7 @@
+
diff --git a/C4IT_DataHistoryProvider_Base/Publish/F4SD-Cockpit-Server.dll b/C4IT_DataHistoryProvider_Base/Publish/F4SD-Cockpit-Server.dll
index 5e46165..88642b0 100644
Binary files a/C4IT_DataHistoryProvider_Base/Publish/F4SD-Cockpit-Server.dll and b/C4IT_DataHistoryProvider_Base/Publish/F4SD-Cockpit-Server.dll differ
diff --git a/C4IT_DataHistoryProvider_Base/app.config b/C4IT_DataHistoryProvider_Base/app.config
index af3adfb..f9f328d 100644
--- a/C4IT_DataHistoryProvider_Base/app.config
+++ b/C4IT_DataHistoryProvider_Base/app.config
@@ -8,7 +8,7 @@
-
+
@@ -20,7 +20,7 @@
-
+
@@ -32,7 +32,7 @@
-
+
@@ -40,15 +40,15 @@
-
+
-
+
-
+
diff --git a/C4IT_DataHistoryProvider_Test/App.config b/C4IT_DataHistoryProvider_Test/App.config
index d4955b7..ccf1770 100644
--- a/C4IT_DataHistoryProvider_Test/App.config
+++ b/C4IT_DataHistoryProvider_Test/App.config
@@ -11,7 +11,7 @@
-
+
@@ -23,7 +23,7 @@
-
+
@@ -35,7 +35,7 @@
-
+
@@ -43,15 +43,15 @@
-
+
-
+
-
+
diff --git a/C4IT_DataHistoryProvider_Test/Config/F4SD-DataClusters-Configuration.xml b/C4IT_DataHistoryProvider_Test/Config/F4SD-DataClusters-Configuration.xml
index 41e16d2..f989495 100644
--- a/C4IT_DataHistoryProvider_Test/Config/F4SD-DataClusters-Configuration.xml
+++ b/C4IT_DataHistoryProvider_Test/Config/F4SD-DataClusters-Configuration.xml
@@ -762,6 +762,16 @@
+
diff --git a/C4IT_DataHistoryProvider_Test/Config/F4SD-Global-Configuration.xml b/C4IT_DataHistoryProvider_Test/Config/F4SD-Global-Configuration.xml
index ff578c1..87e4354 100644
--- a/C4IT_DataHistoryProvider_Test/Config/F4SD-Global-Configuration.xml
+++ b/C4IT_DataHistoryProvider_Test/Config/F4SD-Global-Configuration.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/C4IT_DataHistoryProvider_Test/Config/F4SD-HealthCard-Configuration.xml b/C4IT_DataHistoryProvider_Test/Config/F4SD-HealthCard-Configuration.xml
index b7d9e40..9ee101f 100644
--- a/C4IT_DataHistoryProvider_Test/Config/F4SD-HealthCard-Configuration.xml
+++ b/C4IT_DataHistoryProvider_Test/Config/F4SD-HealthCard-Configuration.xml
@@ -948,7 +948,18 @@
-
+
+ Drucker
+
+
+ Druckername
+
+
+ Ist Standarddrucker
+
+
+
+
@@ -1051,7 +1062,7 @@
RAM/Arbeitsspeicher frei
-
+
Festplatten-Speicher
diff --git a/C4IT_DataHistoryProvider_Test/Config/F4SD-HealthCard-Configuration.xsd b/C4IT_DataHistoryProvider_Test/Config/F4SD-HealthCard-Configuration.xsd
index ef9e2d1..981decd 100644
--- a/C4IT_DataHistoryProvider_Test/Config/F4SD-HealthCard-Configuration.xsd
+++ b/C4IT_DataHistoryProvider_Test/Config/F4SD-HealthCard-Configuration.xsd
@@ -102,6 +102,13 @@
+
+
+
+
+
+
+
@@ -543,7 +550,8 @@
-
+
+
diff --git a/C4IT_DataHistoryProvider_Test/Config/F4SD-Infrastructure-Configuration.xml b/C4IT_DataHistoryProvider_Test/Config/F4SD-Infrastructure-Configuration.xml
index 054b610..2447291 100644
--- a/C4IT_DataHistoryProvider_Test/Config/F4SD-Infrastructure-Configuration.xml
+++ b/C4IT_DataHistoryProvider_Test/Config/F4SD-Infrastructure-Configuration.xml
@@ -76,7 +76,9 @@
-
+
+ onPremisesExtensionAttributes/extensionAttribute8 in ('C4IT', 'TS4U') and userType eq 'member' and accountEnabled eq true
+
diff --git a/C4IT_DataHistoryProvider_Test/Config/F4SD-Infrastructure-Configuration.xsd b/C4IT_DataHistoryProvider_Test/Config/F4SD-Infrastructure-Configuration.xsd
index b5cc666..ce9c2fc 100644
--- a/C4IT_DataHistoryProvider_Test/Config/F4SD-Infrastructure-Configuration.xsd
+++ b/C4IT_DataHistoryProvider_Test/Config/F4SD-Infrastructure-Configuration.xsd
@@ -366,7 +366,8 @@
-
+
+
@@ -379,7 +380,11 @@
-
+
+
+
+
+
diff --git a/C4IT_DataHistoryProvider_Test/DataHistorySql.xml b/C4IT_DataHistoryProvider_Test/DataHistorySql.xml
index 13fb8e9..e970b21 100644
--- a/C4IT_DataHistoryProvider_Test/DataHistorySql.xml
+++ b/C4IT_DataHistoryProvider_Test/DataHistorySql.xml
@@ -189,6 +189,9 @@
IF NOT EXISTS (SELECT * FROM [main-scans] WHERE [Scan] = 'Default')
INSERT INTO [main-scans] ([Scan], [LastTime]) VALUES ('Default','1970-01-01 00:00:00');
+ IF NOT EXISTS (SELECT * FROM [main-scans] WHERE [Scan] = 'AgentScan-all')
+ INSERT INTO [main-scans] ([Scan], [LastTime]) VALUES ('AgentScan-all','1971-01-01 00:00:00');
+
IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[main-scan-history]') AND type in (N'U'))
BEGIN
PRINT N'start creating table [main-scan-history]...';
@@ -372,6 +375,9 @@
IF NOT EXISTS (SELECT * FROM [main-scans] WHERE [Scan] = 'Default')
INSERT INTO [main-scans] ([Scan], [LastTime]) VALUES ('Default','1970-01-01 00:00:00');
+ IF NOT EXISTS (SELECT * FROM [main-scans] WHERE [Scan] = 'AgentScan-all')
+ INSERT INTO [main-scans] ([Scan], [LastTime]) VALUES ('AgentScan-all','1971-01-01 00:00:00');
+
IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[main-scan-history]') AND type in (N'U'))
BEGIN
PRINT N'start creating table [main-scan-history]...';
@@ -2424,48 +2430,56 @@
- UPDATE [UserSessions]
- SET [Finish] = @SessionDate
- WHERE SessionId = @SessionId;
+ IF EXISTS (SELECT TOP 1 * FROM UserSessions WHERE SessionId = @SessionId)
+ BEGIN
+ UPDATE [UserSessions]
+ SET [Finish] = @SessionDate
+ WHERE SessionId = @SessionId;
+ END
+
+ IF NOT EXISTS (SELECT TOP 1 * FROM UserSessions WHERE SessionId = @SessionId) AND EXISTS (SELECT TOP 1 * FROM dbo.Cases WHERE SessionId = @SessionId)
+ BEGIN
+ DECLARE @CurrentTimeStamp DATETIME = GETUTCDATE();
+ INSERT INTO UserSessions
+ ( UserId, SessionId, [Start], [Finish] )
+ SELECT TOP 1 UserId,SessionId,[Start],@CurrentTimeStamp FROM Cases
+ WHERE SessionId = @SessionId ORDER BY [Start] ASC;
+ END
- IF EXISTS (SELECT TOP 1 * FROm dbo.Cases WHERE SessionId = @SessionId)
- BEGIN
+ IF EXISTS (SELECT TOP 1 * FROM dbo.Cases WHERE SessionId = @SessionId)
+ BEGIN
+ INSERT INTO [CaseTime]
+ ( CaseId, StatusId, [TimeStamp] )
+ SELECT CaseId, 4, @SessionDate
+ FROM dbo.Cases
+ WHERE SessionId = @SessionId AND Finish IS NULL;
- INSERT INTO [CaseTime]
- ( CaseId, StatusId, [TimeStamp] )
- SELECT CaseId, 4, @SessionDate
- FROM dbo.Cases
- WHERE SessionId = @SessionId AND Finish IS NULL;
+ UPDATE [Cases]
+ SET [Finish] = @SessionDate
+ WHERE SessionId = @SessionId AND Finish IS NULL;
+ END
- UPDATE [Cases]
- SET [Finish] = @SessionDate
- WHERE SessionId = @SessionId AND Finish IS NULL;
-
- END
-
-
+
DECLARE @CurrentTimeStamp DATETIME = GETUTCDATE();
IF EXISTS (SELECT TOP 1 * FROM dbo.Cases JOIN dbo.CaseTime ON Cases.CaseId = CaseTime.CaseId WHERE Cases.CaseId = @CaseId AND CaseTime.StatusId = 4 )
BEGIN
+ UPDATE [CaseTime]
+ SET Statusid = 2
+ FROM dbo.Cases
+ JOIN dbo.CaseTime ON Cases.CaseId = CaseTime.CaseId
+ WHERE Cases.CaseId = @CaseId AND
+ CaseTime.StatusId = 4
- UPDATE [CaseTime]
- SET Statusid = 2
- FROM dbo.Cases
- JOIN dbo.CaseTime ON Cases.CaseId = CaseTime.CaseId
- WHERE Cases.CaseId = @CaseId AND
- CaseTime.StatusId = 4
-
- INSERT INTO [CaseTime]
- ( CaseId, StatusId, [TimeStamp] )
- SELECT @CaseId, 3, @CurrentTimeStamp;
-
- UPDATE [Cases]
- SET [Finish] = NULL
- WHERE CaseId = @CaseId;
+ INSERT INTO [CaseTime]
+ ( CaseId, StatusId, [TimeStamp] )
+ SELECT @CaseId, 3, @CurrentTimeStamp;
+ UPDATE [Cases]
+ SET [Finish] = NULL
+ WHERE CaseId = @CaseId;
END
diff --git a/C4IT_DataHistoryProvider_Test/F4SD-Cockpit-Collector.csproj b/C4IT_DataHistoryProvider_Test/F4SD-Cockpit-Collector.csproj
index c177b6f..5fc55a1 100644
--- a/C4IT_DataHistoryProvider_Test/F4SD-Cockpit-Collector.csproj
+++ b/C4IT_DataHistoryProvider_Test/F4SD-Cockpit-Collector.csproj
@@ -98,7 +98,7 @@
- ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll
diff --git a/C4IT_DataHistoryProvider_Test/License/F4SD_License.xml b/C4IT_DataHistoryProvider_Test/License/F4SD_License.xml
index 67a95f0..750e156 100644
--- a/C4IT_DataHistoryProvider_Test/License/F4SD_License.xml
+++ b/C4IT_DataHistoryProvider_Test/License/F4SD_License.xml
@@ -1,12 +1,12 @@

-
+
-
+
\ No newline at end of file
diff --git a/C4IT_DataHistoryProvider_Test/ctrlCitrix.Designer.cs b/C4IT_DataHistoryProvider_Test/ctrlCitrix.Designer.cs
index 9c90edc..8b55bef 100644
--- a/C4IT_DataHistoryProvider_Test/ctrlCitrix.Designer.cs
+++ b/C4IT_DataHistoryProvider_Test/ctrlCitrix.Designer.cs
@@ -28,13 +28,59 @@
///
private void InitializeComponent()
{
- this.ctrlProtocolBox1 = new C4IT_DataHistoryProvider_Test.ctrlProtocolBox();
this.buttonCheckConnection = new System.Windows.Forms.Button();
this.btnGetUsers = new System.Windows.Forms.Button();
this.btnGetSessions = new System.Windows.Forms.Button();
this.btnScanUsers = new System.Windows.Forms.Button();
+ this.ctrlProtocolBox1 = new C4IT_DataHistoryProvider_Test.ctrlProtocolBox();
this.SuspendLayout();
//
+ // buttonCheckConnection
+ //
+ this.buttonCheckConnection.Location = new System.Drawing.Point(22, 38);
+ this.buttonCheckConnection.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.buttonCheckConnection.Name = "buttonCheckConnection";
+ this.buttonCheckConnection.Size = new System.Drawing.Size(210, 46);
+ this.buttonCheckConnection.TabIndex = 14;
+ this.buttonCheckConnection.Text = "Check connection";
+ this.buttonCheckConnection.UseVisualStyleBackColor = true;
+ this.buttonCheckConnection.Click += new System.EventHandler(this.buttonCheckConnection_Click);
+ //
+ // btnGetUsers
+ //
+ this.btnGetUsers.Location = new System.Drawing.Point(462, 38);
+ this.btnGetUsers.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.btnGetUsers.Name = "btnGetUsers";
+ this.btnGetUsers.Size = new System.Drawing.Size(210, 46);
+ this.btnGetUsers.TabIndex = 15;
+ this.btnGetUsers.Text = "Get users";
+ this.btnGetUsers.UseVisualStyleBackColor = true;
+ this.btnGetUsers.Visible = false;
+ this.btnGetUsers.Click += new System.EventHandler(this.btnGetUsers_Click);
+ //
+ // btnGetSessions
+ //
+ this.btnGetSessions.Location = new System.Drawing.Point(682, 38);
+ this.btnGetSessions.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.btnGetSessions.Name = "btnGetSessions";
+ this.btnGetSessions.Size = new System.Drawing.Size(210, 46);
+ this.btnGetSessions.TabIndex = 16;
+ this.btnGetSessions.Text = "Get sessions";
+ this.btnGetSessions.UseVisualStyleBackColor = true;
+ this.btnGetSessions.Visible = false;
+ this.btnGetSessions.Click += new System.EventHandler(this.btnGetSessions_Click);
+ //
+ // btnScanUsers
+ //
+ this.btnScanUsers.Location = new System.Drawing.Point(242, 38);
+ this.btnScanUsers.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.btnScanUsers.Name = "btnScanUsers";
+ this.btnScanUsers.Size = new System.Drawing.Size(210, 46);
+ this.btnScanUsers.TabIndex = 17;
+ this.btnScanUsers.Text = "Scan";
+ this.btnScanUsers.UseVisualStyleBackColor = true;
+ this.btnScanUsers.Click += new System.EventHandler(this.btnScanUsers_Click);
+ //
// ctrlProtocolBox1
//
this.ctrlProtocolBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -46,50 +92,6 @@
this.ctrlProtocolBox1.Size = new System.Drawing.Size(1057, 418);
this.ctrlProtocolBox1.TabIndex = 13;
//
- // buttonCheckConnection
- //
- this.buttonCheckConnection.Location = new System.Drawing.Point(22, 38);
- this.buttonCheckConnection.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
- this.buttonCheckConnection.Name = "buttonCheckConnection";
- this.buttonCheckConnection.Size = new System.Drawing.Size(210, 46);
- this.buttonCheckConnection.TabIndex = 14;
- this.buttonCheckConnection.Text = "Check Citrix connection";
- this.buttonCheckConnection.UseVisualStyleBackColor = true;
- this.buttonCheckConnection.Click += new System.EventHandler(this.buttonCheckConnection_Click);
- //
- // btnGetUsers
- //
- this.btnGetUsers.Location = new System.Drawing.Point(242, 38);
- this.btnGetUsers.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
- this.btnGetUsers.Name = "btnGetUsers";
- this.btnGetUsers.Size = new System.Drawing.Size(210, 46);
- this.btnGetUsers.TabIndex = 15;
- this.btnGetUsers.Text = "Get users";
- this.btnGetUsers.UseVisualStyleBackColor = true;
- this.btnGetUsers.Click += new System.EventHandler(this.btnGetUsers_Click);
- //
- // btnGetSessions
- //
- this.btnGetSessions.Location = new System.Drawing.Point(462, 38);
- this.btnGetSessions.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
- this.btnGetSessions.Name = "btnGetSessions";
- this.btnGetSessions.Size = new System.Drawing.Size(210, 46);
- this.btnGetSessions.TabIndex = 16;
- this.btnGetSessions.Text = "Get sessions";
- this.btnGetSessions.UseVisualStyleBackColor = true;
- this.btnGetSessions.Click += new System.EventHandler(this.btnGetSessions_Click);
- //
- // btnScanUsers
- //
- this.btnScanUsers.Location = new System.Drawing.Point(682, 38);
- this.btnScanUsers.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
- this.btnScanUsers.Name = "btnScanUsers";
- this.btnScanUsers.Size = new System.Drawing.Size(210, 46);
- this.btnScanUsers.TabIndex = 17;
- this.btnScanUsers.Text = "Scan Users";
- this.btnScanUsers.UseVisualStyleBackColor = true;
- this.btnScanUsers.Click += new System.EventHandler(this.btnScanUsers_Click);
- //
// ctrlCitrix
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
diff --git a/C4IT_DataHistoryProvider_Test/ctrlTestFunctions.cs b/C4IT_DataHistoryProvider_Test/ctrlTestFunctions.cs
index 2bbc30b..b9bfa65 100644
--- a/C4IT_DataHistoryProvider_Test/ctrlTestFunctions.cs
+++ b/C4IT_DataHistoryProvider_Test/ctrlTestFunctions.cs
@@ -361,9 +361,6 @@ namespace C4IT_DataHistoryProvider_Test
}
}
-
-
-
}
}
else
@@ -397,6 +394,9 @@ namespace C4IT_DataHistoryProvider_Test
ctrlProtocolBox1.ProcessMessage("Values:");
foreach (var Entry in _Table.Columns.Values)
{
+ if (Entry.ColumnName == "Printers")
+ {
+ }
ctrlProtocolBox1.ProcessMessage($" [{Entry.ColumnName}]: {getValueString(Entry.Values)}");
}
}
diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
index 20956a6..e0f59d2 100644
--- a/CommonAssemblyInfo.cs
+++ b/CommonAssemblyInfo.cs
@@ -9,14 +9,14 @@ using System.Runtime.InteropServices;
#endif
[assembly: AssemblyCompany("Consulting4IT GmbH, Germany")]
-[assembly: AssemblyCopyright("Copyright © 2025, Consulting4IT GmbH, Germany")]
+[assembly: AssemblyCopyright("Copyright © 2026, Consulting4IT GmbH, Germany")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersion("2.6.0.14")]
+[assembly: AssemblyInformationalVersion("2.6.1.1")]
[assembly: AssemblyVersion("2.6.*")]
-[assembly: AssemblyMinClientVersion("2.4.0.0")]
+[assembly: AssemblyMinClientVersion("2.6.0.0")]
diff --git a/F4SD-Cockpit-ConfigLoader/App.config b/F4SD-Cockpit-ConfigLoader/App.config
index 5754728..efd6369 100644
--- a/F4SD-Cockpit-ConfigLoader/App.config
+++ b/F4SD-Cockpit-ConfigLoader/App.config
@@ -1,6 +1,14 @@
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/F4SD-Cockpit-ConfigLoader/F4SD-Cockpit-ConfigLoader.csproj b/F4SD-Cockpit-ConfigLoader/F4SD-Cockpit-ConfigLoader.csproj
index a5ad7a1..8a4e9e6 100644
--- a/F4SD-Cockpit-ConfigLoader/F4SD-Cockpit-ConfigLoader.csproj
+++ b/F4SD-Cockpit-ConfigLoader/F4SD-Cockpit-ConfigLoader.csproj
@@ -42,15 +42,49 @@
logo_FASD.ico
+
+ ..\packages\C4IT.F4SD.DisplayFormatting.1.0.0\lib\netstandard2.0\C4IT.F4SD.DisplayFormatting.dll
+
+
+ ..\packages\C4IT.F4SD.SupportCaseProtocoll.1.0.0\lib\netstandard2.0\C4IT.F4SD.SupportCaseProtocoll.dll
+
..\packages\MaterialIcons.1.0.3\lib\MaterialIcons.dll
+
+ ..\packages\Microsoft.Bcl.AsyncInterfaces.10.0.2\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
+
+
+ ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.10.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+
+
+ ..\packages\Microsoft.Extensions.Logging.Abstractions.10.0.2\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll
+
- ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll
+
+ ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll
+
+
+ ..\packages\System.Diagnostics.DiagnosticSource.10.0.2\lib\net462\System.Diagnostics.DiagnosticSource.dll
+
+
+ ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll
+
+
+
+ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll
+
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll
+
+
+ ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll
+
diff --git a/F4SD-Cockpit-ServerCore/DataHistoryCollector.cs b/F4SD-Cockpit-ServerCore/DataHistoryCollector.cs
index 8ab9144..a204929 100644
--- a/F4SD-Cockpit-ServerCore/DataHistoryCollector.cs
+++ b/F4SD-Cockpit-ServerCore/DataHistoryCollector.cs
@@ -46,21 +46,21 @@ namespace C4IT.DataHistoryProvider
public abstract class cDataHistoryCollectorModule
{
public cDataHistoryCollector Collector { get; protected set; }
- public readonly List Origins;
+ public readonly List Origins;
public readonly string Name = "";
public readonly Guid LicenseId = Guid.Empty;
- public cDataHistoryCollectorModule(cDataHistoryCollector Collector, eDataHistoryOrigin Origin, string Name, string LicenseId)
+ public cDataHistoryCollectorModule(cDataHistoryCollector Collector, enumDataHistoryOrigin Origin, string Name, string LicenseId)
{
this.Name = Name;
Guid.TryParse(LicenseId, out this.LicenseId);
this.Collector = Collector;
- this.Origins = new List() { Origin };
+ this.Origins = new List() { Origin };
}
- public cDataHistoryCollectorModule(cDataHistoryCollector Collector, List Origin, string Name, string LicenseId)
+ public cDataHistoryCollectorModule(cDataHistoryCollector Collector, List Origin, string Name, string LicenseId)
{
this.Name = Name;
Guid.TryParse(LicenseId, out this.LicenseId);
@@ -251,7 +251,7 @@ namespace C4IT.DataHistoryProvider
private DateTime GlobalParametersConfigTimestamp = DateTime.MinValue;
private object GlobalParametersConfigLock = new object();
- public readonly Dictionary Connectors = new Dictionary();
+ public readonly Dictionary Connectors = new Dictionary();
public readonly cDataHistoryCollectorActiveDirectory ActiveDirectory = null;
public readonly cDataHistoryCollectorClientAgent F4sdAgent = null;
public cDataHistoryCollectorM42Wpm M42WpmCollector { get; private set; } = null;
@@ -303,14 +303,14 @@ namespace C4IT.DataHistoryProvider
public cDataHistoryConfigSqlConnection mainDbConnection { get; private set; } = null;
- public cDataHistoryCollector(bool autoConnectionCheck, cF4sdWebRequestInfo requestInfo, int LogDeep) : base(null, eDataHistoryOrigin.Main, constConnectorName, constLicenseId)
+ public cDataHistoryCollector(bool autoConnectionCheck, cF4sdWebRequestInfo requestInfo, int LogDeep) : base(null, enumDataHistoryOrigin.Main, constConnectorName, constLicenseId)
{
this.Collector = this;
this.autoConnectionCheck = autoConnectionCheck;
TokenCache = new cDataHistoryCollectorTokenCache(this, requestInfo, LogDeep + 1);
- Connectors.Add(eDataHistoryOrigin.Main, this);
+ Connectors.Add(enumDataHistoryOrigin.Main, this);
try
{
@@ -329,14 +329,14 @@ namespace C4IT.DataHistoryProvider
if (cF4SDLicense.Instance.Modules.ContainsKey(_ActiveDirectory.LicenseId))
{
ActiveDirectory = _ActiveDirectory;
- Connectors.Add(eDataHistoryOrigin.ActiveDirectory, ActiveDirectory);
+ Connectors.Add(enumDataHistoryOrigin.ActiveDirectory, ActiveDirectory);
}
var _F4sdAgent = new cDataHistoryCollectorClientAgent(this);
if (cF4SDLicense.Instance.Modules.ContainsKey(_F4sdAgent.LicenseId))
{
F4sdAgent = _F4sdAgent;
- Connectors.Add(eDataHistoryOrigin.F4sdAgent, F4sdAgent);
+ Connectors.Add(enumDataHistoryOrigin.F4sdAgent, F4sdAgent);
}
}
@@ -489,7 +489,7 @@ namespace C4IT.DataHistoryProvider
if (cF4SDLicense.Instance.Modules.ContainsKey(_M42WpmCollector.LicenseId))
{
M42WpmCollector = _M42WpmCollector;
- Connectors.Add(eDataHistoryOrigin.M42Wpm, M42WpmCollector);
+ Connectors.Add(enumDataHistoryOrigin.M42Wpm, M42WpmCollector);
RegisterSearchRelationProvider(_M42WpmCollector);
}
}
@@ -501,7 +501,7 @@ namespace C4IT.DataHistoryProvider
if (cF4SDLicense.Instance.Modules.ContainsKey(_NxqlCollector.LicenseId))
{
NxqlCollector = _NxqlCollector;
- Connectors.Add(eDataHistoryOrigin.NexthinkNxql, NxqlCollector);
+ Connectors.Add(enumDataHistoryOrigin.NexthinkNxql, NxqlCollector);
}
}
@@ -512,14 +512,14 @@ namespace C4IT.DataHistoryProvider
//if (cF4SDLicense.Instance.Modules.ContainsKey(_CitrixCollector.LicenseId))
//{
CitrixCollector = _CitrixCollector;
- Connectors.Add(eDataHistoryOrigin.Citrix, _CitrixCollector);
+ Connectors.Add(enumDataHistoryOrigin.Citrix, _CitrixCollector);
RegisterSearchRelationProvider(_CitrixCollector);
//}
}
if(HasIntuneConfig)
{
- Connectors.Add(eDataHistoryOrigin.Intune, ActiveDirectory);
+ Connectors.Add(enumDataHistoryOrigin.Intune, ActiveDirectory);
RegisterSearchRelationProvider(ActiveDirectory);
}
@@ -4537,7 +4537,7 @@ namespace C4IT.DataHistoryProvider
var Ids = await getConntectorIds(Identities, Token, requestInfo, LogDeep + 1).ConfigureAwait(false);
- var dicVirtualTables = new Dictionary>();
+ var dicVirtualTables = new Dictionary>();
var lstDbTables = new List();
foreach (var strTable in _tables)
@@ -4729,7 +4729,7 @@ namespace C4IT.DataHistoryProvider
{
var Ids = await getConntectorIds(Identities, Token, requestInfo, LogDeep + 1).ConfigureAwait(false);
- var dicVirtualTables = new Dictionary>();
+ var dicVirtualTables = new Dictionary>();
var lstDbTables = new List();
foreach (var strTable in Tables)
{
@@ -4892,10 +4892,11 @@ namespace C4IT.DataHistoryProvider
if (_reader.FieldCount > 2)
{
- var retVal = new cF4SDHealthCardRawData.cHealthCardTable
+ var retVal = new cF4SDHealthCardRawData.cHealthCardTable()
{
Name = tableConfig.Name,
InformationClass = tableConfig.ParentCluster.InformationClass,
+ Origin = tableConfig.ParentCluster.Origin,
StartingIndex = int.MaxValue,
IsStatic = false,
TableType = tableConfig.Type
@@ -4908,13 +4909,13 @@ namespace C4IT.DataHistoryProvider
var _propName = _reader.GetName(i);
if (tableConfig.Columns.TryGetValue(_propName, out var _col))
{
- var _ci = new cF4SDHealthCardRawData.cHealthCardTableColumn() { ColumnName = _col.Name };
+ var _ci = new cF4SDHealthCardRawData.cHealthCardTableColumn(retVal) { ColumnName = _col.Name };
Cols[i] = _ci;
retVal.Columns[_col.Name] = _ci;
}
if (tableConfig.Columns.TryGetValue(_propName + "_bin", out var _col2))
{
- var _ci = new cF4SDHealthCardRawData.cHealthCardTableColumn() { ColumnName = _col.Name + "_bin" };
+ var _ci = new cF4SDHealthCardRawData.cHealthCardTableColumn(retVal) { ColumnName = _col.Name + "_bin" };
Cols[i] = _ci;
retVal.Columns[_col.Name + "_bin"] = _ci;
}
@@ -5032,11 +5033,12 @@ namespace C4IT.DataHistoryProvider
{
var objVal = objValues[i] == DBNull.Value ? null : objValues[i];
var strCol = _reader.GetName(i);
- RetVal.Columns.Add(strCol, new cF4SDHealthCardRawData.cHealthCardTableColumn() { ColumnName = strCol, Values = new List
+
+
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
diff --git a/F4SDwebService/Config/F4SD-DataClusters-Configuration.xml b/F4SDwebService/Config/F4SD-DataClusters-Configuration.xml
index 41e16d2..f989495 100644
--- a/F4SDwebService/Config/F4SD-DataClusters-Configuration.xml
+++ b/F4SDwebService/Config/F4SD-DataClusters-Configuration.xml
@@ -762,6 +762,16 @@
+
diff --git a/F4SDwebService/Config/F4SD-Global-Configuration.xml b/F4SDwebService/Config/F4SD-Global-Configuration.xml
index ff578c1..87e4354 100644
--- a/F4SDwebService/Config/F4SD-Global-Configuration.xml
+++ b/F4SDwebService/Config/F4SD-Global-Configuration.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/F4SDwebService/Config/F4SD-HealthCard-Configuration.xml b/F4SDwebService/Config/F4SD-HealthCard-Configuration.xml
index b7d9e40..9ee101f 100644
--- a/F4SDwebService/Config/F4SD-HealthCard-Configuration.xml
+++ b/F4SDwebService/Config/F4SD-HealthCard-Configuration.xml
@@ -948,7 +948,18 @@
-
+
+ Drucker
+
+
+ Druckername
+
+
+ Ist Standarddrucker
+
+
+
+
@@ -1051,7 +1062,7 @@
RAM/Arbeitsspeicher frei
-
+
Festplatten-Speicher
diff --git a/F4SDwebService/Config/F4SD-HealthCard-Configuration.xsd b/F4SDwebService/Config/F4SD-HealthCard-Configuration.xsd
index ef9e2d1..981decd 100644
--- a/F4SDwebService/Config/F4SD-HealthCard-Configuration.xsd
+++ b/F4SDwebService/Config/F4SD-HealthCard-Configuration.xsd
@@ -102,6 +102,13 @@
+
+
+
+
+
+
+
@@ -543,7 +550,8 @@
-
+
+
diff --git a/F4SDwebService/Config/F4SD-Infrastructure-Configuration.xml b/F4SDwebService/Config/F4SD-Infrastructure-Configuration.xml
index 054b610..2447291 100644
--- a/F4SDwebService/Config/F4SD-Infrastructure-Configuration.xml
+++ b/F4SDwebService/Config/F4SD-Infrastructure-Configuration.xml
@@ -76,7 +76,9 @@
-
+
+ onPremisesExtensionAttributes/extensionAttribute8 in ('C4IT', 'TS4U') and userType eq 'member' and accountEnabled eq true
+
diff --git a/F4SDwebService/Controllers/CheckConnectionController.cs b/F4SDwebService/Controllers/CheckConnectionController.cs
index b5066fc..25c6d67 100644
--- a/F4SDwebService/Controllers/CheckConnectionController.cs
+++ b/F4SDwebService/Controllers/CheckConnectionController.cs
@@ -1,8 +1,9 @@
-using C4IT.FASD.Base;
-using F4SDwebService;
-using System;
+using System;
using System.Web.Http;
+using C4IT.FASD.Base;
+using F4SDwebService;
+
namespace FasdWebService.Controllers
{
public class CheckConnectionController : ApiController
diff --git a/F4SDwebService/Controllers/TicketOverviewController.cs b/F4SDwebService/Controllers/TicketOverviewController.cs
new file mode 100644
index 0000000..2442560
--- /dev/null
+++ b/F4SDwebService/Controllers/TicketOverviewController.cs
@@ -0,0 +1,122 @@
+using C4IT.DataHistoryProvider;
+using C4IT.FASD.Base;
+using C4IT.Logging;
+using F4SDwebService;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web.Http;
+using static C4IT.Logging.cLogManager;
+
+namespace FasdWebService.Controllers
+{
+ [RoutePrefix("api/TicketOverview")]
+ public class TicketOverviewController : ApiController
+ {
+ private static bool IsTicketOverviewEnabled()
+ {
+ return WebApiApplication.Collector?.GetGlobalConfig()?.TicketConfiguration?.ShowOverview == true;
+ }
+
+ [HttpGet]
+ [Route("GetCounts")]
+ public async Task GetCounts(string scope = "personal", string keys = "")
+ {
+ MethodBase CM = null; if (cLogManager.DefaultLogger.IsDebug) { CM = MethodBase.GetCurrentMethod(); LogMethodBegin(CM); }
+
+ var requestInfo = new cF4sdWebRequestInfo("TicketOverview.GetCounts", scope ?? string.Empty, cAuthentication.GetUserInfo(ActionContext));
+ if (cPerformanceLogger.IsActive && requestInfo != null) { cPerformanceLogger.LogPerformanceStart(0, requestInfo.requestName, requestInfo.id, requestInfo.created); }
+
+ var apiError = 0;
+ try
+ {
+ if (!IsTicketOverviewEnabled())
+ {
+ return Ok(new TicketOverviewCountsResult());
+ }
+
+ var collector = WebApiApplication.Collector?.M42WpmCollector;
+ if (collector == null)
+ {
+ return Ok(new TicketOverviewCountsResult());
+ }
+
+ var useRoleScope = string.Equals(scope, "role", StringComparison.OrdinalIgnoreCase);
+ var normalizedKeys = (keys ?? string.Empty)
+ .Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+ .Select(k => k.Trim())
+ .Where(k => !string.IsNullOrWhiteSpace(k))
+ .Distinct(StringComparer.OrdinalIgnoreCase)
+ .ToList();
+
+ var counts = await collector.GetTicketOverviewCountsAsync(normalizedKeys, useRoleScope, requestInfo, 1, CancellationToken.None);
+ return Ok(new TicketOverviewCountsResult { Counts = counts });
+ }
+ catch (Exception E)
+ {
+ apiError = E.HResult;
+ LogException(E);
+ }
+ finally
+ {
+ if (WebApiApplication.Debug_apiTiming) WebApiApplication.SaveApiTimingEntry(requestInfo.requestName, requestInfo.id, requestInfo.created, apiError);
+ if (cPerformanceLogger.IsActive && requestInfo != null) { cPerformanceLogger.LogPerformanceEnd(0, requestInfo.requestName, requestInfo.id, requestInfo.created, requestInfo.created, ErrorCode: apiError); }
+ if (CM != null) LogMethodEnd(CM);
+ }
+
+ return Ok(new TicketOverviewCountsResult());
+ }
+
+ [HttpGet]
+ [Route("GetRelations")]
+ public async Task GetRelations(string key, string scope = "personal", int count = 0)
+ {
+ MethodBase CM = null; if (cLogManager.DefaultLogger.IsDebug) { CM = MethodBase.GetCurrentMethod(); LogMethodBegin(CM); }
+
+ var requestInfo = new cF4sdWebRequestInfo("TicketOverview.GetRelations", key ?? string.Empty, cAuthentication.GetUserInfo(ActionContext));
+ if (cPerformanceLogger.IsActive && requestInfo != null) { cPerformanceLogger.LogPerformanceStart(0, requestInfo.requestName, requestInfo.id, requestInfo.created); }
+
+ var apiError = 0;
+ try
+ {
+ if (!IsTicketOverviewEnabled())
+ {
+ return Ok(new List());
+ }
+
+ var collector = WebApiApplication.Collector?.M42WpmCollector;
+ if (collector == null)
+ {
+ return Ok(new List());
+ }
+
+ var useRoleScope = string.Equals(scope, "role", StringComparison.OrdinalIgnoreCase);
+ var relations = await collector.GetTicketOverviewRelationsAsync(key, useRoleScope, Math.Max(0, count), requestInfo, 1, CancellationToken.None);
+ return Ok(relations ?? new List());
+ }
+ catch (Exception E)
+ {
+ apiError = E.HResult;
+ LogException(E);
+ }
+ finally
+ {
+ if (WebApiApplication.Debug_apiTiming) WebApiApplication.SaveApiTimingEntry(requestInfo.requestName, requestInfo.id, requestInfo.created, apiError);
+ if (cPerformanceLogger.IsActive && requestInfo != null) { cPerformanceLogger.LogPerformanceEnd(0, requestInfo.requestName, requestInfo.id, requestInfo.created, requestInfo.created, ErrorCode: apiError); }
+ if (CM != null) LogMethodEnd(CM);
+ }
+
+ return Ok(new List());
+ }
+ }
+
+ public class TicketOverviewCountsResult
+ {
+ [JsonProperty("counts")]
+ public Dictionary Counts { get; set; } = new Dictionary(StringComparer.OrdinalIgnoreCase);
+ }
+}
diff --git a/F4SDwebService/F4SD-Cockpit-WebService.csproj b/F4SDwebService/F4SD-Cockpit-WebService.csproj
index bdcc063..6d07405 100644
--- a/F4SDwebService/F4SD-Cockpit-WebService.csproj
+++ b/F4SDwebService/F4SD-Cockpit-WebService.csproj
@@ -50,75 +50,78 @@
4
-
- ..\packages\Azure.Core.1.47.1\lib\net472\Azure.Core.dll
+
+ ..\packages\Azure.Core.1.50.0\lib\net472\Azure.Core.dll
-
- ..\packages\Azure.Identity.1.14.2\lib\netstandard2.0\Azure.Identity.dll
+
+ ..\packages\Azure.Identity.1.17.1\lib\netstandard2.0\Azure.Identity.dll
-
- ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.7\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
+
+ ..\packages\C4IT.F4SD.DisplayFormatting.1.0.0\lib\netstandard2.0\C4IT.F4SD.DisplayFormatting.dll
-
- ..\packages\Microsoft.Bcl.Cryptography.9.0.7\lib\net462\Microsoft.Bcl.Cryptography.dll
+
+ ..\packages\Microsoft.Bcl.AsyncInterfaces.10.0.2\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
-
- ..\packages\Microsoft.Bcl.TimeProvider.9.0.7\lib\net462\Microsoft.Bcl.TimeProvider.dll
+
+ ..\packages\Microsoft.Bcl.Cryptography.10.0.2\lib\net462\Microsoft.Bcl.Cryptography.dll
+
+
+ ..\packages\Microsoft.Bcl.TimeProvider.10.0.2\lib\net462\Microsoft.Bcl.TimeProvider.dll
..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
- ..\packages\Microsoft.Data.SqlClient.6.1.0\lib\net462\Microsoft.Data.SqlClient.dll
+ ..\packages\Microsoft.Data.SqlClient.6.1.4\lib\net462\Microsoft.Data.SqlClient.dll
-
- ..\packages\Microsoft.Extensions.Caching.Abstractions.9.0.7\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll
+
+ ..\packages\Microsoft.Extensions.Caching.Abstractions.10.0.2\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll
-
- ..\packages\Microsoft.Extensions.Caching.Memory.9.0.7\lib\net462\Microsoft.Extensions.Caching.Memory.dll
+
+ ..\packages\Microsoft.Extensions.Caching.Memory.10.0.2\lib\net462\Microsoft.Extensions.Caching.Memory.dll
-
- ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.7\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+
+ ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.10.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll
-
- ..\packages\Microsoft.Extensions.Logging.Abstractions.9.0.7\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll
+
+ ..\packages\Microsoft.Extensions.Logging.Abstractions.10.0.2\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll
-
- ..\packages\Microsoft.Extensions.Options.9.0.7\lib\net462\Microsoft.Extensions.Options.dll
+
+ ..\packages\Microsoft.Extensions.Options.10.0.2\lib\net462\Microsoft.Extensions.Options.dll
-
- ..\packages\Microsoft.Extensions.Primitives.9.0.7\lib\net462\Microsoft.Extensions.Primitives.dll
+
+ ..\packages\Microsoft.Extensions.Primitives.10.0.2\lib\net462\Microsoft.Extensions.Primitives.dll
-
- ..\packages\Microsoft.Identity.Client.4.74.1\lib\net472\Microsoft.Identity.Client.dll
+
+ ..\packages\Microsoft.Identity.Client.4.81.0\lib\net472\Microsoft.Identity.Client.dll
-
- ..\packages\Microsoft.Identity.Client.Extensions.Msal.4.74.1\lib\netstandard2.0\Microsoft.Identity.Client.Extensions.Msal.dll
+
+ ..\packages\Microsoft.Identity.Client.Extensions.Msal.4.81.0\lib\netstandard2.0\Microsoft.Identity.Client.Extensions.Msal.dll
-
- ..\packages\Microsoft.IdentityModel.Abstractions.8.13.0\lib\net472\Microsoft.IdentityModel.Abstractions.dll
+
+ ..\packages\Microsoft.IdentityModel.Abstractions.8.15.0\lib\net472\Microsoft.IdentityModel.Abstractions.dll
-
- ..\packages\Microsoft.IdentityModel.JsonWebTokens.8.13.0\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll
+
+ ..\packages\Microsoft.IdentityModel.JsonWebTokens.8.15.0\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll
-
- ..\packages\Microsoft.IdentityModel.Logging.8.13.0\lib\net472\Microsoft.IdentityModel.Logging.dll
+
+ ..\packages\Microsoft.IdentityModel.Logging.8.15.0\lib\net472\Microsoft.IdentityModel.Logging.dll
-
- ..\packages\Microsoft.IdentityModel.Protocols.8.13.0\lib\net472\Microsoft.IdentityModel.Protocols.dll
+
+ ..\packages\Microsoft.IdentityModel.Protocols.8.15.0\lib\net472\Microsoft.IdentityModel.Protocols.dll
-
- ..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.8.13.0\lib\net472\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll
+
+ ..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.8.15.0\lib\net472\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll
-
- ..\packages\Microsoft.IdentityModel.Tokens.8.13.0\lib\net472\Microsoft.IdentityModel.Tokens.dll
+
+ ..\packages\Microsoft.IdentityModel.Tokens.8.15.0\lib\net472\Microsoft.IdentityModel.Tokens.dll
..\packages\Microsoft.Web.Infrastructure.2.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
- ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll
..\packages\Newtonsoft.Json.Bson.1.0.3\lib\net45\Newtonsoft.Json.Bson.dll
@@ -127,11 +130,11 @@
..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll
-
- ..\packages\System.ClientModel.1.5.1\lib\netstandard2.0\System.ClientModel.dll
+
+ ..\packages\System.ClientModel.1.8.1\lib\netstandard2.0\System.ClientModel.dll
-
- ..\packages\System.Configuration.ConfigurationManager.9.0.7\lib\net462\System.Configuration.ConfigurationManager.dll
+
+ ..\packages\System.Configuration.ConfigurationManager.10.0.2\lib\net462\System.Configuration.ConfigurationManager.dll
@@ -140,29 +143,29 @@
True
-
- ..\packages\System.Diagnostics.DiagnosticSource.9.0.7\lib\net462\System.Diagnostics.DiagnosticSource.dll
+
+ ..\packages\System.Diagnostics.DiagnosticSource.10.0.2\lib\net462\System.Diagnostics.DiagnosticSource.dll
-
- ..\packages\System.Formats.Asn1.9.0.7\lib\net462\System.Formats.Asn1.dll
+
+ ..\packages\System.Formats.Asn1.10.0.2\lib\net462\System.Formats.Asn1.dll
-
- ..\packages\System.IdentityModel.Tokens.Jwt.8.13.0\lib\net472\System.IdentityModel.Tokens.Jwt.dll
+
+ ..\packages\System.IdentityModel.Tokens.Jwt.8.15.0\lib\net472\System.IdentityModel.Tokens.Jwt.dll
..\packages\System.IO.FileSystem.AccessControl.5.0.0\lib\net461\System.IO.FileSystem.AccessControl.dll
-
- ..\packages\System.IO.Pipelines.9.0.7\lib\net462\System.IO.Pipelines.dll
+
+ ..\packages\System.IO.Pipelines.10.0.2\lib\net462\System.IO.Pipelines.dll
..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll
-
- ..\packages\System.Memory.Data.9.0.7\lib\net462\System.Memory.Data.dll
+
+ ..\packages\System.Memory.Data.10.0.2\lib\net462\System.Memory.Data.dll
@@ -184,24 +187,29 @@
..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll
-
- ..\packages\System.Security.Cryptography.Pkcs.9.0.7\lib\net462\System.Security.Cryptography.Pkcs.dll
+
+ ..\packages\System.Security.Cryptography.Pkcs.10.0.2\lib\net462\System.Security.Cryptography.Pkcs.dll
-
- ..\packages\System.Security.Cryptography.ProtectedData.9.0.7\lib\net462\System.Security.Cryptography.ProtectedData.dll
+
+ ..\packages\System.Security.Cryptography.ProtectedData.10.0.2\lib\net462\System.Security.Cryptography.ProtectedData.dll
-
- ..\packages\System.Security.Permissions.9.0.7\lib\net462\System.Security.Permissions.dll
+
+ ..\packages\System.Security.Permissions.10.0.2\lib\net462\System.Security.Permissions.dll
..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll
-
- ..\packages\System.Text.Encodings.Web.9.0.7\lib\net462\System.Text.Encodings.Web.dll
+
+ ..\packages\System.Text.Encodings.Web.10.0.2\lib\net462\System.Text.Encodings.Web.dll
-
- ..\packages\System.Text.Json.9.0.7\lib\net462\System.Text.Json.dll
+
+ ..\packages\System.Text.Json.10.0.2\lib\net462\System.Text.Json.dll
+
+
+ ..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll
+ True
+ True
..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll
@@ -310,14 +318,15 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
Global.asax
@@ -683,4 +692,4 @@ copy "$(ProjectDir)..\C4IT_DataHistoryProvider_Test\License\*" "$(ProjectDir)Lic
-->
-
\ No newline at end of file
+
diff --git a/F4SDwebService/License/F4SD_License.xml b/F4SDwebService/License/F4SD_License.xml
index 67a95f0..750e156 100644
--- a/F4SDwebService/License/F4SD_License.xml
+++ b/F4SDwebService/License/F4SD_License.xml
@@ -1,12 +1,12 @@

-
+
-
+
\ No newline at end of file
diff --git a/F4SDwebService/Publish/Config/F4SD-DataClusters-Configuration.xml b/F4SDwebService/Publish/Config/F4SD-DataClusters-Configuration.xml
index 41e16d2..f989495 100644
--- a/F4SDwebService/Publish/Config/F4SD-DataClusters-Configuration.xml
+++ b/F4SDwebService/Publish/Config/F4SD-DataClusters-Configuration.xml
@@ -762,6 +762,16 @@
+
diff --git a/F4SDwebService/Publish/Config/F4SD-Global-Configuration.xml b/F4SDwebService/Publish/Config/F4SD-Global-Configuration.xml
index ff578c1..87e4354 100644
--- a/F4SDwebService/Publish/Config/F4SD-Global-Configuration.xml
+++ b/F4SDwebService/Publish/Config/F4SD-Global-Configuration.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/F4SDwebService/Publish/Config/F4SD-HealthCard-Configuration.xml b/F4SDwebService/Publish/Config/F4SD-HealthCard-Configuration.xml
index b7d9e40..9ee101f 100644
--- a/F4SDwebService/Publish/Config/F4SD-HealthCard-Configuration.xml
+++ b/F4SDwebService/Publish/Config/F4SD-HealthCard-Configuration.xml
@@ -948,7 +948,18 @@
-
+
+ Drucker
+
+
+ Druckername
+
+
+ Ist Standarddrucker
+
+
+
+
@@ -1051,7 +1062,7 @@
RAM/Arbeitsspeicher frei
-
+
Festplatten-Speicher
diff --git a/F4SDwebService/Publish/Config/F4SD-HealthCard-Configuration.xsd b/F4SDwebService/Publish/Config/F4SD-HealthCard-Configuration.xsd
index ef9e2d1..981decd 100644
--- a/F4SDwebService/Publish/Config/F4SD-HealthCard-Configuration.xsd
+++ b/F4SDwebService/Publish/Config/F4SD-HealthCard-Configuration.xsd
@@ -102,6 +102,13 @@
+
+
+
+
+
+
+
@@ -543,7 +550,8 @@
-
+
+
diff --git a/F4SDwebService/Publish/Config/F4SD-Infrastructure-Configuration.xml b/F4SDwebService/Publish/Config/F4SD-Infrastructure-Configuration.xml
index 054b610..2447291 100644
--- a/F4SDwebService/Publish/Config/F4SD-Infrastructure-Configuration.xml
+++ b/F4SDwebService/Publish/Config/F4SD-Infrastructure-Configuration.xml
@@ -76,7 +76,9 @@
-
+
+ onPremisesExtensionAttributes/extensionAttribute8 in ('C4IT', 'TS4U') and userType eq 'member' and accountEnabled eq true
+
diff --git a/F4SDwebService/Publish/Config/F4SD-Infrastructure-Configuration.xsd b/F4SDwebService/Publish/Config/F4SD-Infrastructure-Configuration.xsd
index b5cc666..ce9c2fc 100644
--- a/F4SDwebService/Publish/Config/F4SD-Infrastructure-Configuration.xsd
+++ b/F4SDwebService/Publish/Config/F4SD-Infrastructure-Configuration.xsd
@@ -366,7 +366,8 @@
-
+
+
@@ -379,7 +380,11 @@
-
+
+
+
+
+
diff --git a/F4SDwebService/Publish/License/F4SD_License.xml b/F4SDwebService/Publish/License/F4SD_License.xml
index 67a95f0..750e156 100644
--- a/F4SDwebService/Publish/License/F4SD_License.xml
+++ b/F4SDwebService/Publish/License/F4SD_License.xml
@@ -1,12 +1,12 @@

-
+
-
+
\ No newline at end of file
diff --git a/F4SDwebService/Publish/Web.config b/F4SDwebService/Publish/Web.config
index 612738a..baca64e 100644
--- a/F4SDwebService/Publish/Web.config
+++ b/F4SDwebService/Publish/Web.config
@@ -50,11 +50,11 @@
-
+
-
+
@@ -62,7 +62,7 @@
-
+
@@ -74,7 +74,7 @@
-
+
@@ -90,11 +90,11 @@
-
+
-
+
@@ -102,23 +102,23 @@
-
+
-
+
-
+
-
+
-
+
@@ -126,7 +126,7 @@
-
+
@@ -134,47 +134,55 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
diff --git a/F4SDwebService/Web.config b/F4SDwebService/Web.config
index 612738a..baca64e 100644
--- a/F4SDwebService/Web.config
+++ b/F4SDwebService/Web.config
@@ -50,11 +50,11 @@
-
+
-
+
@@ -62,7 +62,7 @@
-
+
@@ -74,7 +74,7 @@
-
+
@@ -90,11 +90,11 @@
-
+
-
+
@@ -102,23 +102,23 @@
-
+
-
+
-
+
-
+
-
+
@@ -126,7 +126,7 @@
-
+
@@ -134,47 +134,55 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
diff --git a/Setup/SignSourceFiles.cmd b/Setup/SignSourceFiles.cmd
index cc1cae8..882ccfd 100644
--- a/Setup/SignSourceFiles.cmd
+++ b/Setup/SignSourceFiles.cmd
@@ -3,7 +3,7 @@ set ProductName="C4IT First Aid ServiceDesk (F4SD)"
set SignTool=..\..\Common Code\Tools\signtool.exe
set TimeStamp=http://rfc3161timestamp.globalsign.com/advanced
-"%SignTool%" sign /a /tr %TimeStamp% /td SHA256 /fd SHA256 /d %ProductName% ".\Source\bin\F4SD-Cockpit-Collector.exe" ".\Source\bin\F4SD-Cockpit-WebService.dll" ".\Source\bin\F4SD-Cockpit-Server.dll"
+"%SignTool%" sign /a /tr %TimeStamp% /td SHA256 /fd SHA256 /d %ProductName% ".\Source\bin\F4SD-Cockpit-Collector.exe" ".\Source\bin\F4SD-Cockpit-WebService.dll" ".\Source\bin\F4SD-Cockpit-Server.dll" ".\Source\bin\C4IT.F4SD.DisplayFormatting.dll"
pause
diff --git a/nuget.config b/nuget.config
new file mode 100644
index 0000000..2114a94
--- /dev/null
+++ b/nuget.config
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file