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:
@@ -35,7 +35,7 @@
|
||||
<%
|
||||
Dim strSQL, rs
|
||||
|
||||
strSQL = "SELECT " & _
|
||||
strSQL = "SELECT DISTINCT " & _
|
||||
"pc.machineid AS pc_id, " & _
|
||||
"pc.machinenumber AS hostname, " & _
|
||||
"c.address AS ip, " & _
|
||||
@@ -56,7 +56,31 @@ strSQL = "SELECT " & _
|
||||
"AND eq.machinenumber NOT IN ('0612', '0613', '0614', '0615') " & _
|
||||
"AND (v.vendor IS NULL OR v.vendor != 'WJDT') " & _
|
||||
"AND (m.modelnumber IS NULL OR m.modelnumber != 'TBD') " & _
|
||||
"ORDER BY eq.machinenumber"
|
||||
"UNION " & _
|
||||
"SELECT DISTINCT " & _
|
||||
"pc.machineid AS pc_id, " & _
|
||||
"pc.machinenumber AS hostname, " & _
|
||||
"c.address AS ip, " & _
|
||||
"dp.machineid AS machine_id, " & _
|
||||
"dp.machinenumber AS machine_number, " & _
|
||||
"v.vendor AS vendor, " & _
|
||||
"m.modelnumber AS model " & _
|
||||
"FROM machinerelationships dual_rel " & _
|
||||
"JOIN relationshiptypes drt ON dual_rel.relationshiptypeid = drt.relationshiptypeid AND drt.relationshiptype = 'Dualpath' " & _
|
||||
"JOIN machines dp ON dual_rel.related_machineid = dp.machineid " & _
|
||||
"JOIN machinerelationships mr ON mr.machineid = dual_rel.machineid AND mr.isactive = 1 " & _
|
||||
"JOIN relationshiptypes rt ON mr.relationshiptypeid = rt.relationshiptypeid AND rt.relationshiptype IN ('Controls', 'Controlled By') " & _
|
||||
"JOIN machines pc ON mr.related_machineid = pc.machineid AND pc.pctypeid IS NOT NULL " & _
|
||||
"LEFT JOIN communications c ON pc.machineid = c.machineid AND c.isprimary = 1 AND c.comstypeid = 1 " & _
|
||||
"LEFT JOIN models m ON dp.modelnumberid = m.modelnumberid " & _
|
||||
"LEFT JOIN vendors v ON m.vendorid = v.vendorid " & _
|
||||
"WHERE dual_rel.isactive = 1 " & _
|
||||
"AND dp.machinenumber IS NOT NULL AND dp.machinenumber != '' " & _
|
||||
"AND dp.machinenumber REGEXP '^[0-9]{4}$' " & _
|
||||
"AND dp.machinenumber NOT IN ('0612', '0613', '0614', '0615') " & _
|
||||
"AND (v.vendor IS NULL OR v.vendor != 'WJDT') " & _
|
||||
"AND (m.modelnumber IS NULL OR m.modelnumber != 'TBD') " & _
|
||||
"ORDER BY machine_number"
|
||||
|
||||
Set rs = objConn.Execute(strSQL)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user