SW/SystemX.Web
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[성현모] TestTrend 기능 추가

Browse Source
This commit is contained in:
SHM
2025-09-23 10:03:12 +09:00
parent 4ceaa7c4e3
commit 681f1e97f4
10 changed files with 337 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Projects/WebClient/Web.Tra/Components/Module/TitleCard.razor
View File

@ -1,9 +1,9 @@
<RadzenCard Style="@($"height:100%;{CardStyle};")" class="rz-mb-3 rz-p-0">
<RadzenCard Style="@($"height:100%;{CardStyle}; margin:0 !important;")" class="rz-mb-3 rz-p-0">
<RadzenStack Style="width:100%; height:2.7rem; background-color:var(--rz-primary-lighter);" class="rz-pl-3">
<RadzenLabel class="rz-p-1" Text="@HeaderText">
</RadzenLabel>
</RadzenStack>
<RadzenStack Style="@($"height:{ContentsHeight}")" Orientation="Orientation.Horizontal" AlignItems="AlignItems.Start" JustifyContent="JustifyContent.Start">
<RadzenStack Style="@($"height:{ContentsHeight}; overflow:auto;")" Orientation="Orientation.Horizontal" AlignItems="AlignItems.Start" JustifyContent="JustifyContent.Start">
@ChildContent
</RadzenStack>
</RadzenCard>

19
Projects/WebClient/Web.Tra/Components/Module/TraGrid.razor
View File

@ -1,5 +1,5 @@
@using WebClient.Library.Model
@typeparam TDataModel
@typeparam TDataModel
<RadzenDataGrid class="rz-shadow-1" TItem="TDataModel" Data="@DataList" GridLines="DataGridGridLines.Both"
AllowFiltering FilterMode="FilterMode.Advanced" CellRender="@CellRender" AllowColumnResize AllowVirtualization
@ -107,7 +107,10 @@
public EventCallback<TDataModel> OnSelectRow { get; set; }
[Parameter]
public EventCallback<TDataModel> OnDoubleClickRow{ get; set; }
public EventCallback<SelectRow> OnDoubleClickRow { get; set; }
[Parameter]
public int ParentTabId { get; set; }
[Parameter]
public bool VisibleRowNo { get; set; }
@ -136,7 +139,7 @@
// var cellData = args.Data as Overview;
// if (cellData is null)
// return;
// if ((args.Column.Property.ToLower().Equals("testdate") || args.Column.Property.ToLower().Equals("host")) == false)
// return;
@ -189,7 +192,7 @@
// args.Attributes.Add("rowspan", rowCount);
// }
}
private async Task SelectRow(TDataModel data)
{
await OnSelectRow.InvokeAsync(data);
@ -197,6 +200,12 @@
private async Task OnRowDoublClick(DataGridRowMouseEventArgs<TDataModel> args)
{
await OnDoubleClickRow.InvokeAsync(args.Data);
var selectRow = new SelectRow
{
Row = args.Data as IDataModel,
ParentTabID = ParentTabId
};
await OnDoubleClickRow.InvokeAsync(selectRow);
}
}

246
Projects/WebClient/Web.Tra/Components/Pages/TRA.razor
View File

