[성현모] DataModel분리, TestResult 페이지/기능 추가
This commit is contained in:
SHM
@ -79,7 +79,7 @@
|
||||
</RadzenStack>
|
||||
|
||||
<!--Data Grid-->
|
||||
<RadzenTabs @ref="@tabs" Style="width:100%; height:100%;" RenderMode="TabRenderMode.Client" @bind-SelectedIndex=@SelectedTabIndex>
|
||||
<RadzenTabs @ref="@tabs" Style="width:100%;" RenderMode="TabRenderMode.Client" @bind-SelectedIndex=@SelectedTabIndex>
|
||||
<Tabs>
|
||||
@foreach (var tab in Tabs.OrderBy(x=>x.Key.Id))
|
||||
{
|
||||
@ -88,30 +88,95 @@
|
||||
<span style="margin-right: 1rem; font-size: 1.5rem;">@context.Text</span>
|
||||
<RadzenButton Size="ButtonSize.Small" Icon="close" Click="@(()=>OnClickClose(tab.Key.Id))"></RadzenButton>
|
||||
</Template>
|
||||
|
||||
<ChildContent>
|
||||
@if (tab.Key.EnumTab == EnumTabs.OverviewC1)
|
||||
{
|
||||
<TraGrid TDataModel="Overview" DataList="@(tab.Value.Cast<Overview>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
|
||||
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@OverviewDisableColums"
|
||||
OnDoubleClickRow="@OnDoubleClickRowOverview" HostColumnMerge>
|
||||
</TraGrid>
|
||||
}
|
||||
<RadzenStack Orientation="Orientation.Vertical">
|
||||
<RadzenStack Style="height: 5.6rem; font-size: 1.5rem;">
|
||||
<RadzenCard 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="Summary">
|
||||
</RadzenLabel>
|
||||
</RadzenStack>
|
||||
<RadzenStack Style="height: 2.9rem;" Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" JustifyContent="JustifyContent.Start">
|
||||
<RadzenLabel class="rz-ml-10" Text=""></RadzenLabel>
|
||||
<RadzenLabel class="rz-ml-10" Text=""></RadzenLabel>
|
||||
</RadzenStack>
|
||||
</RadzenCard>
|
||||
</RadzenStack>
|
||||
|
||||
@if (tab.Key.EnumTab == EnumTabs.OverviewC1Detail)
|
||||
{
|
||||
<TraGrid TDataModel="Overview" DataList="@(tab.Value.Cast<Overview>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
|
||||
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@OverviewDisableColums"
|
||||
OnDoubleClickRow="@OnDoubleClickRowDetailOverview" HostColumnMerge>
|
||||
</TraGrid>
|
||||
}
|
||||
<RadzenStack Style="height:calc(100vh - 29rem);">
|
||||
@if (tab.Key.EnumTab == EnumTabs.OverviewC1)
|
||||
{
|
||||
<TraGrid TDataModel="Overview" DataList="@(tab.Value.Cast<Overview>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
|
||||
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@OverviewDisableColums"
|
||||
OnDoubleClickRow="@OnDoubleClickRowOverview" HostColumnMerge>
|
||||
</TraGrid>
|
||||
}
|
||||
|
||||
@if (tab.Key.EnumTab == EnumTabs.TestHistoryC1)
|
||||
{
|
||||
<TraGrid TDataModel="TestHistory" DataList="@(tab.Value.Cast<TestHistory>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
|
||||
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@HistoryDisableColums"
|
||||
VisibleRowNo HostColumnMerge="false">
|
||||
</TraGrid>
|
||||
}
|
||||
@if (tab.Key.EnumTab == EnumTabs.OverviewC1Detail)
|
||||
{
|
||||
<TraGrid TDataModel="Overview" DataList="@(tab.Value.Cast<Overview>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
|
||||
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@OverviewDisableColums"
|
||||
OnDoubleClickRow="@OnDoubleClickRowDetailOverview" HostColumnMerge>
|
||||
</TraGrid>
|
||||
}
|
||||
|
||||
@if (tab.Key.EnumTab == EnumTabs.TestHistoryC1)
|
||||
{
|
||||
<TraGrid TDataModel="TestHistory" DataList="@(tab.Value.Cast<TestHistory>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
|
||||
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@HistoryDisableColums"
|
||||
OnDoubleClickRow="@OnDoubleClickRowHistory" VisibleRowNo HostColumnMerge="false">
|
||||
</TraGrid>
|
||||
}
|
||||
|
||||
@if (tab.Key.EnumTab == EnumTabs.TestResultC1)
|
||||
{
|
||||
<RadzenStack Style="height:inherit;" Orientation="Orientation.Horizontal">
|
||||
<!--Test Info-->
|
||||
<RadzenStack Style="width:35rem; font-size: 1.5rem; height: inherit;">
|
||||
@{
|
||||
var history = tab.Key.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" />
|
||||
}
|
||||
else
|
||||
{
|
||||
<RadzenLabel Style="width:inherit; height: 5rem; min-height:5rem; background:var(--rz-danger); border: solid 2px var(--rz-grid-hover-color); overflow:auto;" class="rz-shadow-1" />
|
||||
}
|
||||
|
||||
<RadzenCard Style="height: calc(100% - 5rem); overflow:hidden;" class="rz-p-0 rz-pb-2">
|
||||
<RadzenStack Style="height:100%;">
|
||||
<!--header-->
|
||||
<RadzenStack Style="width:100%; height:2.7rem; background-color:var(--rz-primary-lighter);" class="rz-pl-3">
|
||||
<RadzenLabel class="rz-p-1" Text="Test Information">
|
||||
</RadzenLabel>
|
||||
</RadzenStack>
|
||||
<!--info with scroll-->
|
||||
<RadzenStack Style="padding:1rem; color: var(--rz-grid-hover-color); overflow-y:auto;">
|
||||
@foreach (var prop in history.GetType().GetProperties())
|
||||
{
|
||||
<RadzenStack Style="width:31rem; background-color:transparent;" class="rz-border-bottom rz-p-1 rz-pb-2" Orientation="Orientation.Horizontal">
|
||||
<span style="width:12rem;">@prop.Name</span>
|
||||
<span>@prop.GetValue(history)</span>
|
||||
</RadzenStack>
|
||||
}
|
||||
</RadzenStack>
|
||||
</RadzenStack>
|
||||
</RadzenCard>
|
||||
}
|
||||
</RadzenStack>
|
||||
|
||||
<!--TestResult-->
|
||||
<RadzenStack Style="height:inherit;">
|
||||
<TraGrid TDataModel="DecompressTestResult" DataList="@(tab.Value.Cast<DecompressTestResult>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
|
||||
AllowPaging="false" DisableColums="@HistoryDisableColums" VisibleRowNo HostColumnMerge="false">
|
||||
</TraGrid>
|
||||
</RadzenStack>
|
||||
</RadzenStack>
|
||||
}
|
||||
</RadzenStack>
|
||||
</RadzenStack>
|
||||
</ChildContent>
|
||||
</RadzenTabsItem>
|
||||
}
|
||||
@ -188,7 +253,7 @@
|
||||
}
|
||||
|
||||
Tabs.AddOrUpdate(
|
||||
new OrderdTab {Id = tabId, TabName = $"{EnumTabs.OverviewC1} ({tabId})" , EnumTab = EnumTabs.OverviewC1 },
|
||||
new OrderdTab {Id = tabId, TabName = $"{EnumTabs.OverviewC1} ({tabId})" , EnumTab = EnumTabs.OverviewC1, Parent = null },
|
||||
key => overviews.Cast<IDataModel>().ToList(), (key, oldValue) => overviews.Cast<IDataModel>().ToList());
|
||||
|
||||
SelectedTabIndex = Tabs.Count - 1;
|
||||
@ -196,38 +261,46 @@
|
||||
|
||||
private void OnSelectRowOverview(IDataModel overview)
|
||||
{
|
||||
SelectionStationName = $"{overview.StationName} ({overview.Host},{overview.Section})";
|
||||
SelectionProductNO = $"{overview.ProductNo} ({overview.TestCode})";
|
||||
SelectionParentInfo = $"{overview.ParentNo} ({overview.FileVersion},{overview.FileCode})";
|
||||
var selectOverview = overview as Overview;
|
||||
if(selectOverview is not null)
|
||||
{
|
||||
SelectionStationName = $"{selectOverview.StationName} ({selectOverview.Host},{selectOverview.Section})";
|
||||
SelectionProductNO = $"{selectOverview.ProductNo} ({selectOverview.TestCode})";
|
||||
SelectionParentInfo = $"{selectOverview.ParentNo} ({selectOverview.FileVersion},{selectOverview.FileCode})";
|
||||
|
||||
SelectionSearchBegin = $"{overview.TestDate?.ToString("yyyy-MM-dd")} {overview.FirstTestTime}";
|
||||
SelectionSearchEnd = $"{overview.TestDate?.ToString("yyyy-MM-dd")} {overview.FinalTestTime}";
|
||||
SelectionStepVersion = $"{overview.StepVersion}";
|
||||
SelectionSearchBegin = $"{selectOverview.TestDate?.ToString("yyyy-MM-dd")} {selectOverview.FirstTestTime}";
|
||||
SelectionSearchEnd = $"{selectOverview.TestDate?.ToString("yyyy-MM-dd")} {selectOverview.FinalTestTime}";
|
||||
SelectionStepVersion = $"{selectOverview.StepVersion}";
|
||||
}
|
||||
}
|
||||
|
||||
private async Task OnDoubleClickRowOverview(IDataModel row)
|
||||
{
|
||||
List<Overview> detailOverviews = new();
|
||||
|
||||
if (IsMergePartNumberOption == false)
|
||||
var selectRow = row as Overview;
|
||||
if(selectRow is not null)
|
||||
{
|
||||
detailOverviews = await CPXV2LogService.GetDetailOverview(SearchDataOverviews, row);
|
||||
}
|
||||
else
|
||||
{
|
||||
detailOverviews = await CPXV2LogService.GetDetailOverviewMerged(SearchDataOverviews, row);
|
||||
}
|
||||
List<Overview> detailOverviews = new();
|
||||
|
||||
int tabId = Tabs.Max(x => x.Key.Id) + 1;
|
||||
Tabs.AddOrUpdate(
|
||||
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.OverviewC1Detail} ({tabId})", EnumTab = EnumTabs.OverviewC1Detail },
|
||||
key => detailOverviews.Cast<IDataModel>().ToList(), (key, oldValue) => detailOverviews.Cast<IDataModel>().ToList());
|
||||
if (IsMergePartNumberOption == false)
|
||||
{
|
||||
detailOverviews = await CPXV2LogService.GetDetailOverview(SearchDataOverviews, selectRow);
|
||||
}
|
||||
else
|
||||
{
|
||||
detailOverviews = await CPXV2LogService.GetDetailOverviewMerged(SearchDataOverviews, selectRow);
|
||||
}
|
||||
|
||||
tabs.Reload();
|
||||
SelectedTabIndex = Tabs.Count - 1;
|
||||
int tabId = Tabs.Max(x => x.Key.Id) + 1;
|
||||
Tabs.AddOrUpdate(
|
||||
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.OverviewC1Detail} ({tabId})", EnumTab = EnumTabs.OverviewC1Detail, Parent = 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(IOverviewModel row)
|
||||
{
|
||||
List<TestHistory> histories = new();
|
||||
if (IsMergePartNumberOption == false)
|
||||
@ -241,13 +314,26 @@
|
||||
|
||||
int tabId = Tabs.Max(x => x.Key.Id) + 1;
|
||||
Tabs.AddOrUpdate(
|
||||
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.TestHistoryC1}({tabId})", EnumTab = EnumTabs.TestHistoryC1 },
|
||||
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.TestHistoryC1}({tabId})", EnumTab = EnumTabs.TestHistoryC1, Parent = row },
|
||||
key => histories.Cast<IDataModel>().ToList(), (key, oldValue) => histories.Cast<IDataModel>().ToList());
|
||||
|
||||
tabs.Reload();
|
||||
SelectedTabIndex = Tabs.Count - 1;
|
||||
}
|
||||
|
||||
private async Task OnDoubleClickRowHistory(IDataModel row)
|
||||
{
|
||||
var s = await CPXV2LogService.GetTestResult(row);
|
||||
|
||||
int tabId = Tabs.Max(x => x.Key.Id) + 1;
|
||||
Tabs.AddOrUpdate(
|
||||
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.TestResultC1}({tabId})", EnumTab = EnumTabs.TestResultC1, Parent = row },
|
||||
key => s.DecompressTestResult.Cast<IDataModel>().ToList(), (key, oldValue) => s.DecompressTestResult.Cast<IDataModel>().ToList());
|
||||
|
||||
tabs.Reload();
|
||||
SelectedTabIndex = Tabs.Count - 1;
|
||||
}
|
||||
|
||||
private void OnClickDetailOverviewContextMenu()
|
||||
{
|
||||
// DetailOverviews = OverviewService.SearchDetailOverview(SelectedDataService.SelectedOverview);
|
||||
|
||||
Reference in New Issue
Block a user