diff --git a/.vscode/thunder-tests/thunderActivity.json b/.vscode/thunder-tests/thunderActivity.json
index 9fb71fd..51f4a32 100644
--- a/.vscode/thunder-tests/thunderActivity.json
+++ b/.vscode/thunder-tests/thunderActivity.json
@@ -123,5 +123,38 @@
"value": "1"
}
]
+ },
+ {
+ "_id": "4eafe190-e59e-4a3e-af76-356f62fde842",
+ "colId": "history",
+ "containerId": "",
+ "name": "https://oi-metrology-viewer-prod.mes.infineon.com/api/tooltypes",
+ "url": "https://oi-metrology-viewer-prod.mes.infineon.com/api/tooltypes",
+ "method": "GET",
+ "sortNum": 0,
+ "created": "2023-03-07T17:20:54.044Z",
+ "modified": "2023-03-07T17:20:54.044Z",
+ "headers": [],
+ "params": [],
+ "tests": []
+ },
+ {
+ "_id": "280ea9be-50e3-4813-8eb0-ffff739fe196",
+ "colId": "history",
+ "containerId": "",
+ "name": "GetHeaders",
+ "url": "https://oi-metrology-viewer-prod.mes.infineon.com/api/export/headers",
+ "method": "GET",
+ "sortNum": 0,
+ "created": "2023-03-07T17:21:05.219Z",
+ "modified": "2023-03-07T17:28:47.716Z",
+ "headers": [],
+ "params": [],
+ "body": {
+ "type": "json",
+ "raw": "{\n \"MesEntity\": \"CDE5\",\n \"Employee\": \"Operator\",\n \"Layer\": \"-\",\n \"PSN\": \"5008\",\n \"RDS\": \"579487\",\n \"Reactor\": \"61\",\n \"Recipe\": \"LSL8IN \\\\ 10PT_5mm\",\n \"Zone\": \"-\",\n \"Ticks\": 638137811504314166,\n \"ID\": 1678209360\n}",
+ "form": []
+ },
+ "tests": []
}
]
\ No newline at end of file
diff --git a/Archive/OI.Metrology.Archive.csproj b/Archive/OI.Metrology.Archive.csproj
index c417e75..a0d7d79 100644
--- a/Archive/OI.Metrology.Archive.csproj
+++ b/Archive/OI.Metrology.Archive.csproj
@@ -34,7 +34,7 @@
-
+
diff --git a/Server/OI.Metrology.Server.csproj b/Server/OI.Metrology.Server.csproj
index d957929..332c474 100644
--- a/Server/OI.Metrology.Server.csproj
+++ b/Server/OI.Metrology.Server.csproj
@@ -1,4 +1,4 @@
-
+
SAK
SAK
@@ -28,13 +28,13 @@
-
+
-
+
diff --git a/Server/Repositories/ExportRepository.cs b/Server/Repositories/ExportRepository.cs
index 98e892f..c3d6a8f 100644
--- a/Server/Repositories/ExportRepository.cs
+++ b/Server/Repositories/ExportRepository.cs
@@ -27,9 +27,10 @@ public class ExportRepository : IExportRepository
private static string[] Get()
{
DateTime dateTime = DateTime.Now;
+ DateTime lastWeekDateTime = dateTime.AddDays(-7);
Calendar calendar = new CultureInfo("en-US").Calendar;
- string weekOfYear = calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
- string lastWeekOfYear = calendar.GetWeekOfYear(dateTime.AddDays(7), CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
+ string weekOfYear = $"{dateTime:yyyy}_Week_{calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday):00}";
+ string lastWeekOfYear = $"{lastWeekDateTime:yyyy}_Week_{calendar.GetWeekOfYear(lastWeekDateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday):00}";
return new string[] { weekOfYear, lastWeekOfYear };
}
diff --git a/Server/wwwroot/js/site.js b/Server/wwwroot/js/site.js
index bb3f7ea..293cee3 100644
--- a/Server/wwwroot/js/site.js
+++ b/Server/wwwroot/js/site.js
@@ -492,7 +492,7 @@ function recipeParametersButtonRunInfo() {
var gridCreated = $("#ModalBodyGrid").data("igGrid");
if (gridCreated)
$("#ModalBodyGrid").igGrid("destroy");
- $.getJSON('https://messa020ec.ec.local/api/oiWizard/materials/rds/' + jsonObject.RDS, function (data) {
+ $.getJSON('https://oi-prod-ec-api.mes.infineon.com/api/oiWizard/materials/rds/' + jsonObject.RDS, function (data) {
$("#RecipeParametersButton").prop("disabled", false);
var text = "";
for (var i = 0; i < data.rds.rdsLayers.length; i++) {
diff --git a/Shared/OI.Metrology.Shared.csproj b/Shared/OI.Metrology.Shared.csproj
index 3d6cbd1..526a475 100644
--- a/Shared/OI.Metrology.Shared.csproj
+++ b/Shared/OI.Metrology.Shared.csproj
@@ -30,7 +30,7 @@
Linux
-
+
diff --git a/Tests/OI.Metrology.Tests.csproj b/Tests/OI.Metrology.Tests.csproj
index be585e9..3af27c8 100644
--- a/Tests/OI.Metrology.Tests.csproj
+++ b/Tests/OI.Metrology.Tests.csproj
@@ -31,9 +31,9 @@
-
-
-
+
+
+
diff --git a/Tests/UnitTestExportController.cs b/Tests/UnitTestExportController.cs
index c57bee5..4d5b206 100644
--- a/Tests/UnitTestExportController.cs
+++ b/Tests/UnitTestExportController.cs
@@ -37,7 +37,7 @@ public class UnitTestExportController
}
private static HeaderCommon GetHeaderCommon() =>
- new() { PSN = "5008", Reactor = "39", RDS = "578918", ID = 1 };
+ new() { PSN = "5008", Reactor = "61", RDS = "579487", ID = 1678209360 };
[TestMethod]
public void GetExport()
diff --git a/View/OI.Metrology.View.csproj b/View/OI.Metrology.View.csproj
index 26a1fa7..8de7e60 100644
--- a/View/OI.Metrology.View.csproj
+++ b/View/OI.Metrology.View.csproj
@@ -1,4 +1,4 @@
-
+
net7.0
enable
@@ -8,8 +8,8 @@
-
-
+
+