diff --git a/addknowledgebase.asp b/addknowledgebase.asp index 889dfd7..6d634b3 100644 --- a/addknowledgebase.asp +++ b/addknowledgebase.asp @@ -36,7 +36,7 @@ Add Knowledge Base Article - Back + Back to Knowledge Base diff --git a/addnotification.asp b/addnotification.asp index 81e58c0..4787da6 100644 --- a/addnotification.asp +++ b/addnotification.asp @@ -36,7 +36,7 @@ Add Notification - Back + Back to Notifications diff --git a/addprinter.asp b/addprinter.asp index 216169c..aead0d7 100644 --- a/addprinter.asp +++ b/addprinter.asp @@ -36,7 +36,7 @@ Add Printer - Back + Back to Printers diff --git a/addsubnet.asp b/addsubnet.asp index 3da1abd..0c04fba 100644 --- a/addsubnet.asp +++ b/addsubnet.asp @@ -34,7 +34,7 @@
Add Subnet
- +
diff --git a/computers.asp b/computers.asp index 708ca31..9adf52d 100644 --- a/computers.asp +++ b/computers.asp @@ -30,11 +30,11 @@
-
+ diff --git a/displayapplication.asp b/displayapplication.asp index ec01c1b..df8b49f 100644 --- a/displayapplication.asp +++ b/displayapplication.asp @@ -80,7 +80,7 @@
  • - +
    • diff --git a/displayapplications.asp b/displayapplications.asp index 3f77ecd..efff5a7 100644 --- a/displayapplications.asp +++ b/displayapplications.asp @@ -34,7 +34,7 @@ If filterType = "" Then filterType = "installable" %>
    ") + While Not rs.EOF + Response.Write("") ' Show download icon if installpath is set, or if applicationlink is set as fallback - IF Not IsNull(rs("installpath")) And rs("installpath") <> "" THEN - response.write("") - ELSEIF Not IsNull(rs("applicationlink")) And rs("applicationlink") <> "" THEN - response.write("") - ELSE - response.write("") - END IF - IF Not IsNull(rs("documentationpath")) And rs("documentationpath") <> "" THEN - response.write("") - ELSE - response.write("") - END IF - response.write("") - response.write("") - response.write("") - response.write("") - response.write("") - rs.movenext - wend + If Not IsNull(rs("installpath")) And rs("installpath") <> "" Then + Response.Write("") + ElseIf Not IsNull(rs("applicationlink")) And rs("applicationlink") <> "" Then + Response.Write("") + Else + Response.Write("") + End If + If Not IsNull(rs("documentationpath")) And rs("documentationpath") <> "" Then + Response.Write("") + Else + Response.Write("") + End If + Response.Write("") + Response.Write("") + Response.Write("") + Response.Write("") + Response.Write("") + rs.MoveNext + Wend objConn.Close %> diff --git a/displaydevice.asp b/displaydevice.asp index 4eb629a..0929d9b 100644 --- a/displaydevice.asp +++ b/displaydevice.asp @@ -158,7 +158,7 @@ <%End If%>
  • - +
    • diff --git a/displayknowledgearticle.asp b/displayknowledgearticle.asp index 650c977..4757980 100644 --- a/displayknowledgearticle.asp +++ b/displayknowledgearticle.asp @@ -63,7 +63,7 @@
    -
    +
    Knowledge Base Article
    diff --git a/displaymachines.asp b/displaymachines.asp index 136cc6c..8c2c47d 100644 --- a/displaymachines.asp +++ b/displaymachines.asp @@ -33,7 +33,7 @@
    -
    +
        Machines
    diff --git a/displaypcs.asp b/displaypcs.asp index 1035e05..b6a8987 100644 --- a/displaypcs.asp +++ b/displaypcs.asp @@ -30,11 +30,11 @@
    -
    + diff --git a/displayprinter.asp b/displayprinter.asp index 73c0898..9c4a5d7 100644 --- a/displayprinter.asp +++ b/displayprinter.asp @@ -97,7 +97,7 @@
  • - +
    • diff --git a/displayprinters.asp b/displayprinters.asp index 5838292..9ed90e4 100644 --- a/displayprinters.asp +++ b/displayprinters.asp @@ -47,7 +47,7 @@
    - + diff --git a/displaysubnet.asp b/displaysubnet.asp index 861b90e..65af4ec 100644 --- a/displaysubnet.asp +++ b/displaysubnet.asp @@ -70,13 +70,13 @@
    -
    Vlan #
      " &rs("appname") &"") - response.write(rs("teamname")) - response.write("") - response.write("" &rs("appowner") &"") - response.write("") - response.write(rs("sso")) - response.write("
      " & Server.HTMLEncode(rs("appname") & "") & "") + Response.Write(Server.HTMLEncode(rs("teamname") & "")) + Response.Write("") + Response.Write("" & Server.HTMLEncode(rs("appowner") & "") & "") + Response.Write("") + Response.Write(Server.HTMLEncode(rs("sso") & "")) + Response.Write("
    ID MachineMakeVendor Model CSF IP
    +
    @@ -132,7 +132,7 @@
    Subnet Details
    -
    Vlan #
    +
    diff --git a/displaysubnets.asp b/displaysubnets.asp index 1b3e60d..b4146bd 100644 --- a/displaysubnets.asp +++ b/displaysubnets.asp @@ -36,13 +36,13 @@
    -
    Vlan #
    +
    @@ -58,12 +58,12 @@ @@ -96,7 +96,7 @@
      Subnet Details
    -
    Vlan #
    +
    @@ -115,11 +115,11 @@ WHILE NOT rs.eof %> - - - - - + + + + + <% rs.movenext diff --git a/editpc.asp b/editpc.asp index 1d08033..af0c8db 100644 --- a/editpc.asp +++ b/editpc.asp @@ -187,12 +187,12 @@
    -
    +
    - Edit Equipment + Edit PC
    - - Back to Machines + + Back to PCs
    diff --git a/listpcs.asp b/listpcs.asp index a00cdeb..8901cc6 100644 --- a/listpcs.asp +++ b/listpcs.asp @@ -30,11 +30,11 @@
    -
    + diff --git a/logs/api-2025-12-09.log b/logs/api-2025-12-09.log new file mode 100755 index 0000000..f53e0d9 --- /dev/null +++ b/logs/api-2025-12-09.log @@ -0,0 +1,47 @@ +12/9/2025 10:06:31 AM - === NEW updateCompleteAsset REQUEST === +12/9/2025 10:06:31 AM - Hostname: TEST +12/9/2025 10:06:31 AM - Serial: TEST123 +12/9/2025 10:06:31 AM - PC Type: +12/9/2025 10:06:31 AM - PC record created/updated. machineid: 5838 +12/9/2025 10:30:37 AM - === NEW updateCompleteAsset REQUEST === +12/9/2025 10:30:37 AM - Hostname: TESTHT +12/9/2025 10:30:37 AM - Serial: TESTHT123 +12/9/2025 10:30:37 AM - PC Type: HeatTreat +12/9/2025 10:30:37 AM - Unknown pcType 'HeatTreat' for pctypeid, defaulting to Standard (1) +12/9/2025 10:30:37 AM - Mapped pcType 'HeatTreat' to pctypeid: 1 +12/9/2025 10:30:37 AM - PC record created/updated. machineid: 5839 +12/9/2025 10:31:10 AM - === NEW updateCompleteAsset REQUEST === +12/9/2025 10:31:10 AM - Hostname: TESTHT +12/9/2025 10:31:10 AM - Serial: TESTHT123 +12/9/2025 10:31:10 AM - PC Type: HeatTreat +12/9/2025 10:31:10 AM - Unknown pcType 'HeatTreat' for pctypeid, defaulting to Standard (1) +12/9/2025 10:31:10 AM - Mapped pcType 'HeatTreat' to pctypeid: 1 +12/9/2025 10:31:10 AM - PC record created/updated. machineid: 5840 +12/9/2025 10:32:05 AM - === NEW updateCompleteAsset REQUEST === +12/9/2025 10:32:05 AM - Hostname: TESTHT +12/9/2025 10:32:05 AM - Serial: TESTHT123 +12/9/2025 10:32:05 AM - PC Type: HeatTreat +12/9/2025 10:32:05 AM - Mapped pcType 'HeatTreat' to pctypeid: 9 +12/9/2025 10:32:05 AM - PC record created/updated. machineid: 5841 +12/9/2025 10:40:33 AM - === NEW updateCompleteAsset REQUEST === +12/9/2025 10:40:33 AM - Hostname: GFG48DW2ESF +12/9/2025 10:40:33 AM - Serial: FG48DW2 +12/9/2025 10:40:33 AM - PC Type: HeatTreat +12/9/2025 10:40:34 AM - Mapped pcType 'HeatTreat' to pctypeid: 9 +12/9/2025 10:40:34 AM - PC record created/updated. machineid: 5268 +12/9/2025 10:40:34 AM - CreatePCMachineRelationship: Executing SQL: SELECT machineid FROM machines WHERE machinenumber = '6603' AND pctypeid IS NULL +12/9/2025 10:40:34 AM - CreatePCMachineRelationship: Found equipment machineid=174 for machine number: 6603 +12/9/2025 10:40:34 AM - CreatePCMachineRelationship: Creating relationship PC 5268 -> Controls -> Equipment 174 +12/9/2025 10:40:34 AM - CreatePCMachineRelationship: Checking for duplicate: SELECT relationshipid FROM machinerelationships WHERE machineid = 5268 AND related_machineid = 174 AND relationshiptypeid = 3 +12/9/2025 10:40:34 AM - CreatePCMachineRelationship: No duplicate found, proceeding with INSERT +12/9/2025 10:40:34 AM - Created Controls relationship: Equipment 174 controlled by PC 5268 +12/9/2025 10:40:34 AM - PC-Machine relationship created: True +12/9/2025 10:40:34 AM - SaveInstalledApps: machineid=5268, raw JSON length=94 +12/9/2025 10:40:34 AM - SaveInstalledApps: Parsed 2 apps +12/9/2025 10:40:34 AM - SaveInstalledApps: Saved 2 apps +12/9/2025 10:40:34 AM - Installed apps saved: 2 +12/9/2025 10:47:04 AM - === NEW updateCompleteAsset REQUEST === +12/9/2025 10:47:04 AM - Hostname: TESTPC +12/9/2025 10:47:04 AM - Serial: TEST123 +12/9/2025 10:47:04 AM - PC Type: HeatTreat +12/9/2025 10:47:04 AM - PC record created/updated. machineid: 5842 diff --git a/pclist.asp b/pclist.asp index 026afb1..8d3de8f 100644 --- a/pclist.asp +++ b/pclist.asp @@ -30,11 +30,11 @@
    -
    + diff --git a/pcs.asp b/pcs.asp index a00cdeb..8901cc6 100644 --- a/pcs.asp +++ b/pcs.asp @@ -30,11 +30,11 @@
    -
    + diff --git a/search.asp b/search.asp index 25e3844..a7d0d87 100644 --- a/search.asp +++ b/search.asp @@ -267,7 +267,7 @@ Set rs = Nothing
    Vlan #
    "><%Response.Write(rs("vlan"))%><%Response.Write(rs("subnettype"))%> <%Response.Write(rs("subnetstart"))%><%Response.Write(rs("cidr"))%><%Response.Write(rs("description"))%>"><%=Server.HTMLEncode(rs("vlan") & "")%><%=Server.HTMLEncode(rs("subnettype") & "")%><%=Server.HTMLEncode(rs("subnetstart") & "")%><%=Server.HTMLEncode(rs("cidr") & "")%><%=Server.HTMLEncode(rs("description") & "")%>