diff --git a/fireworks_detect/__pycache__/views.cpython-312.pyc b/fireworks_detect/__pycache__/views.cpython-312.pyc index 3a7ffcd..6a4ebe1 100644 Binary files a/fireworks_detect/__pycache__/views.cpython-312.pyc and b/fireworks_detect/__pycache__/views.cpython-312.pyc differ diff --git a/fireworks_detect/templates/fireworks_detect/includes/manual_report_form.html b/fireworks_detect/templates/fireworks_detect/includes/manual_report_form.html index 7ae2a8a..e564bf5 100644 --- a/fireworks_detect/templates/fireworks_detect/includes/manual_report_form.html +++ b/fireworks_detect/templates/fireworks_detect/includes/manual_report_form.html @@ -53,6 +53,7 @@ {% trans "Optional. Without an accepted window, BoomCast reports the count without an intensity rating." %} {% include "fireworks_detect/includes/manual_direction_panel.html" %} +
diff --git a/fireworks_detect/templates/fireworks_detect/manual_pending_submission.html b/fireworks_detect/templates/fireworks_detect/manual_pending_submission.html index 3453417..3db343d 100644 --- a/fireworks_detect/templates/fireworks_detect/manual_pending_submission.html +++ b/fireworks_detect/templates/fireworks_detect/manual_pending_submission.html @@ -16,6 +16,7 @@

{% if pending.is_burst %}{% trans "Burst Event" %}{% else %}{% trans "Ordinary report" %}{% endif %} ยท {% trans "Submitted" %} {{ pending.created_at|date:"j M Y, H:i" }}

{% if pending.is_burst %}

{% trans "Duration" %}: {% if pending.observation_duration_minutes %}{{ pending.observation_duration_minutes }} {% trans "minutes (estimated)" %}{% else %}{% trans "Unknown" %}{% endif %}

{% trans "Intensity" %}: {% if pending.burst_intensity %}{{ pending.burst_intensity_display }} ({{ pending.bangs_per_15_minutes|floatformat:1 }} {% trans "bangs per 15 minutes" %}){% else %}{% trans "Not rated" %}{% endif %}

{% endif %} +

{% trans "Visually confirmed" %}: {% if pending.visually_confirmed %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}

{% if request.user.is_authenticated %}

{% trans "Add or review field notes for this report" %}

{% endif %} {% if editable %}
{% csrf_token %} diff --git a/fireworks_detect/tests.py b/fireworks_detect/tests.py index d7fad67..c370cc3 100644 --- a/fireworks_detect/tests.py +++ b/fireworks_detect/tests.py @@ -55,6 +55,24 @@ class ManualPendingEventTests(TestCase): def setUp(self): self.client.cookies["django_language"] = "en" + def test_manual_visual_confirmation_is_optional_and_survives_review(self): + url = reverse("fireworks_detect:submit_manual_pending") + for posted, expected in (({}, False), ({"visually_confirmed": "on"}, True)): + with self.subTest(confirmed=expected): + response = self.client.post(url, {"occurrences": "1", **posted}) + self.assertEqual(response.status_code, 200) + pending = PendingEvent.objects.latest("pk") + self.assertEqual(pending.visually_confirmed, expected) + self.assertContains(response, f"Visually confirmed: {'Yes' if expected else 'No'}") + update_url = reverse("fireworks_detect:update_manual_pending", args=[pending.pk]) + self.client.post(update_url, {"occurrences": "2"}) + pending.refresh_from_db() + self.assertEqual(pending.visually_confirmed, expected) + event = pending.approve() + self.assertEqual(event.visually_confirmed, expected) + self.assertContains(self.client.get(reverse("fireworks_detect:event_detail", args=[event.pk])), + f"Visually confirmed{'Yes' if expected else 'No'}") + def test_manual_report_creates_a_timestamped_pending_event(self): response = self.client.post(reverse("fireworks_detect:submit_manual_pending"), { "occurrences": "4", diff --git a/fireworks_detect/views.py b/fireworks_detect/views.py index 04b8023..85044e7 100644 --- a/fireworks_detect/views.py +++ b/fireworks_detect/views.py @@ -577,6 +577,7 @@ def submit_manual_pending_event(request): latitude=latitude, longitude=longitude, h3_cell=h3_cell or "", + visually_confirmed=request.POST.get("visually_confirmed") == "on", direction_degrees=direction_degrees, direction_accuracy_degrees=direction_accuracy_degrees, direction_source="device_compass" if direction_degrees is not None else "",