Add displaylocations, location/inspection migrations, UI refinements
- New displaylocations.asp (production location listing) - 3 new SQL migrations: inspection machine type, location relationship types, pctype inspection update - displaymachine.asp / printbadge.asp substantial rework - editmachine/editpc/savemachineedit: ~50 line additions each - Dashboard index.html + tv-dashboard tweaks - .gitignore: block database-backup-*.sql, *.bak, *.pdf Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -524,20 +524,6 @@ End If
|
||||
<%
|
||||
End If
|
||||
%>
|
||||
<!-- Connected Equipment -->
|
||||
<h6 class="mt-3 mb-2"><i class="zmdi zmdi-settings"></i> Connected Equipment</h6>
|
||||
<div class="table-responsive mb-4">
|
||||
<table class="table table-hover table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Machine Number</th>
|
||||
<th>Type</th>
|
||||
<th>Model</th>
|
||||
<th>Location</th>
|
||||
<th>Relationship</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<%
|
||||
' Query ALL equipment related to this PC via machinerelationships
|
||||
' Check both directions - the equipment is identified by pctypeid IS NULL
|
||||
@@ -552,9 +538,22 @@ End If
|
||||
"ORDER BY rt.relationshiptype, m.machinenumber"
|
||||
Set rs2 = ExecuteParameterizedQuery(objConn, strSQL2, Array(machineid, machineid, machineid))
|
||||
|
||||
If rs2.EOF Then
|
||||
Response.Write("<tr><td colspan='5' class='text-muted text-center'>No connected equipment</td></tr>")
|
||||
Else
|
||||
If Not rs2.EOF Then
|
||||
%>
|
||||
<h6 class="mt-3 mb-2"><i class="zmdi zmdi-settings"></i> Connected Equipment</h6>
|
||||
<div class="table-responsive mb-4">
|
||||
<table class="table table-hover table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Machine Number</th>
|
||||
<th>Type</th>
|
||||
<th>Model</th>
|
||||
<th>Location</th>
|
||||
<th>Relationship</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<%
|
||||
Do While Not rs2.EOF
|
||||
Dim ctrlMachineNum, ctrlType, ctrlModel, ctrlMachineID, ctrlRelType
|
||||
ctrlMachineNum = rs2("machinenumber") & ""
|
||||
@@ -567,7 +566,6 @@ End If
|
||||
If ctrlType = "" Then ctrlType = "<span class='text-muted'>N/A</span>"
|
||||
If ctrlModel = "" Then ctrlModel = "<span class='text-muted'>N/A</span>"
|
||||
|
||||
' Badge color based on relationship type
|
||||
Dim ctrlRelBadge
|
||||
Select Case LCase(ctrlRelType)
|
||||
Case "controls"
|
||||
@@ -589,13 +587,15 @@ End If
|
||||
Response.Write("</tr>")
|
||||
rs2.MoveNext
|
||||
Loop
|
||||
End If
|
||||
rs2.Close
|
||||
Set rs2 = Nothing
|
||||
%>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<%
|
||||
End If
|
||||
rs2.Close
|
||||
Set rs2 = Nothing
|
||||
%>
|
||||
</div>
|
||||
<div class="tab-pane" id="compliance">
|
||||
<h5 class="mb-3">Compliance & Security</h5>
|
||||
|
||||
Reference in New Issue
Block a user