aktueller Stand

This commit is contained in:
Meik
2026-02-03 15:54:56 +01:00
parent ee1f54675e
commit 7192319e1e
25 changed files with 689 additions and 260 deletions

View File

@@ -1,59 +1,69 @@
<?xml version="1.0" encoding="utf-8" ?>
<F4SD-CopyTemplate-Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="F4SD-CopyTemplate-Configuration.xsd">
<CopyTemplates Default="Ticket Information" >
<CopyTemplate Name="Ticket Information">
<Name Lang="DE">Ticket Information</Name>
<CopyTemplates Default="Ticket-Information-Computer">
<CopyTemplate Name="Ticket-Information-Computer">
<Name Lang="DE">Ticket-Information-Computer</Name>
<Description Lang="EN">Transfers the relevant information for ticket creation to the clipboard.</Description>
<Description Lang="DE">Überträgt die relevanten Informationen für eine Ticket Erstellung in den Zwischenspeicher.</Description>
<Icon Name="misc_ticket" IconType="intern"/>
<CopyContent Format="UNICODE">%DeviceName.Label% %DeviceName.Value%
%UserFullName.Label% %UserFullName.Value%
%UserAccount.Label% %UserAccount.Value%
%DeviceModel.Label% %DeviceModel.Value%
%OsInfo.Label% %OsInfo.Value%
%IpAddress.Label% %IpAddress.Value%
%LastSeenCalc.Label% %LastSeenCalc.Value%</CopyContent>
<CopyContent Format="HTML">&lt;table border=&quot;1&quot; cellpadding=&quot;5,1,5,1&quot;&gt;&lt;tbody&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%DeviceName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td style=&quot;color: #0000ff;&quot;&gt;%DeviceName.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%UserFullName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%UserFullName.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%UserAccount.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%UserAccount.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%OsInfo.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%OsInfo.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%IpAddress.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%IpAddress.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%LastSeenCalc.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%LastSeenCalc.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;/tbody&gt;&lt;/table&gt;</CopyContent>
<CopyContent Format="UNICODE">
%DeviceName.Label% %DeviceName.Value%
%UserFullName.Label% %UserFullName.Value%
%UserAccount.Label% %UserAccount.Value%
%DeviceModel.Label% %DeviceModel.Value%
%OsInfo.Label% %OsInfo.Value%
%IpAddress.Label% %IpAddress.Value%
%LastBoot.Label% %LastBoot.Value%
%LastSeen.Label% %LastSeen.Value%
</CopyContent>
<CopyContent Format="HTML">
&lt;table border=&quot;1&quot; cellpadding=&quot;5,1,5,1&quot;&gt;&lt;tbody&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%DeviceName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td style=&quot;color: #0000ff;&quot;&gt;%DeviceName.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%UserFullName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%UserFullName.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%UserAccount.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%UserAccount.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%OsInfo.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%OsInfo.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%IpAddress.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%IpAddress.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%LastBoot.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%LastBoot.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%LastSeen.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%LastSeen.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;/tbody&gt;&lt;/table&gt;
</CopyContent>
</CopyTemplate>
<CopyTemplate Name="Ticket Information-VM">
<Name Lang="DE">Ticket Information-VM</Name>
<Description Lang="EN">Transfers the relevant information for ticket creation to the clipboard.</Description>
<Description Lang="DE">Überträgt die relevanten Informationen für eine Ticket Erstellung in den Zwischenspeicher.</Description>
<Icon Name="misc_ticket" IconType="intern"/>
<CopyContent Format="UNICODE">
%VirtualSessionName.Label% %VirtualSessionName.Value%
%DNSName.Label% %DNSName.Value%
%DomainName.Label% %DomainName.Value%
%HostedMachine.Label% %HostedMachine.Value%
</CopyContent>
<CopyContent Format="HTML">
&lt;table border=&quot;1&quot; cellpadding=&quot;5,1,5,1&quot;&gt;&lt;tbody&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%VirtualSessionName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td style=&quot;color: #0000ff;&quot;&gt;%VirtualSessionName.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%DNSName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%DNSName.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%DomainName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%DomainName.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;tr&gt;&lt;td&gt;&lt;em&gt;%HostedMachine.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%HostedMachine.Value%&lt;/td&gt;&lt;/tr&gt;
&lt;/tbody&gt;&lt;/table&gt;
</CopyContent>
</CopyTemplate>
<CopyTemplate Name="Computer name">
<Name Lang="DE">Computer Name</Name>
<Section>DemoActions</Section>
<Icon Name="misc_computer" IconType="intern"/>
<CopyContent Format="UNICODE">%DeviceName.Value%</CopyContent>
<CopyContent Format="UNICODE">%DeviceName.Label% %DeviceName.Value%</CopyContent>
</CopyTemplate>
<CopyTemplate Name="User name">
<Name Lang="DE">Anwendername</Name>
<Icon Name="misc_user" IconType="intern"/>
<CopyContent Format="UNICODE">%UserFullName.Value%</CopyContent>
<CopyContent Format="UNICODE">%UserFullName.Label% %UserFullName.Value%</CopyContent>
</CopyTemplate>
<CopyTemplate Name="User account">
<Name Lang="DE">Anwender Account</Name>
<Icon Name="misc_user" IconType="intern"/>
<CopyContent Format="UNICODE">%UserAccount.Value%</CopyContent>
<CopyContent Format="UNICODE">%UserAccount.Label% %UserAccount.Value%</CopyContent>
</CopyTemplate>
<CopyTemplate Name="Copy last Quick Action">
<Name Lang="DE">Letzte Quick Action kopieren</Name>
<Section>Ticket</Section>
<Icon Name="misc_functionBolt" IconType="intern"/>
<CopyContent Format="UNICODE">%F4SD_QuickActionProtocolLast.Value%</CopyContent>
<CopyContent Format="HTML">%F4SD_QuickActionProtocolLast.Value%</CopyContent>
</CopyTemplate>
<CopyTemplate Name="Copy Quick Action history" HiddenInTicketDialog="true">
<Name Lang="DE">Quick Action Historie kopieren</Name>
<Section>Ticket</Section>
<Icon Name="misc_copy_bolt" IconType="intern"/>
<CopyContent Format="UNICODE">%F4SD_QuickActionProtocol.Value%</CopyContent>
<CopyContent Format="HTML">%F4SD_QuickActionProtocol.Value%</CopyContent>
</CopyTemplate>
</CopyTemplates>
</F4SD-CopyTemplate-Configuration>

