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

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
{