diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index b530ca9..9e50e35 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -25,6 +25,45 @@
],
"problemMatcher": "$msCompile"
},
+ {
+ "label": "testDebug",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "test",
+ "/property:GenerateFullPaths=true",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "label": "testRelease",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "test",
+ "/property:GenerateFullPaths=true",
+ "/consoleloggerparameters:NoSummary",
+ "-c",
+ "Release"
+ ],
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "label": "format",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "format",
+ "--report",
+ ".vscode",
+ "--verbosity",
+ "detailed",
+ "--severity",
+ "warn"
+ ],
+ "problemMatcher": "$msCompile"
+ },
{
"label": "old-watch",
"command": "dotnet",
diff --git a/.vscode/thunder-tests/thunderActivity.json b/.vscode/thunder-tests/thunderActivity.json
index c7dd363..9fb71fd 100644
--- a/.vscode/thunder-tests/thunderActivity.json
+++ b/.vscode/thunder-tests/thunderActivity.json
@@ -108,11 +108,11 @@
"colId": "history",
"containerId": "",
"name": "OI-RDS",
- "url": "http://messa020ec.ec.local/apidev/oiWizard/materials/rds/578941",
+ "url": "http://messa020ec.ec.local/api/oiWizard/materials/rds/578941",
"method": "GET",
"sortNum": 0,
"created": "2023-03-02T18:20:01.561Z",
- "modified": "2023-03-06T17:18:56.337Z",
+ "modified": "2023-03-06T18:40:43.162Z",
"headers": [],
"params": [],
"tests": [
diff --git a/Server/Data/Tests/Export-GetExport.txt b/Server/Data/Tests/Export-GetExport.txt
new file mode 100644
index 0000000..5e40c08
--- /dev/null
+++ b/Server/Data/Tests/Export-GetExport.txt
@@ -0,0 +1 @@
+asdf
\ No newline at end of file
diff --git a/Server/Data/Tests/Export-GetHeaders.json b/Server/Data/Tests/Export-GetHeaders.json
new file mode 100644
index 0000000..5d0a549
--- /dev/null
+++ b/Server/Data/Tests/Export-GetHeaders.json
@@ -0,0 +1,4 @@
+{
+ "Results": [],
+ "TotalRows": 0
+}
\ No newline at end of file
diff --git a/Server/Data/Tests/Export-GetLogistics.json b/Server/Data/Tests/Export-GetLogistics.json
new file mode 100644
index 0000000..5d0a549
--- /dev/null
+++ b/Server/Data/Tests/Export-GetLogistics.json
@@ -0,0 +1,4 @@
+{
+ "Results": [],
+ "TotalRows": 0
+}
\ No newline at end of file
diff --git a/Server/Data/Tests/Export-GetProcessDataStandardFormat.pdsf b/Server/Data/Tests/Export-GetProcessDataStandardFormat.pdsf
new file mode 100644
index 0000000..5e40c08
--- /dev/null
+++ b/Server/Data/Tests/Export-GetProcessDataStandardFormat.pdsf
@@ -0,0 +1 @@
+asdf
\ No newline at end of file
diff --git a/Server/OI.Metrology.Server.csproj b/Server/OI.Metrology.Server.csproj
index 11f56f1..d957929 100644
--- a/Server/OI.Metrology.Server.csproj
+++ b/Server/OI.Metrology.Server.csproj
@@ -77,6 +77,18 @@
Always
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
Always
diff --git a/Server/Repositories/ExportRepository.cs b/Server/Repositories/ExportRepository.cs
index c98aa9f..98e892f 100644
--- a/Server/Repositories/ExportRepository.cs
+++ b/Server/Repositories/ExportRepository.cs
@@ -52,7 +52,7 @@ public class ExportRepository : IExportRepository
{
string result;
if (!string.IsNullOrEmpty(_MockRoot))
- result = File.ReadAllText(Path.Combine(string.Concat(AppContext.BaseDirectory, _MockRoot), $"{_RepositoryName}-{nameof(IExportRepository.GetLogistics)}.txt"));
+ result = File.ReadAllText(Path.Combine(string.Concat(AppContext.BaseDirectory, _MockRoot), $"{_RepositoryName}-{nameof(IExportRepository.GetExport)}.txt"));
else
{
List files = GetFiles(headerCommon, "*.txt");
@@ -135,7 +135,7 @@ public class ExportRepository : IExportRepository
{
string result;
if (!string.IsNullOrEmpty(_MockRoot))
- result = File.ReadAllText(Path.Combine(string.Concat(AppContext.BaseDirectory, _MockRoot), $"{_RepositoryName}-{nameof(IExportRepository.GetLogistics)}.txt"));
+ result = File.ReadAllText(Path.Combine(string.Concat(AppContext.BaseDirectory, _MockRoot), $"{_RepositoryName}-{nameof(IExportRepository.GetProcessDataStandardFormat)}.pdsf"));
else
{
List files = GetFiles(headerCommon, "*.pdsf");
diff --git a/Server/wwwroot/js/site.js b/Server/wwwroot/js/site.js
index 9f81e0e..7dfa0fe 100644
--- a/Server/wwwroot/js/site.js
+++ b/Server/wwwroot/js/site.js
@@ -492,32 +492,44 @@ function recipeParametersButtonRunInfo() {
var gridCreated = $("#ModalBodyGrid").data("igGrid");
if (gridCreated)
$("#ModalBodyGrid").igGrid("destroy");
- // $.getJSON('http://messa020ec.ec.local/apidev/oiWizard/materials/rds/' + jsonObject.RDS, function (data) {
- // $("#RecipeParametersButton").prop("disabled", false);
- // var text = "";
- // for (var i = 0; i < data.rds.rdsLayers.length; i++) {
- // text = text + data.rds.rdsLayers[i].EpiTime + "\t" + data.rds.rdsLayers[i].DiluentAdjParam + "\t" + data.rds.rdsLayers[i].DopantFlow + "\t" + data.rds.rdsLayers[i].HCLFlow + "\t" + data.rds.rdsLayers[i].BakeTime + "\t" + data.rds.rdsLayers[i].EpiH2Flow + "\t" + data.rds.rdsLayers[i].TCSFlow + "\t" + data.rds.rdsLayers[i].DCSFlow + "\t" + data.rds.rdsLayers[i].FOffset + "\r";
- // }
- // $("#textareaClipboard").val(text);
- // $("#ModalBodyGrid").igGrid({
- // dataSource: data.rds.rdsLayers,
- // features: [
- // { name: 'Resizing' }
- // ],
- // columns: [
- // { headerText: "Dep Time", key: "EpiTime", dataType: "number", width: "10%" },
- // { headerText: "H2", key: "EpiH2Flow", dataType: "number", width: "10%" },
- // { headerText: "TCS", key: "TCSFlow", dataType: "number", width: "10%" },
- // { headerText: "DIL", key: "DiluentAdjParam", dataType: "string", width: "10%" },
- // { headerText: "DopantFlow", key: "DopantFlow", dataType: "number", width: "10%" },
- // { headerText: "HCLFlow", key: "HCLFlow", dataType: "string", width: "10%" },
- // { headerText: "BakeTime", key: "BakeTime", dataType: "string", width: "10%" },
- // { headerText: "DCSFlow", key: "DCSFlow", dataType: "string", width: "10%" },
- // { headerText: "FOffset", key: "FOffset", dataType: "string", width: "10%" },
- // ],
- // responseDataKey: "Results",
- // });
- // });
+ $.getJSON('http://messa020ec.ec.local/api/oiWizard/materials/rds/' + jsonObject.RDS, function (data) {
+ $("#RecipeParametersButton").prop("disabled", false);
+ var text = "";
+ for (var i = 0; i < data.rds.rdsLayers.length; i++) {
+ text = text
+ + data.rds.rdsLayers[i].EpiTime
+ + "\t" + data.rds.rdsLayers[i].EpiH2Flow
+ + "\t" + data.rds.rdsLayers[i].TCSFlow
+ + "\t" + data.rds.rdsLayers[i].DiluentAdjParam
+ + "\t" + data.rds.rdsLayers[i].EpiH2Flow
+ + "\t" + data.rds.rdsLayers[i].DopantFlow
+ + "\t" + data.rds.rdsLayers[i].FOffset
+ + "\t" + data.rds.rdsLayers[i].SOffset
+ + "\t" + data.rds.rdsLayers[i].ROffset
+ + "\t" + data.rds.rdsLayers[i].SuscEtch
+ + "\r"
+ }
+ $("#textareaClipboard").val(text);
+ $("#ModalBodyGrid").igGrid({
+ dataSource: data.rds.rdsLayers,
+ features: [
+ { name: 'Resizing' }
+ ],
+ columns: [
+ { headerText: "Dep Time", key: "EpiTime", dataType: "number", width: "10%" },
+ { headerText: "H2", key: "EpiH2Flow", dataType: "number", width: "10%" },
+ { headerText: "TCS", key: "TCSFlow", dataType: "number", width: "10%" },
+ { headerText: "DIL", key: "DiluentAdjParam", dataType: "string", width: "10%" },
+ { headerText: "SRC", key: "EpiH2Flow", dataType: "number", width: "10%" },
+ { headerText: "INJ", key: "DopantFlow", dataType: "string", width: "10%" },
+ { headerText: "F", key: "FOffset", dataType: "string", width: "10%" },
+ { headerText: "S", key: "SOffset", dataType: "string", width: "10%" },
+ { headerText: "R", key: "ROffset", dataType: "string", width: "10%" },
+ { headerText: "Susc Etch", key: "SuscEtch", dataType: "string", width: "10%" },
+ ],
+ responseDataKey: "Results",
+ });
+ });
}
}
@@ -633,7 +645,17 @@ function pinButtonRunInfo() {
});
var text = "";
for (var i = 0; i < data.Results.length; i++) {
- text = text + data.Results[i].Point1 + "\t" + data.Results[i].Point2 + "\t" + data.Results[i].Point3 + "\t" + data.Results[i].Point4 + "\t" + data.Results[i].Point5 + "\t" + data.Results[i].Point6 + "\t" + data.Results[i].Point7 + "\t" + data.Results[i].Point8 + "\t" + data.Results[i].Point9 + "\r";
+ text = text
+ + data.Results[i].Point1
+ + "\t" + data.Results[i].Point2
+ + "\t" + data.Results[i].Point3
+ + "\t" + data.Results[i].Point4
+ + "\t" + data.Results[i].Point5
+ + "\t" + data.Results[i].Point6
+ + "\t" + data.Results[i].Point7
+ + "\t" + data.Results[i].Point8
+ + "\t" + data.Results[i].Point9
+ + "\r";
}
$("#textareaClipboard").val(text);
$("#ModalBodyGrid").igGrid({