Kategorie
This commit is contained in:
@@ -15,7 +15,6 @@ namespace FasdDesktopUi.Basics.Services.ProtocollService
|
||||
{
|
||||
private readonly cFasdQuickAction _quickActionDefinition;
|
||||
private readonly cQuickActionCopyData _quickActionCopyData;
|
||||
private readonly IRawValueFormatter _rawValueFormatter = new RawValueFormatter();
|
||||
|
||||
const string AsciiSeperator = "\n\n";
|
||||
|
||||
@@ -261,18 +260,18 @@ namespace FasdDesktopUi.Basics.Services.ProtocollService
|
||||
|
||||
output += AsciiSeperator + cMultiLanguageSupport.GetItem("QuickAction.Copy.Measure");
|
||||
|
||||
_rawValueFormatter.SetDefaultCulture(new System.Globalization.CultureInfo(cFasdCockpitConfig.Instance.SelectedLanguage));
|
||||
cUtility.RawValueFormatter.SetDefaultCulture(new System.Globalization.CultureInfo(cFasdCockpitConfig.Instance.SelectedLanguage));
|
||||
|
||||
foreach (var measureValue in measureValues)
|
||||
{
|
||||
try
|
||||
{
|
||||
string value = _rawValueFormatter.GetDisplayValue(measureValue.Value, measureValue.Display);
|
||||
string postValue = _rawValueFormatter.GetDisplayValue(measureValue.PostValue, measureValue.Display);
|
||||
string value = cUtility.RawValueFormatter.GetDisplayValue(measureValue.Value, measureValue.Display);
|
||||
string postValue = cUtility.RawValueFormatter.GetDisplayValue(measureValue.PostValue, measureValue.Display);
|
||||
string difference = string.Empty;
|
||||
|
||||
if (measureValue.Difference != null)
|
||||
difference = $" (∆ {_rawValueFormatter.GetDisplayValue(measureValue.Difference, measureValue.Display)})";
|
||||
difference = $" (∆ {cUtility.RawValueFormatter.GetDisplayValue(measureValue.Difference, measureValue.Display)})";
|
||||
|
||||
output += "\n" + measureValue.Names.GetValue(cF4SDCockpitXmlConfig.Instance.HealthCardConfig.ProtocollLanguage) + ": " + value + " ➜ " + postValue + difference;
|
||||
}
|
||||
@@ -475,18 +474,18 @@ namespace FasdDesktopUi.Basics.Services.ProtocollService
|
||||
|
||||
output += "<p>" + cMultiLanguageSupport.GetItem("QuickAction.Copy.Measure.Html") + "</p>";
|
||||
|
||||
_rawValueFormatter.SetDefaultCulture(new System.Globalization.CultureInfo(cFasdCockpitConfig.Instance.SelectedLanguage));
|
||||
cUtility.RawValueFormatter.SetDefaultCulture(new System.Globalization.CultureInfo(cFasdCockpitConfig.Instance.SelectedLanguage));
|
||||
|
||||
foreach (var measureValue in measureValues)
|
||||
{
|
||||
try
|
||||
{
|
||||
string value = _rawValueFormatter.GetDisplayValue(measureValue.Value, measureValue.Display);
|
||||
string postValue = _rawValueFormatter.GetDisplayValue(measureValue.PostValue, measureValue.Display);
|
||||
string value = cUtility.RawValueFormatter.GetDisplayValue(measureValue.Value, measureValue.Display);
|
||||
string postValue = cUtility.RawValueFormatter.GetDisplayValue(measureValue.PostValue, measureValue.Display);
|
||||
string difference = string.Empty;
|
||||
|
||||
if (measureValue.Difference != null)
|
||||
difference = $" (∆ {_rawValueFormatter.GetDisplayValue(measureValue.Difference, measureValue.Display)})";
|
||||
difference = $" (∆ {cUtility.RawValueFormatter.GetDisplayValue(measureValue.Difference, measureValue.Display)})";
|
||||
|
||||
output += "<p>";
|
||||
output += "<b>" + measureValue.Names.GetValue(cF4SDCockpitXmlConfig.Instance.HealthCardConfig.ProtocollLanguage) + ": </b>" + value + " ➜ " + postValue + difference;
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace FasdDesktopUi.Basics.Services.RelationService
|
||||
stagedRelations.MergeAsRelationInfosWith(relatedTo);
|
||||
|
||||
_relations = _relations.Union(stagedRelations.Relations);
|
||||
RelationsFound?.Invoke(this, new StagedSearchResultRelationsEventArgs() { RelatedTo = relatedTo, StagedResultRelations = stagedRelations });
|
||||
RelationsFound?.Invoke(this, new StagedSearchResultRelationsEventArgs() { RelatedTo = relatedTo, StagedResultRelations = stagedRelations, RelationService = this });
|
||||
|
||||
if (stagedRelations?.IsComplete ?? false)
|
||||
break;
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace FasdDesktopUi.Basics.Services.SupportCase
|
||||
|
||||
private static ISupportCase Create(cF4sdIdentityEntry primaryIdentity, IRelationService relationService, cSupportCaseDataProvider supportCaseDataProvider)
|
||||
{
|
||||
SupportCase supportCase = new SupportCase(primaryIdentity.Id, relationService.Clone(), supportCaseDataProvider);
|
||||
SupportCase supportCase = new SupportCase(primaryIdentity.Id, relationService, supportCaseDataProvider);
|
||||
_supportCases.Add(primaryIdentity.Id, supportCase);
|
||||
supportCase.Initialize();
|
||||
return supportCase;
|
||||
|
||||
@@ -3,9 +3,6 @@ using C4IT.FASD.Cockpit.Communication;
|
||||
using FasdDesktopUi.Basics.Services.RelationService;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using static C4IT.Logging.cLogManager;
|
||||
@@ -19,12 +16,6 @@ namespace FasdDesktopUi.Basics.Services.SupportCaseSearchService
|
||||
public SupportCaseSearchService(IRelationService relationService)
|
||||
{
|
||||
_relationService = relationService;
|
||||
_relationService.RelationsFound += HandleRelationsFound;
|
||||
}
|
||||
|
||||
~SupportCaseSearchService()
|
||||
{
|
||||
_relationService.RelationsFound -= HandleRelationsFound;
|
||||
}
|
||||
|
||||
public static async Task<cFasdApiSearchResultCollection> GetSearchResultsAsync(string searchQuery, CancellationToken token = default)
|
||||
@@ -53,12 +44,18 @@ namespace FasdDesktopUi.Basics.Services.SupportCaseSearchService
|
||||
}
|
||||
|
||||
public async Task<cF4sdStagedSearchResultRelationTaskId> LoadRelationsAsync(IEnumerable<cFasdApiSearchResultEntry> relatedTo, CancellationToken token = default)
|
||||
=> await _relationService.LoadRelationsAsync(relatedTo, token);
|
||||
{
|
||||
IRelationService relationService = _relationService.Clone();
|
||||
relationService.RelationsFound += HandleRelationsFound;
|
||||
return await relationService.LoadRelationsAsync(relatedTo, token);
|
||||
}
|
||||
|
||||
private void HandleRelationsFound(object sender, StagedSearchResultRelationsEventArgs e)
|
||||
{
|
||||
e.RelationService = _relationService;
|
||||
RelationsFound.Invoke(this, e);
|
||||
|
||||
if (e.StagedResultRelations.IsComplete)
|
||||
e.RelationService.RelationsFound -= HandleRelationsFound;
|
||||
}
|
||||
|
||||
public event EventHandler<StagedSearchResultRelationsEventArgs> RelationsFound;
|
||||
|
||||
Reference in New Issue
Block a user