remote-access protocol collection; dashboard site timezone + badge alignment

plugins/computers/plugin.py

@@ -124,6 +124,18 @@ class ComputersPlugin(BasePlugin):
                                     '(Win32_Printer): windows name / share / '
                                     'hostname / IP. Unresolved -> warning.'),
                 },
+                'accessprotocols': {
+                    'type': 'array',
+                    'items': {'type': 'string'},
+                    'description': ('Remote-access protocols this PC actually '
+                                    'exposes, by catalog name (VNC, WinRM, '
+                                    'RDP). Presence of the key drives the sync: '
+                                    'reported protocols are activated and '
+                                    'catalogued ones not reported are '
+                                    'deactivated. Omit the key entirely to '
+                                    'leave existing rows alone - most came from '
+                                    'the legacy isvnc/iswinrm migration.'),
+                },
             },
         }
 
@@ -262,6 +274,9 @@ class ComputersPlugin(BasePlugin):
                     computerid=comp.computerid, appid=app.appid,
                     installedversion=version))
 
+        # Remote-access protocol sync (only when the payload carried the key).
+        accessprotocols = self._sync_access_protocols(comp, payload, warnings)
+
         # Printer relationship sync (only when the payload carried printer data).
         printerlinks = self._sync_printer_links(comp.asset, payload, warnings)
 
@@ -281,11 +296,75 @@ class ComputersPlugin(BasePlugin):
                 'printerlinkcount': len(printerlinks),
                 'measuringtoollinks': measuringtoollinks,
                 'measuringtoollinkcount': len(measuringtoollinks),
+                'accessprotocols': accessprotocols,
             },
         }
 
     # -- printer relationship sync -----------------------------------------
 
+    def _sync_access_protocols(self, comp, payload, warnings):
+        """Idempotently sync a PC's remote-access protocols from the collector.
+
+        Payload key 'accessprotocols' is a list of protocol NAMES as they appear
+        in the accessprotocols catalog ('VNC', 'WinRM', 'RDP'), matched
+        case-insensitively. An unknown name warns and is skipped rather than
+        creating a protocol: the catalog is admin-managed on purpose, so a
+        typo on one bay must not invent a protocol for the whole site.
+
+        Presence of the key drives the sync, exactly like the printer links: a
+        reported protocol is activated, and a catalogued protocol the PC did
+        NOT report is deactivated (not deleted, so a port override survives a
+        temporary outage). A payload with no 'accessprotocols' key leaves every
+        existing row untouched - most PCs' rows came from the legacy
+        isvnc/iswinrm migration and must not be wiped by a collector that
+        simply does not report them yet.
+
+        Returns the list of active protocol names after the sync.
+        """
+        from plugins.computers.models import AccessProtocol, ComputerAccess
+
+        if 'accessprotocols' not in payload:
+            return []
+
+        reported = payload.get('accessprotocols') or []
+        if not isinstance(reported, list):
+            warnings.append('accessprotocols must be a list of protocol names')
+            return []
+
+        wanted = set()
+        for name in reported:
+            name = str(name or '').strip()
+            if not name:
+                continue
+            protocol = AccessProtocol.query.filter(
+                AccessProtocol.name.ilike(name)).first()
+            if not protocol:
+                warnings.append('unknown access protocol: {}'.format(name))
+                continue
+            wanted.add(protocol.protocolid)
+
+        existing = {row.protocolid: row for row in
+                    ComputerAccess.query.filter_by(computerid=comp.computerid).all()}
+
+        for protocolid in wanted:
+            row = existing.get(protocolid)
+            if row:
+                row.isactive = True
+            else:
+                db.session.add(ComputerAccess(
+                    computerid=comp.computerid, protocolid=protocolid,
+                    isactive=True))
+
+        # Deactivate what the PC no longer exposes. Kept as rows so a manual
+        # portoverride is not lost the first time a service is briefly down.
+        for protocolid, row in existing.items():
+            if protocolid not in wanted:
+                row.isactive = False
+
+        names = [p.name for p in AccessProtocol.query.filter(
+            AccessProtocol.protocolid.in_(wanted)).all()] if wanted else []
+        return sorted(names)
+
     def _sync_printer_links(self, pcasset, payload, warnings):
         """Idempotently sync PC->printer relationships from collector printer data.
 

plugins/notifications/api/routes.py

@@ -11,6 +11,7 @@ from flask_jwt_extended import jwt_required
 from shopdb.api import db, success_response, error_response, paginated_response, ErrorCodes, get_pagination_params, paginate_query
 
 from ..models import Notification, NotificationType
+from ..models.notification import _utc_iso
 
 from shopdb.api import require_permission, Setting
 
@@ -792,8 +793,12 @@ def get_shopfloor_notifications():
         result = {
             'notificationid': n.notificationid,
             'notification': n.notification,
-            'starttime': n.starttime.isoformat() if n.starttime else None,
-            'endtime': n.endtime.isoformat() if n.endtime else None,
+            # _utc_iso, not a bare isoformat: these are stored NAIVE but hold
+            # UTC, and an untagged string is read by the browser as LOCAL time,
+            # shifting every card on the board by the tz offset. The model's
+            # to_dict already learned this; the shopfloor feed had not.
+            'starttime': _utc_iso(n.starttime),
+            'endtime': _utc_iso(n.endtime),
             'ticketnumber': n.ticketnumber,
             'link': n.link,
             'isactive': n.isactive,