phares3757/barcode-host
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EquipmentName and error div

Browse Source
This commit is contained in:
Mike Phares 2023-08-02 14:42:43 -07:00
parent 2b9e48c61c
commit 93eb6a08b4
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Server/Pages/Notification.cshtml
View File

@ -13,7 +13,7 @@
<p>&nbsp;</p> <p>&nbsp;</p>
<div class="row p-1"> <div class="row p-1">
<div class="col-6"> <div class="col-6">
<h1 style="text-align:center">Scan RDS barcode before starting BioRad</h1> <h1 style="text-align:center">Scan RDS barcode before starting <span id="equipmentName">BioRad</span></h1>
</div> </div>
</div> </div>
<p>&nbsp;</p> <p>&nbsp;</p>
@ -40,6 +40,12 @@
<h1 id="qaMetTests" style="text-align:center"></h1> <h1 id="qaMetTests" style="text-align:center"></h1>
</div> </div>
</div> </div>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<div class="row p-1">
<div class="col-6" id="error"></div>
</div>
</div> </div>
<script> <script>
var appSettings = JSON.parse('@(Html.Raw(System.Text.Json.JsonSerializer.Serialize(this.Model.AppSettings)))'); var appSettings = JSON.parse('@(Html.Raw(System.Text.Json.JsonSerializer.Serialize(this.Model.AppSettings)))');

19
Server/wwwroot/js/notification.js
View File

@ -1,12 +1,14 @@
"use strict"; "use strict";
console.log(appSettings.OpenInsightApplicationProgrammingInterface); console.log(appSettings.OpenInsightApplicationProgrammingInterface);
document.getElementById("equipmentName").innerText = appSettings.EquipmentName;
var connection = new signalR.HubConnectionBuilder() var connection = new signalR.HubConnectionBuilder()
.withUrl("/NotificationHub") .withUrl("/NotificationHub")
.build(); .build();
connection.on("NotifyAll", function (data) { connection.on("NotifyAll", function (data) {
document.getElementById("error").innerHTML = "";
if (!data.keyPressEvent || !data.lastScanServiceResultValue) { if (!data.keyPressEvent || !data.lastScanServiceResultValue) {
if (!data.httpContentBody) { if (!data.httpContentBody) {
document.getElementById("lastScanServiceResultValue").innerText = ""; document.getElementById("lastScanServiceResultValue").innerText = "";
@ -25,20 +27,25 @@ connection.on("NotifyAll", function (data) {
if (!postResult.MId) { if (!postResult.MId) {
document.getElementById("mId").innerText = ""; document.getElementById("mId").innerText = "";
} else { } else {
document.getElementById( var mId = postResult.MId.replace(/\r\n/g, ' ');
"mId", if (mId.length == postResult.MId) {
).innerText = `Use ${postResult.MId} for the wafer and input id`; document.getElementById("mId").innerText = `Use ${mId} for the wafer and input id`;
}
else {
document.getElementById("mId").innerText = "";
document.getElementById("error").innerHTML = mId;
}
} }
if (!postResult.QaMetTests) { if (!postResult.QaMetTests) {
document.getElementById("qaMetTests").innerText = data.httpContentBody; document.getElementById("qaMetTests").innerText = data.httpContentBody;
} else { } else {
var properties = []; var properties = [];
var qaMetTests = ""; var qaMetTests = "";
for (const property in postResult) for (const property in postResult.QaMetTests)
properties.push(property); properties.push(property);
for (var i = 0; i < properties.length; i++) { for (var i = 0; i < properties.length; i++) {
for (var j = 0; j < postResult[properties[i]].length; j++) { for (var j = 0; j < postResult.QaMetTests[properties[i]].length; j++) {
qaMetTests += properties[i] + " - [" + postResult[properties[i]][j].recipe + "] - [" + postResult[properties[i]][j].recipePattern + "]<br />"; qaMetTests += properties[i] + " - [" + postResult.QaMetTests[properties[i]][j].recipe + "] - [" + postResult.QaMetTests[properties[i]][j].recipePattern + "]<br />";
} }
} }
document.getElementById("qaMetTests").innerText = qaMetTests; document.getElementById("qaMetTests").innerText = qaMetTests;