diff --git a/recounting_dashboard.py b/recounting_dashboard.py index 4f76cbf..4104274 100644 --- a/recounting_dashboard.py +++ b/recounting_dashboard.py @@ -137,7 +137,7 @@ def start_recount(): return jsonify({ "success": True, - "stream_url": f"{GO2RTC_URL}/api/stream.mjpeg?src={STREAM_NAME}", + "stream_url": f"{RECOUNT_API_URL}/api/live-video", "file": Path(mp4_path).name, }) diff --git a/templates/recounting.html b/templates/recounting.html index 11afd2b..5b13bd8 100644 --- a/templates/recounting.html +++ b/templates/recounting.html @@ -363,7 +363,7 @@
--
Objects Recounted
-
Batch #-- · --
+
--
waiting...
@@ -517,8 +517,8 @@ async function loadBatchResult(filePath) { } batchResultLoaded = true; document.getElementById('live-title').innerHTML = '◉ Batch Result'; - document.getElementById('live-count').textContent = data.count.toLocaleString(); - document.getElementById('live-label').textContent = 'Batch #' + data.batch_number; + document.getElementById('live-count').textContent = '#' + data.batch_number; + document.getElementById('live-label').textContent = data.count.toLocaleString() + ' objects'; document.getElementById('live-batch').textContent = data.batch_number; document.getElementById('live-time').textContent = data.date; var startStr = data.start_time ? new Date(data.start_time).toLocaleTimeString('en-US', {hour12: false, hour:'2-digit', minute:'2-digit'}) : '--'; @@ -626,7 +626,6 @@ async function stopRecount() { async function loadRecountProgress() { const countEl = document.getElementById('recount-count'); - const batchEl = document.getElementById('recount-batch'); const timeEl = document.getElementById('recount-time'); const statusEl = document.getElementById('recount-status'); try { @@ -634,14 +633,12 @@ async function loadRecountProgress() { const data = await res.json(); if (!data.success) { countEl.textContent = '--'; - batchEl.textContent = '--'; timeEl.textContent = data.error || 'unreachable'; statusEl.className = 'counter-status disconnected'; statusEl.textContent = 'no connection'; return; } countEl.textContent = data.count.toLocaleString(); - batchEl.textContent = data.batch_number || '--'; if (data.last_detection_time) { const d = new Date(data.last_detection_time); timeEl.textContent = d.toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit', second: '2-digit' }); @@ -652,7 +649,6 @@ async function loadRecountProgress() { statusEl.textContent = 'connected'; } catch (err) { countEl.textContent = '--'; - batchEl.textContent = '--'; timeEl.textContent = 'unreachable'; statusEl.className = 'counter-status disconnected'; statusEl.textContent = 'no connection';