View File

@@ -567,7 +567,7 @@
<State-Info Name="Primary user" ValueTable="intune-deviceInfo" ValueColumn="userDisplayName">
<Name Lang="DE">Hauptbenutzer</Name>
</State-Info>
<State-Info Name="Last Sync Date" ValueTable="intune-deviceInfo" ValueColumn="lastSyncDateTime">
<State-Info Name="Last Sync Date" ValueTable="intune-deviceInfo" ValueColumn="lastSyncDateTime" Display="DATETIME">
<Name Lang="DE">Letzte Synchronisation</Name>
</State-Info>
@@ -1289,10 +1289,10 @@
<State-Info Name="Session name" ParameterName="VirtualSessionName">
<Name Lang="DE">Sessionname</Name>
</State-Info>
<State-Info Name="Start Date" ValueTable="citrix-session" ValueColumn="StartDate">
<State-Info Name="Start Date" ValueTable="citrix-session" ValueColumn="StartDate" Display="DATETIME">
<Name Lang="DE">Startdatum</Name>
</State-Info>
<State-Info Name="End Date" ValueTable="citrix-session" ValueColumn="EndDate">
<State-Info Name="End Date" ValueTable="citrix-session" ValueColumn="EndDate" Display="DATETIME">
<Name Lang="DE">Enddatum</Name>
</State-Info>
<State-Translation Name="Connection State" ValueTable="citrix-session" ValueColumn="ConnectionState" Translation ="citrix_connectionState" DefaultState="Ok" >

View File

@@ -1237,7 +1237,7 @@ namespace C4IT.FASD.Cockpit.Communication
public override async Task<cF4SDHealthCardRawData> GetHealthCardData(Guid healthCardId)
{
cF4SDHealthCardRawData output = null;
cF4SDHealthCardRawData healthcardData = null;
try
{
@@ -1245,25 +1245,16 @@ namespace C4IT.FASD.Cockpit.Communication
lock (CachedHealthCardRawData)
{
if (CachedHealthCardRawData.TryGetValue(healthCardId, out output))
{
CachedHealthCardRawData.Remove(healthCardId);
return output;
}
if (CachedHealthCardRawData.TryGetValue(healthCardId, out healthcardData))
return healthcardData;
}
return null;
}
catch (Exception E)
{
LogException(E);
}
finally
{
}
await Task.CompletedTask;
return output;
return healthcardData;
}
public override async Task<List<cF4SDHealthCardRawData.cHealthCardDetailsTable>> GetDetailsData(cF4sdHealthCardRawDataRequest requestData)