Link to OI Wizard and new files page

This commit is contained in:
Mike Phares 2024-07-17 10:58:48 -07:00
parent fe3292133e
commit 478aecf2c8
21 changed files with 250 additions and 17 deletions

6
.vscode/tasks.json vendored
View File

@ -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": []
}
]
}

View File

@ -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": []
}
]

View File

@ -28,7 +28,7 @@
<PackageReference Include="Dapper" Version="2.1.44" />
<PackageReference Include="EntityFramework" Version="6.5.1" />
<PackageReference Include="jQuery" Version="3.7.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
@ -40,7 +40,7 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
<PackageReference Include="System.Drawing.Common" Version="8.0.6" />
<PackageReference Include="System.Drawing.Common" Version="8.0.7" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Shared\OI.Metrology.Shared.csproj" />

View File

@ -46,8 +46,10 @@
<li><a href="/awaiting-disposition.html">Awaiting Disposition</a></li>
<li><a href="/index.html" class="alert-info">Run Information</a></li>
<li><a href="/run-headers.html">Run Headers</a></li>
<li><a href="/files.html">Files</a></li>
<li><a href="/export.html">Export</a></li>
<li><a href="https://oi-metrology-viewer-archive.mes.infineon.com/" target="_blank">Archive</a></li>
<li><a href="https://goto.infineon.com/oiwizard" target="_blank">OI Web Services</a></li>
</ul>
<p class="navbar-text navbar-right">
&nbsp;

View File

@ -46,8 +46,10 @@
<li><a href="/awaiting-disposition.html">Awaiting Disposition</a></li>
<li><a href="/index.html" class="alert-info">Run Information</a></li>
<li><a href="/run-headers.html">Run Headers</a></li>
<li><a href="/files.html">Files</a></li>
<li><a href="/export.html">Export</a></li>
<li><a href="https://oi-metrology-viewer-archive.mes.infineon.com/" target="_blank">Archive</a></li>
<li><a href="https://goto.infineon.com/oiwizard" target="_blank">OI Web Services</a></li>
</ul>
<p class="navbar-text navbar-right">
&nbsp;

View File

@ -46,8 +46,10 @@
<li><a href="/awaiting-disposition.html">Awaiting Disposition</a></li>
<li><a href="/index.html" class="alert-info">Run Information</a></li>
<li><a href="/run-headers.html">Run Headers</a></li>
<li><a href="/files.html">Files</a></li>
<li><a href="/export.html">Export</a></li>
<li><a href="https://oi-metrology-viewer-archive.mes.infineon.com/" target="_blank">Archive</a></li>
<li><a href="https://goto.infineon.com/oiwizard" target="_blank">OI Web Services</a></li>
</ul>
<p class="navbar-text navbar-right">
&nbsp;

View File

@ -46,8 +46,10 @@
<li><a href="/awaiting-disposition.html">Awaiting Disposition</a></li>
<li><a href="/index.html" class="alert-info">Run Information</a></li>
<li><a href="/run-headers.html">Run Headers</a></li>
<li><a href="/files.html">Files</a></li>
<li><a href="/export.html">Export</a></li>
<li><a href="https://oi-metrology-viewer-archive.mes.infineon.com/" target="_blank">Archive</a></li>
<li><a href="https://goto.infineon.com/oiwizard" target="_blank">OI Web Services</a></li>
</ul>
<p class="navbar-text navbar-right">
&nbsp;

View File

@ -46,8 +46,10 @@
<li><a href="/awaiting-disposition.html">Awaiting Disposition</a></li>
<li><a href="/index.html" class="alert-info">Run Information</a></li>
<li><a href="/run-headers.html">Run Headers</a></li>
<li><a href="/files.html">Files</a></li>
<li><a href="/export.html">Export</a></li>
<li><a href="https://oi-metrology-viewer-archive.mes.infineon.com/" target="_blank">Archive</a></li>
<li><a href="https://goto.infineon.com/oiwizard" target="_blank">OI Web Services</a></li>
</ul>
<p class="navbar-text navbar-right">
&nbsp;

