From 478aecf2c881797e831997f573265a4d998df085 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Wed, 17 Jul 2024 10:58:48 -0700 Subject: [PATCH] Link to OI Wizard and new files page --- .vscode/tasks.json | 6 - Server/.vscode/tasks.json | 7 +- Server/OI.Metrology.Server.csproj | 4 +- Static/AwaitingDispo/index.html | 2 + Static/Export/index.html | 2 + Static/Metrology/AwaitingDispo/index.html | 2 + Static/Metrology/Export/index.html | 2 + Static/Metrology/RunHeaders/index.html | 2 + Static/Metrology/RunInfo/index.html | 2 + Static/Metrology/index.html | 2 + Static/RunHeaders/index.html | 2 + Static/RunInfo/index.html | 2 + Static/awaiting-disposition.html | 2 + Static/export.html | 2 + Static/files.html | 160 ++++++++++++++++++++++ Static/index.html | 2 + Static/js/export.js | 3 +- Static/js/files.js | 10 ++ Static/js/site-server.js | 45 ++++++ Static/run-headers.html | 2 + Tests/.vscode/tasks.json | 6 - 21 files changed, 250 insertions(+), 17 deletions(-) create mode 100644 Static/files.html create mode 100644 Static/js/files.js diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 0a81546..6cd5c22 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -217,12 +217,6 @@ "endsPattern": "^.*Application started.*" } } - }, - { - "label": "File-Folder-Helper AOT s M Self .Kanbn Tasks", - "type": "shell", - "command": "L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net8.0/win-x64/publish/File-Folder-Helper.exe s M L:/DevOps/Mesa_FI/OI-Metrology -s L:/DevOps/Mesa_FI/OI-Metrology/.kanbn/tasks", - "problemMatcher": [] } ] } \ No newline at end of file diff --git a/Server/.vscode/tasks.json b/Server/.vscode/tasks.json index 90e682c..535c86d 100644 --- a/Server/.vscode/tasks.json +++ b/Server/.vscode/tasks.json @@ -162,7 +162,12 @@ { "label": "File-Folder-Helper AOT s X Server", "type": "shell", - "command": "L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net8.0/win-x64/publish/File-Folder-Helper.exe s X L:/DevOps/Mesa_FI/OI-Metrology Day-Helper-2024-01-08 L:/DevOps/Mesa_FI/OI-Metrology/Server", + "command": "L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net8.0/win-x64/publish/File-Folder-Helper.exe", + "args": [ + "s", + "X", + "L:/DevOps/Mesa_FI/OI-Metrology Day-Helper-2024-01-08 L:/DevOps/Mesa_FI/OI-Metrology/Server" + ], "problemMatcher": [] } ] diff --git a/Server/OI.Metrology.Server.csproj b/Server/OI.Metrology.Server.csproj index 130ff7a..1bbd9b6 100644 --- a/Server/OI.Metrology.Server.csproj +++ b/Server/OI.Metrology.Server.csproj @@ -28,7 +28,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/Static/AwaitingDispo/index.html b/Static/AwaitingDispo/index.html index 795bfc2..537f1b8 100644 --- a/Static/AwaitingDispo/index.html +++ b/Static/AwaitingDispo/index.html @@ -46,8 +46,10 @@
  • Awaiting Disposition
  • Run Information
  • Run Headers
    • +
  • Files
  • Export
  • Archive
    • +
  • OI Web Services

    •   diff --git a/Static/Export/index.html b/Static/Export/index.html index 795bfc2..537f1b8 100644 --- a/Static/Export/index.html +++ b/Static/Export/index.html @@ -46,8 +46,10 @@

  • Awaiting Disposition
  • Run Information
  • Run Headers
    • +
  • Files
  • Export
  • Archive
    • +
  • OI Web Services

    •   diff --git a/Static/Metrology/AwaitingDispo/index.html b/Static/Metrology/AwaitingDispo/index.html index 795bfc2..537f1b8 100644 --- a/Static/Metrology/AwaitingDispo/index.html +++ b/Static/Metrology/AwaitingDispo/index.html @@ -46,8 +46,10 @@

  • Awaiting Disposition
  • Run Information
  • Run Headers
    • +
  • Files
  • Export
  • Archive
    • +
  • OI Web Services

    •   diff --git a/Static/Metrology/Export/index.html b/Static/Metrology/Export/index.html index 795bfc2..537f1b8 100644 --- a/Static/Metrology/Export/index.html +++ b/Static/Metrology/Export/index.html @@ -46,8 +46,10 @@

  • Awaiting Disposition
  • Run Information
  • Run Headers
    • +
  • Files
  • Export
  • Archive
    • +
  • OI Web Services

    •   diff --git a/Static/Metrology/RunHeaders/index.html b/Static/Metrology/RunHeaders/index.html index 795bfc2..537f1b8 100644 --- a/Static/Metrology/RunHeaders/index.html +++ b/Static/Metrology/RunHeaders/index.html @@ -46,8 +46,10 @@

  • Awaiting Disposition
  • Run Information
  • Run Headers
    • +
  • Files
  • Export
  • Archive
    • +
  • OI Web Services

    •   diff --git a/Static/Metrology/RunInfo/index.html b/Static/Metrology/RunInfo/index.html index 795bfc2..537f1b8 100644 --- a/Static/Metrology/RunInfo/index.html +++ b/Static/Metrology/RunInfo/index.html @@ -46,8 +46,10 @@

  • Awaiting Disposition
  • Run Information
  • Run Headers
    • +
  • Files
  • Export
  • Archive
    • +
  • OI Web Services

    •   diff --git a/Static/Metrology/index.html b/Static/Metrology/index.html index 795bfc2..537f1b8 100644 --- a/Static/Metrology/index.html +++ b/Static/Metrology/index.html @@ -46,8 +46,10 @@

  • Awaiting Disposition
  • Run Information
  • Run Headers
    • +
  • Files
  • Export
  • Archive
    • +
  • OI Web Services

    •   diff --git a/Static/RunHeaders/index.html b/Static/RunHeaders/index.html index 795bfc2..537f1b8 100644 --- a/Static/RunHeaders/index.html +++ b/Static/RunHeaders/index.html @@ -46,8 +46,10 @@

  • Awaiting Disposition
  • Run Information
  • Run Headers
    • +
  • Files
  • Export
  • Archive
    • +
  • OI Web Services

    •   diff --git a/Static/RunInfo/index.html b/Static/RunInfo/index.html index 795bfc2..537f1b8 100644 --- a/Static/RunInfo/index.html +++ b/Static/RunInfo/index.html @@ -46,8 +46,10 @@

  • Awaiting Disposition
  • Run Information
  • Run Headers
    • +
  • Files
  • Export
  • Archive
    • +
  • OI Web Services

    •   diff --git a/Static/awaiting-disposition.html b/Static/awaiting-disposition.html index 9ca3a81..c6fe0a0 100644 --- a/Static/awaiting-disposition.html +++ b/Static/awaiting-disposition.html @@ -45,8 +45,10 @@

  • Awaiting Disposition
  • Run Information
  • Run Headers
    • +
  • Files
  • Export
  • Archive
    • +
  • OI Web Services

    •   diff --git a/Static/export.html b/Static/export.html index 21fbb2a..cbf7cd9 100644 --- a/Static/export.html +++ b/Static/export.html @@ -46,8 +46,10 @@

  • Awaiting Disposition
  • Run Information
  • Run Headers
    • +
  • Files
  • Export
  • Archive
    • +
  • OI Web Services

    •   diff --git a/Static/files.html b/Static/files.html new file mode 100644 index 0000000..cfa89e1 --- /dev/null +++ b/Static/files.html @@ -0,0 +1,160 @@ + + + + + + + File(s) + + + + + + + + + + + + + + + + + + + + + + +

    +
    +
    + +
    + + OI Metrology Viewer +
    +
    +
    + +

    +   +

    +
    +
    +
    +
    + +

    Run Information

    + +
    +
    + +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
       +
    + +
       +
    + + +
    +
    + + +
    +
    + +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + + + +
    +
    +

    © 2024 - Infineon Technologies

    +
    +
    + +
    + + + + + + + \ No newline at end of file diff --git a/Static/index.html b/Static/index.html index 795bfc2..537f1b8 100644 --- a/Static/index.html +++ b/Static/index.html @@ -46,8 +46,10 @@
  • Awaiting Disposition
  • Run Information
  • Run Headers
    • +
  • Files
  • Export
  • Archive
    • +
  • OI Web Services

    •   diff --git a/Static/js/export.js b/Static/js/export.js index 7bab9b9..faa2c70 100644 --- a/Static/js/export.js +++ b/Static/js/export.js @@ -20,8 +20,7 @@ function getParams() { function postExport() { parms = getParams(); var toolTypeID = $("#ToolType").igCombo("value"); - var url = _apiUrl + "/Export/" + toolTypeID + "/csv"; - // var url = _apiUrl + "/ToolTypes/" + toolTypeID + "/csv"; + var url = _apiUrl + "/Export/" + toolTypeID + "/export"; $.get(url, parms, function (data) { var blob = new Blob([data], { type: "text/plain;charset=utf-8", diff --git a/Static/js/files.js b/Static/js/files.js new file mode 100644 index 0000000..f4432eb --- /dev/null +++ b/Static/js/files.js @@ -0,0 +1,10 @@ +$(document).ready(function () { + + const queryString = window.location.search; + const urlParams = new URLSearchParams(queryString); + const initialHeaderId = urlParams.get('headerid'); + const initialToolTypeID = urlParams.get('tooltypeid'); + const initialHeaderAttachmentId = urlParams.get('headerattachmentid'); + initFiles("https://oi-metrology-viewer-prod.mes.infineon.com:4433/api", "https://oi-metrology-viewer-prod.mes.infineon.com", initialToolTypeID, initialHeaderId, initialHeaderAttachmentId); + +}); \ No newline at end of file diff --git a/Static/js/site-server.js b/Static/js/site-server.js index 9ef8ace..3fb1840 100644 --- a/Static/js/site-server.js +++ b/Static/js/site-server.js @@ -1274,5 +1274,50 @@ function restartButton() { clearWorkMaterial(); }; +function initFiles(apiUrl, staticUrl, initialToolTypeID, initialHeaderId, initialHeaderAttachmentId) { + _apiUrl = apiUrl; + _StaticUrl = staticUrl; + _initialHeaderId = initialHeaderId === null ? "" : initialHeaderId; + _initialHeaderAttachmentId = initialHeaderAttachmentId === null ? "" : initialHeaderAttachmentId; + $.getJSON(_apiUrl + '/tooltypes', function (data) { + for (var i = 0; i < data.Results.length; i++) { + if (data.Results[i].ToolTypeName === "CDE") { + _CdeId = data.Results[i].ID; + } + else if (data.Results[i].ToolTypeName === "BioRad") { + _BioRadId = data.Results[i].ID; + } + } + $("#ToolType").igCombo({ + dataSource: data, + responseDataKey: "Results", + textKey: "ToolTypeName", + valueKey: "ID", + mode: "dropdown", + width: 150, + itemsRendered: function (evt, ui) { + loadHeaderGridRunInfo(); + }, + selectionChanged: loadHeaderGridRunInfo, + initialSelectedItems: [{ value: initialToolTypeID === null ? 1 : initialToolTypeID }] + }); + }); + setInitialDateTimesRunInfo(6 * 60 * 60 * 1000); + $("#HeaderGrid").on("dblclick", "tr", loadDetailsRunInfo); + $("#LoadHeadersButton").click(loadHeaderGridRunInfo); + $("#GetDataButton").click(loadDetailsRunInfo); + $("#ReviewButton").click(reviewButtonRunInfo); + $("#RecipeParametersButton").click(recipeParametersButtonRunInfo); + $("#ViewButton").click(viewButtonRunInfo); + $("#PinButton").click(pinButtonRunInfo); + $("#OIExportButton").click(oiExportButtonRunInfo); + setInterval(function () { + if ($("#chkAutoRefresh").is(':checked')) { + setInitialDateTimesRunInfo(null); + $("#LoadHeadersButton").click(); + } + }, 180000); +}; + // { "frame": { "controller": "SpreadingResistanceProfile", "height": "718px", "width": "698px" } } // { "div": { "width": "698px", "position": "absolute", "top":"700px", "left": "800px" }, "height": "160px" } diff --git a/Static/run-headers.html b/Static/run-headers.html index 65d94c5..d193831 100644 --- a/Static/run-headers.html +++ b/Static/run-headers.html @@ -46,8 +46,10 @@

  • Awaiting Disposition
  • Run Information
  • Run Headers
    • +
  • Files
  • Export
  • Archive
    • +
  • OI Web Services

    •   diff --git a/Tests/.vscode/tasks.json b/Tests/.vscode/tasks.json index e86b351..eb1405b 100644 --- a/Tests/.vscode/tasks.json +++ b/Tests/.vscode/tasks.json @@ -82,12 +82,6 @@ "D:/web-sites/OI-Metrology/hh-3498d1da-_______-OI-Metrology-Release/Server" ], "problemMatcher": "$msCompile" - }, - { - "label": "File-Folder-Helper AOT s V Repositories", - "type": "shell", - "command": "L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net8.0/win-x64/publish/File-Folder-Helper.exe s V Repositories", - "problemMatcher": [] } ] } \ No newline at end of file