@ -68,7 +68,7 @@
<!--Function Block-->
<RadzenStack Style="height:10rem; width:fit-content;" class="rz-border-right rz-pr-5" Orientation="Orientation.Horizontal" AlignItems="AlignItems.Start" JustifyContent="JustifyContent.Start">
<RadzenStack Style="font-size:1.5rem;" Orientation="Orientation.Vertical" AlignItems="AlignItems.Start" JustifyContent="JustifyContent.Center">
<RadzenStack Style="cursor: pointer;" class="" Orientation="Orientation.Vertical" AlignItems="AlignItems.Center" JustifyContent="JustifyContent.Start" @onclick="@OnSummary">
<RadzenStack Style="cursor: pointer;" class="" Orientation="Orientation.Vertical" AlignItems="AlignItems.Center" JustifyContent="JustifyContent.Start" @onclick="@(() => OnSummary())">
<RadzenIcon Style="font-size: 3.5rem; font-weight:400; color:var(--rz-info)" Icon="ssid_chart"></RadzenIcon>
<RadzenLabel Style="font-size: 1.5rem; cursor:pointer; color:var(--rz-info)" Text="Summary"></RadzenLabel>
</RadzenStack>
@ -124,14 +124,14 @@
@if (tab.Key.EnumTab == EnumTabs.OverviewC1Detail || tab.Key.EnumTab == EnumTabs.OverviewC1DetailMerged)
{
<TraGrid TDataModel="Overview" DataList="@(tab.Value.Cast<Overview>())" EnumTab="@tab.Key.EnumTab"
<TraGrid TDataModel="Overview" DataList="@(tab.Value.Cast<Overview>())" EnumTab="@tab.Key.EnumTab" ParentTabId="@tab.Key.Id"
OnSelectRow="@OnSelectRowOverview" OnDoubleClickRow="@OnDoubleClickRowDetailOverview" HostColumnMerge>
</TraGrid>
}
@if (tab.Key.EnumTab == EnumTabs.TestHistoryC1)
{
<TraGrid TDataModel="TestHistory" DataList="@(tab.Value.Cast<TestHistory>())" EnumTab="@tab.Key.EnumTab"
<TraGrid TDataModel="TestHistory" DataList="@(tab.Value.Cast<TestHistory>())" EnumTab="@tab.Key.EnumTab" ParentTabId="@tab.Key.Id"
OnSelectRow="@OnSelectRowOverview" OnDoubleClickRow="@OnDoubleClickRowHistory" VisibleRowNo HostColumnMerge="false">
</TraGrid>
}
@ -142,7 +142,7 @@
<!--Test Info-->
<RadzenStack Style="width:35rem; font-size: 1.5rem; height: inherit;">
@{
var history = tab.Key.Parent as TestHistory;
var history = tab.Key.Parent.Parent as TestHistory;
if(history.TestResult.ToLower().Contains("ok") == true)
{
<RadzenLabel Style="width:inherit; height: 5rem; min-height:5rem; background:var(--rz-success); border: solid 2px var(--rz-grid-hover-color); overflow:auto;" class="rz-shadow-1"/>
@ -174,7 +174,7 @@
@if(tab.Value?.Count > 0)
{
<TraGrid TDataModel="ParseTestResult" DataList="@(tab.Value.Cast<ParseTestResult>())"
HostColumnMerge="false" EnumTab="@tab.Key.EnumTab">
HostColumnMerge="false" EnumTab="@tab.Key.EnumTab" ParentTabId="@tab.Key.Id">
</TraGrid>
}
</RadzenStack>
@ -187,7 +187,7 @@
<!--Test Info-->
<RadzenStack Style="width:35rem; font-size: 1.5rem; height: inherit;">
@{
var history = tab.Key.Parent as TestSummaryInformation;
var history = tab.Key.Parent.Parent as TestSummaryInformation;
<TitleCard HeaderText="Test Information" ContentsHeight="calc(100% - 5rem);" CardStyle="overflow:auto;">
<RadzenStack Style="padding:1rem; color: var(--rz-grid-hover-color); overflow-y:auto; align-items:flex-start;">
@foreach (var prop in history.GetType().GetProperties())
@ -206,13 +206,96 @@
<RadzenStack Style="height:inherit;">
@if (tab.Value?.Count > 0)
{
<TraGrid TDataModel="ParseTestSummary" DataList="@(tab.Value.Cast<ParseTestSummary>())"
HostColumnMerge="false" EnumTab="@tab.Key.EnumTab">
<TraGrid TDataModel="ParseTestSummary" DataList="@(tab.Value.Cast<ParseTestSummary>())" ParentTabId="@tab.Key.Parent.TabID"
HostColumnMerge="false" EnumTab="@tab.Key.EnumTab" OnDoubleClickRow="@OnDoubleClickRowSummary">
</TraGrid>
}
</RadzenStack>
</RadzenStack>
}
@if (tab.Key.EnumTab == EnumTabs.TestTrendC1)
{
<!--Test Info-->
<RadzenStack Orientation="Orientation.Horizontal">
<RadzenStack Style="width:35rem; font-size: 1.5rem; height: inherit; overflow:auto;">
@{
var trend = tab.Key.Parent.Parent as TestTrend;
<TitleCard HeaderText="Test Step Info." ContentsHeight="27rem" CardStyle="">
<RadzenStack Style="padding:1rem; color: var(--rz-grid-hover-color); overflow-y:auto; align-items:flex-start;">
@foreach (var prop in trend.TestStepInfo.GetType().GetProperties())
{
if (prop.Name.ToLower().Contains("min") || prop.Name.ToLower().Contains("max") || prop.Name.ToLower().Contains("average"))
continue;
<RadzenStack Style="width:100%; background-color:transparent;" class="rz-border-bottom rz-p-1 rz-pb-2" Orientation="Orientation.Horizontal">
<span style="width:12rem; min-width:12rem; font-size: 1.3rem;">@prop.Name</span>
<BlockLabel Text="@prop.GetValue(trend.TestStepInfo).ToString()" MaxWidth="20rem"></BlockLabel>
</RadzenStack>
}
</RadzenStack>
</TitleCard>
<TitleCard HeaderText="Test Data Info." ContentsHeight="27rem" CardStyle="">
<RadzenStack Style="padding:1rem; color: var(--rz-grid-hover-color); overflow-y:auto; align-items:flex-start;">
@foreach (var prop in trend.TestDataInfo.GetType().GetProperties())
{
if (prop.Name.ToLower().Contains("min") || prop.Name.ToLower().Contains("max") || prop.Name.ToLower().Contains("average"))
continue;
<RadzenStack Style="width:100%; background-color:transparent;" class="rz-border-bottom rz-p-1 rz-pb-2" Orientation="Orientation.Horizontal">
<span style="width:12rem; min-width:12rem; font-size: 1.3rem;">@prop.Name</span>
<BlockLabel Text="@prop.GetValue(trend.TestDataInfo).ToString()" MaxWidth="20rem"></BlockLabel>
</RadzenStack>
}
</RadzenStack>
</TitleCard>
<TitleCard HeaderText="Measured Data Analysis" ContentsHeight="27rem" CardStyle="">
<RadzenStack Style="padding:1rem; color: var(--rz-grid-hover-color); overflow-y:auto; align-items:flex-start;">
@foreach (var prop in trend.MesuredDataAnalysis.GetType().GetProperties())
{
<RadzenStack Style="width:100%; background-color:transparent;" class="rz-border-bottom rz-p-1 rz-pb-2" Orientation="Orientation.Horizontal">
<span style="width:12rem; min-width:12rem; font-size: 1.3rem;">@prop.Name</span>
<BlockLabel Text="@prop.GetValue(trend.MesuredDataAnalysis).ToString()" MaxWidth="20rem"></BlockLabel>
</RadzenStack>
}
</RadzenStack>
</TitleCard>
}
</RadzenStack>
<RadzenStack Style="width:calc(100vw - 40rem); height:inherit;" Orientation="Orientation.Horizontal">
<!--TestResult-->
@if (tab.Value?.Count > 0)
{
<RadzenStack Style="width:170rem; height:calc(100vh - 29rem);">
<TraGrid TDataModel="ParseTestTrend" DataList="@(tab.Value.Cast<ParseTestTrend>().Where(x=>x.Result.ToLower().Contains("ok")))" ParentTabId="@tab.Key.Parent.TabID"
HostColumnMerge="false" EnumTab="@tab.Key.EnumTab">
</TraGrid>
</RadzenStack>
<RadzenStack Style="width:100%; height:inherit;">
<RadzenChart Style="height:100%;" ColorScheme="ColorScheme.Divergent">
<RadzenLineSeries Data="@(tab.Value.Cast<ParseTestTrend>().Where(x=>x.Result.ToLower().Contains("ok")).Select(x => new TrendPoint { Category = Convert.ToInt32(x.RowNo), Value = Convert.ToDouble(x.Value) }))"
TItem="TrendPoint" LineType="LineType.Solid" ValueProperty="Value" CategoryProperty="Category" Title="Value" Stroke="rgba(255,0,0)">
</RadzenLineSeries>
<RadzenLineSeries Data="@(tab.Value.Cast<ParseTestTrend>().Where(x => x.Result.ToLower().Contains("ok")).Select(x => new TrendPoint { Category = Convert.ToInt32(x.RowNo), Value = Convert.ToDouble(x.Min) }))"
TItem="TrendPoint" LineType="LineType.Dashed" ValueProperty="Value" CategoryProperty="Category" Title="MIN" Stroke="#2196f3" >
</RadzenLineSeries>
<RadzenLineSeries Data="@(tab.Value.Cast<ParseTestTrend>().Where(x => x.Result.ToLower().Contains("ok")).Select(x => new TrendPoint { Category = Convert.ToInt32(x.RowNo), Value = Convert.ToDouble(x.Max) }))"
TItem="TrendPoint" LineType="LineType.Dashed" ValueProperty="Value" CategoryProperty="Category" Title="MAX" Stroke="#2196f3">
</RadzenLineSeries>
<RadzenValueAxis Min="3" Max="11">
<RadzenGridLines Visible="true" />
</RadzenValueAxis>
<RadzenCategoryAxis Step="5">
</RadzenCategoryAxis>
</RadzenChart>
</RadzenStack>
}
</RadzenStack>
</RadzenStack>
}
</RadzenStack>
</RadzenStack>
</ChildContent>
@ -285,7 +368,7 @@
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.OverviewC1} ({tabId})", EnumTab = EnumTabs.OverviewC1Merged, Parent = null },
key => overviews.Cast<IDataModel>().ToList(), (key, oldValue) => overviews.Cast<IDataModel>().ToList());
}
SelectedTabIndex = Tabs.Count - 1;
}
@ -304,9 +387,9 @@
}
}
private async Task OnDoubleClickRowOverview(IDataModel row)
private async Task OnDoubleClickRowOverview(SelectRow row)
{
var selectRow = row as Overview;
var selectRow = row.Row as Overview;
if(selectRow is not null)
{
List<Overview> detailOverviews = new();
@ -317,7 +400,7 @@
int tabId = Tabs.Max(x => x.Key.Id) + 1;
Tabs.AddOrUpdate(
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.OverviewC1Detail} ({tabId})", EnumTab = EnumTabs.OverviewC1Detail, Parent = row },
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.OverviewC1Detail} ({tabId})", EnumTab = EnumTabs.OverviewC1Detail, Parent = new ParentRow { TabID = row.ParentTabID, Parent = row.Row } },
key => detailOverviews.Cast<IDataModel>().ToList(), (key, oldValue) => detailOverviews.Cast<IDataModel>().ToList());
}
else
@ -326,27 +409,27 @@
int tabId = Tabs.Max(x => x.Key.Id) + 1;
Tabs.AddOrUpdate(
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.OverviewC1Detail} ({tabId})", EnumTab = EnumTabs.OverviewC1DetailMerged, Parent = row },
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.OverviewC1Detail} ({tabId})", EnumTab = EnumTabs.OverviewC1DetailMerged, Parent = new ParentRow { TabID = row.ParentTabID, Parent = row.Row } },
key => detailOverviews.Cast<IDataModel>().ToList(), (key, oldValue) => detailOverviews.Cast<IDataModel>().ToList());
}
tabs.Reload();
SelectedTabIndex = Tabs.Count - 1;
}
}
private async Task OnDoubleClickRowDetailOverview(IDataModel row)
private async Task OnDoubleClickRowDetailOverview(SelectRow row)
{
List<TestHistory> histories = new();
if (IsMergePartNumberOption == false)
{
histories = await CPXV2LogService.GetTestHistory(SearchDataOverviews, row);
histories = await CPXV2LogService.GetTestHistory(SearchDataOverviews, row.Row);
}
else
{
histories = await CPXV2LogService.GetTestHistoryMerged(SearchDataOverviews, row);
histories = await CPXV2LogService.GetTestHistoryMerged(SearchDataOverviews, row.Row);
}
//test summary
int ok = histories.Count(x => x.TestResult.ToLower().Contains("ok"));
int ng = histories.Count(x => !x.TestResult.ToLower().Contains("ok"));
@ -355,10 +438,10 @@
double testTimeAvg = histories.Average(x => Convert.ToInt32(x.Duration)) / 1000.0;
double testTimeMin = histories.Min(x => Convert.ToInt32(x.Duration)) / 1000.0;
double testTimeMax = histories.Max(x => Convert.ToInt32(x.Duration)) / 1000.0;
int tabId = Tabs.Max(x => x.Key.Id) + 1;
Tabs.AddOrUpdate(
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.TestHistoryC1}({tabId})", EnumTab = EnumTabs.TestHistoryC1, Parent = row ,
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.TestHistoryC1}({tabId})", EnumTab = EnumTabs.TestHistoryC1, Parent = new ParentRow { TabID = row.ParentTabID, Parent = row.Row } ,
SummaryTestResult = $"Test Result: {ok + ng} (OK:{ok}/NG:{ng}) - Ratio:{ratio.ToString("F2")}%",
SummaryTestTime = $"Test Time: Average={testTimeAvg.ToString("F2")}sec Min={testTimeMin.ToString("F2")}sec Max={testTimeMax.ToString("F2")}sec" },
key => histories.Cast<IDataModel>().ToList(), (key, oldValue) => histories.Cast<IDataModel>().ToList());
@ -367,26 +450,102 @@
SelectedTabIndex = Tabs.Count - 1;
}
private async Task OnDoubleClickRowHistory(IDataModel row)
private async Task OnDoubleClickRowHistory(SelectRow row)
{
var selectRow = row as TestHistory;
var selectRow = row.Row as TestHistory;
int testStepVersion = selectRow.StepVersion;
if(Int32.TryParse(SelectionStepVersion, out var inputStepVersion) == true)
{
testStepVersion = inputStepVersion;
}
var s = await CPXV2LogService.GetTestResult(row, testStepVersion);
var s = await CPXV2LogService.GetTestResult(row.Row, testStepVersion);
int tabId = Tabs.Max(x => x.Key.Id) + 1;
Tabs.AddOrUpdate(
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.TestResultC1}({tabId})", EnumTab = EnumTabs.TestResultC1, Parent = row },
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.TestResultC1}({tabId})", EnumTab = EnumTabs.TestResultC1, Parent = new ParentRow { TabID = row.ParentTabID, Parent = row.Row } },
key => s?.ParseTestResult?.Cast<IDataModel>()?.ToList(), (key, oldValue) => s?.ParseTestResult?.Cast<IDataModel>()?.ToList());
tabs.Reload();
SelectedTabIndex = Tabs.Count - 1;
}
private async Task OnSummary()
{
var selectedTab = Tabs.Select(x => x.Key)?.FirstOrDefault(x => x.Id == SelectedTabIndex);
if (selectedTab is not null)
{
//history에서만 summary 사용
if (selectedTab.EnumTab == EnumTabs.TestHistoryC1)
{
if (Tabs.TryGetValue(selectedTab, out var data) == true)
{
if (Int32.TryParse(SelectionStepVersion, out int stepVersion) == true)
{
var testHistories = data.Cast<TestHistory>().ToList();
var summary = await CPXV2LogService.GetTestSummary(testHistories, stepVersion);
var summaryInformation = testHistories.GetTestSummaryInformation();
if (summary is not null && summaryInformation is not null)
{
summaryInformation.SearchRangeStart = (DateTime)new DateTime(RequestSearch.SearchStart, TimeOnly.MinValue);
summaryInformation.SearchRangeEnd = (DateTime)new DateTime(RequestSearch.SearchEnd, TimeOnly.MaxValue);
int tabId = Tabs.Max(x => x.Key.Id) + 1;
Tabs.AddOrUpdate(
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.TestSummaryC1}({tabId})", EnumTab = EnumTabs.TestSummaryC1, Parent = new ParentRow { TabID = selectedTab.Id, Parent = summaryInformation } },
key => summary?.ParseTestSummary?.Cast<IDataModel>()?.ToList(), (key, oldValue) => summary?.ParseTestSummary?.Cast<IDataModel>()?.ToList());
tabs.Reload();
SelectedTabIndex = Tabs.Count - 1;
}
}
}
}
else
{
LogXnet.WriteLine("Not history", LogXLabel.Warning);
}
}
}
private async Task OnDoubleClickRowSummary(SelectRow row)
{
var selectRow = row.Row as ParseTestSummary;
if(selectRow is not null)
{
var historyTabId = Tabs.Select(x => x.Key)?.FirstOrDefault(x => x.Id == row.ParentTabID);
var selectedTab = Tabs.Select(x => x.Key)?.FirstOrDefault(x => x.Id == historyTabId.Id);
if (selectedTab is not null)
{
if (selectedTab.EnumTab == EnumTabs.TestHistoryC1)
{
if (Tabs.TryGetValue(selectedTab, out var data) == true)
{
if (Int32.TryParse(SelectionStepVersion, out int stepVersion) == true)
{
var testHistories = data.Cast<TestHistory>().ToList();
var trend = await CPXV2LogService.GetTestTrend(testHistories, stepVersion, selectRow.StepNo);
int tabId = Tabs.Max(x => x.Key.Id) + 1;
Tabs.AddOrUpdate(
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.TestTrendC1}({tabId})", EnumTab = EnumTabs.TestTrendC1, Parent = new ParentRow { TabID = selectedTab.Id, Parent = trend } },
key => trend?.ParseTestTrend?.Cast<IDataModel>()?.ToList(), (key, oldValue) => trend?.ParseTestTrend?.Cast<IDataModel>()?.ToList());
tabs.Reload();
SelectedTabIndex = Tabs.Count - 1;
}
}
}
else
{
LogXnet.WriteLine("Not history", LogXLabel.Warning);
}
}
}
}
private void OnClickClose(int tabId)
{
CloseTab(tabId);
@ -429,45 +588,6 @@
await JS.InvokeVoidAsync("open", $"/testlist/{history.ProductNo}/{history.TestCode}/{SelectionStepVersion}", "_blank");
}
private async Task OnSummary()
{
var selectedTab = Tabs.Select(x => x.Key)?.FirstOrDefault(x=>x.Id == SelectedTabIndex);
if(selectedTab is not null)
{
//history에서만 summary 사용
if(selectedTab.EnumTab == EnumTabs.TestHistoryC1)
{
if(Tabs.TryGetValue(selectedTab, out var data) == true)
{
if(Int32.TryParse(SelectionStepVersion, out int stepVersion) == true)
{
var testHistories = data.Cast<TestHistory>().ToList();
var summary = await CPXV2LogService.GetTestSummary(testHistories, stepVersion);
var summaryInformation = testHistories.GetTestSummaryInformation();
if(summary is not null && summaryInformation is not null)
{
summaryInformation.SearchRangeStart = (DateTime)new DateTime(RequestSearch.SearchStart, TimeOnly.MinValue);
summaryInformation.SearchRangeEnd = (DateTime)new DateTime(RequestSearch.SearchEnd, TimeOnly.MaxValue);
int tabId = Tabs.Max(x => x.Key.Id) + 1;
Tabs.AddOrUpdate(
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.TestSummaryC1}({tabId})", EnumTab = EnumTabs.TestSummaryC1, Parent = summaryInformation },
key => summary?.ParseTestSummary?.Cast<IDataModel>()?.ToList(), (key, oldValue) => summary?.ParseTestSummary?.Cast<IDataModel>()?.ToList());
tabs.Reload();
SelectedTabIndex = Tabs.Count - 1;
}
}
}
}
else
{
LogXnet.WriteLine("Not history",LogXLabel.Warning);
}
}
}
private async Task OnExportExcel()
{