Remove legacy pc tables, fix ASP issues, update dashboard APIs
Database changes (run sql/migration_drop_pc_tables.sql on prod): - Drop pc, pc_backup_phase2, pc_to_machine_id_mapping tables - Rename pcid columns to machineid in machineoverrides, dualpathassignments, networkinterfaces - Recreate 9 views to use machines.machineid instead of pcid - Clean orphaned records and add FK constraints to machines table ASP fixes: - editprinter.asp: Fix CLng type mismatch when no printerid provided - includes/sql.asp: Remove AutoDeactivateExpiredNotifications (endtime handles expiry) - includes/leftsidebar.asp: Update fiscal week banner styling, remove dead Information link - charts/warrantychart.asp: Use vw_warranty_status instead of pc table Dashboard API renames (naming convention): - shopfloor-dashboard: Update to use apishopfloor.asp, apibusinessunits.asp - tv-dashboard: Rename api_slides.asp to apislides.asp 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -37,7 +37,10 @@ End If
|
||||
<h5 class="logo-text">West Jefferson</h5>
|
||||
</a>
|
||||
</div>
|
||||
<div style="font-size: 10px; color: #888; text-align: center; padding-bottom: 8px;">Fiscal Week <%=fiscalWeek%></div>
|
||||
<div style="padding: 10px 0; background: #2a2a2a; border-top: 1px solid #3a3a3a; border-bottom: 1px solid #3a3a3a; text-align: center;">
|
||||
<span style="font-size: 10px; color: #888; text-transform: uppercase; letter-spacing: 1px;">Fiscal Week</span>
|
||||
<div style="font-size: 22px; font-weight: 600; color: #fff;"><%=fiscalWeek%></div>
|
||||
</div>
|
||||
<ul class="sidebar-menu do-nicescrol">
|
||||
<li class="sidebar-header">MAIN NAVIGATION</li>
|
||||
<li>
|
||||
@@ -88,7 +91,6 @@ End If
|
||||
<li><a href="./displayusb.asp"><i class="zmdi zmdi-usb text-purple"></i><span>USB Devices</span></a></li>
|
||||
<li><a href="./displaynotifications.asp"><i class="zmdi zmdi zmdi-notifications-none text-success"></i><span>Notifications</span></a></li>
|
||||
<li><a href="./tv-dashboard/" target="_blank"><i class="zmdi zmdi-tv text-warning"></i><span>Lobby Display</span></a></li>
|
||||
<li><a href="javaScript:void();"><i class="zmdi zmdi-share text-info"></i> <span>Information</span></a></li>
|
||||
|
||||
</ul>
|
||||
|
||||
|
||||
@@ -1,26 +1,4 @@
|
||||
<%
|
||||
'=============================================================================
|
||||
' SUBROUTINE: AutoDeactivateExpiredNotifications
|
||||
' PURPOSE: Automatically deactivate notifications where endtime has passed
|
||||
'
|
||||
' LOGIC:
|
||||
' - Find all active notifications where endtime < NOW() (expired)
|
||||
' - Set isactive = 0 for those notifications
|
||||
' - This provides automatic cleanup without manual intervention
|
||||
'
|
||||
' RUNS: On every page load (minimal performance impact - simple UPDATE query)
|
||||
'=============================================================================
|
||||
Sub AutoDeactivateExpiredNotifications()
|
||||
On Error Resume Next
|
||||
Dim strAutoDeactivate
|
||||
strAutoDeactivate = "UPDATE notifications SET isactive = 0 " & _
|
||||
"WHERE isactive = 1 " & _
|
||||
"AND endtime IS NOT NULL " & _
|
||||
"AND endtime < NOW()"
|
||||
objConn.Execute strAutoDeactivate
|
||||
On Error Goto 0
|
||||
End Sub
|
||||
|
||||
' objConn - script-global connection object (no Dim for global scope)
|
||||
Session.Timeout=15
|
||||
Set objConn=Server.CreateObject("ADODB.Connection")
|
||||
@@ -37,8 +15,4 @@ End Sub
|
||||
"Pooling=True;Max Pool Size=100;"
|
||||
objConn.Open
|
||||
set rs = server.createobject("ADODB.Recordset")
|
||||
|
||||
' Auto-deactivate expired notifications
|
||||
' This runs on every page load to ensure notifications with past endtime are automatically disabled
|
||||
Call AutoDeactivateExpiredNotifications()
|
||||
%>
|
||||
Reference in New Issue
Block a user