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

aktueller stand

Browse Source
This commit is contained in:
Meik
2025-11-13 17:35:09 +01:00
parent 5856ff4df8
commit 567584faf0
32 changed files with 1253 additions and 1762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -461,7 +461,7 @@ namespace FasdDesktopUi.Pages.DetailsPage
List<Task> tasks = new List<Task>
{
_supportCase?.SupportCaseDataProviderArtifact?.HealthCardDataHelper?.UpdateOnlineStatusAsync(),
_supportCase?.SupportCaseDataProviderArtifact?.HealthCardDataHelper?.RefreshLatestDataAsync()
_supportCase?.SupportCaseDataProviderArtifact?.HealthCardDataHelper?.LoadingHelper?.RefreshLatestDataAsync()
};
await Task.WhenAll(tasks);
@@ -1591,7 +1591,7 @@ namespace FasdDesktopUi.Pages.DetailsPage
{
midnightTimer.Stop();
var from = _supportCase?.SupportCaseDataProviderArtifact?.HealthCardDataHelper?.LastDataRequest;
var from = _supportCase?.SupportCaseDataProviderArtifact?.HealthCardDataHelper?.LoadingHelper?.LastDataRequest;
if (from == null)
{

4
FasdDesktopUi/Pages/DetailsPage/DetailsPageViewModel.cs
View File

@@ -147,8 +147,8 @@ namespace FasdDesktopUi.Pages.DetailsPage.ViewModels
#region DetailsData property
private List<cDetailsPageDataHistoryDataModel> detailsDataList;
public List<cDetailsPageDataHistoryDataModel> DetailsDataList
private cDetailsPageDataHistoryDataModel detailsDataList;
public cDetailsPageDataHistoryDataModel DetailsDataList
{
get { return detailsDataList; }
set

2
FasdDesktopUi/Pages/DetailsPage/Models/DetailsPageBase.cs
View File

@@ -33,7 +33,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.Models
//Details
public TimeSpan TimeSinceLastRefresh { get; set; } = new TimeSpan(0, 1, 0);
public List<cDetailsPageDataHistoryDataModel> DataHistoryList { get; set; }
public cDetailsPageDataHistoryDataModel DataHistoryList { get; set; }
public int ShownValueColumnsCount { get; set; }
//Customizable Section

19
FasdDesktopUi/Pages/DetailsPage/Models/cDetailsPageDataHistoryDataModel.cs
View File

@@ -10,19 +10,12 @@ using FasdDesktopUi.Basics.Models;
namespace FasdDesktopUi.Pages.DetailsPage.Models
{
public class DetailsPageDataHistoryValueModel : cDataHistoryValueModel
public class DetailsPageDataHistoryColumnModel : cDataHistoryValueModel
{
public enumHistoryTitleType? PresentationStyle { get; set; }
public List<List<string>> DetailedData { get; set; }
public List<cDataHistoryValueModel> ColumnValues { get; set; }
}
public class DetailsPageDataHistoryColumnModel : DetailsPageDataHistoryValueModel
{
public List<DetailsPageDataHistoryValueModel> ColumnValues { get; set; }
}
public class cDetailsPageDataHistoryDataModel
public class cDetailsPageDataHistoryCategoryDataModel
{
public DetailsPageDataHistoryColumnModel TitleColumn { get; set; }
public List<DetailsPageDataHistoryColumnModel> ValueColumns { get; set; }
@@ -30,9 +23,13 @@ namespace FasdDesktopUi.Pages.DetailsPage.Models
public double ValueColumnWidth { get; set; } = 100;
}
public class cDetailsPageDataHistoryDataModel : List<cDetailsPageDataHistoryCategoryDataModel>
{
}
public class DataHistoryEventArgs : RoutedEventArgs
{
public DetailsPageDataHistoryValueModel HistoryValueData { get; set; }
public cDataHistoryValueModel HistoryValueData { get; set; }
public DataHistoryEventArgs()
{

14
FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistoryCollection.xaml.cs
View File

@@ -109,11 +109,11 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
}
public static readonly DependencyProperty HistoryDataListProperty =
DependencyProperty.Register("HistoryDataList", typeof(List<cDetailsPageDataHistoryDataModel>), typeof(DetailsPageDataHistoryCollection), new PropertyMetadata(new List<cDetailsPageDataHistoryDataModel>(), new PropertyChangedCallback(RefreshDataCallback)));
DependencyProperty.Register("HistoryDataList", typeof(cDetailsPageDataHistoryDataModel), typeof(DetailsPageDataHistoryCollection), new PropertyMetadata(new cDetailsPageDataHistoryDataModel(), new PropertyChangedCallback(RefreshDataCallback)));
public List<cDetailsPageDataHistoryDataModel> HistoryDataList
public cDetailsPageDataHistoryDataModel HistoryDataList
{
get { return (List<cDetailsPageDataHistoryDataModel>)GetValue(HistoryDataListProperty); }
get { return (cDetailsPageDataHistoryDataModel)GetValue(HistoryDataListProperty); }
set { SetValue(HistoryDataListProperty, value); }
}
@@ -380,7 +380,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
#region UpdateData
public void UpdateHistory(List<cDetailsPageDataHistoryDataModel> historyData)
public void UpdateHistory(cDetailsPageDataHistoryDataModel historyData)
{
try
{
@@ -414,7 +414,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
}
}
private bool DidHistoryCategoryChange(cDetailsPageDataHistoryDataModel oldValue, cDetailsPageDataHistoryDataModel newValue)
private bool DidHistoryCategoryChange(cDetailsPageDataHistoryCategoryDataModel oldValue, cDetailsPageDataHistoryCategoryDataModel newValue)
{
var CM = MethodBase.GetCurrentMethod();
LogMethodBegin(CM);
@@ -490,7 +490,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
return new Size(formattedText.Width, formattedText.Height);
}
private double GetTitleColumnWidth(cDetailsPageDataHistoryDataModel detailsData)
private double GetTitleColumnWidth(cDetailsPageDataHistoryCategoryDataModel detailsData)
{
double maxTitleLength = MeasureStringSize(detailsData.TitleColumn.Content, new TextBox { Style = titleColumnOverViewTitleStyle }).Width + 90;
@@ -518,7 +518,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
return maxTitleLength;
}
private double GetValueColumnWidth(cDetailsPageDataHistoryDataModel detailsData)
private double GetValueColumnWidth(cDetailsPageDataHistoryCategoryDataModel detailsData)
{
double maxValueWidth = 55; //55 to set MinWidth

23
FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistorySection.xaml.cs
View File

@@ -112,7 +112,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
{
foreach (DetailsPageDataHistoryValueColumn valueColumn in _me.MainGrid.Children)
{
valueColumn.ColumnValues = new DetailsPageDataHistoryColumnModel() { HighlightColor = Basics.Enums.enumHighlightColor.none, IsLoading = true, ColumnValues = new List<DetailsPageDataHistoryValueModel>() { new DetailsPageDataHistoryValueModel() { Content = "-", IsLoading = true } } };
valueColumn.ColumnValues = new DetailsPageDataHistoryColumnModel() { HighlightColor = Basics.Enums.enumHighlightColor.none, IsLoading = true, ColumnValues = new List<cDataHistoryValueModel>() { new cDataHistoryValueModel() { Content = "-", IsLoading = true } } };
}
return;
}
@@ -122,11 +122,11 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
}
public static readonly DependencyProperty HistoryDataProperty =
DependencyProperty.Register("HistoryData", typeof(cDetailsPageDataHistoryDataModel), typeof(DetailsPageDataHistorySection), new PropertyMetadata(new cDetailsPageDataHistoryDataModel(), new PropertyChangedCallback(RefreshDataCallback)));
DependencyProperty.Register("HistoryData", typeof(cDetailsPageDataHistoryCategoryDataModel), typeof(DetailsPageDataHistorySection), new PropertyMetadata(new cDetailsPageDataHistoryCategoryDataModel(), new PropertyChangedCallback(RefreshDataCallback)));
public cDetailsPageDataHistoryDataModel HistoryData
public cDetailsPageDataHistoryCategoryDataModel HistoryData
{
get { return (cDetailsPageDataHistoryDataModel)GetValue(HistoryDataProperty); }
get { return (cDetailsPageDataHistoryCategoryDataModel)GetValue(HistoryDataProperty); }
set { SetValue(HistoryDataProperty, value); }
}
@@ -292,19 +292,6 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
valueColumnControl.AggregateRowIndexes = aggregateRowIndexes;
valueColumnControl.ColumnValues = valueColumnEnumerator.Current;
foreach (var rowValue in valueColumnControl.ColumnValues.ColumnValues)
{
try
{
if (titleColumnEnumerator.MoveNext())
rowValue.DetailedData = titleColumnEnumerator.Current.DetailedData;
}
catch (Exception E)
{
LogException(E);
}
}
}
catch (Exception E)
{
@@ -346,7 +333,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
return false;
}
public void UpdateHistoryData(cDetailsPageDataHistoryDataModel historyData)
public void UpdateHistoryData(cDetailsPageDataHistoryCategoryDataModel historyData)
{
var CM = MethodBase.GetCurrentMethod();
LogMethodBegin(CM);

21
FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistoryTitleColumn.xaml.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
@@ -13,17 +14,19 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using C4IT.FASD.Base;
using C4IT.Logging;
using F4SD_AdaptableIcon.Enums;
using FasdDesktopUi.Basics.Enums;
using FasdDesktopUi.Basics.Models;
using FasdDesktopUi.Basics.UiActions;
using FasdDesktopUi.Basics.UserControls;
using FasdDesktopUi.Pages.DetailsPage.Models;
using FasdDesktopUi.Basics.Enums;
using C4IT.Logging;
using FasdDesktopUi.Basics.UserControls.AdaptableIcon;
using C4IT.FASD.Base;
using System.Reflection;
using FasdDesktopUi.Pages.DetailsPage.Models;
using static C4IT.Logging.cLogManager;
using F4SD_AdaptableIcon.Enums;
namespace FasdDesktopUi.Pages.DetailsPage.UserControls
{
@@ -165,7 +168,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
if (!(sender is FrameworkElement FE))
return;
if (!(FE.Tag is DetailsPageDataHistoryValueModel HistorySubtitleValue))
if (!(FE.Tag is cDataHistoryValueModel HistorySubtitleValue))
return;
if (HistorySubtitleValue.UiAction == null)
@@ -284,7 +287,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
if (!(sender is FrameworkElement FE))
return;
if (!(FE.Tag is DetailsPageDataHistoryValueModel HistorySubtitleValue))
if (!(FE.Tag is cDataHistoryValueModel HistorySubtitleValue))
return;
if (string.IsNullOrEmpty(HistorySubtitleValue.ContentDescription) || HistorySubtitleValue.ContentDescription == HistorySubtitleValue.Content)

6
FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistoryValueColumn.xaml.cs
View File

@@ -129,7 +129,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
}
}
private void UpdateBorderThresholdValues(Border border, DetailsPageDataHistoryValueModel valueInfo)
private void UpdateBorderThresholdValues(Border border, cDataHistoryValueModel valueInfo)
{
try
{
@@ -236,7 +236,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
if (!(sender is FrameworkElement FE))
return;
if (!(FE.Tag is DetailsPageDataHistoryValueModel HistoryValue))
if (!(FE.Tag is cDataHistoryValueModel HistoryValue))
return;
if (HistoryValue.UiAction == null)
@@ -469,7 +469,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
#region UpdateValues
private bool DidCellValueChange(DetailsPageDataHistoryValueModel oldData, DetailsPageDataHistoryValueModel newData)
private bool DidCellValueChange(cDataHistoryValueModel oldData, cDataHistoryValueModel newData)
{
try
{

4
FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageRefreshControl.xaml.cs
View File

@@ -73,7 +73,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
try
{
string newText = string.Empty;
if (DataProvider?.HealthCardDataHelper?.LastDataRequest is null)
if (DataProvider?.HealthCardDataHelper?.LoadingHelper?.LastDataRequest is null)
{
LastDataRequestTextBlock.Text = newText;
return;
@@ -82,7 +82,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
string dateAddtionFormat = cMultiLanguageSupport.GetItem("DetailsPage.LastRefresh");
string timeText = string.Empty;
var from = DataProvider?.HealthCardDataHelper?.LastDataRequest;
var from = DataProvider?.HealthCardDataHelper?.LoadingHelper?.LastDataRequest;
if (from == null)
return;

19
FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageWindowStateBar.xaml
View File

@@ -50,24 +50,17 @@
</Style>
</StackPanel.Resources>
<ico:AdaptableIcon x:Name="SlimPageButton"
MouseLeftButtonUp="SlimPageButton_MouseLeftButtonUp"
TouchDown="SlimPageButton_TouchDown"
ToolTip="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Global.NavBar.ToSlim}"
SelectedInternIcon="window_toSlim"
Margin="0"/>
<ico:AdaptableIcon x:Name="MinimizeButton"
BorderPadding="0 10 0 0"
VerticalAlignment="Bottom"
MouseUp="MinimizeButton_MouseUp"
TouchDown="MinimizeButton_TouchDown"
MouseUp="MinimizeButton_Click"
TouchDown="MinimizeButton_Click"
ToolTip="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Global.NavBar.Minimize}"
SelectedInternIcon="window_minimize" />
<ico:AdaptableIcon x:Name="WindowSizeButton"
MouseUp="WindowSizeButton_MouseUp"
TouchDown="WindowSizeButton_TouchDown">
MouseUp="WindowSizeButton_Click"
TouchDown="WindowSizeButton_Click">
<ico:AdaptableIcon.Resources>
<Style TargetType="ico:AdaptableIcon"
@@ -100,8 +93,8 @@
</ico:AdaptableIcon>
<ico:AdaptableIcon x:Name="CloseButton"
MouseUp="CloseButton_MouseUp"
TouchDown="CloseButton_TouchDown"
MouseUp="CloseButton_Click"
TouchDown="CloseButton_Click"
Margin="7.5 0 0 0"
ToolTip="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Global.NavBar.Close}"
SelectedInternIcon="window_close" />

77
FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageWindowStateBar.xaml.cs
View File

@@ -1,13 +1,6 @@
using FasdDesktopUi.Basics;
using FasdDesktopUi.Pages.SettingsPage;
using FasdDesktopUi.Pages.SlimPage;
using System;
using System.Linq;
using System.Reflection;
using System.Windows;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using static C4IT.Logging.cLogManager;
namespace FasdDesktopUi.Pages.DetailsPage.UserControls
{
@@ -18,84 +11,22 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
InitializeComponent();
}
#region MinimizeButton
private void Minimize_Click(object sender)
private void MinimizeButton_Click(object sender, InputEventArgs e)
{
if (sender is UIElement senderVisual)
Window.GetWindow(senderVisual).WindowState = WindowState.Minimized;
}
private void MinimizeButton_MouseUp(object sender, MouseButtonEventArgs e)
{
Minimize_Click(sender);
}
private void MinimizeButton_TouchDown(object sender, TouchEventArgs e)
{
Minimize_Click(sender);
}
#endregion
#region WindowSizeButton
private void WindowSize_Click(object sender)
private void WindowSizeButton_Click(object sender, InputEventArgs e)
{
if (sender is UIElement senderVisual)
Window.GetWindow(senderVisual).WindowState = Window.GetWindow(senderVisual).WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
}
private void WindowSizeButton_MouseUp(object sender, MouseButtonEventArgs e)
{
WindowSize_Click(sender);
}
private void WindowSizeButton_TouchDown(object sender, TouchEventArgs e)
{
WindowSize_Click(sender);
}
#endregion
#region CloseButton
private void CloseButton_Click(object sender)
private void CloseButton_Click(object sender, InputEventArgs e)
{
if (sender is UIElement senderVisual)
Window.GetWindow(senderVisual).Close();
}
private void CloseButton_MouseUp(object sender, MouseButtonEventArgs e)
{
CloseButton_Click(sender);
}
private void CloseButton_TouchDown(object sender, TouchEventArgs e)
{
CloseButton_Click(sender);
}
#endregion
#region SlimPageButton
private void SlimPageButton_Click()
{
App.HideAllSettingViews();
Window.GetWindow(this).Hide();
cSupportCaseDataProvider.slimPage?.Show();
}
private void SlimPageButton_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
SlimPageButton_Click();
}
private void SlimPageButton_TouchDown(object sender, TouchEventArgs e)
{
SlimPageButton_Click();
}
#endregion
}
}

4
FasdDesktopUi/Pages/SlimPage/SlimPageView.xaml.cs
View File

@@ -348,8 +348,8 @@ namespace FasdDesktopUi.Pages.SlimPage
if (_supportCase != null)
{
_supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.DataChanged -= DataProvider_DataChanged;
_supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.DataFullyLoaded -= DataProvider_DataFullyLoaded;
_supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.LoadingHelper.DataChanged -= DataProvider_DataChanged;
_supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.LoadingHelper.DataFullyLoaded -= DataProvider_DataFullyLoaded;
}
}
catch (Exception E)

8
FasdDesktopUi/Pages/SupportCasePageBase/SupportCasePageBase.cs
View File

@@ -19,14 +19,14 @@ namespace FasdDesktopUi.Pages
{
if (_supportCase != null)
{
_supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.DataChanged -= DataProvider_DataChanged;
_supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.DataFullyLoaded -= DataProvider_DataFullyLoaded;
_supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.LoadingHelper.DataChanged -= DataProvider_DataChanged;
_supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.LoadingHelper.DataFullyLoaded -= DataProvider_DataFullyLoaded;
_supportCase.SupportCaseDataProviderArtifact.DirectConnectionHelper.DirectConnectionChanged -= DirectConnectionHelper_DirectConnectionChanged;
}
_supportCase = supportCase;
_supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.DataChanged += DataProvider_DataChanged;
_supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.DataFullyLoaded += DataProvider_DataFullyLoaded;
_supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.LoadingHelper.DataChanged += DataProvider_DataChanged;
_supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.LoadingHelper.DataFullyLoaded += DataProvider_DataFullyLoaded;
_supportCase.SupportCaseDataProviderArtifact.DirectConnectionHelper.DirectConnectionChanged += DirectConnectionHelper_DirectConnectionChanged;
}