phares3757/met08resimapcde
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back to x64 to pass tests

Browse Source 
Directory Trigger for OI
Remove extra .vscode files
Viewer support
tasks.json
kanbn initialize
WSRequest alignment
This commit is contained in:
Mike Phares 2023-07-24 10:51:27 -07:00
parent 632f213217
commit df24c40850
13 changed files with 117 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitignore vendored
View File

@ -331,11 +331,11 @@ ASALocalRun/
## ##
## Visual Studio Code ## Visual Studio Code
## ##
*/!.vscode/extensions.json **/.vscode/*
*/!.vscode/launch.json !**/.vscode/extensions.json
*/!.vscode/settings.json !**/.vscode/format-report.json
*/!.vscode/tasks.json !**/.vscode/launch.json
*/.vscode/* !**/.vscode/settings.json
*/.vscode/ReportGenerator/* !**/.vscode/tasks.json
*.lnk *.lnk

3
.vscode/settings.json vendored
View File

@ -1,4 +1,7 @@
{ {
"[markdown]": {
"editor.wordWrap": "off"
},
"cSpell.words": [ "cSpell.words": [
"Epuipment", "Epuipment",
"Idrv", "Idrv",

7
Adaptation/.kanbn/board.css Normal file
View File

@ -0,0 +1,7 @@
.kanbn-task-data-workload {
display: none;
}
.kanbn-task-data-relation {
display: block;
color: #198038;
}

21
Adaptation/.kanbn/index.md Normal file
View File

@ -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 + '' '', '''')) : ''''}'
---
# MET08RESIMAPCDE
## Backlog
## Todo
## In Progress
## Done

22
Adaptation/.vscode/Reactor.js vendored
View File

@ -1,22 +0,0 @@
// (self.length != 0) ?
// self :
// (getContextData('2', 'cds.PROCESS_JOBID', '') == '-') ?
// self :
// getContextData('2', 'cds.PROCESS_JOBID', '')
getValue(self, self.length, $('dcp.CDE5/RsM/MesEntity', ''), $('dcp.CDE5/RsM/Recipe', ''), getContextData('2', 'cds.PROCESS_JOBID', ''));
function getValue(value, length, mesEntity, recipe, processJobId) {
if (recipe.toUpperCase() === 'STANDARD \\ RLOW_STD')
return mesEntity;
else if (recipe.toUpperCase() === 'STANDARD \\ RMID_STD')
return mesEntity;
else if (recipe.toUpperCase() === 'STANDARD \\ RHI_STD')
return mesEntity;
else if (recipe.toUpperCase() === 'STANDARD \\ THINSPC')
return mesEntity;
else if (length === 0)
return processJobId;
else
return value;
}

22
Adaptation/.vscode/psn.js vendored
View File

@ -1,22 +0,0 @@
// (self.length != 0) ?
// self :
// (getContextData('2', 'cds.PRODUCT', '') == '-') ?
// self :
// getContextData('2', 'cds.PRODUCT', '')
getValue(self, self.length, getContextData('2', 'cds.PRODUCT', ''), $('dcp.CDE5/RsM/Recipe', ''));
function getValue(value, length, product, recipe) {
if (recipe.toUpperCase() === 'STANDARD \\ RLOW_STD')
return 'RLOW_STD';
else if (recipe.toUpperCase() === 'STANDARD \\ RMID_STD')
return 'RMID_STD';
else if (recipe.toUpperCase() === 'STANDARD \\ RHI_STD')
return 'RHI_STD';
else if (recipe.toUpperCase() === 'STANDARD \\ THINSPC')
return 'THINSPC';
else if (length === 0)
return product;
else
return value;
}

3
Adaptation/.vscode/settings.json vendored
View File

@ -1,4 +1,7 @@
{ {
"[markdown]": {
"editor.wordWrap": "off"
},
"cSpell.words": [ "cSpell.words": [
"datauniqueid", "datauniqueid",
"Epuipment", "Epuipment",

66
Adaptation/.vscode/tasks.json vendored
View File

@ -2,41 +2,81 @@
"version": "2.0.0", "version": "2.0.0",
"tasks": [ "tasks": [
{ {
"label": "build", "label": "Build",
"command": "dotnet", "command": "dotnet",
"type": "process", "type": "process",
"args": [ "args": [
"build", "build",
"${workspaceFolder}/MET08RESIMAPCDE.Tests.csproj",
"/property:GenerateFullPaths=true", "/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary" "/consoleloggerparameters:NoSummary"
], ],
"problemMatcher": "$msCompile" "problemMatcher": "$msCompile"
}, },
{ {
"label": "publish", "label": "Format",
"command": "dotnet", "command": "dotnet",
"type": "process", "type": "process",
"args": [ "args": [
"publish", "format",
"${workspaceFolder}/MET08RESIMAPCDE.Tests.csproj", "--report",
"/property:GenerateFullPaths=true", ".vscode",
"/consoleloggerparameters:NoSummary" "--verbosity",
"detailed",
"--severity",
"warn"
], ],
"problemMatcher": "$msCompile" "problemMatcher": "$msCompile"
}, },
{ {
"label": "watch", "label": "Nuget Clear",
"command": "dotnet", "command": "dotnet",
"type": "process", "type": "process",
"args": [ "args": [
"watch", "nuget",
"run", "locals",
"${workspaceFolder}/MET08RESIMAPCDE.Tests.csproj", "all",
"/property:GenerateFullPaths=true", "--clear"
"/consoleloggerparameters:NoSummary"
], ],
"problemMatcher": "$msCompile" "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",
"../MET08RESIMAPCDE.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:/MET08RESIMAPCDE/06_SourceCode/MET08RESIMAPCDE/Adaptation -s T:/MET08RESIMAPCDE/06_SourceCode/MET08RESIMAPCDE/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": []
} }
] ]
} }

16
Adaptation/FileHandlers/OpenInsight/FileRead.cs
View File

@ -155,13 +155,19 @@ public class FileRead : Shared.FileRead, IFileRead
{ {
bool isDummyRun = false; bool isDummyRun = false;
List<(Shared.Properties.IScopeInfo, string)> collection = new(); List<(Shared.Properties.IScopeInfo, string)> collection = new();
string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder; string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName);
string parentParent = GetParentParent(_FileConnectorConfiguration.SourceFileLocation);
if (parentParent.Contains(_CellInstanceName))
parentParent = Path.GetDirectoryName(parentParent);
string duplicateDirectory = Path.Combine(parentParent, "Data");
if (!Directory.Exists(duplicateDirectory)) if (!Directory.Exists(duplicateDirectory))
_ = Directory.CreateDirectory(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)); string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
if (descriptions.Any() && tests.Any()) if (descriptions.Any() && tests.Any())
{ {

4
Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs
View File

@ -27,7 +27,7 @@ public class WSRequest
public string EquipId { get; set; } public string EquipId { get; set; }
public string FileName { get; set; } public string FileName { get; set; }
public string FilePath { get; set; } public string FilePath { get; set; }
public string Id { get; set; } public int Id { get; set; }
public string Layer { get; set; } public string Layer { get; set; }
public string LotId { get; set; } public string LotId { get; set; }
public string Op { get; set; } public string Op { get; set; }
@ -52,7 +52,7 @@ public class WSRequest
#pragma warning restore IDE0060 #pragma warning restore IDE0060
{ {
ProcessDataStandardFormat = processDataStandardFormat; ProcessDataStandardFormat = processDataStandardFormat;
Id = "-1"; Id = -1;
CellName = logistics.MesEntity; CellName = logistics.MesEntity;
Details = new List<txt.Detail>(); Details = new List<txt.Detail>();
if (descriptions[0] is not txt.Description x) if (descriptions[0] is not txt.Description x)

11
Adaptation/Shared/FileRead.cs
View File

@ -260,10 +260,11 @@ public class FileRead : Properties.IFileRead
return results; return results;
} }
protected static string GetTupleFile<T>(Logistics logistics, List<T> descriptions, Properties.IScopeInfo scopeInfo, string duplicateDirectory) where T : Properties.IDescription protected static string GetTupleFile<T>(Logistics logistics, List<T> descriptions, Properties.IScopeInfo scopeInfo, string duplicateDirectory, string duplicateFile) where T : Properties.IDescription
{ {
string result; string result;
string rds; string rds;
string fileName;
string dateValue; string dateValue;
string rdsPlaceholder = "%RDS%"; string rdsPlaceholder = "%RDS%";
string mesEntityPlaceholder = "%MesEntity%"; string mesEntityPlaceholder = "%MesEntity%";
@ -285,7 +286,11 @@ public class FileRead : Properties.IFileRead
continue; continue;
datePlaceholder = string.Concat('%', segment, '%'); 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('%')) if (result.Contains('%'))
throw new Exception("Placeholder exists!"); throw new Exception("Placeholder exists!");
@ -318,7 +323,7 @@ public class FileRead : Properties.IFileRead
else if (!scopeInfo.FileName.Contains('%')) else if (!scopeInfo.FileName.Contains('%'))
tupleFile = string.Concat(duplicateDirectory, @"\", fileName, "_", scopeInfo.FileNameWithoutExtension, ".pdsfc"); tupleFile = string.Concat(duplicateDirectory, @"\", fileName, "_", scopeInfo.FileNameWithoutExtension, ".pdsfc");
else else
tupleFile = GetTupleFile(logistics, descriptions, scopeInfo, duplicateDirectory); tupleFile = GetTupleFile(logistics, descriptions, scopeInfo, duplicateDirectory, duplicateFile);
tupleFileName = Path.GetFileNameWithoutExtension(tupleFile).Split('.')[0]; tupleFileName = Path.GetFileNameWithoutExtension(tupleFile).Split('.')[0];
duplicateFiles.Add(tupleFile); duplicateFiles.Add(tupleFile);
if (_IsEAFHosted) if (_IsEAFHosted)

2
Adaptation/_Tests/Extract/Staging/v2.49.2/CDE6-EQPT.cs
View File

@ -38,7 +38,7 @@ public class CDE6_EQPT
MethodBase methodBase = new StackFrame().GetMethod(); MethodBase methodBase = new StackFrame().GetMethod();
_CDE6_EQPT.Staging__v2_49_2__CDE6_EQPT__DownloadRsMFile(); _CDE6_EQPT.Staging__v2_49_2__CDE6_EQPT__DownloadRsMFile();
_ = _CDE6_EQPT.AdaptationTesting.GetVariables(methodBase, check, validatePDSF); _ = _CDE6_EQPT.AdaptationTesting.GetVariables(methodBase, check, validatePDSF);
for (int i = 0; i < int.MinValue; i++) for (int i = 0; i < int.MaxValue; i++)
Thread.Sleep(500); Thread.Sleep(500);
} }

10
Adaptation/package.json
View File

@ -16,14 +16,8 @@
"HB-Extract.Staging.v2_47_1-MET08RESIMAPCDE-Staging__v2_47_1__MET08RESIMAPCDE__OpenInsight638054501710000000__IqsSql": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~MET08RESIMAPCDE & Name~Staging__v2_47_1__MET08RESIMAPCDE__OpenInsight638054501710000000__IqsSql\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", "HB-Extract.Staging.v2_47_1-MET08RESIMAPCDE-Staging__v2_47_1__MET08RESIMAPCDE__OpenInsight638054501710000000__IqsSql": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_1 & ClassName~MET08RESIMAPCDE & Name~Staging__v2_47_1__MET08RESIMAPCDE__OpenInsight638054501710000000__IqsSql\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
"HC-Extract.Staging.v2_47_2-CDE6-Staging__v2_47_2__CDE6__RsM638065099250000000__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_2 & ClassName~CDE6 & Name~Staging__v2_47_2__CDE6__RsM638065099250000000__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")", "HC-Extract.Staging.v2_47_2-CDE6-Staging__v2_47_2__CDE6__RsM638065099250000000__Normal": "dotnet test --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_47_2 & ClassName~CDE6 & Name~Staging__v2_47_2__CDE6__RsM638065099250000000__Normal\" -- TestRunParameters.Parameter(name=\\\"WaitFor\\\", value=\\\"Debugger.IsAttached\\\")",
"Alpha": "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "Alpha": "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
"nuget-clear": "dotnet nuget locals all --clear", "kanbn.board": "kanbn board",
"build": "dotnet build --runtime win-x64 --self-contained", "kanbn.board.json": "kanbn board -j > .kanbn/board.json",
"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 ../MET08RESIMAPCDE.csproj",
"pull": "git pull",
"garbage-collect": "git gc" "garbage-collect": "git gc"
} }
} }