Save ProcessDataStandardFormat to EC_Metrology_Si

IDescription.GetDescriptions with body
nuget bump

Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs

@@ -6,6 +6,7 @@ using Adaptation.Shared.Methods;
 using Adaptation.Shared.Metrology;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
@@ -16,6 +17,7 @@ public class FileRead : Shared.FileRead, IFileRead
 {
 
     private readonly string _OpenInsightMetrologyViewerAPI;
+    private readonly string _OpenInsightMetrologyViewerFileShare;
 
     public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
         base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
@@ -29,6 +31,7 @@ public class FileRead : Shared.FileRead, IFileRead
             throw new Exception(cellInstanceConnectionName);
         if (!_IsDuplicator)
             throw new Exception(cellInstanceConnectionName);
+        _OpenInsightMetrologyViewerFileShare = @"\\messv02ecc1.ec.local\EC_Metrology_Si\MetrologyAttachments\SRPRunHeader_";
         _OpenInsightMetrologyViewerAPI = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerAPI");
     }
 
@@ -107,11 +110,15 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-#pragma warning disable IDE0060
+    private void SendData(string reportFullPath, DateTime dateTime, List<json.Description> descriptions)
-    private void SendData(DateTime dateTime, List<json.Description> descriptions)
-#pragma warning restore IDE0060
     {
-        WSRequest wsRequest = new(this, _Logistics, descriptions);
+        int weekOfYear = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
+        string directory = Path.Combine(_OpenInsightMetrologyViewerFileShare, dateTime.Year.ToString(), $"WW{weekOfYear:00}", _Logistics.Sequence.ToString());
+        if (!Directory.Exists(directory))
+            _ = Directory.CreateDirectory(directory);
+        string fullPath = Path.Combine(directory, Path.GetFileName(reportFullPath));
+        File.Copy(reportFullPath, fullPath);
+        WSRequest wsRequest = new(this, _Logistics, descriptions, fullPath);
         (string json, WS.Results wsResults) = WS.SendData(_OpenInsightMetrologyViewerAPI, wsRequest);
         if (!wsResults.Success)
             throw new Exception(wsResults.ToString());
@@ -134,7 +141,7 @@ public class FileRead : Shared.FileRead, IFileRead
         List<json.Description> descriptions = json.ProcessData.GetDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            SendData(dateTime, descriptions);
+            SendData(reportFullPath, dateTime, descriptions);
         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         return results;
     }

Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs

@@ -30,13 +30,15 @@ public class WSRequest
     public string SineBevelAngle { get; set; }
     public string XStep { get; set; }
     public List<json.Detail> Details { get; protected set; }
+    public string ProcessDataStandardFormat { get; set; }
 
     [Obsolete("For json")] public WSRequest() { }
 
 #pragma warning disable IDE0060
-    internal WSRequest(IFileRead fileRead, Logistics logistics, List<json.Description> descriptions)
+    internal WSRequest(IFileRead fileRead, Logistics logistics, List<json.Description> descriptions, string processDataStandardFormat = null)
 #pragma warning restore IDE0060
     {
+        ProcessDataStandardFormat = processDataStandardFormat;
         Id = 0;
         FilePath = string.Empty;
         CellName = logistics.MesEntity;

Adaptation/MET08RESISRP2100.Tests.csproj

@@ -33,7 +33,7 @@
         <DefineConstants>Linux</DefineConstants>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="3.2.0" />
+        <PackageReference Include="coverlet.collector" Version="6.0.0" />
         <PackageReference Include="FFMpegCore" Version="5.1.0" />
         <PackageReference Include="IKVM.AWT.WinForms" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
         <PackageReference Include="IKVM.OpenJDK.Core" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
@@ -53,10 +53,10 @@
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
         <PackageReference Include="Microsoft.Win32.SystemEvents" Version="7.0.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.0.4" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.0.4" />
         <PackageReference Include="Pdfbox" Version="1.1.1"><NoWarn>NU1701</NoWarn></PackageReference>
         <PackageReference Include="RoboSharp" Version="1.2.8" />
         <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
@@ -67,8 +67,8 @@
         <PackageReference Include="Tesseract" Version="5.2.0" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Tibco.Rendezvous" Version="8.5.0" />
+        <PackageReference Include="Tibco.Rendezvous.DotNetCore" Version="8.5.0" />
-        <PackageReference Include="Infineon.Yoda" Version="5.4.1" />
+        <PackageReference Include="Infineon.Yoda.DotNetCore" Version="5.4.1" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Infineon.Mesa.PDF.Text.Stripper" Version="4.8.0.1"><NoWarn>NU1701</NoWarn></PackageReference>

Adaptation/Shared/Duplicator/Description.cs

@@ -110,6 +110,42 @@ public class Description : IDescription, Properties.IDescription
     List<IDescription> IDescription.GetDescriptions(IFileRead fileRead, Logistics logistics, List<Test> tests, IProcessData iProcessData)
     {
         List<IDescription> 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;
     }