[성현모] DataModel분리, TestResult 페이지/기능 추가
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
53
Projects/SystemX.Core/SystemX.Core/Utils/Gzip.cs
Normal file
53
Projects/SystemX.Core/SystemX.Core/Utils/Gzip.cs
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO.Compression;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace SystemX.Core.Utils
|
||||||
|
{
|
||||||
|
public static class Gzip
|
||||||
|
{
|
||||||
|
public static string Compress(string stringData)
|
||||||
|
{
|
||||||
|
byte[] bytes = Encoding.UTF8.GetBytes(stringData);
|
||||||
|
byte[] inArray = null;
|
||||||
|
using (MemoryStream memoryStream = new MemoryStream())
|
||||||
|
{
|
||||||
|
using (GZipStream gZipStream = new GZipStream(memoryStream, CompressionMode.Compress))
|
||||||
|
{
|
||||||
|
gZipStream.Write(bytes, 0, bytes.Length);
|
||||||
|
}
|
||||||
|
|
||||||
|
inArray = memoryStream.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Convert.ToBase64String(inArray);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string Decompression(string compressedDataStr)
|
||||||
|
{
|
||||||
|
string result = null;
|
||||||
|
byte[] buffer = Convert.FromBase64String(compressedDataStr);
|
||||||
|
using (MemoryStream stream = new MemoryStream(buffer))
|
||||||
|
{
|
||||||
|
using GZipStream stream2 = new GZipStream(stream, CompressionMode.Decompress);
|
||||||
|
using StreamReader streamReader = new StreamReader(stream2);
|
||||||
|
result = streamReader.ReadToEnd();
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string GzipCompress(this string stringData)
|
||||||
|
{
|
||||||
|
return Compress(stringData);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string GzipDecompress(this string compressedDataStr)
|
||||||
|
{
|
||||||
|
return Decompression(compressedDataStr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -2,18 +2,7 @@
|
|||||||
|
|
||||||
@inject ContextMenuService ContextMenuService
|
@inject ContextMenuService ContextMenuService
|
||||||
|
|
||||||
<RadzenCard Style="height: 5.6rem; font-size: 1.5rem;" class="rz-mb-3 rz-p-0">
|
<RadzenDataGrid class="rz-shadow-1" TItem="TDataModel" Data="@DataList" AllowPaging="@AllowPaging" PageSize="@PageSize"
|
||||||
<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="@SummaryTestResult"></RadzenLabel>
|
|
||||||
<RadzenLabel class="rz-ml-10" Text="@SummaryTestTime"></RadzenLabel>
|
|
||||||
</RadzenStack>
|
|
||||||
</RadzenCard>
|
|
||||||
|
|
||||||
<RadzenDataGrid Style="height:calc(100vh - 30rem);" TItem="TDataModel" Data="@DataList" AllowPaging PageSize="@PageSize"
|
|
||||||
AllowFiltering FilterMode="FilterMode.Advanced" CellRender="@CellRender" AllowColumnResize
|
AllowFiltering FilterMode="FilterMode.Advanced" CellRender="@CellRender" AllowColumnResize
|
||||||
SelectionMode="DataGridSelectionMode.Single" @bind-Value="@SelectedRow"
|
SelectionMode="DataGridSelectionMode.Single" @bind-Value="@SelectedRow"
|
||||||
RowSelect="@SelectRow" RowDoubleClick="@OnRowDoublClick">
|
RowSelect="@SelectRow" RowDoubleClick="@OnRowDoublClick">
|
||||||
@ -117,6 +106,9 @@
|
|||||||
[Parameter]
|
[Parameter]
|
||||||
public bool HostColumnMerge { get; set; }
|
public bool HostColumnMerge { get; set; }
|
||||||
|
|
||||||
|
[Parameter]
|
||||||
|
public bool AllowPaging { get; set; } = true;
|
||||||
|
|
||||||
[Parameter]
|
[Parameter]
|
||||||
public int PageSize { get; set; } = 30;
|
public int PageSize { get; set; } = 30;
|
||||||
|
|
||||||
@ -128,25 +120,6 @@
|
|||||||
private string SummaryTestResult = string.Empty;
|
private string SummaryTestResult = string.Empty;
|
||||||
private string SummaryTestTime = string.Empty;
|
private string SummaryTestTime = string.Empty;
|
||||||
|
|
||||||
protected override async Task OnParametersSetAsync()
|
|
||||||
{
|
|
||||||
if(typeof(TDataModel) == typeof(TestHistory))
|
|
||||||
{
|
|
||||||
var dataList = DataList.Cast<TestHistory>();
|
|
||||||
|
|
||||||
int ok = dataList.Count(x => x.TestResult.ToLower().Contains("ok"));
|
|
||||||
int ng = dataList.Count(x => !x.TestResult.ToLower().Contains("ok"));
|
|
||||||
double ratio = (double)(ok) / (double)(ok + ng) * 100.0;
|
|
||||||
|
|
||||||
double testTimeAvg = dataList.Average(x => Convert.ToInt32(x.Duration)) / 1000.0;
|
|
||||||
double testTimeMin = dataList.Min(x => Convert.ToInt32(x.Duration)) / 1000.0;
|
|
||||||
double testTimeMax = dataList.Max(x => Convert.ToInt32(x.Duration)) / 1000.0;
|
|
||||||
|
|
||||||
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";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void CellRender(DataGridCellRenderEventArgs<TDataModel> args)
|
private void CellRender(DataGridCellRenderEventArgs<TDataModel> args)
|
||||||
{
|
{
|
||||||
if (args.Column.Property == null)
|
if (args.Column.Property == null)
|
||||||
@ -205,29 +178,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// private async Task OnCellContextMenu(DataGridCellMouseEventArgs<TDataModel> args)
|
|
||||||
// {
|
|
||||||
// SelectedRow = new List<TDataModel>() { args.Data };
|
|
||||||
|
|
||||||
// ContextMenuService.Open(args,
|
|
||||||
// new List<ContextMenuItem> {
|
|
||||||
// new ContextMenuItem(){ Text = "Overview", Value = 1, Icon = "home" },
|
|
||||||
// new ContextMenuItem(){ Text = "Detail Overview", Value =2 , Icon = "assessment" },
|
|
||||||
// new ContextMenuItem(){ Text = "Test History", Value = 3, Icon = "description" },
|
|
||||||
// new ContextMenuItem(){ Text = "Test Summary", Value = 4, Icon = "assignment_turned_in" },
|
|
||||||
// new ContextMenuItem(){ Text = "Detail Data", Value = 5, Icon = "list" },
|
|
||||||
// new ContextMenuItem(){ Text = "Test-Error/Extended Search", Value = 6, Icon = "search" },
|
|
||||||
// },
|
|
||||||
// (e) =>
|
|
||||||
// {
|
|
||||||
// ContextMenuService.Close();
|
|
||||||
// OnClickContextMenu.InvokeAsync();
|
|
||||||
// }
|
|
||||||
// );
|
|
||||||
|
|
||||||
// await OnSelectRow.InvokeAsync(args.Data);
|
|
||||||
// }
|
|
||||||
|
|
||||||
private async Task SelectRow(TDataModel data)
|
private async Task SelectRow(TDataModel data)
|
||||||
{
|
{
|
||||||
await OnSelectRow.InvokeAsync(data);
|
await OnSelectRow.InvokeAsync(data);
|
||||||
|
|||||||
@ -79,7 +79,7 @@
|
|||||||
</RadzenStack>
|
</RadzenStack>
|
||||||
|
|
||||||
<!--Data Grid-->
|
<!--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>
|
<Tabs>
|
||||||
@foreach (var tab in Tabs.OrderBy(x=>x.Key.Id))
|
@foreach (var tab in Tabs.OrderBy(x=>x.Key.Id))
|
||||||
{
|
{
|
||||||
@ -88,7 +88,23 @@
|
|||||||
<span style="margin-right: 1rem; font-size: 1.5rem;">@context.Text</span>
|
<span style="margin-right: 1rem; font-size: 1.5rem;">@context.Text</span>
|
||||||
<RadzenButton Size="ButtonSize.Small" Icon="close" Click="@(()=>OnClickClose(tab.Key.Id))"></RadzenButton>
|
<RadzenButton Size="ButtonSize.Small" Icon="close" Click="@(()=>OnClickClose(tab.Key.Id))"></RadzenButton>
|
||||||
</Template>
|
</Template>
|
||||||
|
|
||||||
<ChildContent>
|
<ChildContent>
|
||||||
|
<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>
|
||||||
|
|
||||||
|
<RadzenStack Style="height:calc(100vh - 29rem);">
|
||||||
@if (tab.Key.EnumTab == EnumTabs.OverviewC1)
|
@if (tab.Key.EnumTab == EnumTabs.OverviewC1)
|
||||||
{
|
{
|
||||||
<TraGrid TDataModel="Overview" DataList="@(tab.Value.Cast<Overview>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
|
<TraGrid TDataModel="Overview" DataList="@(tab.Value.Cast<Overview>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
|
||||||
@ -109,9 +125,58 @@
|
|||||||
{
|
{
|
||||||
<TraGrid TDataModel="TestHistory" DataList="@(tab.Value.Cast<TestHistory>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
|
<TraGrid TDataModel="TestHistory" DataList="@(tab.Value.Cast<TestHistory>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
|
||||||
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@HistoryDisableColums"
|
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@HistoryDisableColums"
|
||||||
VisibleRowNo HostColumnMerge="false">
|
OnDoubleClickRow="@OnDoubleClickRowHistory" VisibleRowNo HostColumnMerge="false">
|
||||||
</TraGrid>
|
</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>
|
</ChildContent>
|
||||||
</RadzenTabsItem>
|
</RadzenTabsItem>
|
||||||
}
|
}
|
||||||
@ -188,7 +253,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
Tabs.AddOrUpdate(
|
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());
|
key => overviews.Cast<IDataModel>().ToList(), (key, oldValue) => overviews.Cast<IDataModel>().ToList());
|
||||||
|
|
||||||
SelectedTabIndex = Tabs.Count - 1;
|
SelectedTabIndex = Tabs.Count - 1;
|
||||||
@ -196,38 +261,46 @@
|
|||||||
|
|
||||||
private void OnSelectRowOverview(IDataModel overview)
|
private void OnSelectRowOverview(IDataModel overview)
|
||||||
{
|
{
|
||||||
SelectionStationName = $"{overview.StationName} ({overview.Host},{overview.Section})";
|
var selectOverview = overview as Overview;
|
||||||
SelectionProductNO = $"{overview.ProductNo} ({overview.TestCode})";
|
if(selectOverview is not null)
|
||||||
SelectionParentInfo = $"{overview.ParentNo} ({overview.FileVersion},{overview.FileCode})";
|
{
|
||||||
|
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}";
|
SelectionSearchBegin = $"{selectOverview.TestDate?.ToString("yyyy-MM-dd")} {selectOverview.FirstTestTime}";
|
||||||
SelectionSearchEnd = $"{overview.TestDate?.ToString("yyyy-MM-dd")} {overview.FinalTestTime}";
|
SelectionSearchEnd = $"{selectOverview.TestDate?.ToString("yyyy-MM-dd")} {selectOverview.FinalTestTime}";
|
||||||
SelectionStepVersion = $"{overview.StepVersion}";
|
SelectionStepVersion = $"{selectOverview.StepVersion}";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task OnDoubleClickRowOverview(IDataModel row)
|
private async Task OnDoubleClickRowOverview(IDataModel row)
|
||||||
|
{
|
||||||
|
var selectRow = row as Overview;
|
||||||
|
if(selectRow is not null)
|
||||||
{
|
{
|
||||||
List<Overview> detailOverviews = new();
|
List<Overview> detailOverviews = new();
|
||||||
|
|
||||||
if (IsMergePartNumberOption == false)
|
if (IsMergePartNumberOption == false)
|
||||||
{
|
{
|
||||||
detailOverviews = await CPXV2LogService.GetDetailOverview(SearchDataOverviews, row);
|
detailOverviews = await CPXV2LogService.GetDetailOverview(SearchDataOverviews, selectRow);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
detailOverviews = await CPXV2LogService.GetDetailOverviewMerged(SearchDataOverviews, row);
|
detailOverviews = await CPXV2LogService.GetDetailOverviewMerged(SearchDataOverviews, selectRow);
|
||||||
}
|
}
|
||||||
|
|
||||||
int tabId = Tabs.Max(x => x.Key.Id) + 1;
|
int tabId = Tabs.Max(x => x.Key.Id) + 1;
|
||||||
Tabs.AddOrUpdate(
|
Tabs.AddOrUpdate(
|
||||||
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.OverviewC1Detail} ({tabId})", EnumTab = EnumTabs.OverviewC1Detail },
|
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.OverviewC1Detail} ({tabId})", EnumTab = EnumTabs.OverviewC1Detail, Parent = row },
|
||||||
key => detailOverviews.Cast<IDataModel>().ToList(), (key, oldValue) => detailOverviews.Cast<IDataModel>().ToList());
|
key => detailOverviews.Cast<IDataModel>().ToList(), (key, oldValue) => detailOverviews.Cast<IDataModel>().ToList());
|
||||||
|
|
||||||
tabs.Reload();
|
tabs.Reload();
|
||||||
SelectedTabIndex = Tabs.Count - 1;
|
SelectedTabIndex = Tabs.Count - 1;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private async Task OnDoubleClickRowDetailOverview(IDataModel row)
|
private async Task OnDoubleClickRowDetailOverview(IOverviewModel row)
|
||||||
{
|
{
|
||||||
List<TestHistory> histories = new();
|
List<TestHistory> histories = new();
|
||||||
if (IsMergePartNumberOption == false)
|
if (IsMergePartNumberOption == false)
|
||||||
@ -241,13 +314,26 @@
|
|||||||
|
|
||||||
int tabId = Tabs.Max(x => x.Key.Id) + 1;
|
int tabId = Tabs.Max(x => x.Key.Id) + 1;
|
||||||
Tabs.AddOrUpdate(
|
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());
|
key => histories.Cast<IDataModel>().ToList(), (key, oldValue) => histories.Cast<IDataModel>().ToList());
|
||||||
|
|
||||||
tabs.Reload();
|
tabs.Reload();
|
||||||
SelectedTabIndex = Tabs.Count - 1;
|
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()
|
private void OnClickDetailOverviewContextMenu()
|
||||||
{
|
{
|
||||||
// DetailOverviews = OverviewService.SearchDetailOverview(SelectedDataService.SelectedOverview);
|
// DetailOverviews = OverviewService.SearchDetailOverview(SelectedDataService.SelectedOverview);
|
||||||
|
|||||||
@ -1,4 +1,7 @@
|
|||||||
using Web.Tra.Model;
|
using Newtonsoft.Json;
|
||||||
|
using SystemX.Core.DB;
|
||||||
|
using Web.Tra.Model;
|
||||||
|
using SystemX.Core.Utils;
|
||||||
|
|
||||||
public static class ObjectExtend
|
public static class ObjectExtend
|
||||||
{
|
{
|
||||||
@ -83,4 +86,22 @@ public static class ObjectExtend
|
|||||||
TestListReqID = data.Summary.TestListCntID
|
TestListReqID = data.Summary.TestListCntID
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static List<DecompressTestResult> ToTestResult(this HIST_TestResult histTestResult)
|
||||||
|
{
|
||||||
|
var decompStr = histTestResult?.LogData.GzipDecompress();
|
||||||
|
var logData = JsonConvert.DeserializeObject<List<DecompressTestResult>>(decompStr);
|
||||||
|
|
||||||
|
foreach (var log in logData)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(log.Message) == false)
|
||||||
|
log.MesauredValue = log.Message;
|
||||||
|
else if (string.IsNullOrEmpty(log.MeasValStr) == false)
|
||||||
|
log.MesauredValue = log.MeasValStr;
|
||||||
|
else
|
||||||
|
log.MesauredValue = log.MeasVal.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
return logData;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -6,6 +6,7 @@
|
|||||||
OverviewC1 = 10,
|
OverviewC1 = 10,
|
||||||
OverviewC1Detail = 20,
|
OverviewC1Detail = 20,
|
||||||
TestHistoryC1 = 30,
|
TestHistoryC1 = 30,
|
||||||
|
TestResultC1 = 40,
|
||||||
End = 10000
|
End = 10000
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,18 +3,7 @@
|
|||||||
public interface IDataModel
|
public interface IDataModel
|
||||||
{
|
{
|
||||||
public DateTime? TestDate { get; set; }
|
public DateTime? TestDate { get; set; }
|
||||||
public string StationName { get; set; }
|
|
||||||
public string Host { get; set; }
|
public string Host { get; set; }
|
||||||
public string Section { get; set; }
|
|
||||||
public string ModelName { get; set; }
|
public string ModelName { get; set; }
|
||||||
public string ProductNo { get; set; }
|
|
||||||
public string TestCode { get; set; }
|
|
||||||
public string ParentNo { get; set; }
|
|
||||||
public string FileCode { get; set; }
|
|
||||||
public string FileVersion { get; set; }
|
|
||||||
public int? StepVersion { get; set; }
|
|
||||||
public string FirstTestTime { get; set; }
|
|
||||||
public string FinalTestTime { get; set; }
|
|
||||||
public string TestListCntID { get; set; }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
20
Projects/WebClient/Web.Tra/Model/IOverviewModel.cs
Normal file
20
Projects/WebClient/Web.Tra/Model/IOverviewModel.cs
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
namespace Web.Tra.Model
|
||||||
|
{
|
||||||
|
public interface IOverviewModel : IDataModel
|
||||||
|
{
|
||||||
|
public DateTime? TestDate { get; set; }
|
||||||
|
public string StationName { get; set; }
|
||||||
|
public string Host { get; set; }
|
||||||
|
public string Section { get; set; }
|
||||||
|
public string ModelName { get; set; }
|
||||||
|
public string ProductNo { get; set; }
|
||||||
|
public string TestCode { get; set; }
|
||||||
|
public string ParentNo { get; set; }
|
||||||
|
public string FileCode { get; set; }
|
||||||
|
public string FileVersion { get; set; }
|
||||||
|
public int? StepVersion { get; set; }
|
||||||
|
public string FirstTestTime { get; set; }
|
||||||
|
public string FinalTestTime { get; set; }
|
||||||
|
public string TestListCntID { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
7
Projects/WebClient/Web.Tra/Model/ITestResultModel.cs
Normal file
7
Projects/WebClient/Web.Tra/Model/ITestResultModel.cs
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
namespace Web.Tra.Model
|
||||||
|
{
|
||||||
|
public interface ITestResultModel : IDataModel
|
||||||
|
{
|
||||||
|
public long No { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -7,5 +7,7 @@ namespace Web.Tra.Model
|
|||||||
public int Id { get; set; }
|
public int Id { get; set; }
|
||||||
public string TabName { get; set; }
|
public string TabName { get; set; }
|
||||||
public EnumTabs EnumTab { get; set; }
|
public EnumTabs EnumTab { get; set; }
|
||||||
|
|
||||||
|
public IDataModel Parent { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
namespace Web.Tra.Model
|
namespace Web.Tra.Model
|
||||||
{
|
{
|
||||||
public class Overview : IDataModel
|
public class Overview : IOverviewModel
|
||||||
{
|
{
|
||||||
public DateTime? TestDate { get; set; }
|
public DateTime? TestDate { get; set; }
|
||||||
public string StationName { get; set; }
|
public string StationName { get; set; }
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
namespace Web.Tra.Model
|
namespace Web.Tra.Model
|
||||||
{
|
{
|
||||||
public class TestHistory : IDataModel
|
public class TestHistory : IOverviewModel
|
||||||
{
|
{
|
||||||
public long No { get; set; }
|
public long No { get; set; }
|
||||||
public DateTime? TestDate { get; set; }
|
public DateTime? TestDate { get; set; }
|
||||||
|
|||||||
45
Projects/WebClient/Web.Tra/Model/TestResult.cs
Normal file
45
Projects/WebClient/Web.Tra/Model/TestResult.cs
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
|
||||||
|
namespace Web.Tra.Model
|
||||||
|
{
|
||||||
|
public class TestResult : ITestResultModel
|
||||||
|
{
|
||||||
|
public long No { get; set; }
|
||||||
|
|
||||||
|
public DateTime? TestDate { get; set; }
|
||||||
|
public string StationName { get; set; }
|
||||||
|
public string Host { get; set; }
|
||||||
|
public string Section { get; set; }
|
||||||
|
public string ModelName { get; set; }
|
||||||
|
public string ProductNo { get; set; }
|
||||||
|
public string TestCode { get; set; }
|
||||||
|
public string ParentNo { get; set; }
|
||||||
|
public string FileCode { get; set; }
|
||||||
|
public string FileVersion { get; set; }
|
||||||
|
public int? StepVersion { get; set; }
|
||||||
|
public string FirstTestTime { get; set; }
|
||||||
|
public string FinalTestTime { get; set; }
|
||||||
|
public string TestListCntID { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
public List<DecompressTestResult> DecompressTestResult { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class DecompressTestResult : ITestResultModel
|
||||||
|
{
|
||||||
|
public long No { get; set; }
|
||||||
|
public DateTime? TestDate { get; set; }
|
||||||
|
public string StationName { get; set; }
|
||||||
|
public string Host { get; set; }
|
||||||
|
public string ModelName { get; set; }
|
||||||
|
|
||||||
|
public int StepID { get; set; }
|
||||||
|
public double MeasVal { get; set; }
|
||||||
|
public string MeasValStr { get; set; }
|
||||||
|
public string Message { get; set; }
|
||||||
|
public string GlobalMin { get; set; }
|
||||||
|
public string MesauredValue { get; set; }
|
||||||
|
public string GlobalMax { get; set; }
|
||||||
|
public string Result { get; set; }
|
||||||
|
public string SpentTime { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -114,7 +114,7 @@ namespace Web.Tra.Services
|
|||||||
return group.ToList();
|
return group.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<List<Overview>> GetDetailOverview(List<SearchData> request, IDataModel row)
|
public async Task<List<Overview>> GetDetailOverview(List<SearchData> request, IOverviewModel row)
|
||||||
{
|
{
|
||||||
var detailOverview = request
|
var detailOverview = request
|
||||||
.Where(x => x.Summary.HostID == row.Host &&
|
.Where(x => x.Summary.HostID == row.Host &&
|
||||||
@ -134,7 +134,7 @@ namespace Web.Tra.Services
|
|||||||
return detailOverview.ToList();
|
return detailOverview.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<List<Overview>> GetDetailOverviewMerged(List<SearchData> request, IDataModel row)
|
public async Task<List<Overview>> GetDetailOverviewMerged(List<SearchData> request, IOverviewModel row)
|
||||||
{
|
{
|
||||||
var detailOverview = request
|
var detailOverview = request
|
||||||
.Where(x => x.Summary.Testcode == row.TestCode &&
|
.Where(x => x.Summary.Testcode == row.TestCode &&
|
||||||
@ -151,7 +151,7 @@ namespace Web.Tra.Services
|
|||||||
return detailOverview.ToList();
|
return detailOverview.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<List<TestHistory>> GetTestHistory(List<SearchData> request, IDataModel row)
|
public async Task<List<TestHistory>> GetTestHistory(List<SearchData> request, IOverviewModel row)
|
||||||
{
|
{
|
||||||
var testHistory = request
|
var testHistory = request
|
||||||
.Where(x => x.Summary.TestDT.Date == row.TestDate.Value.Date &&
|
.Where(x => x.Summary.TestDT.Date == row.TestDate.Value.Date &&
|
||||||
@ -166,7 +166,7 @@ namespace Web.Tra.Services
|
|||||||
return testHistory.ToList();
|
return testHistory.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<List<TestHistory>> GetTestHistoryMerged(List<SearchData> request, IDataModel row)
|
public async Task<List<TestHistory>> GetTestHistoryMerged(List<SearchData> request, IOverviewModel row)
|
||||||
{
|
{
|
||||||
var testHistory = request
|
var testHistory = request
|
||||||
.Where(x => x.Summary.TestDT.Date == row.TestDate.Value.Date &&
|
.Where(x => x.Summary.TestDT.Date == row.TestDate.Value.Date &&
|
||||||
@ -179,6 +179,37 @@ namespace Web.Tra.Services
|
|||||||
return testHistory.ToList();
|
return testHistory.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<TestResult> GetTestResult(IDataModel row)
|
||||||
|
{
|
||||||
|
TestResult result = new TestResult();
|
||||||
|
|
||||||
|
var selectRow = row as TestHistory;
|
||||||
|
if(selectRow is not null)
|
||||||
|
{
|
||||||
|
int year = selectRow.TestDate.Value.Year;
|
||||||
|
|
||||||
|
using (var scope = _scopeFactory.CreateScope())
|
||||||
|
{
|
||||||
|
var provider = scope.ServiceProvider.GetRequiredService<DbContextProvider>();
|
||||||
|
using (var context = GetDBContext<CPXV2Log>(provider, year))
|
||||||
|
{
|
||||||
|
if (context is not null)
|
||||||
|
{
|
||||||
|
var testResult = context.HIST_TestResults.Where(x => x.No == selectRow.No)?.First();
|
||||||
|
var decompressTestResult = testResult.ToTestResult();
|
||||||
|
|
||||||
|
result.DecompressTestResult = decompressTestResult;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
result.No = selectRow.No;
|
||||||
|
}
|
||||||
|
|
||||||
|
await Task.CompletedTask;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
//Get DBContext
|
//Get DBContext
|
||||||
private T? GetDBContext<T>(DbContextProvider provider, int dbID) where T : DbContext
|
private T? GetDBContext<T>(DbContextProvider provider, int dbID) where T : DbContext
|
||||||
{
|
{
|
||||||
|
|||||||
@ -101,6 +101,7 @@ h1:focus {
|
|||||||
font-size: 1.5rem !important;
|
font-size: 1.5rem !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*common*/
|
||||||
span{
|
span{
|
||||||
font-size: 1.5rem;
|
font-size: 1.5rem;
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user