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

[성현모] Overview 예외 추가

Browse Source
This commit is contained in:
SHM
2025-09-04 10:35:17 +09:00
parent 9a18f51bef
commit e36a7ba8a6
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,7 @@
private void CellRender(DataGridCellRenderEventArgs<TDataModel> args) private void CellRender(DataGridCellRenderEventArgs<TDataModel> args)
{ {
if (args.Column.Property == null || !args.Column.Property.ToLower().Equals("testdate")) if (args.Column.Property == null)
return; return;
int index = DataList.ToList().FindIndex(x => x.Equals(args.Data)); int index = DataList.ToList().FindIndex(x => x.Equals(args.Data));
@ -124,6 +124,26 @@
if (rowCount > 0) if (rowCount > 0)
args.Attributes.Add("rowspan", rowCount); args.Attributes.Add("rowspan", rowCount);
} }
if (args.Column.Property.ToLower().Equals("host"))
{
int rowCount = 0;
var take = DataList.Skip(index).Take(((index / PageSize) + 1) * PageSize - index);
foreach (var r in take)
{
if (r.Host == args.Data.Host)
{
rowCount += 1;
}
else
{
break;
}
}
args.Attributes.Clear();
if (rowCount > 0)
args.Attributes.Add("rowspan", rowCount);
}
} }
private async Task OnCellContextMenu(DataGridCellMouseEventArgs<TDataModel> args) private async Task OnCellContextMenu(DataGridCellMouseEventArgs<TDataModel> args)

1
Projects/WebClient/Web.Tra/Model/IDataModel.cs
View File

@ -4,5 +4,6 @@
{ {
public DateTime? TestDate { get; set; } public DateTime? TestDate { get; set; }
public string ModelName { get; set; } public string ModelName { get; set; }
public string Host { get; set; }
} }
} }

19
Projects/WebClient/Web.Tra/Services/CPXV2LogService.cs
View File

@ -83,16 +83,18 @@ namespace Web.Tra.Services
var group = request var group = request
.GroupBy(x => (x.Summary.HostID, x.Summary.Section)) .GroupBy(x => (x.Summary.HostID, x.Summary.Section))
.Select(x => x.ToOverview()) .Select(x => x.ToOverview())
.OrderBy(x => x.Host); .OrderBy(x => (x.Host, x.Section));
await Task.CompletedTask; await Task.CompletedTask;
return group.OrderBy(x => x.TestDate).ToList(); return group.ToList();
} }
public async Task<List<Overview>> GetOverviewMerged(List<SearchData> request) public async Task<List<Overview>> GetOverviewMerged(List<SearchData> request)
{ {
var group = request.OrderByDescending(x=>x.Summary.TestDT).GroupBy(x => var group = request.OrderByDescending(x=>x.Summary.TestDT)
(DateOnly.FromDateTime(x.Summary.TestDT.Date), .GroupBy(x =>
(
DateOnly.FromDateTime(x.Summary.TestDT.Date),
x.Summary.TestType, x.Summary.TestType,
x.Summary.ProdNo_C, x.Summary.ProdNo_C,
x.Summary.Testcode, x.Summary.Testcode,
@ -101,11 +103,12 @@ namespace Web.Tra.Services
x.Summary.ProdNo_P, x.Summary.ProdNo_P,
x.Summary.ProdCode, x.Summary.ProdCode,
x.Summary.Version, x.Summary.Version,
x.Summary.StepVersion)) x.Summary.StepVersion
))
.Select(x => x.ToOverviewMerged()) .Select(x => x.ToOverviewMerged())
.DistinctBy(x => (x.TestType, x.ProductNo, x.TestCode, .OrderByDescending(x=>x.TestDate)
x.ParentNo,x.FileCode, x.FileVersion)) .DistinctBy(x => (x.TestType, x.ProductNo, x.TestCode))
.OrderBy(x => (x.ProductNo, x.ParentNo)); .OrderBy(x => (x.ProductNo, x.ParentNo, x.TestCode));
await Task.CompletedTask; await Task.CompletedTask;
return group.ToList(); return group.ToList();