diff --git a/Adaptation/FileHandlers/OpenInsight/FileRead.cs b/Adaptation/FileHandlers/OpenInsight/FileRead.cs index 9959bcc..5e64512 100644 --- a/Adaptation/FileHandlers/OpenInsight/FileRead.cs +++ b/Adaptation/FileHandlers/OpenInsight/FileRead.cs @@ -118,8 +118,8 @@ public class FileRead : Shared.FileRead, IFileRead internal static string GetLines(Logistics logistics, List descriptions) { StringBuilder results = new(); + char del = '\t'; txt.Description x = descriptions[0]; - char del = x.MesEntity == x.Reactor ? '\t' : '~'; _ = results.Append(x.UniqueId).Append(del). Append(x.Run).Append(del). Append(x.Date).Append(del). @@ -141,15 +141,13 @@ public class FileRead : Shared.FileRead, IFileRead Append(x.FileName).Append(del). Append(x.Avg).Append(del). Append(x.StdDev).Append(del). - Append(x.SemiRadial).Append(del); + Append(x.SemiRadial); foreach (txt.Description description in descriptions) - { - _ = results.Append(description.Pt).Append(del). - Append(description.R).Append(del). - Append(description.T).Append(del). - Append(description.Rs).Append(del). - Append(description.Merit).Append(del); - }; + _ = results.Append(del).Append(description.Pt). + Append(del).Append(description.R). + Append(del).Append(description.T). + Append(del).Append(description.Rs). + Append(del).Append(description.Merit); return results.ToString(); } diff --git a/Adaptation/MET08RESIMAPCDE.Tests.csproj b/Adaptation/MET08RESIMAPCDE.Tests.csproj index c21e6f4..33bd291 100644 --- a/Adaptation/MET08RESIMAPCDE.Tests.csproj +++ b/Adaptation/MET08RESIMAPCDE.Tests.csproj @@ -33,7 +33,7 @@ Linux - + NU1701 NU1701 @@ -43,6 +43,7 @@ NU1701 NU1701 + @@ -53,10 +54,10 @@ - + - - + + NU1701 @@ -67,8 +68,8 @@ - - + + NU1701 diff --git a/Adaptation/Shared/Duplicator/Description.cs b/Adaptation/Shared/Duplicator/Description.cs index ee456bf..ee6eb49 100644 --- a/Adaptation/Shared/Duplicator/Description.cs +++ b/Adaptation/Shared/Duplicator/Description.cs @@ -110,6 +110,42 @@ public class Description : IDescription, Properties.IDescription List IDescription.GetDescriptions(IFileRead fileRead, Logistics logistics, List tests, IProcessData iProcessData) { List results = new(); + if (iProcessData is null || !iProcessData.Details.Any()) + results.Add(GetDefault(fileRead, logistics)); + else + { + string nullData; + Description description; + object configDataNullData = fileRead.NullData; + if (configDataNullData is null) + nullData = string.Empty; + else + nullData = configDataNullData.ToString(); + for (int i = 0; i < iProcessData.Details.Count; i++) + { + if (iProcessData.Details[i] is null) + continue; + description = new Description + { + Test = (int)tests[i], + Count = tests.Count, + Index = i, + // + EventName = fileRead.EventName, + NullData = nullData, + JobID = fileRead.CellInstanceName, + Sequence = logistics.Sequence.ToString(), + MesEntity = logistics.MesEntity, + ReportFullPath = logistics.ReportFullPath, + ProcessJobID = logistics.ProcessJobID, + MID = logistics.MID, + // + Date = DateTime.Now.ToString(GetDateFormat()), + RDS = string.Empty, + }; + results.Add(description); + } + } return results; }