diff --git a/displaymachine.asp b/displaymachine.asp index 48256ad..6958095 100644 --- a/displaymachine.asp +++ b/displaymachine.asp @@ -113,23 +113,6 @@ Response.End End If - ' Check if machine has UDC data (only for equipment with machinenumber) - Dim rsUDCCheck, hasUDCData, strSQL2, machineNum - hasUDCData = False - machineNum = rs("machinenumber") & "" - If machineNum <> "" Then - strSQL2 = "SELECT COUNT(*) as cnt FROM udcparts p " & _ - "JOIN udcsessions s ON p.sessionid = s.sessionid " & _ - "WHERE s.machinenumber = ?" - Set rsUDCCheck = ExecuteParameterizedQuery(objConn, strSQL2, Array(machineNum)) - If Not rsUDCCheck Is Nothing Then - If Not rsUDCCheck.EOF Then - If CLng(rsUDCCheck("cnt") & "0") > 0 Then hasUDCData = True - End If - rsUDCCheck.Close - Set rsUDCCheck = Nothing - End If - End If %>
@@ -192,11 +175,6 @@| Time | -Type | -Badge | -Details | -
|---|---|---|---|
| No recent activity | |||
| " & Server.HTMLEncode(rsActivity("eventtime") & "") & " | ") - Response.Write("" & actBadge & " | ") - Response.Write("" & Server.HTMLEncode(rsActivity("badgenumber") & "") & " | ") - Response.Write("" & Server.HTMLEncode(rsActivity("details") & "") & " | ") - Response.Write("
| Tool # | -Description | -Checks | -Avg Dev | -Max Dev | -Status | -
|---|---|---|---|---|---|
| No tool data available | |||||
| " & Server.HTMLEncode(rsTools("toolnumber") & "") & " | ") - Response.Write("" & Server.HTMLEncode(Left(rsTools("description") & "", 30)) & " | ") - Response.Write("" & rsTools("measurements") & " | ") - Response.Write("" & toolAvgDev & " | ") - Response.Write("" & toolMaxDev & " | ") - Response.Write("" & toolStatus & " | ") - Response.Write("
| Time | -Tool # | -Description | -Actual | -Min/Max | -Deviation | -
|---|---|---|---|---|---|
| " & Server.HTMLEncode(rsOOTEvents("eventtime") & "") & " | ") - Response.Write("" & Server.HTMLEncode(rsOOTEvents("toolnumber") & "") & " | ") - Response.Write("" & Server.HTMLEncode(Left(rsOOTEvents("description") & "", 25)) & " | ") - Response.Write("" & FormatNumber(CDbl(rsOOTEvents("actualval") & "0"), 4) & " | ") - Response.Write("" & FormatNumber(CDbl(rsOOTEvents("minval") & "0"), 4) & " / " & FormatNumber(CDbl(rsOOTEvents("maxval") & "0"), 4) & " | ") - Response.Write("" & FormatNumber(CDbl(rsOOTEvents("deviation") & "0"), 4) & " | ") - Response.Write("
Vendor:
-Model:
-Serial:
-Location:
-IP:
-FQDN:
-PIN:
-Driver:
-CSF Name:
-Windows Name:
-<%=Server.HTMLEncode(vendorVal)%>
--<% - If modelVal <> "N/A" And rs("documentationpath") & "" <> "" Then - Response.Write("" & Server.HTMLEncode(modelVal) & "") - Else - Response.Write(Server.HTMLEncode(modelVal)) - End If -%> -
-<%=Server.HTMLEncode(serialVal)%>
--<% - If machineVal <> "N/A" Then -%> - - <%=Server.HTMLEncode(machineVal)%> - -<% - Else - Response.Write("N/A") - End If -%> -
--<% - If ipVal <> "N/A" Then - Response.Write("" & Server.HTMLEncode(ipVal) & "") - Else - Response.Write("N/A") - End If -%> -
-<%=Server.HTMLEncode(fqdnVal)%>
-<%=Server.HTMLEncode(pinVal)%>
--<% - ' Driver download - use icon link to maintain alignment - IF rs("installpath") & "" <> "" THEN - response.write (" Specific Installer") - ELSE - response.write (" Universal Installer") - END IF -%> -
-<%=Server.HTMLEncode(csfVal)%>
-<%=Server.HTMLEncode(winNameVal)%>
-" & Server.HTMLEncode(zabbixConnected) & "
Vendor:
+Model:
+Serial:
+Location:
+IP:
+FQDN:
+PIN:
+Driver:
+CSF Name:
+Windows Name:
+<%=Server.HTMLEncode(vendorVal)%>
++<% + If modelVal <> "N/A" And rs("documentationpath") & "" <> "" Then + Response.Write("" & Server.HTMLEncode(modelVal) & "") + Else + Response.Write(Server.HTMLEncode(modelVal)) + End If +%> +
+<%=Server.HTMLEncode(serialVal)%>
++<% + If machineVal <> "N/A" Then +%> + + <%=Server.HTMLEncode(machineVal)%> + +<% + Else + Response.Write("N/A") + End If +%> +
++<% + If ipVal <> "N/A" Then + Response.Write("" & Server.HTMLEncode(ipVal) & "") + Else + Response.Write("N/A") + End If +%> +
+<%=Server.HTMLEncode(fqdnVal)%>
+<%=Server.HTMLEncode(pinVal)%>
++<% + ' Driver download - use icon link to maintain alignment + IF rs("installpath") & "" <> "" THEN + response.write (" Specific Installer") + ELSE + response.write (" Universal Installer") + END IF +%> +
+<%=Server.HTMLEncode(csfVal)%>
+<%=Server.HTMLEncode(winNameVal)%>
+" & Server.HTMLEncode(zabbixConnected) & "
Select printers to print (6 per page):
+ +