View File

@ -46,8 +46,10 @@
<li><a href="/awaiting-disposition.html">Awaiting Disposition</a></li>
<li><a href="/index.html" class="alert-info">Run Information</a></li>
<li><a href="/run-headers.html">Run Headers</a></li>
<li><a href="/files.html">Files</a></li>
<li><a href="/export.html">Export</a></li>
<li><a href="https://oi-metrology-viewer-archive.mes.infineon.com/" target="_blank">Archive</a></li>
<li><a href="https://goto.infineon.com/oiwizard" target="_blank">OI Web Services</a></li>
</ul>
<p class="navbar-text navbar-right">
&nbsp;

View File

@ -46,8 +46,10 @@
<li><a href="/awaiting-disposition.html">Awaiting Disposition</a></li>
<li><a href="/index.html" class="alert-info">Run Information</a></li>
<li><a href="/run-headers.html">Run Headers</a></li>
<li><a href="/files.html">Files</a></li>
<li><a href="/export.html">Export</a></li>
<li><a href="https://oi-metrology-viewer-archive.mes.infineon.com/" target="_blank">Archive</a></li>
<li><a href="https://goto.infineon.com/oiwizard" target="_blank">OI Web Services</a></li>
</ul>
<p class="navbar-text navbar-right">
&nbsp;

View File

@ -46,8 +46,10 @@
<li><a href="/awaiting-disposition.html">Awaiting Disposition</a></li>
<li><a href="/index.html" class="alert-info">Run Information</a></li>
<li><a href="/run-headers.html">Run Headers</a></li>
<li><a href="/files.html">Files</a></li>
<li><a href="/export.html">Export</a></li>
<li><a href="https://oi-metrology-viewer-archive.mes.infineon.com/" target="_blank">Archive</a></li>
<li><a href="https://goto.infineon.com/oiwizard" target="_blank">OI Web Services</a></li>
</ul>
<p class="navbar-text navbar-right">
&nbsp;

View File

@ -46,8 +46,10 @@
<li><a href="/awaiting-disposition.html">Awaiting Disposition</a></li>
<li><a href="/index.html" class="alert-info">Run Information</a></li>
<li><a href="/run-headers.html">Run Headers</a></li>
<li><a href="/files.html">Files</a></li>
<li><a href="/export.html">Export</a></li>
<li><a href="https://oi-metrology-viewer-archive.mes.infineon.com/" target="_blank">Archive</a></li>
<li><a href="https://goto.infineon.com/oiwizard" target="_blank">OI Web Services</a></li>
</ul>
<p class="navbar-text navbar-right">
&nbsp;

View File

@ -45,8 +45,10 @@
<li><a href="/awaiting-disposition.html" class="alert-info">Awaiting Disposition</a></li>
<li><a href="/index.html">Run Information</a></li>
<li><a href="/run-headers.html">Run Headers</a></li>
<li><a href="/files.html">Files</a></li>
<li><a href="/export.html">Export</a></li>
<li><a href="https://oi-metrology-viewer-archive.mes.infineon.com/" target="_blank">Archive</a></li>
<li><a href="https://goto.infineon.com/oiwizard" target="_blank">OI Web Services</a></li>
</ul>
<p class="navbar-text navbar-right">
&nbsp;

View File

@ -46,8 +46,10 @@
<li><a href="/awaiting-disposition.html">Awaiting Disposition</a></li>
<li><a href="/index.html">Run Information</a></li>
<li><a href="/run-headers.html">Run Headers</a></li>
<li><a href="/files.html">Files</a></li>
<li><a href="/export.html" class="alert-info">Export</a></li>
<li><a href="https://oi-metrology-viewer-archive.mes.infineon.com/" target="_blank">Archive</a></li>
<li><a href="https://goto.infineon.com/oiwizard" target="_blank">OI Web Services</a></li>
</ul>
<p class="navbar-text navbar-right">
&nbsp;

