From 839a08eda70026639cd3eacc7cd08ca85beabab1 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Mon, 24 Jul 2023 10:40:44 -0700 Subject: [PATCH] Back to x64 to pass tests Directory Trigger for OI Remove extra .vscode files Viewer support tasks.json kanbn initialize WSRequest alignment --- .gitignore | 12 +-- Adaptation/.kanbn/board.css | 7 ++ Adaptation/.kanbn/index.md | 21 +++++ Adaptation/.vscode/Reactor.js | 16 ---- Adaptation/.vscode/psn.js | 16 ---- Adaptation/.vscode/settings.json | 3 + Adaptation/.vscode/tasks.json | 82 +++++++++++++++++++ .../FileHandlers/OpenInsight/FileRead.cs | 16 ++-- .../OpenInsightMetrologyViewer/WSRequest.cs | 4 +- Adaptation/FileHandlers/pcl/FileRead.cs | 2 +- Adaptation/Shared/FileRead.cs | 11 ++- Adaptation/package.json | 10 +-- 12 files changed, 143 insertions(+), 57 deletions(-) create mode 100644 Adaptation/.kanbn/board.css create mode 100644 Adaptation/.kanbn/index.md delete mode 100644 Adaptation/.vscode/Reactor.js delete mode 100644 Adaptation/.vscode/psn.js create mode 100644 Adaptation/.vscode/tasks.json diff --git a/.gitignore b/.gitignore index c19d760..e85055c 100644 --- a/.gitignore +++ b/.gitignore @@ -331,11 +331,11 @@ ASALocalRun/ ## ## Visual Studio Code ## -*/!.vscode/extensions.json -*/!.vscode/launch.json -*/!.vscode/settings.json -*/!.vscode/tasks.json -*/.vscode/* -*/.vscode/ReportGenerator/* +**/.vscode/* +!**/.vscode/extensions.json +!**/.vscode/format-report.json +!**/.vscode/launch.json +!**/.vscode/settings.json +!**/.vscode/tasks.json *.lnk diff --git a/Adaptation/.kanbn/board.css b/Adaptation/.kanbn/board.css new file mode 100644 index 0000000..8bc14b6 --- /dev/null +++ b/Adaptation/.kanbn/board.css @@ -0,0 +1,7 @@ +.kanbn-task-data-workload { + display: none; +} +.kanbn-task-data-relation { + display: block; + color: #198038; +} diff --git a/Adaptation/.kanbn/index.md b/Adaptation/.kanbn/index.md new file mode 100644 index 0000000..d02a231 --- /dev/null +++ b/Adaptation/.kanbn/index.md @@ -0,0 +1,21 @@ +--- +type: "kanbn" +created: 2023-07-07T15:37:56.040Z +updated: 2023-07-18T19:52:59.668Z +startedColumns: + - 'In Progress' +completedColumns: + - Done +dateFormat: mm/dd +taskTemplate: '^+^_${overdue ? ''^R'' : ''''}${name}^: ${relations ? (''\n^-^/^g'' + relations.reduce((accumulator, currentValue) => accumulator.task + currentValue.task + '' '', '''')) : ''''}' +--- + +# MET08DDUPSFS6420 + +## Backlog + +## Todo + +## In Progress + +## Done diff --git a/Adaptation/.vscode/Reactor.js b/Adaptation/.vscode/Reactor.js deleted file mode 100644 index 0365ca4..0000000 --- a/Adaptation/.vscode/Reactor.js +++ /dev/null @@ -1,16 +0,0 @@ -// (self.length != 0) ? -// self : -// (getContextData('2', 'cds.PROCESS_JOBID', '') == '-') ? -// self : -// getContextData('2', 'cds.PROCESS_JOBID', '') - -getValue(self, self.length, $('dcp.TENCOR1/pcl/MesEntity', ''), $('dcp.TENCOR1/pcl/asdf', ''), getContextData('2', 'cds.PROCESS_JOBID', '')); - -function getValue(value, length, mesEntity, recipe, processJobId) { - if (recipe.toUpperCase() === 'adsf') - return mesEntity; - else if (length === 0) - return processJobId; - else - return value; -} \ No newline at end of file diff --git a/Adaptation/.vscode/psn.js b/Adaptation/.vscode/psn.js deleted file mode 100644 index 94db65b..0000000 --- a/Adaptation/.vscode/psn.js +++ /dev/null @@ -1,16 +0,0 @@ -// (self.length != 0) ? -// self : -// (getContextData('2', 'cds.PRODUCT', '') == '-') ? -// self : -// getContextData('2', 'cds.PRODUCT', '') - -getValue(self, self.length, getContextData('2', 'cds.PRODUCT', ''), $('dcp.TENCOR1/pcl/asdf', '')); - -function getValue(value, length, product, recipe) { - if (recipe.toUpperCase() === 'asdf') - return 'asdf'; - else if (length === 0) - return product; - else - return value; -} \ No newline at end of file diff --git a/Adaptation/.vscode/settings.json b/Adaptation/.vscode/settings.json index 3865fe5..cf1dbcc 100644 --- a/Adaptation/.vscode/settings.json +++ b/Adaptation/.vscode/settings.json @@ -1,4 +1,7 @@ { + "[markdown]": { + "editor.wordWrap": "off" + }, "cSpell.words": [ "CICN", "DDUPSFS", diff --git a/Adaptation/.vscode/tasks.json b/Adaptation/.vscode/tasks.json new file mode 100644 index 0000000..fcfe194 --- /dev/null +++ b/Adaptation/.vscode/tasks.json @@ -0,0 +1,82 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Format", + "command": "dotnet", + "type": "process", + "args": [ + "format", + "--report", + ".vscode", + "--verbosity", + "detailed", + "--severity", + "warn" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Nuget Clear", + "command": "dotnet", + "type": "process", + "args": [ + "nuget", + "locals", + "all", + "--clear" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "MSBuild for EAF Deployment Packages", + "command": "C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe", + "type": "process", + "args": [ + "/target:Build", + "/restore:True", + "/p:RestoreSources=https://api.nuget.org/v3/index.json%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json%3Bhttps://localhost/v3/index.json", + "/detailedsummary", + "/consoleloggerparameters:PerformanceSummary;ErrorsOnly;", + "/property:Configuration=Debug;TargetFrameworkVersion=v4.8", + "../MET08DDUPSFS6420.csproj" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "File-Folder-Helper AOT s M .Kanbn Tasks", + "type": "shell", + "command": "& L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net7.0/win-x64/publish/File-Folder-Helper.exe s M T:/MET08DDUPSFS6420/06_SourceCode/MET08DDUPSFS6420/Adaptation -s T:/MET08DDUPSFS6420/06_SourceCode/MET08DDUPSFS6420/Adaptation/.kanbn/tasks", + "problemMatcher": [] + }, + { + "label": "Kanbn Console", + "type": "npm", + "script": "kanbn.board", + "problemMatcher": [] + }, + { + "label": "Kanbn Write Boad", + "type": "shell", + "command": "& kanbn board -j | L:/Git/kanbn2md/kanbn2md.exe >.kanbn/board.md", + "problemMatcher": [] + }, + { + "label": "Kanbn Write json", + "type": "npm", + "script": "kanbn.board.json", + "problemMatcher": [] + } + ] +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/OpenInsight/FileRead.cs b/Adaptation/FileHandlers/OpenInsight/FileRead.cs index a1aa712..2d25dd4 100644 --- a/Adaptation/FileHandlers/OpenInsight/FileRead.cs +++ b/Adaptation/FileHandlers/OpenInsight/FileRead.cs @@ -239,13 +239,19 @@ public class FileRead : Shared.FileRead, IFileRead { bool isDummyRun = false; List<(Shared.Properties.IScopeInfo, string)> collection = new(); - string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder; - string parentParent = GetParentParent(_FileConnectorConfiguration.SourceFileLocation); - if (parentParent.Contains(_CellInstanceName)) - parentParent = Path.GetDirectoryName(parentParent); - string duplicateDirectory = Path.Combine(parentParent, "Data"); + string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName); if (!Directory.Exists(duplicateDirectory)) _ = Directory.CreateDirectory(duplicateDirectory); + string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder; + if (!Directory.Exists(Path.Combine(duplicateDirectory, "1"))) + { + string parentParent = GetParentParent(_FileConnectorConfiguration.SourceFileLocation); + if (parentParent.Contains(_CellInstanceName)) + parentParent = Path.GetDirectoryName(parentParent); + duplicateDirectory = Path.Combine(parentParent, "Data"); + if (!Directory.Exists(duplicateDirectory)) + _ = Directory.CreateDirectory(duplicateDirectory); + } string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath)); if (descriptions.Any() && tests.Any()) { diff --git a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs index db72484..d2d40c6 100644 --- a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs +++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs @@ -13,7 +13,7 @@ namespace Adaptation.FileHandlers.OpenInsightMetrologyViewer; public class WSRequest { - public long Id { get; set; } + public int Id { get; set; } public string AreaCountAvg { get; set; } public string AreaCountMax { get; set; } public string AreaCountMin { get; set; } @@ -78,7 +78,7 @@ public class WSRequest { ProcessDataStandardFormat = processDataStandardFormat; i = -1; - Id = 0; + Id = -1; Zone = null; Layer = null; Title = null; diff --git a/Adaptation/FileHandlers/pcl/FileRead.cs b/Adaptation/FileHandlers/pcl/FileRead.cs index a742804..49949df 100644 --- a/Adaptation/FileHandlers/pcl/FileRead.cs +++ b/Adaptation/FileHandlers/pcl/FileRead.cs @@ -102,7 +102,7 @@ public class FileRead : Shared.FileRead, IFileRead private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) { Tuple> results = new(string.Empty, null, null, new List()); - _TickOffset ??= new FileInfo(reportFullPath).LastWriteTime.Ticks - dateTime.Ticks; + _TickOffset ??= 0; // new FileInfo(reportFullPath).LastWriteTime.Ticks - dateTime.Ticks; _Logistics = new Logistics(this, _TickOffset.Value, reportFullPath, useSplitForMID: true); SetFileParameterLotIDToLogisticsMID(); if (_Logistics.FileInfo.Length < _MinFileLength) diff --git a/Adaptation/Shared/FileRead.cs b/Adaptation/Shared/FileRead.cs index 956cafc..09be7bc 100644 --- a/Adaptation/Shared/FileRead.cs +++ b/Adaptation/Shared/FileRead.cs @@ -260,10 +260,11 @@ public class FileRead : Properties.IFileRead return results; } - protected static string GetTupleFile(Logistics logistics, List descriptions, Properties.IScopeInfo scopeInfo, string duplicateDirectory) where T : Properties.IDescription + protected static string GetTupleFile(Logistics logistics, List descriptions, Properties.IScopeInfo scopeInfo, string duplicateDirectory, string duplicateFile) where T : Properties.IDescription { string result; string rds; + string fileName; string dateValue; string rdsPlaceholder = "%RDS%"; string mesEntityPlaceholder = "%MesEntity%"; @@ -285,7 +286,11 @@ public class FileRead : Properties.IFileRead continue; datePlaceholder = string.Concat('%', segment, '%'); } - result = string.Concat(duplicateDirectory, @"\", scopeInfo.FileName.Replace(rdsPlaceholder, rds).Replace(mesEntityPlaceholder, logistics.MesEntity).Replace(datePlaceholder, dateValue)); + fileName = scopeInfo.FileName.Replace(rdsPlaceholder, rds).Replace(mesEntityPlaceholder, logistics.MesEntity).Replace(datePlaceholder, dateValue); + if (!duplicateFile.Contains("Viewer")) + result = Path.Combine(duplicateDirectory, fileName); + else + result = Path.Combine(duplicateDirectory, $"Viewer_{fileName}"); } if (result.Contains('%')) throw new Exception("Placeholder exists!"); @@ -318,7 +323,7 @@ public class FileRead : Properties.IFileRead else if (!scopeInfo.FileName.Contains('%')) tupleFile = string.Concat(duplicateDirectory, @"\", fileName, "_", scopeInfo.FileNameWithoutExtension, ".pdsfc"); else - tupleFile = GetTupleFile(logistics, descriptions, scopeInfo, duplicateDirectory); + tupleFile = GetTupleFile(logistics, descriptions, scopeInfo, duplicateDirectory, duplicateFile); tupleFileName = Path.GetFileNameWithoutExtension(tupleFile).Split('.')[0]; duplicateFiles.Add(tupleFile); if (_IsEAFHosted) diff --git a/Adaptation/package.json b/Adaptation/package.json index 960960f..279c588 100644 --- a/Adaptation/package.json +++ b/Adaptation/package.json @@ -18,14 +18,8 @@ "HA-Extract.Staging.v2_47_1-TENCOR1-Staging__v2_47_1__TENCOR1__pcl637812984345592512__MinFileLength": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~TENCOR1 & Name~Staging__v2_47_1__TENCOR1__pcl637812984345592512__MinFileLength\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", "HB-Extract.Staging.v2_47_1-MET08DDUPSFS6420-Staging__v2_47_1__MET08DDUPSFS6420__OpenInsight638052163299572098__IqsSql": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~MET08DDUPSFS6420 & Name~Staging__v2_47_1__MET08DDUPSFS6420__OpenInsight638052163299572098__IqsSql\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", "Alpha": "ABCDEFGHIJKLMNOPQRSTUVWXYZ", - "nuget-clear": "dotnet nuget locals all --clear", - "build": "dotnet build --runtime win-x64 --self-contained", - "build-Package-Management": "dotnet build --runtime win-x64 --self-contained --source https://packagemanagement.eu.infineon.com:4430/api/v2/", - "build-nuget-And-Package-Management": "dotnet build --runtime win-x64 --self-contained --source https://api.nuget.org/v3/index.json --source https://packagemanagement.eu.infineon.com:4430/api/v2/", - "build-All-Sources": "dotnet build --runtime win-x64 --self-contained --source https://api.nuget.org/v3/index.json --source https://packagemanagement.eu.infineon.com:4430/api/v2/ --source https://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json --source http://192.168.0.73:5002/v3/index.json", - "dotnet-format": "dotnet format --report .vscode --verbosity detailed --severity warn", - "MSBuild": "\"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe\" /target:Build /restore:True /p:RestoreSources=https://api.nuget.org/v3/index.json%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=Debug;TargetFrameworkVersion=v4.8 ../MET08DDUPSFS6420.csproj", - "pull": "git pull", + "kanbn.board": "kanbn board", + "kanbn.board.json": "kanbn board -j > .kanbn/board.json", "garbage-collect": "git gc" } } \ No newline at end of file