From ce49616a2243f7fb330e7f3a72c0cec78b4b0555 Mon Sep 17 00:00:00 2001
From: Eric Bellm <ecbellm@uw.edu>
Date: Fri, 17 Jan 2025 15:30:25 -0800
Subject: [PATCH] enable scan page auto reload

---
 src/tasso/handlers/external.py             | 12 ++++++------
 src/tasso/webapp/templates/pages/scan.html |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/tasso/handlers/external.py b/src/tasso/handlers/external.py
index 4a354a0..4c0dd19 100644
--- a/src/tasso/handlers/external.py
+++ b/src/tasso/handlers/external.py
@@ -4,6 +4,7 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends
+from fastapi.responses import JSONResponse
 from safir.dependencies.db_session import db_session_dependency
 from safir.dependencies.logger import logger_dependency
 from safir.metadata import get_metadata
@@ -147,14 +148,13 @@ async def get_unclassified_subject(
 
 
 @external_router.put(
-    "/classify_and_get_next",
-    summary="Store classification for a given subject and return "
-    "an unclassified one.",
+    "/classify_and_reload",
+    summary="Store classification for a given subject and reload",
 )
-async def put_classification_and_return_new(
+async def put_classification_and_reload(
     classification: Classification,
     logger: Annotated[BoundLogger, Depends(logger_dependency)],
-) -> Subject | None:
+) -> JSONResponse:
     await put_classification(classification, logger)
 
-    return await get_unclassified_subject(classification.user, logger)
+    return JSONResponse(content={}, headers={"HX-Refresh": "true"})
diff --git a/src/tasso/webapp/templates/pages/scan.html b/src/tasso/webapp/templates/pages/scan.html
index 4657675..0776532 100644
--- a/src/tasso/webapp/templates/pages/scan.html
+++ b/src/tasso/webapp/templates/pages/scan.html
@@ -1,7 +1,7 @@
 {% extends "pages/base.html" %}
 {% block title %} subject {% endblock %}
 {% block content %}
-    <div id="scan_content" hx-get="/scan" hx-swap="innerHTML">
+<div id="scan_content">
 	    <div class="flex pl-3 items-center">
 		<span class="text-large" name="subject_id">{{subject.subject_id}}</span>
 		&nbsp;
@@ -17,7 +17,7 @@
 
 	    <div class="flex pl-3 items-center">
 	    <button class="flex items-center px-4 py-3 border"
-		    hx-put="/tasso/classify_and_get_next"
+		    hx-put="/tasso/classify_and_reload"
 			      hx-vals='js:{"user":"{{user}}",
 			      "subject_id":"{{subject.subject_id}}",
 			      "run_id":"{{subject.run_id}}",
@@ -26,14 +26,14 @@
 			      "flags":0,
 			      "time_labeled":Date.now()}'
 		    hx-ext="json-enc"
-		    hx-target="#scan_content">
+		    hx-refresh="True">
 		    Real
 	    </button>
 	    </div>
 
 	    <div class="flex pl-3 items-center">
 	    <button class="flex items-center px-4 py-3 border"
-		    hx-put="/tasso/classify_and_get_next"
+		    hx-put="/tasso/classify_and_reload"
 			      hx-vals='js:{"user":"{{user}}",
 			      "subject_id":"{{subject.subject_id}}",
 			      "run_id":"{{subject.run_id}}",