Fix dualpath propagation, getShopfloorPCs filtering, USB management, and printer features
- Fix dualpath PC propagation direction (Equipment->PC) in api.asp and db_helpers.asp - Fix early exit in CreatePCMachineRelationship preventing propagation - Fix getShopfloorPCs to filter machinetypeid IN (33,34,35) instead of >= 33 - Fix getShopfloorPCs to show equipment numbers via GROUP_CONCAT subquery - Add detailed PropagateDP logging for dualpath debugging - Default "Show on Shopfloor Dashboard" checkbox to checked in addnotification.asp - Add USB label batch printing, single USB labels, and USB history pages - Add printer supplies tracking and toner report enhancements - Add uptime map visualization page - Add dashboard/lobby display SQL migration - Update CLAUDE.md with IIS 401 workaround documentation - Update TODO.md Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -68,6 +68,20 @@
|
||||
"LEFT JOIN vendors v ON m.vendorid = v.vendorid " & _
|
||||
"LEFT JOIN communications c ON mac.machineid = c.machineid AND c.isprimary = 1 AND c.comstypeid = 1 " & _
|
||||
"WHERE mac.machineid = " & CLng(deviceId) & " AND mac.machinetypeid = 19"
|
||||
Case "firewall"
|
||||
machineTypeId = 46
|
||||
editUrl = "devicefirewall.asp?id=" & deviceId
|
||||
listUrl = "networkdevices.asp?filter=Firewall"
|
||||
strSQL = "SELECT mac.machineid, mac.alias AS firewallname, mac.machinenotes AS description, " & _
|
||||
"mac.maptop, mac.mapleft, mac.isactive, mac.serialnumber, mac.fqdn, mac.logicmonitorurl, " & _
|
||||
"v.vendor, m.modelnumber, m.image, c.address AS ipaddress, c.macaddress, " & _
|
||||
"NULL AS idfname, 'Firewall' AS devicetype, " & _
|
||||
"mac.alias AS devicename " & _
|
||||
"FROM machines mac " & _
|
||||
"LEFT JOIN models m ON mac.modelnumberid = m.modelnumberid " & _
|
||||
"LEFT JOIN vendors v ON m.vendorid = v.vendorid " & _
|
||||
"LEFT JOIN communications c ON mac.machineid = c.machineid AND c.isprimary = 1 AND c.comstypeid = 1 " & _
|
||||
"WHERE mac.machineid = " & CLng(deviceId) & " AND mac.machinetypeid = 46"
|
||||
Case "camera"
|
||||
machineTypeId = 18
|
||||
editUrl = "devicecamera.asp?id=" & deviceId
|
||||
@@ -121,6 +135,8 @@
|
||||
deviceName = rs("servername")
|
||||
Case "switch"
|
||||
deviceName = rs("switchname")
|
||||
Case "firewall"
|
||||
deviceName = rs("firewallname")
|
||||
Case "camera"
|
||||
deviceName = rs("cameraname")
|
||||
Case "accesspoint", "access point"
|
||||
@@ -206,7 +222,7 @@
|
||||
<%
|
||||
Dim showLogicMonitor
|
||||
showLogicMonitor = False
|
||||
If LCase(deviceType) = "server" Or LCase(deviceType) = "switch" Or LCase(deviceType) = "accesspoint" Or LCase(deviceType) = "access point" Then
|
||||
If LCase(deviceType) = "server" Or LCase(deviceType) = "switch" Or LCase(deviceType) = "firewall" Or LCase(deviceType) = "accesspoint" Or LCase(deviceType) = "access point" Then
|
||||
If Not IsNull(rs("logicmonitorurl")) Then
|
||||
If rs("logicmonitorurl") & "" <> "" Then showLogicMonitor = True
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user