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

[성현모] HistoryMerged 조회 추가

Browse Source
This commit is contained in:
SHM
2025-09-05 09:15:48 +09:00
parent db28cfdec0
commit 95f137d543
6 changed files with 118 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
@inject ContextMenuService ContextMenuService
<RadzenDataGrid Style="height:calc(100vh - 23rem); font-size: 20px;" TItem="TDataModel" Data="@DataList" AllowPaging PageSize="@PageSize"
AllowFiltering FilterMode="FilterMode.Advanced" CellRender="@CellRender"
AllowFiltering FilterMode="FilterMode.Advanced" CellRender="@CellRender" AllowColumnResize
SelectionMode="DataGridSelectionMode.Single" @bind-Value="@SelectedRow"
CellContextMenu="@OnCellContextMenu" RowSelect="@SelectRow" RowDoubleClick="@OnRowDoublClick">
<Columns>
@ -12,7 +12,9 @@
{
<RadzenDataGridColumn Title="No.">
<Template>
@(DataList.ToList().IndexOf(context) + 1)
<span class="custom-rz-value">
@(DataList.ToList().IndexOf(context) + 1)
</span>
</Template>
</RadzenDataGridColumn>
}
@ -130,6 +132,9 @@
if (args.Column.Property.ToLower().Equals("host"))
{
if (HostColumnMerge == false)
return;
int rowCount = 0;
var take = DataList.Skip(index).Take(((index / PageSize) + 1) * PageSize - index);
foreach (var r in take)

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

@ -89,16 +89,24 @@
@if (tab.Key == EnumTabs.OverviewC1.ToString())
{
<TraGrid TDataModel="Overview" DataList="@Overviews" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@DisableColums"
OnDoubleClickRow="@OnDoubleClickRowOverview">
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@OverviewDisableColums"
OnDoubleClickRow="@OnDoubleClickRowOverview" HostColumnMerge>
</TraGrid>
}
@if (tab.Key == EnumTabs.OverviewC1Detail.ToString())
{
<TraGrid TDataModel="Overview" DataList="@DetailOverviews" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@DisableColums"
OnDoubleClickRow="@OnDoubleClickRowOverview">
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@OverviewDisableColums"
OnDoubleClickRow="@OnDoubleClickRowDetailOverview" HostColumnMerge>
</TraGrid>
}
@if (tab.Key.Contains(EnumTabs.TestHistoryC1.ToString()))
{
<TraGrid TDataModel="TestHistory" DataList="@TestHistories.Where(x=>x.Key == tab.Key).First().Value" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@HistoryDisableColums"
VisibleRowNo HostColumnMerge="false">
</TraGrid>
}
</ChildContent>
@ -121,7 +129,8 @@
//options
private bool IsMergePartNumberOption = false;
private int PageSize = 30;
private List<string> DisableColums = new List<string>();
private List<string> OverviewDisableColums = new List<string>();
private List<string> HistoryDisableColums = new List<string> { "testdate", "modelname", "firsttesttime", "finaltesttime", "testlistcntid" };
//tab
RadzenTabs tabs;
@ -132,6 +141,7 @@
List<SearchData> SearchDataOverviews = new List<SearchData>();
List<Overview> Overviews = new List<Overview>();
List<Overview> DetailOverviews = new List<Overview>();
Dictionary<string,List<TestHistory>> TestHistories = new();
private async Task OnSearch()
{
@ -155,9 +165,9 @@
private async Task GetOverviews()
{
DisableColums.Clear();
DisableColums.Add("rn");
DisableColums.Add("stepversion");
OverviewDisableColums.Clear();
OverviewDisableColums.Add("rn");
OverviewDisableColums.Add("stepversion");
if (IsMergePartNumberOption == false)
{
@ -165,10 +175,10 @@
}
else
{
DisableColums.Add("stationname");
DisableColums.Add("host");
DisableColums.Add("section");
DisableColums.Add("testlistcntid");
OverviewDisableColums.Add("stationname");
OverviewDisableColums.Add("host");
OverviewDisableColums.Add("section");
OverviewDisableColums.Add("testlistcntid");
Overviews = await CPXV2LogService.GetOverviewMerged(SearchDataOverviews);
}
}
@ -204,6 +214,29 @@
SelectedTabIndex = ListTabs.Keys.ToList().IndexOf(EnumTabs.OverviewC1Detail.ToString());
}
private async Task OnDoubleClickRowDetailOverview(IDataModel row)
{
var historyIndex = TestHistories.Count();
string histoiresKey = $"{EnumTabs.TestHistoryC1.ToString()}({historyIndex + 1})";
if (IsMergePartNumberOption == false)
{
var getHistories = await CPXV2LogService.GetTestHistory(SearchDataOverviews, row);
TestHistories.Add(histoiresKey, getHistories);
}
else
{
var getHistories = await CPXV2LogService.GetTestHistoryMerged(SearchDataOverviews, row);
TestHistories.Add(histoiresKey, getHistories);
}
//tab control
ListTabs.Add(histoiresKey, EnumTabs.TestHistoryC1);
tabs.Reload();
SelectedTabIndex = ListTabs.Count - 1;
}
private void OnClickDetailOverviewContextMenu()
{
// DetailOverviews = OverviewService.SearchDetailOverview(SelectedDataService.SelectedOverview);