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..e605e1c
--- /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 + '' '', '''')) : ''''}'
+---
+
+# EC
+
+## Backlog
+
+## Todo
+
+## In Progress
+
+## Done
diff --git a/Adaptation/.vscode/settings.json b/Adaptation/.vscode/settings.json
index 474db4b..f234edb 100644
--- a/Adaptation/.vscode/settings.json
+++ b/Adaptation/.vscode/settings.json
@@ -1,4 +1,8 @@
{
+ "[markdown]": {
+ "editor.wordWrap": "off"
+ },
+ "cSpell.words": [],
"coverage-gutters.coverageBaseDir": "../../../../EC/05_TestResults/TestResults/**",
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#d791c9",
diff --git a/Adaptation/.vscode/tasks.json b/Adaptation/.vscode/tasks.json
new file mode 100644
index 0000000..b160d04
--- /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",
+ "../EC.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:/EC/06_SourceCode/EC/Adaptation -s T:/EC/06_SourceCode/EC/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/EC.Tests.csproj b/Adaptation/EC.Tests.csproj
index a7ab829..da9b66c 100644
--- a/Adaptation/EC.Tests.csproj
+++ b/Adaptation/EC.Tests.csproj
@@ -10,7 +10,7 @@
false
10.0
disable
- win-x64
+ win-x86
net7.0
@@ -33,7 +33,7 @@
Linux
-
+
NU1701
NU1701
@@ -53,10 +53,10 @@
-
+
-
-
+
+
NU1701
@@ -67,8 +67,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;
}
diff --git a/Adaptation/Shared/FileRead.cs b/Adaptation/Shared/FileRead.cs
index 90ed6e6..f66b29b 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 2bbf185..244d056 100644
--- a/Adaptation/package.json
+++ b/Adaptation/package.json
@@ -1,14 +1,8 @@
{
"scripts": {
"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 ../MET08RESIMAPCDE.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