160
Static/files.html Normal file
View File

@ -0,0 +1,160 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width" />
<title>File(s)</title>
<script src="/js/modernizr-3.6.0-custom.js?no-cache=2024-06-18-10-54" type="text/javascript"></script>
<link href="/styles/bootstrap.min.css?no-cache=2024-06-18-10-54" rel="stylesheet" />
<link href="/igniteui/css/themes/bootstrap3/default/infragistics.theme.css?no-cache=2024-06-18-10-54"
rel="stylesheet" />
<link href="/igniteui/css/structure/infragistics.css?no-cache=2024-06-18-10-54" rel="stylesheet" />
<link href="/styles/site-server.css?no-cache=2024-06-18-10-54" rel="stylesheet" />
<link href="/styles/index.css?no-cache=2024-06-18-10-54" rel="stylesheet" />
<script src="/js/jquery-3.6.0.min.js?no-cache=2024-06-18-10-54" type="text/javascript"></script>
<script src="/js/jquery-ui.min.js?no-cache=2024-06-18-10-54" type="text/javascript"></script>
<script src="/igniteui/js/infragistics.core.js?no-cache=2024-06-18-10-54" type="text/javascript"></script>
<script src="/igniteui/js/infragistics.lob.js?no-cache=2024-06-18-10-54" type="text/javascript"></script>
<script src="/igniteui/js/infragistics.dv.js?no-cache=2024-06-18-10-54" type="text/javascript"></script>
<script src="/js/chart-4.3.0.min.js" type="module"></script>
<script src="/js/common.js?no-cache=2024-06-18-10-54" type="text/javascript"></script>
<script src="/js/site-server.js?no-cache=2024-06-18-10-54" type="text/javascript"></script>
</head>
<body>
<div class="navbar navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<div class="navbar-brand">
<a href="/"><img src="/images/IFX_LOGO_RGB.png" height="20" /></a>
OI Metrology Viewer
</div>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a href="/awaiting-disposition.html">Awaiting Disposition</a></li>
<li><a href="/index.html">Run Information</a></li>
<li><a href="/run-headers.html">Run Headers</a></li>
<li><a href="/files.html" class="alert-info">Files</a></li>
<li><a href="/export.html">Export</a></li>
<li><a href="https://oi-metrology-viewer-archive.mes.infineon.com/" target="_blank">Archive</a></li>
<li><a href="https://goto.infineon.com/oiwizard" target="_blank">OI Web Services</a></li>
</ul>
<p class="navbar-text navbar-right">
&nbsp;
</p>
</div>
</div>
</div>
<div class="container-fluid body-content">
<h4>Run Information</h4>
<form class="form-inline mb-4">
<div class="form-group">
<label for="ToolType">Tool Type</label>
<div class="form-control" id="ToolType"></div>
</div>
<div class="form-group">
<label for="StartDate">Start Time</label>
<div class="form-control mb-2 mr-sm-2" id="StartDate"></div>
<div class="form-control mb-2 mr-sm-2" id="StartTime"></div>
</div>
<div class="form-group">
<label for="EndDate">End Time</label>
<div class="form-control mb-2 mr-sm-2" id="EndDate"></div>
<div class="form-control mb-2 mr-sm-2" id="EndTime"></div>
</div>&nbsp;&nbsp;
<div class="form-group">
<input class="btn btn-primary" type="button" value="Load Headers" id="LoadHeadersButton" />
</div>&nbsp;&nbsp;
<div class="form-group">
<label class="form-check-label" for="chkAutoRefresh">
Auto-Refresh
</label>
<input class="form-check-input" type="checkbox" id="chkAutoRefresh">
</div>
<div class="form-group">
<label class="form-check-label" for="chkCopyOnGet">
Copy-On-Get
</label>
<input class="form-check-input" type="checkbox" id="chkCopyOnGet">
</div>
</form>
<div style="height: 300px;" id="HeaderGridDiv">
<span id="ToolTypeID" hidden></span>
<table id="HeaderGrid"></table>
</div>
<div class="row" style="margin-top: 10px; margin-bottom: 20px;">
<div class="col-xs-1">
<input type="button" class="btn" id="GetDataButton" value="Get Data" disabled />
</div>
<div class="col-xs-1">
<input type="button" class="btn" id="ReviewButton" value="Review" disabled />
</div>
<div class="col-xs-1">
<input type="button" class="btn" id="RecipeParametersButton" value="Parameters" disabled />
</div>
<div class="col-xs-1">
<input type="button" class="btn" id="ViewButton" value="View" disabled />
</div>
<div class="col-xs-1">
<input type="button" class="btn" id="PinButton" value="Pin" disabled />
</div>
</div>
<div id="DetailsDiv" hidden>
<span id="HeaderId" hidden></span>
<span id="HeaderAttachmentId" hidden></span>
<div style="padding-bottom: 20px;" id="DetailsGridDiv">
<table id="DetailsGrid"></table>
</div>
<div id="ExportDiv" style="margin-top: 10px;" hidden>
<input type="button" value="Send to OpenInsight" id="OIExportButton" />
<span id="OIExportResult" style="margin-left: 10px; font-weight: bold; color: #366b02;"></span>
</div>
<p style="margin-top: 20px;">
<iframe id="DataAttachmentFrame" style="height:900px; border-width:thin; margin-right: 10px;"
hidden></iframe>
<iframe id="HeaderAttachmentFrame" style="height:900px; border-width:thin;" hidden></iframe>
&nbsp;
<div id="DataAttachmentDiv" hidden>
<canvas id="DataAttachmentCanvas"></canvas>
</div>
<div id="HeaderAttachmentDiv" hidden>
<canvas id="HeaderAttachmentCanvas"></canvas>
</div>
</p>
</div>
<hr />
<footer>
<p>&copy; 2024 - Infineon Technologies</p>
</footer>
</div>
<div id="MessageModal"></div>
<script src="/js/bootstrap.min.js?no-cache=2024-06-18-10-54" type="text/javascript"></script>
<script src="/js/respond.min.js?no-cache=2024-06-18-10-54" type="text/javascript"></script>
<script src="/js/files.js?no-cache=2024-06-18-10-54" type="text/javascript"></script>
</body>
</html>

