feat(activity): implement scoped activity monitoring and fallback mechanism

app/auth.py

@@ -69,6 +69,7 @@ import urllib.error
 import urllib.parse
 import urllib.request
 from datetime import datetime, timezone
+from zoneinfo import ZoneInfo
 
 log = logging.getLogger("ihki.auth")
 TIMEOUT = 10
@@ -891,6 +892,49 @@ class SupabaseAuth:
                 raise
         return {"buckets": buckets, "summary": summary}
 
+    def scoped_activity(self, user_ids: set[str], since: datetime, bucket_minutes: int = 15) -> dict:
+        """Aggregated monitoring data for one admin's students, calculated in Postgres without downloading attempts."""
+        if not user_ids:
+            return {"buckets": [], "summary": {"attempts": 0, "active_students": 0,
+                                                 "returning_students": 0, "active_days": 0}}
+        body = {"p_user_ids": sorted(user_ids), "p_since": since.isoformat()}
+        try:
+            buckets = self._admin("/rest/v1/rpc/activity_buckets_scoped", "POST",
+                                  {**body, "p_bucket_minutes": bucket_minutes})
+            rows = self._admin("/rest/v1/rpc/activity_summary_scoped", "POST", body) or []
+            return {"buckets": buckets or [], "summary": rows[0] if rows else None}
+        except AuthUnavailable as e:
+            if "answered 404" not in str(e):
+                raise
+            log.warning("scoped activity RPCs are missing; using the paged timestamp fallback")
+            return self._scoped_activity_fallback(user_ids, since, bucket_minutes)
+
+    def _scoped_activity_fallback(self, user_ids: set[str], since: datetime, bucket_minutes: int) -> dict:
+        """Accurate compatibility path until the scoped aggregate RPC migration is installed."""
+        rows: list[dict] = []
+        for offset in range(0, MAX_CLASS_ATTEMPTS, PAGE):
+            query = urllib.parse.urlencode({"select": "user_id,created_at", "user_id": f"in.({','.join(sorted(user_ids))})",
+                                            "created_at": f"gte.{since.isoformat()}", "order": "created_at.desc",
+                                            "limit": PAGE, "offset": offset})
+            batch = self._admin(f"/rest/v1/attempts?{query}") or []
+            rows += batch
+            if len(batch) < PAGE:
+                break
+        seconds, buckets, per_user = max(1, min(bucket_minutes, 60)) * 60, {}, {}
+        local = ZoneInfo("Asia/Jerusalem")
+        for row in rows:
+            stamp = datetime.strptime(row["created_at"][:19], "%Y-%m-%dT%H:%M:%S").replace(tzinfo=timezone.utc)
+            slot = int(stamp.timestamp()) // seconds * seconds
+            item = buckets.setdefault(slot, {"users": set(), "attempts": 0})
+            item["attempts"] += 1; item["users"].add(row["user_id"])
+            per_user.setdefault(row["user_id"], set()).add(stamp.astimezone(local).date())
+        return {"buckets": [{"bucket": datetime.fromtimestamp(slot, timezone.utc).isoformat(),
+                              "attempts": item["attempts"], "active_students": len(item["users"])}
+                             for slot, item in sorted(buckets.items())],
+                "summary": {"attempts": len(rows), "active_students": len(per_user),
+                            "returning_students": sum(len(days) >= 2 for days in per_user.values()),
+                            "active_days": len({day for days in per_user.values() for day in days})}}
+
     def log_event(self, kind: str, user: dict | None, label: str = "", details: dict | None = None) -> None:
         """Best-effort append to the management activity feed; a missing audit table never blocks the action."""
         try:

app/main.py

