diff --git a/Projects/WebClient/Web.Tra/Components/Module/TraGrid.razor b/Projects/WebClient/Web.Tra/Components/Module/TraGrid.razor index 24933da..568d3ec 100644 --- a/Projects/WebClient/Web.Tra/Components/Module/TraGrid.razor +++ b/Projects/WebClient/Web.Tra/Components/Module/TraGrid.razor @@ -122,9 +122,6 @@ private IList SelectedRow; - private string SummaryTestResult = string.Empty; - private string SummaryTestTime = string.Empty; - protected override async Task OnParametersSetAsync() { GlobalGridDisableFilter = configService?.GetConfig()?.GridDisableFilter.Where(x => x.EnumTabs == 1)?.FirstOrDefault(); diff --git a/Projects/WebClient/Web.Tra/Components/Pages/TRA.razor b/Projects/WebClient/Web.Tra/Components/Pages/TRA.razor index e09499a..8758734 100644 --- a/Projects/WebClient/Web.Tra/Components/Pages/TRA.razor +++ b/Projects/WebClient/Web.Tra/Components/Pages/TRA.razor @@ -107,9 +107,10 @@ - @* - - *@ + + + + @@ -345,10 +346,21 @@ { histories = await CPXV2LogService.GetTestHistoryMerged(SearchDataOverviews, row); } + + //test summary + int ok = histories.Count(x => x.TestResult.ToLower().Contains("ok")); + int ng = histories.Count(x => !x.TestResult.ToLower().Contains("ok")); + double ratio = (double)(ok) / (double)(ok + ng) * 100.0; + 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 = 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().ToList(), (key, oldValue) => histories.Cast().ToList()); tabs.Reload(); diff --git a/Projects/WebClient/Web.Tra/Model/OrderdTab.cs b/Projects/WebClient/Web.Tra/Model/OrderdTab.cs index 361c66f..a529591 100644 --- a/Projects/WebClient/Web.Tra/Model/OrderdTab.cs +++ b/Projects/WebClient/Web.Tra/Model/OrderdTab.cs @@ -9,5 +9,8 @@ namespace Web.Tra.Model public EnumTabs EnumTab { get; set; } public IDataModel Parent { get; set; } + + public string SummaryTestResult { get; set; } + public string SummaryTestTime { get; set; } } }