e1e54eded1
Extended the shopfloor-dashboard's 30-minute fade/removal logic from incidents-only to ALL notification types (Changes, Awareness, TBD). Changes to api_shopfloor.asp: - Removed typecolor='danger' restriction from is_current and is_resolved - Now shows all completed notifications for 30 minutes regardless of type - All notification types fade progressively over 30 minutes after completion Changes to displaynotifications.asp: - Added TIMESTAMPDIFF to calculate minutes_since_end - Added is_complete flag for completed notifications - Filter query to only show active OR recently completed (within 30 minutes) - Progressive opacity fade: 100% → 50% over 30 minutes - Changed status badge to "Complete" (info) for completed items - Automatically hides notifications 30 minutes after endtime Behavior: - Notification is marked complete (endtime passed) - Shows at 100% opacity initially - Fades to 50% opacity over next 30 minutes - Automatically removed from display after 30 minutes - Works for ALL types: Incident, Change, Awareness, TBD 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
167 lines
6.6 KiB
Plaintext
167 lines
6.6 KiB
Plaintext
<%@ Language=VBScript %>
|
|
<%
|
|
Response.ContentType = "application/json"
|
|
Response.Charset = "UTF-8"
|
|
Response.AddHeader "Access-Control-Allow-Origin", "*"
|
|
Response.AddHeader "Cache-Control", "no-cache, no-store, must-revalidate"
|
|
%><!--#include file="./includes/sql.asp"--><%
|
|
|
|
Dim strSQL, jsonOutput, isFirstCurrent, isFirstUpcoming
|
|
Dim businessUnitFilter
|
|
|
|
' Get business unit filter from query string
|
|
businessUnitFilter = Request.QueryString("businessunit")
|
|
|
|
strSQL = "SELECT n.notificationid, n.notification, n.starttime, n.endtime, " & _
|
|
"n.ticketnumber, n.link, n.isactive, n.isshopfloor, n.businessunitid, " & _
|
|
"nt.typename, nt.typecolor, bu.businessunit, " & _
|
|
"CASE " & _
|
|
" WHEN n.starttime <= NOW() AND (n.endtime IS NULL OR n.endtime >= NOW()) THEN 1 " & _
|
|
" WHEN n.endtime IS NOT NULL AND n.endtime < NOW() AND DATE_ADD(n.endtime, INTERVAL 30 MINUTE) >= NOW() THEN 1 " & _
|
|
" ELSE 0 " & _
|
|
"END as is_current, " & _
|
|
"CASE " & _
|
|
" WHEN n.endtime IS NOT NULL AND n.endtime < NOW() THEN 1 " & _
|
|
" ELSE 0 " & _
|
|
"END as is_resolved, " & _
|
|
"CASE " & _
|
|
" WHEN n.starttime > NOW() AND n.starttime <= DATE_ADD(NOW(), INTERVAL 72 HOUR) THEN 1 " & _
|
|
" ELSE 0 " & _
|
|
"END as is_upcoming, " & _
|
|
"TIMESTAMPDIFF(MINUTE, n.endtime, NOW()) as minutes_since_end " & _
|
|
"FROM notifications n " & _
|
|
"LEFT JOIN notificationtypes nt ON n.notificationtypeid = nt.notificationtypeid " & _
|
|
"LEFT JOIN businessunits bu ON n.businessunitid = bu.businessunitid " & _
|
|
"WHERE n.isshopfloor = 1 AND (" & _
|
|
" n.isactive = 1 OR " & _
|
|
" (n.isactive = 0 AND n.endtime IS NOT NULL AND " & _
|
|
" DATE_ADD(n.endtime, INTERVAL 30 MINUTE) >= NOW())" & _
|
|
")"
|
|
|
|
' Add business unit filter
|
|
If businessUnitFilter <> "" And IsNumeric(businessUnitFilter) Then
|
|
' Specific business unit selected - show that BU's notifications AND null (all units) notifications
|
|
strSQL = strSQL & " AND (n.businessunitid = " & CLng(businessUnitFilter) & " OR n.businessunitid IS NULL)"
|
|
Else
|
|
' "All Units" selected - only show notifications with NULL businessunitid (truly for all units)
|
|
strSQL = strSQL & " AND n.businessunitid IS NULL"
|
|
End If
|
|
|
|
strSQL = strSQL & " ORDER BY n.notificationid DESC"
|
|
|
|
Set rs = objConn.Execute(strSQL)
|
|
|
|
jsonOutput = "{""success"":true,""timestamp"":""" & FormatDateTime(Now(), 2) & " " & FormatDateTime(Now(), 4) & """,""current"":["
|
|
isFirstCurrent = True
|
|
|
|
Do While Not rs.EOF
|
|
Dim st, et, isCurrent, isResolved
|
|
st = rs("starttime")
|
|
et = rs("endtime")
|
|
isCurrent = rs("is_current")
|
|
isResolved = rs("is_resolved")
|
|
|
|
If isCurrent = 1 Then
|
|
If Not isFirstCurrent Then jsonOutput = jsonOutput & ","
|
|
isFirstCurrent = False
|
|
|
|
jsonOutput = jsonOutput & "{"
|
|
jsonOutput = jsonOutput & """notificationid"":" & rs("notificationid") & ","
|
|
jsonOutput = jsonOutput & """notification"":""" & JSEscape(rs("notification") & "") & ""","
|
|
jsonOutput = jsonOutput & """starttime"":""" & ISODate(st) & ""","
|
|
jsonOutput = jsonOutput & """endtime"":" & ISODateOrNull(et) & ","
|
|
jsonOutput = jsonOutput & """ticketnumber"":" & StrOrNull(rs("ticketnumber")) & ","
|
|
jsonOutput = jsonOutput & """link"":" & StrOrNull(rs("link")) & ","
|
|
jsonOutput = jsonOutput & """isactive"":" & LCase(CStr(CBool(rs("isactive")))) & ","
|
|
jsonOutput = jsonOutput & """isshopfloor"":true,"
|
|
jsonOutput = jsonOutput & """resolved"":" & LCase(CStr(CBool(isResolved))) & ","
|
|
If Not IsNull(rs("minutes_since_end")) Then
|
|
jsonOutput = jsonOutput & """minutes_since_end"":" & rs("minutes_since_end") & ","
|
|
Else
|
|
jsonOutput = jsonOutput & """minutes_since_end"":null,"
|
|
End If
|
|
jsonOutput = jsonOutput & """typename"":""" & JSEscape(rs("typename") & "") & ""","
|
|
jsonOutput = jsonOutput & """typecolor"":""" & JSEscape(rs("typecolor") & "") & ""","
|
|
jsonOutput = jsonOutput & """businessunit"":" & StrOrNull(rs("businessunit")) & ""
|
|
jsonOutput = jsonOutput & "}"
|
|
End If
|
|
|
|
rs.MoveNext
|
|
Loop
|
|
|
|
rs.Close
|
|
Set rs = objConn.Execute(strSQL)
|
|
|
|
jsonOutput = jsonOutput & "],""upcoming"":["
|
|
isFirstUpcoming = True
|
|
|
|
Do While Not rs.EOF
|
|
Dim isUpcoming
|
|
st = rs("starttime")
|
|
et = rs("endtime")
|
|
isUpcoming = rs("is_upcoming")
|
|
|
|
If isUpcoming = 1 Then
|
|
If Not isFirstUpcoming Then jsonOutput = jsonOutput & ","
|
|
isFirstUpcoming = False
|
|
|
|
jsonOutput = jsonOutput & "{"
|
|
jsonOutput = jsonOutput & """notificationid"":" & rs("notificationid") & ","
|
|
jsonOutput = jsonOutput & """notification"":""" & JSEscape(rs("notification") & "") & ""","
|
|
jsonOutput = jsonOutput & """starttime"":""" & ISODate(st) & ""","
|
|
jsonOutput = jsonOutput & """endtime"":" & ISODateOrNull(et) & ","
|
|
jsonOutput = jsonOutput & """ticketnumber"":" & StrOrNull(rs("ticketnumber")) & ","
|
|
jsonOutput = jsonOutput & """link"":" & StrOrNull(rs("link")) & ","
|
|
jsonOutput = jsonOutput & """isactive"":" & LCase(CStr(CBool(rs("isactive")))) & ","
|
|
jsonOutput = jsonOutput & """isshopfloor"":true,"
|
|
jsonOutput = jsonOutput & """typename"":""" & JSEscape(rs("typename") & "") & ""","
|
|
jsonOutput = jsonOutput & """typecolor"":""" & JSEscape(rs("typecolor") & "") & ""","
|
|
jsonOutput = jsonOutput & """businessunit"":" & StrOrNull(rs("businessunit")) & ""
|
|
jsonOutput = jsonOutput & "}"
|
|
End If
|
|
|
|
rs.MoveNext
|
|
Loop
|
|
|
|
rs.Close
|
|
jsonOutput = jsonOutput & "]}"
|
|
|
|
Response.Write jsonOutput
|
|
|
|
Function JSEscape(s)
|
|
Dim r
|
|
r = s
|
|
r = Replace(r, "\", "\\")
|
|
r = Replace(r, """", "\""")
|
|
r = Replace(r, Chr(13), "")
|
|
r = Replace(r, Chr(10), "\n")
|
|
r = Replace(r, Chr(9), "\t")
|
|
JSEscape = r
|
|
End Function
|
|
|
|
Function ISODate(d)
|
|
If Not IsDate(d) Then
|
|
ISODate = ""
|
|
Exit Function
|
|
End If
|
|
ISODate = Year(d) & "-" & Right("0" & Month(d), 2) & "-" & Right("0" & Day(d), 2) & "T" & _
|
|
Right("0" & Hour(d), 2) & ":" & Right("0" & Minute(d), 2) & ":" & Right("0" & Second(d), 2)
|
|
End Function
|
|
|
|
Function ISODateOrNull(d)
|
|
If IsNull(d) Or Not IsDate(d) Then
|
|
ISODateOrNull = "null"
|
|
Else
|
|
ISODateOrNull = """" & ISODate(d) & """"
|
|
End If
|
|
End Function
|
|
|
|
Function StrOrNull(s)
|
|
If IsNull(s) Then
|
|
StrOrNull = "null"
|
|
Else
|
|
StrOrNull = """" & JSEscape(s & "") & """"
|
|
End If
|
|
End Function
|
|
%>
|