@@ -914,13 +914,16 @@ def create_app(scorer: Scorer | None = None, tts: SawtakTTS | None = None,
         """Anonymous, aggregated practice activity for the teacher's monitoring graph."""
         try:
             scoped = bool(actor and "developer" not in actor.get("roles", ()) and hasattr(a, "access_for"))
-            if scoped or window_minutes is not None:
+            if scoped:
                 ids = None
-                if scoped:
-                    classes, users = managed_classes(a, actor, fresh=True), a.users()
-                    emails = {email for c in classes for email in c.get("emails", ())}
-                    ids = {u["id"] for u in users if u["email"].lower() in emails}
+                classes, users = managed_classes(a, actor, fresh=True), a.users()
+                emails = {email for c in classes for email in c.get("emails", ())}
+                ids = {u["id"] for u in users if u["email"].lower() in emails}
                 start = datetime.now(timezone.utc) - (timedelta(minutes=window_minutes) if window_minutes else timedelta(hours=hours))
+                data = a.scoped_activity(ids, start, bucket_minutes)
+            elif window_minutes is not None:
+                ids = None
+                start = datetime.now(timezone.utc) - timedelta(minutes=window_minutes)
                 rows = [r for r in a.all_attempts(limit=MAX_MONITOR_ATTEMPTS)
                         if (ids is None or r.get("user_id") in ids) and utc(r["created_at"]) >= start]
                 seconds, buckets = bucket_minutes * 60, {}

docs/mathly-supabase.sql

@@ -58,6 +58,40 @@ $$;
 revoke execute on function public.activity_summary(integer) from public, anon, authenticated;
 grant execute on function public.activity_summary(integer) to service_role;
 
+-- Subject-scoped monitoring aggregates. These keep busy classes accurate without downloading individual attempts.
+create or replace function public.activity_buckets_scoped(
+  p_user_ids uuid[], p_since timestamptz, p_bucket_minutes integer default 15
+)
+returns table (bucket timestamptz, attempts bigint, active_students bigint)
+language sql stable security invoker set search_path = '' as $$
+  select date_bin(make_interval(mins => greatest(1, least(p_bucket_minutes, 60))), a.created_at,
+                  timestamptz '2000-01-01 00:00:00+00'),
+         count(*)::bigint, count(distinct a.user_id)::bigint
+  from public.attempts a
+  where a.created_at >= p_since and a.user_id = any(p_user_ids)
+  group by 1 order by 1
+$$;
+revoke execute on function public.activity_buckets_scoped(uuid[], timestamptz, integer) from public, anon, authenticated;
+grant execute on function public.activity_buckets_scoped(uuid[], timestamptz, integer) to service_role;
+
+create or replace function public.activity_summary_scoped(p_user_ids uuid[], p_since timestamptz)
+returns table (attempts bigint, active_students bigint, returning_students bigint, active_days bigint)
+language sql stable security invoker set search_path = '' as $$
+  with windowed as (
+    select a.user_id, (a.created_at at time zone 'Asia/Jerusalem')::date as practice_day
+    from public.attempts a
+    where a.created_at >= p_since and a.user_id = any(p_user_ids)
+  ), per_user as (
+    select user_id, count(distinct practice_day) as days from windowed group by user_id
+  )
+  select (select count(*) from windowed)::bigint,
+         (select count(*) from per_user)::bigint,
+         (select count(*) from per_user where days >= 2)::bigint,
+         (select count(distinct practice_day) from windowed)::bigint
+$$;
+revoke execute on function public.activity_summary_scoped(uuid[], timestamptz) from public, anon, authenticated;
+grant execute on function public.activity_summary_scoped(uuid[], timestamptz) to service_role;
+
 -- Recent system activity shown only in the management panel. The backend writes with the service-role key;
 -- no browser role gets direct table access.
 create table public.system_events (

docs/scoped-activity-migration.sql

@@ -0,0 +1,35 @@
+-- Accurate, subject-scoped monitoring aggregates. Safe to run more than once.
+create or replace function public.activity_buckets_scoped(
+  p_user_ids uuid[], p_since timestamptz, p_bucket_minutes integer default 15
+)
+returns table (bucket timestamptz, attempts bigint, active_students bigint)
+language sql stable security invoker set search_path = '' as $$
+  select date_bin(make_interval(mins => greatest(1, least(p_bucket_minutes, 60))), a.created_at,
+                  timestamptz '2000-01-01 00:00:00+00'),
+         count(*)::bigint, count(distinct a.user_id)::bigint
+  from public.attempts a
+  where a.created_at >= p_since and a.user_id = any(p_user_ids)
+  group by 1 order by 1
+$$;
+revoke execute on function public.activity_buckets_scoped(uuid[], timestamptz, integer)
+  from public, anon, authenticated;
+grant execute on function public.activity_buckets_scoped(uuid[], timestamptz, integer) to service_role;
+
+create or replace function public.activity_summary_scoped(p_user_ids uuid[], p_since timestamptz)
+returns table (attempts bigint, active_students bigint, returning_students bigint, active_days bigint)
+language sql stable security invoker set search_path = '' as $$
+  with windowed as (
+    select a.user_id, (a.created_at at time zone 'Asia/Jerusalem')::date as practice_day
+    from public.attempts a
+    where a.created_at >= p_since and a.user_id = any(p_user_ids)
+  ), per_user as (
+    select user_id, count(distinct practice_day) as days from windowed group by user_id
+  )
+  select (select count(*) from windowed)::bigint,
+         (select count(*) from per_user)::bigint,
+         (select count(*) from per_user where days >= 2)::bigint,
+         (select count(distinct practice_day) from windowed)::bigint
+$$;
+revoke execute on function public.activity_summary_scoped(uuid[], timestamptz)
+  from public, anon, authenticated;
+grant execute on function public.activity_summary_scoped(uuid[], timestamptz) to service_role;

static/index.html

@@ -373,7 +373,8 @@ body:not(.home) .reward-shelf,body.manage .reward-shelf,body[data-view] .reward-
 .label{position:absolute;top:50%;width:var(--w);transform:translateY(-50%);display:flex;flex-direction:column;gap:2px}
 .sat.R .label{left:calc(100% + 10px);text-align:left;align-items:flex-end}
 .sat.L .label{right:calc(100% + 10px);text-align:right;align-items:flex-start}
-.label small{font:600 12px/1.2 var(--f-body);color:var(--muted)}
+.label b{color:#F7FAEF;text-shadow:0 1px 2px #000,0 0 5px rgb(0 0 0/.8)}
+.label small{font:600 12px/1.2 var(--f-body);color:#D5DDCE;text-shadow:0 1px 2px #000,0 0 5px rgb(0 0 0/.8)}
 .way{padding:1px 7px;border-radius:999px;background:var(--olive-soft);color:var(--olive);font:700 11px/1.3 var(--f-body);white-space:nowrap}
 .way.read{background:var(--surface);color:var(--ink);box-shadow:inset 0 0 0 1px var(--track)}
 .sat.now .label b{font-weight:700}
@@ -747,6 +748,8 @@ body.manage #manage{width:100%;max-width:none}
 .access-actions{display:flex;justify-content:flex-end;margin:8px 0}.access-scroll{overflow:auto}.access-table{width:100%;border-collapse:collapse;min-width:1180px}.access-table :is(th,td){padding:9px 10px;border-bottom:1px solid var(--line);text-align:center}.access-table th{position:sticky;top:0;background:var(--surface);font-size:13px;white-space:nowrap;z-index:1}.access-table th>span{display:block;margin-bottom:4px}.access-table .access-all{display:inline-flex;align-items:center;gap:4px;color:var(--muted);font-weight:600;cursor:pointer}.access-table .access-all small{font-size:11px}.access-table :is(th,td):first-child{text-align:start;position:sticky;right:0;background:var(--surface);z-index:2;min-width:260px}.access-table td:first-child{font-weight:700}.access-table td:first-child small{display:block;color:var(--muted);font-weight:400;direction:ltr;overflow:hidden;text-overflow:ellipsis}.access-table input{width:18px;height:18px}.access-table .save-cell{min-width:96px}
 @media(max-width:700px){.modes{grid-template-columns:repeat(2,1fr)}}
 .flag-review{gap:10px}.flag-review h2{margin:0}.flag-review .meta{color:var(--muted);font-size:13px}.flag-review fieldset{border:0;margin:0;padding:0;display:flex;flex-wrap:wrap;gap:7px}
+.flag-review.flag-urgent{border-inline-start:4px solid var(--sumac)}.flag-review.flag-lower{border-inline-start:4px solid var(--line)}
+.flag-priority{display:inline-block;margin-inline-start:6px;padding:2px 7px;border-radius:999px;font-size:12px;font-weight:700}.flag-priority.urgent{background:var(--sumac-bg);color:var(--sumac)}.flag-priority.lower{background:var(--bg);color:var(--muted)}
 .flag-review fieldset label{display:flex;align-items:center;gap:5px;padding:6px 8px;border:1px solid var(--line);border-radius:9px}.flag-review select,.flag-review textarea{font:inherit;border:1px solid var(--line);border-radius:9px;padding:7px;background:var(--surface);color:var(--ink)}
 .flag-review textarea{width:100%;resize:vertical}
 .scoring-rules summary{cursor:pointer;font-size:17px}.scoring-rules details[open] summary{margin-bottom:8px}
@@ -1236,7 +1239,7 @@ html[data-subject="math"] #bootErr{color:#F08A8A}
 #wrap{opacity:1;transition:opacity .65s ease .1s}
 #wrap[inert]{opacity:0}
 /* Accessibility toolbar: available on the splash screen and throughout every app view. */
-.a11y-launch{position:fixed;top:max(12px,env(safe-area-inset-top));left:12px;z-index:100;display:grid;place-items:center;width:46px;height:46px;padding:0;border:2px solid var(--olive);border-radius:50%;background:var(--surface);color:var(--olive);box-shadow:0 3px 12px rgb(0 0 0/.2);font:700 24px/1 var(--f-body);cursor:pointer}
+.a11y-launch{position:fixed;top:max(12px,env(safe-area-inset-top));left:12px;z-index:100;display:none;place-items:center;width:46px;height:46px;padding:0;border:2px solid var(--olive);border-radius:50%;background:var(--surface);color:var(--olive);box-shadow:0 3px 12px rgb(0 0 0/.2);font:700 24px/1 var(--f-body);cursor:pointer}
 .a11y-launch:hover,.a11y-launch:focus-visible{background:var(--olive-soft);outline:3px solid var(--surface);outline-offset:2px}
 .a11y-panel{position:fixed;top:max(66px,calc(env(safe-area-inset-top) + 66px));left:12px;z-index:101;width:min(310px,calc(100vw - 24px));padding:14px;border:1px solid var(--line);border-radius:14px;background:var(--surface);color:var(--ink);box-shadow:0 8px 28px rgb(0 0 0/.28)}
 .a11y-head{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:10px}.a11y-head strong{font-size:19px}.a11y-close{width:36px;height:36px;border:0;border-radius:50%;background:transparent;color:var(--ink);font:700 18px/1 var(--f-body);cursor:pointer}.a11y-close:hover,.a11y-close:focus-visible{background:var(--olive-soft);outline:2px solid var(--olive)}
@@ -4747,14 +4750,19 @@ function drawFlags(){
   if(!pending.length){ head.append(mark("meta","אין כרגע דיווחים שממתינים לבדיקה.","p")); return; }
   const byUser=new Map; for(const f of pending){ const who=f.email||""; if(!byUser.has(who)) byUser.set(who,[]); byUser.get(who).push(f); }
   head.append(mark("meta",`${pending.length} ${pending.length===1?"דיווח":"דיווחים"} מ־${byUser.size} ${byUser.size===1?"מדווח/ת":"מדווחים"}, מקובצים לפי המדווח/ת.`,"p"));
-  for(const [who,flags] of [...byUser].sort((a,b)=>b[1].length-a[1].length||a[0].localeCompare(b[0]))){   // the most reports first
+  const flagScore=f=>Number.isFinite(Number(f.score))?Number(f.score):101;
+  const groupPriority=flags=>Math.min(...flags.map(flagScore));
+  for(const [who,flags] of [...byUser].sort((a,b)=>groupPriority(a[1])-groupPriority(b[1])||b[1].length-a[1].length||a[0].localeCompare(b[0]))){
     const group=document.createElement("details"), summary=document.createElement("summary");
     group.className="flag-group"; group.open=flagGroupOpen[who]===true; group.ontoggle=()=>{ flagGroupOpen[who]=group.open; };
-    summary.append(mark("",who||"ללא משתמש","b"),mark("meta",` · ${flags.length} ${flags.length===1?"דיווח":"דיווחים"}`)); group.append(summary); box.append(group);
-    for(const f of flags){
-      const card=mark("card flag-review",""), title=mark("",f.he||f.phrase,"h2"), result=f.result||{}, issues=flagIssues(f);
+    const urgent=flags.filter(f=>flagScore(f)<75).length;
+    summary.append(mark("",who||"ללא משתמש","b"),mark("meta",` · ${flags.length} ${flags.length===1?"דיווח":"דיווחים"}${urgent?` · ${urgent} מתחת ל־75`:" · כולם בחומרה נמוכה"}`)); group.append(summary); box.append(group);
+    for(const f of [...flags].sort((a,b)=>flagScore(a)-flagScore(b))){
+      const lower=flagScore(f)>=75, card=mark(`card flag-review ${lower?"flag-lower":"flag-urgent"}`,""), title=mark("",f.he||f.phrase,"h2"), result=f.result||{}, issues=flagIssues(f);
       const ar=mark("",f.ar||"","p"); ar.dir="rtl";
-      card.append(title,ar,mark("meta",`ציון ${f.score} · המודל שמע: ${f.heard_ipa||"–"}`,"p"));
+      const scoreLine=mark("meta",`ציון ${f.score} · המודל שמע: ${f.heard_ipa||"–"}`,"p");
+      scoreLine.append(mark(`flag-priority ${lower?"lower":"urgent"}`,lower?"חומרה נמוכה":"עדיפות לבדיקה"));
+      card.append(title,ar,scoreLine);
       if(f.note) card.append(mark("",`הערת המדווח/ת: ${f.note}`,"p"));
       if(f.audio){
         const audioRow=mark("row",""), play=mark("btn","▶ השמעת ההקלטה","button"), audio=document.createElement("audio"), audioMsg=mark("msg","");

tests/test_activity.py

@@ -0,0 +1,38 @@
+from datetime import datetime, timezone
+
+from app.auth import AuthUnavailable, SupabaseAuth
+
+
+def test_scoped_activity_uses_database_aggregates():
+    auth = SupabaseAuth("https://example.supabase.co", "public", secret="secret")
+    calls = []
+
+    def admin(path, method="GET", body=None, prefer="return=representation", timeout=10):
+        calls.append((path, body))
+        if path.endswith("activity_buckets_scoped"):
+            return [{"bucket": "2026-10-22T10:00:00+00:00", "attempts": 4, "active_students": 2}]
+        return [{"attempts": 4, "active_students": 2, "returning_students": 1, "active_days": 2}]
+
+    auth._admin = admin
+    data = auth.scoped_activity({"u2", "u1"}, datetime(2026, 10, 15, tzinfo=timezone.utc), 60)
+    assert data["summary"]["returning_students"] == 1
+    assert calls[0][1]["p_user_ids"] == ["u1", "u2"]
+    assert calls[0][1]["p_bucket_minutes"] == 60
+
+
+def test_scoped_activity_fallback_is_not_limited_to_the_newest_day():
+    auth = SupabaseAuth("https://example.supabase.co", "public", secret="secret")
+
+    def admin(path, method="GET", body=None, prefer="return=representation", timeout=10):
+        if "/rpc/" in path:
+            raise AuthUnavailable("supabase answered 404: function missing")
+        return [
+            {"user_id": "u1", "created_at": "2026-10-22T08:00:00.12345+00:00"},
+            {"user_id": "u1", "created_at": "2026-10-21T08:00:00+00:00"},
+            {"user_id": "u2", "created_at": "2026-10-22T09:00:00+00:00"},
+        ]
+
+    auth._admin = admin
+    data = auth.scoped_activity({"u1", "u2"}, datetime(2026, 10, 15, tzinfo=timezone.utc), 60)
+    assert data["summary"] == {"attempts": 3, "active_students": 2, "returning_students": 1, "active_days": 2}
+    assert sum(bucket["attempts"] for bucket in data["buckets"]) == 3