Fix card-number field sizing and non-digit Go! errors

src/grades.py

@@ -6,6 +6,7 @@ When the same key appears twice, the row with the later ``modified_at`` wins.
 
 from __future__ import annotations
 
+import re
 from dataclasses import dataclass
 
 import pandas as pd
@@ -329,10 +330,17 @@ def plan_progress_sync(
 
 def parse_card_number(raw: object, total_cards: int) -> tuple[int | None, str | None]:
     """Parse a 1-based card number, or return ``(None, error)``."""
-    text = "" if raw is None else str(raw).strip()
+    if isinstance(raw, bool) or isinstance(raw, float):
+        return None, "Card number must be digits only."
+    if isinstance(raw, int):
+        text = str(raw)
+    elif raw is None:
+        text = ""
+    else:
+        text = str(raw).strip()
     if not text:
         return None, "Enter a card number."
-    if not text.isdigit():
+    if not re.fullmatch(r"[0-9]+", text):
         return None, "Card number must be digits only."
     number = int(text)
     if number <= 0:

src/streamlit_app.py

@@ -871,8 +871,26 @@ def _wire_card_jump_field() -> None:
             const win = window.parent;
             const doc = win.document;
             const size = (inp) => {
-                const n = Math.max(2, (inp.value || '').length);
-                inp.style.width = n + 'ch';
+                inp.setAttribute('maxlength', '6');
+                let v = inp.value || '';
+                if (v.length > 6) {
+                    v = v.slice(0, 6);
+                    inp.value = v;
+                }
+                const n = Math.min(6, Math.max(3, v.length));
+                inp.style.setProperty('width', n + 'ch', 'important');
+            };
+            const commit = (inp) => {
+                inp.dispatchEvent(new Event('input', { bubbles: true }));
+                inp.dispatchEvent(new Event('change', { bubbles: true }));
+            };
+            const hideIfExpired = () => {
+                doc.querySelectorAll('.card-jump-error').forEach((el) => {
+                    const started = parseFloat(el.getAttribute('data-error-at') || '');
+                    const age = Number.isFinite(started)
+                        ? Date.now() - started * 1000 : 0;
+                    el.style.display = age >= 5000 ? 'none' : '';
+                });
             };
             const wire = () => {
                 doc.querySelectorAll(
@@ -887,16 +905,22 @@ def _wire_card_jump_field() -> None:
                         inp.addEventListener('keydown', (e) => {
                             if (e.key !== 'Enter' || e.isComposing) return;
                             e.preventDefault();
+                            commit(inp);
                             const btn = doc.querySelector('.st-key-btn_card_go button');
                             if (btn) btn.click();
                         });
                     }
                 }
-                doc.querySelectorAll('.card-jump-error').forEach((el) => {
-                    if (el.dataset.gradingHideArmed) return;
-                    el.dataset.gradingHideArmed = '1';
-                    setTimeout(() => { el.style.display = 'none'; }, 5000);
-                });
+                hideIfExpired();
+                const err = doc.querySelector('.card-jump-error');
+                const at = err ? (err.getAttribute('data-error-at') || '') : '';
+                if (err && err.style.display !== 'none' && err.dataset.gradingHideTimer !== at) {
+                    err.dataset.gradingHideTimer = at;
+                    const started = parseFloat(at);
+                    const remaining = Number.isFinite(started)
+                        ? Math.max(0, 5000 - (Date.now() - started * 1000)) : 5000;
+                    setTimeout(hideIfExpired, remaining);
+                }
             };
             wire();
             if (win.__gradingCardJumpObserver) {
@@ -1125,8 +1149,10 @@ def _render_card_jump(card_index: int, total_cards: int) -> None:
         st.session_state.card_jump_to = str(card_index + 1)
     err = st.session_state.get("card_jump_error")
     if err:
+        err_at = st.session_state.get("card_jump_error_at") or time.time()
         st.markdown(
-            f"<div class='card-jump-error'>{html.escape(str(err))}</div>",
+            f"<div class='card-jump-error' data-error-at='{float(err_at):.6f}'>"
+            f"{html.escape(str(err))}</div>",
             unsafe_allow_html=True,
         )
     form_kwargs: dict[str, object] = {"border": False}
@@ -1145,6 +1171,7 @@ def _render_card_jump(card_index: int, total_cards: int) -> None:
                 "Card number",
                 key="card_jump_to",
                 label_visibility="collapsed",
+                max_chars=6,
             )
         with suffix:
             st.markdown(

src/styles.py

@@ -325,12 +325,13 @@ hr, [data-testid="stDivider"] {
     font-variant-numeric: tabular-nums !important;
     color: var(--text) !important;
     text-align: center !important;
-    line-height: 1.25 !important;
+    line-height: 1.875em !important;
     min-height: 0 !important;
-    height: 1.25em !important;
-    min-width: 2ch !important;
-    width: 2ch !important;
-    padding: 0.05em 0.12em !important;
+    height: 1.875em !important;
+    min-width: 3ch !important;
+    max-width: 6ch !important;
+    width: 3ch !important;
+    padding: 0.075em 0.18em !important;
     margin: 0 !important;
     background: var(--surface-2) !important;
     border: 1px solid var(--border) !important;

tests/test_grades.py

@@ -362,6 +362,13 @@ def test_parse_card_number_accepts_digits_and_rejects_errors() -> None:
     assert number is None and err is not None
     number, err = parse_card_number("12a", 10)
     assert number is None and err is not None and "digits" in err
+    for raw in (".", "1.2", "1e2", "+3", "abc", "3-1", "12.0"):
+        number, err = parse_card_number(raw, 10)
+        assert number is None and err is not None and "digits" in err, raw
+    number, err = parse_card_number(-4, 10)
+    assert number is None and err is not None and "digits" in err
+    number, err = parse_card_number(1.5, 10)
+    assert number is None and err is not None and "digits" in err
     number, err = parse_card_number("0", 10)
     assert number is None and err is not None and "at least 1" in err
     number, err = parse_card_number("11", 10)