View File

@ -46,8 +46,10 @@
<li><a href="/awaiting-disposition.html">Awaiting Disposition</a></li>
<li><a href="/index.html" class="alert-info">Run Information</a></li>
<li><a href="/run-headers.html">Run Headers</a></li>
<li><a href="/files.html">Files</a></li>
<li><a href="/export.html">Export</a></li>
<li><a href="https://oi-metrology-viewer-archive.mes.infineon.com/" target="_blank">Archive</a></li>
<li><a href="https://goto.infineon.com/oiwizard" target="_blank">OI Web Services</a></li>
</ul>
<p class="navbar-text navbar-right">
&nbsp;

View File

@ -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",

10
Static/js/files.js Normal file
View File

@ -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);
});

View File

@ -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" }

View File

@ -46,8 +46,10 @@
<li><a href="/awaiting-disposition.html">Awaiting Disposition</a></li>
<li><a href="/index.html">Run Information</a></li>
<li><a href="/run-headers.html" class="alert-info">Run Headers</a></li>
<li><a href="/files.html">Files</a></li>
<li><a href="/export.html">Export</a></li>
<li><a href="https://oi-metrology-viewer-archive.mes.infineon.com/" target="_blank">Archive</a></li>
<li><a href="https://goto.infineon.com/oiwizard" target="_blank">OI Web Services</a></li>
</ul>
<p class="navbar-text navbar-right">
&nbsp;

View File

@ -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": []
}
]
}