From 18093516ed540e75a08fee8360fa7bf14f9d7b6a Mon Sep 17 00:00:00 2001 From: jessikitty Date: Mon, 15 Jun 2026 14:54:29 +1000 Subject: [PATCH] feat: v1.5.8 - add Awaiting Vendor and Awaiting Parts sidebar panels, SidebarPanel helper, accent colours --- WebHandler/ServiceTrackerWebHandler.cs | 30 ++++++++++++++++++-------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/WebHandler/ServiceTrackerWebHandler.cs b/WebHandler/ServiceTrackerWebHandler.cs index 3ce3bb0..56a3ffa 100644 --- a/WebHandler/ServiceTrackerWebHandler.cs +++ b/WebHandler/ServiceTrackerWebHandler.cs @@ -87,14 +87,11 @@ namespace Disco.Plugins.ServiceTracker.WebHandler s.Append("
"); if (m.Tiles.Count == 0) s.Append("
✅ No open jobs
"); else foreach (var t in m.Tiles) s.Append(TileHtml(t, u)); s.Append("
"); // Sidebar panels — compact items to fit more entries s.Append("
"); - s.Append("

📦 Ready for Return

"); - if (m.ReadyForReturn.Count == 0) s.Append("

None

"); - else foreach (var r in m.ReadyForReturn) s.Append("
" + H(r.DisplayId) + "
" + H(r.DeviceComputerName ?? r.DeviceSerialNumber) + "
" + H(r.UserDisplayName) + "
"); - s.Append("
"); - s.Append("

⏸ On Hold

"); - if (m.OnHold.Count == 0) s.Append("

None

"); - else foreach (var r in m.OnHold) s.Append("
" + H(r.DisplayId) + "
" + H(r.DeviceComputerName ?? r.DeviceSerialNumber) + "
" + H(r.UserDisplayName) + "
"); - s.Append("
"); + s.Append(SidebarPanel("📦 Ready for Return", "#28A745", m.ReadyForReturn, u, true)); + s.Append(SidebarPanel("⏸ On Hold", "#6C757D", m.OnHold, u, false)); + s.Append(SidebarPanel("📦 Awaiting Vendor", "#E67E22", m.AwaitingVendor, u, false)); + s.Append(SidebarPanel("🔧 Awaiting Parts", "#D4AC0D", m.AwaitingParts, u, false)); + s.Append(""); var rs = m.Config.DashboardRefreshSeconds; s.Append("
Refresh: " + rs + "s
"); s.Append("
v" + ServiceTrackerService.PluginVersion + " — Jess Rogerson © 2025
"); @@ -102,6 +99,21 @@ namespace Disco.Plugins.ServiceTracker.WebHandler return s.ToString(); } + private string SidebarPanel(string title, string accentColor, List items, string u, bool showCollected) + { + var s = new StringBuilder(); + s.Append("

" + title + " " + items.Count + "

"); + if (items.Count == 0) s.Append("

None

"); + else foreach (var r in items) + { + s.Append("
" + H(r.DisplayId) + "
" + H(r.DeviceComputerName ?? r.DeviceSerialNumber) + "
" + H(r.UserDisplayName) + "
"); + if (showCollected) s.Append("
"); + s.Append("
"); + } + s.Append("
"); + return s.ToString(); + } + private string TileHtml(DashboardTile t, string u) { var s = new StringBuilder(); s.Append("
"); s.Append("
" + H(t.DisplayId) + "
" + t.AgeBadge + "
"); if (t.IsSlaBreached) s.Append("
⚠ SLA BREACHED
"); else if (t.IsSlaWarning) s.Append("
⏰ Warning
"); s.Append("
" + H(t.DeviceComputerName ?? t.DeviceSerialNumber) + "
"); if (t.DeviceModelDescription != null) s.Append("
" + H(t.DeviceModelDescription) + "
"); s.Append("
👤" + H(t.UserDisplayName ?? "\u2014") + "
" + t.LocationIcon + " " + H(t.LocationName) + "
"); if (!string.IsNullOrEmpty(t.RawSheetLocation)) s.Append("
📍" + H(t.RawSheetLocation) + "
"); s.Append("
📋" + H(t.StatusOverride ?? t.DiscoStatus) + "
"); if (!string.IsNullOrEmpty(t.AssignedTechName)) s.Append("
🔧" + H(t.AssignedTechName) + "
"); s.Append("
📅ETA: " + H(t.EtaDisplay) + "
"); if (!string.IsNullOrEmpty(t.Summary)) { var sm = t.Summary.Length > 60 ? t.Summary.Substring(0, 57) + "..." : t.Summary; s.Append("
" + H(sm) + "
"); } if (!string.IsNullOrEmpty(t.LatestNote)) { s.Append("
💬 " + H(t.LatestNote)); if (t.NoteCount > 1) s.Append(" (+" + (t.NoteCount - 1) + ")"); s.Append("
"); } s.Append("
" + H(t.PriorityName) + "" + H(t.Source == "ntt" ? "NTT" : t.JobTypeDescription) + "
"); return s.ToString(); } private string BuildDetailPage(Disco.Models.Repository.Job job, ServiceTicket ticket, ServiceTrackerConfig cfg, string src, int jobId) @@ -167,7 +179,7 @@ namespace Disco.Plugins.ServiceTracker.WebHandler return s.ToString(); } - private string CSS() { return @"*{box-sizing:border-box;margin:0;padding:0}body{font-family:'Segoe UI',sans-serif;background:#f0f2f5;color:#333}.header{display:flex;justify-content:space-between;align-items:center;padding:14px 20px;background:#fff;border-bottom:2px solid #337AB7;box-shadow:0 1px 3px rgba(0,0,0,.08)}.hl{display:flex;align-items:center;gap:14px}.hm{display:flex;align-items:center;gap:12px;flex:1;justify-content:center;flex-wrap:wrap}.wt{font-size:12px;color:#555}.wt b{color:#337AB7}.hr{display:flex;gap:6px}h1{font-size:20px;color:#333}.sub{color:#666;font-size:13px}.btn{display:inline-block;padding:7px 14px;font-size:12px;border:none;border-radius:4px;cursor:pointer;text-decoration:none;color:#fff}.bp{background:#337AB7}.bp:hover{background:#286090}.bd{background:#777}.bd:hover{background:#555}.bdi{background:#5B2D8E}.bdi:hover{background:#4A2475}.btn-sm{padding:4px 10px;font-size:11px}.btn-xs{padding:2px 7px;font-size:10px}.btn-lg{padding:10px 20px;font-size:14px}.alert{margin:8px 20px;padding:8px 14px;border-radius:4px;font-size:12px}.ad{background:#f8d7da;color:#721c24;border:1px solid #f5c6cb}.aw{background:#fff3cd;color:#856404;border:1px solid #ffeeba}.as{background:#d4edda;color:#155724;border:1px solid #c3e6cb}.sbar{display:flex;gap:10px;padding:14px 20px;flex-wrap:wrap}.sc{text-align:center;padding:10px 16px;background:#fff;border-radius:6px;min-width:70px;box-shadow:0 1px 2px rgba(0,0,0,.06);text-decoration:none;color:inherit;transition:transform .15s}.sc:hover{transform:translateY(-2px)}.ss{border-left:2px solid #eee;margin-left:6px;padding-left:18px}.sn{font-size:24px;font-weight:700}.sl{font-size:10px;color:#888;margin-top:2px}.lbar{display:flex;gap:6px;padding:0 20px;flex-wrap:wrap;margin-bottom:6px}.lc{display:inline-flex;align-items:center;gap:3px;padding:4px 10px;border-radius:14px;font-size:11px;color:#fff;text-decoration:none}.lc:hover{opacity:.85}.ctrls{display:flex;align-items:center;gap:5px;padding:6px 20px}.cl{font-size:11px;color:#888}.sb{padding:4px 10px;border-radius:12px;font-size:11px;background:#e9ecef;color:#555;text-decoration:none}.sb:hover{background:#d0d5db}.sb.act{background:#337AB7;color:#fff}.clr{background:#DC3545;color:#fff}.dash-layout{display:flex;gap:16px;padding:12px 20px;align-items:flex-start}.tile-grid{flex:1;display:grid;grid-template-columns:repeat(auto-fill,minmax(280px,1fr));gap:12px}.sidebar{display:flex;flex-direction:column;gap:10px;width:220px;flex-shrink:0}.rfr-panel{background:#fff;border-radius:8px;padding:10px 12px;box-shadow:0 1px 3px rgba(0,0,0,.08)}.rfr-panel h3{font-size:12px;font-weight:600;margin-bottom:6px;color:#333;border-bottom:1px solid #eee;padding-bottom:4px}.rfr-item{padding:4px 6px;border:1px solid #eee;border-radius:4px;margin-bottom:4px;background:#fafbfc}.rfr-id{font-weight:700;font-size:11px;color:#337AB7;line-height:1.3}.rfr-dev{font-size:11px;font-weight:600;line-height:1.3;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.rfr-user{font-size:10px;color:#888;line-height:1.3}.rfr-item form{margin-top:3px}.tile{background:#fff;border-radius:8px;box-shadow:0 1px 3px rgba(0,0,0,.08);cursor:pointer;transition:box-shadow .15s,transform .15s;overflow:hidden}.tile:hover{box-shadow:0 4px 12px rgba(0,0,0,.15);transform:translateY(-2px)}.tb{border:2px solid #DC3545;animation:pu 2s infinite}.tw{border:2px solid #FFC107}@keyframes pu{0%,100%{border-color:#DC3545}50%{border-color:#f8d7da}}.tp{height:4px;width:100%}.th{display:flex;justify-content:space-between;padding:8px 12px 3px}.tid{font-weight:700;font-size:14px;color:#337AB7}.ta{font-size:10px;color:#888;padding:2px 6px;background:#f5f5f5;border-radius:8px}.slb{margin:0 12px 4px;padding:3px 6px;border-radius:3px;font-size:10px;font-weight:700;text-align:center}.slb-b{background:#f8d7da;color:#721c24}.slb-w{background:#fff3cd;color:#856404}.td{padding:0 12px 4px}.tdn{font-weight:600;font-size:13px}.tdm{font-size:10px;color:#888}.tr{display:flex;align-items:center;gap:5px;padding:2px 12px;font-size:12px}.ti{width:16px;text-align:center;font-size:11px}.tlb{display:inline-flex;align-items:center;gap:3px;padding:2px 8px;border-radius:10px;font-size:10px;color:#fff}.trsl{font-size:11px;color:#555;font-style:italic}.tsu{padding:4px 12px;font-size:11px;color:#555;border-top:1px solid #f0f0f0;font-style:italic}.tn{padding:4px 12px;font-size:10px;color:#777;background:#fafbfc}.tf{display:flex;justify-content:space-between;align-items:center;padding:6px 12px;border-top:1px solid #f0f0f0;background:#fafbfc}.pl{display:inline-block;padding:2px 8px;border-radius:8px;font-size:10px;color:#fff;font-weight:600}.tt{font-size:10px;color:#aaa}.empty{grid-column:1/-1;text-align:center;padding:50px;color:#888}.wls{padding:0 20px 16px}.wls h3{font-size:13px;color:#888;margin-bottom:6px}.wlb{display:flex;gap:10px;flex-wrap:wrap}.wli{background:#fff;border-radius:6px;padding:6px 14px;box-shadow:0 1px 2px rgba(0,0,0,.06);display:flex;align-items:center;gap:6px;font-size:12px}.foot{text-align:center;padding:16px;font-size:11px;color:#aaa}.rbar{display:flex;align-items:center;gap:8px;padding:6px 20px;background:#fff;border-top:1px solid #eee;position:sticky;bottom:0;z-index:10}.rbar.pau{background:#fff3cd}.rtx{font-size:11px;color:#888;min-width:100px}.rprog{flex:1;height:3px;background:#e9ecef;border-radius:2px;overflow:hidden}.rfill{height:100%;background:#337AB7;border-radius:2px;transition:width 1s linear;width:0%}.rbar.pau .rfill{background:#FFC107}.rtog{padding:3px 10px;font-size:10px;border:1px solid #ddd;border-radius:10px;background:#fff;cursor:pointer;color:#555}.mu{color:#999;font-style:italic;font-size:11px}@media(max-width:900px){.dash-layout{flex-direction:column}.sidebar{width:100%;flex-direction:row;flex-wrap:wrap}.rfr-panel{flex:1;min-width:200px}}"; } + private string CSS() { return @"*{box-sizing:border-box;margin:0;padding:0}body{font-family:'Segoe UI',sans-serif;background:#f0f2f5;color:#333}.header{display:flex;justify-content:space-between;align-items:center;padding:14px 20px;background:#fff;border-bottom:2px solid #337AB7;box-shadow:0 1px 3px rgba(0,0,0,.08)}.hl{display:flex;align-items:center;gap:14px}.hm{display:flex;align-items:center;gap:12px;flex:1;justify-content:center;flex-wrap:wrap}.wt{font-size:12px;color:#555}.wt b{color:#337AB7}.hr{display:flex;gap:6px}h1{font-size:20px;color:#333}.sub{color:#666;font-size:13px}.btn{display:inline-block;padding:7px 14px;font-size:12px;border:none;border-radius:4px;cursor:pointer;text-decoration:none;color:#fff}.bp{background:#337AB7}.bp:hover{background:#286090}.bd{background:#777}.bd:hover{background:#555}.bdi{background:#5B2D8E}.bdi:hover{background:#4A2475}.btn-sm{padding:4px 10px;font-size:11px}.btn-xs{padding:2px 7px;font-size:10px}.btn-lg{padding:10px 20px;font-size:14px}.alert{margin:8px 20px;padding:8px 14px;border-radius:4px;font-size:12px}.ad{background:#f8d7da;color:#721c24;border:1px solid #f5c6cb}.aw{background:#fff3cd;color:#856404;border:1px solid #ffeeba}.as{background:#d4edda;color:#155724;border:1px solid #c3e6cb}.sbar{display:flex;gap:10px;padding:14px 20px;flex-wrap:wrap}.sc{text-align:center;padding:10px 16px;background:#fff;border-radius:6px;min-width:70px;box-shadow:0 1px 2px rgba(0,0,0,.06);text-decoration:none;color:inherit;transition:transform .15s}.sc:hover{transform:translateY(-2px)}.ss{border-left:2px solid #eee;margin-left:6px;padding-left:18px}.sn{font-size:24px;font-weight:700}.sl{font-size:10px;color:#888;margin-top:2px}.lbar{display:flex;gap:6px;padding:0 20px;flex-wrap:wrap;margin-bottom:6px}.lc{display:inline-flex;align-items:center;gap:3px;padding:4px 10px;border-radius:14px;font-size:11px;color:#fff;text-decoration:none}.lc:hover{opacity:.85}.ctrls{display:flex;align-items:center;gap:5px;padding:6px 20px}.cl{font-size:11px;color:#888}.sb{padding:4px 10px;border-radius:12px;font-size:11px;background:#e9ecef;color:#555;text-decoration:none}.sb:hover{background:#d0d5db}.sb.act{background:#337AB7;color:#fff}.clr{background:#DC3545;color:#fff}.dash-layout{display:flex;gap:16px;padding:12px 20px;align-items:flex-start}.tile-grid{flex:1;display:grid;grid-template-columns:repeat(auto-fill,minmax(280px,1fr));gap:12px}.sidebar{display:flex;flex-direction:column;gap:10px;width:220px;flex-shrink:0}.rfr-panel{background:#fff;border-radius:8px;padding:10px 12px;box-shadow:0 1px 3px rgba(0,0,0,.08)}.rfr-panel h3{font-size:12px;font-weight:600;margin-bottom:6px;color:#333;border-bottom:1px solid #eee;padding-bottom:4px;display:flex;justify-content:space-between;align-items:center}.sp-ct{font-size:11px;font-weight:700;margin-left:4px}.rfr-item{padding:4px 6px;border:1px solid #eee;border-radius:4px;margin-bottom:4px;background:#fafbfc}.rfr-id{font-weight:700;font-size:11px;color:#337AB7;line-height:1.3}.rfr-dev{font-size:11px;font-weight:600;line-height:1.3;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.rfr-user{font-size:10px;color:#888;line-height:1.3}.rfr-item form{margin-top:3px}.tile{background:#fff;border-radius:8px;box-shadow:0 1px 3px rgba(0,0,0,.08);cursor:pointer;transition:box-shadow .15s,transform .15s;overflow:hidden}.tile:hover{box-shadow:0 4px 12px rgba(0,0,0,.15);transform:translateY(-2px)}.tb{border:2px solid #DC3545;animation:pu 2s infinite}.tw{border:2px solid #FFC107}@keyframes pu{0%,100%{border-color:#DC3545}50%{border-color:#f8d7da}}.tp{height:4px;width:100%}.th{display:flex;justify-content:space-between;padding:8px 12px 3px}.tid{font-weight:700;font-size:14px;color:#337AB7}.ta{font-size:10px;color:#888;padding:2px 6px;background:#f5f5f5;border-radius:8px}.slb{margin:0 12px 4px;padding:3px 6px;border-radius:3px;font-size:10px;font-weight:700;text-align:center}.slb-b{background:#f8d7da;color:#721c24}.slb-w{background:#fff3cd;color:#856404}.td{padding:0 12px 4px}.tdn{font-weight:600;font-size:13px}.tdm{font-size:10px;color:#888}.tr{display:flex;align-items:center;gap:5px;padding:2px 12px;font-size:12px}.ti{width:16px;text-align:center;font-size:11px}.tlb{display:inline-flex;align-items:center;gap:3px;padding:2px 8px;border-radius:10px;font-size:10px;color:#fff}.trsl{font-size:11px;color:#555;font-style:italic}.tsu{padding:4px 12px;font-size:11px;color:#555;border-top:1px solid #f0f0f0;font-style:italic}.tn{padding:4px 12px;font-size:10px;color:#777;background:#fafbfc}.tf{display:flex;justify-content:space-between;align-items:center;padding:6px 12px;border-top:1px solid #f0f0f0;background:#fafbfc}.pl{display:inline-block;padding:2px 8px;border-radius:8px;font-size:10px;color:#fff;font-weight:600}.tt{font-size:10px;color:#aaa}.empty{grid-column:1/-1;text-align:center;padding:50px;color:#888}.wls{padding:0 20px 16px}.wls h3{font-size:13px;color:#888;margin-bottom:6px}.wlb{display:flex;gap:10px;flex-wrap:wrap}.wli{background:#fff;border-radius:6px;padding:6px 14px;box-shadow:0 1px 2px rgba(0,0,0,.06);display:flex;align-items:center;gap:6px;font-size:12px}.foot{text-align:center;padding:16px;font-size:11px;color:#aaa}.rbar{display:flex;align-items:center;gap:8px;padding:6px 20px;background:#fff;border-top:1px solid #eee;position:sticky;bottom:0;z-index:10}.rbar.pau{background:#fff3cd}.rtx{font-size:11px;color:#888;min-width:100px}.rprog{flex:1;height:3px;background:#e9ecef;border-radius:2px;overflow:hidden}.rfill{height:100%;background:#337AB7;border-radius:2px;transition:width 1s linear;width:0%}.rbar.pau .rfill{background:#FFC107}.rtog{padding:3px 10px;font-size:10px;border:1px solid #ddd;border-radius:10px;background:#fff;cursor:pointer;color:#555}.mu{color:#999;font-style:italic;font-size:11px}@media(max-width:900px){.dash-layout{flex-direction:column}.sidebar{width:100%;flex-direction:row;flex-wrap:wrap}.rfr-panel{flex:1;min-width:200px}}"; } private string DCSS() { return @".bk{font-size:12px;color:#337AB7;text-decoration:none}.bk:hover{text-decoration:underline}.dg{display:grid;grid-template-columns:1fr 1fr;gap:16px;padding:16px 20px}@media(max-width:900px){.dg{grid-template-columns:1fr}}.dl,.dr{display:flex;flex-direction:column;gap:14px}.dc{background:#fff;border-radius:8px;padding:16px;box-shadow:0 1px 3px rgba(0,0,0,.08)}.dc h3{font-size:14px;color:#333;margin-bottom:10px;border-bottom:1px solid #eee;padding-bottom:6px}.dt{width:100%;border-collapse:collapse}.dt th{text-align:left;padding:5px 6px;font-size:11px;color:#888;width:120px}.dt td{padding:5px 6px;font-size:12px}.fg{margin-bottom:10px}.fg label{display:block;font-size:11px;font-weight:600;color:#555;margin-bottom:3px}.fc{width:100%;padding:6px 8px;border:1px solid #ddd;border-radius:4px;font-size:12px;font-family:inherit}.fc:focus{border-color:#337AB7;outline:none}.fcsm{width:auto;padding:3px 6px;font-size:11px}.nf{margin-bottom:12px}.nc{display:flex;gap:6px;margin-top:4px;align-items:center}.tl{border-left:2px solid #e0e0e0;margin-left:6px}.tli{display:flex;gap:10px;padding:6px 0}.tld{width:8px;height:8px;border-radius:50%;margin-top:3px;flex-shrink:0;margin-left:-5px}.tlc{flex:1}.tlh{display:flex;gap:6px;align-items:center;font-size:11px;margin-bottom:2px}.tla{font-weight:600;color:#333}.tldt{color:#aaa;margin-left:auto}.tlb{font-size:12px;color:#555;line-height:1.3}.clt{width:100%;border-collapse:collapse;font-size:11px}.clt th{text-align:left;padding:4px 6px;background:#f8f9fa;color:#888;font-weight:600;border-bottom:1px solid #eee}.clt td{padding:4px 6px;border-bottom:1px solid #f5f5f5}.ov{color:#DC3545;text-decoration:line-through}.nv{color:#28A745;font-weight:500}"; } private string CCSS() { return @".cg{display:grid;grid-template-columns:1fr 1fr;gap:16px;padding:16px 20px}@media(max-width:900px){.cg{grid-template-columns:1fr}}.cc{background:#fff;border-radius:8px;padding:16px;box-shadow:0 1px 3px rgba(0,0,0,.08)}.cc h3{font-size:14px;color:#333;margin-bottom:10px;border-bottom:1px solid #eee;padding-bottom:6px}.ch{font-size:11px;color:#888;margin:6px 0}.je{font-family:'Consolas',monospace;font-size:11px;line-height:1.4;background:#f8f9fa}.je:focus{background:#fff}.pv{margin-top:8px;display:flex;gap:4px;flex-wrap:wrap}.pc{display:inline-block;padding:2px 8px;border-radius:8px;font-size:10px;color:#fff;font-weight:500}.ca{padding:16px 20px;display:flex;gap:8px}.col-grid{display:grid;grid-template-columns:1fr 1fr;gap:6px}.tech-row{display:flex;gap:4px;margin-bottom:4px;align-items:center}.tech-row .fc{flex:1;font-size:11px;padding:4px 6px}.btn-rm{background:none;border:none;color:#DC3545;cursor:pointer;font-size:14px;padding:0 4px}.btn-rm:hover{color:#a71d2a}.hid{display:none}"; } }