From cfc044a6b9f5c82b0975a362fb74bcbef372356f Mon Sep 17 00:00:00 2001 From: Joren de Graaf Date: Fri, 23 Oct 2026 14:32:24 +0200 Subject: [PATCH] latest changes --- .../__pycache__/views.cpython-312.pyc | Bin 59357 -> 59454 bytes .../includes/manual_report_form.html | 1 + .../manual_pending_submission.html | 1 + fireworks_detect/tests.py | 18 ++++++++++++++++++ fireworks_detect/views.py | 1 + 5 files changed, 21 insertions(+) diff --git a/fireworks_detect/__pycache__/views.cpython-312.pyc b/fireworks_detect/__pycache__/views.cpython-312.pyc index 3a7ffcd92deace86ed37ce76ef13427848c39175..6a4ebe1ab64b266838db4d9cd48ec4bcc6930425 100644 GIT binary patch delta 937 zcmYjPdq`7J7(d^+x}|d~T_)~QSRu7E7n5GJ`6wZ>hxQVKvAw4v+ z6Qne-Cl%6*^Jh@m%Sz3ek+M~nCih!-FO~C#f1}|2TQ5Mr$j><`JntZrZBLlz7?~Lh^fsYKT8(_C04fuHj*7~i!RlT%7m@R4d(UK>sGaivY#dUanT;XLCPyF z$jx)+7VX~aQWUdR?qgSSfI}|_KRs3P5JL;yTqyvwkZo12@FDiIKC+`+rjM%@X}~~! z9Zk+MOx6rVAYIguo_huqWm2O=bxO=BeS=jMXEoUxZ9QT_mzdy7OzRfY?{Df7SE;51 zb+%odpW>UJ*%fQ{Wp5Y}S@pq{UuMvq$Ib#&5L}aEbs+RK(c&zD+(f`BSr{L z1CFLhheZe`0Y_`3Q!Dgqz^SDtYkml!@*Sp<)}D+57$!IBW8wz6YAxFUwx)kV8MQ zH6}#|#$sOL=3W8!21!NZN~or-jV1xE(YM~K7+#a(O-mp^9yO)H4H|MT2g4oWy3o(4 z^oz5ZjJ%62&`Rc9YKC^&ed#iWF1qhZCV-zlx>~CNm29|q9{l9%&3XvZ>RX>M{Gog4 zpb-Kzr?p&QebncLEXZiv0`s^ke}t<0FKkBfqX&3pN8B^559Yc a#eD$U5dq<;9P}LGhBTZUE~5uNIN>h|WifmJ delta 901 zcmYjPYe-XJ7(VYgx~X$Bw`6Q3tj4Hmrl@JFrrjv0tSE{s-B=w#yJ(zUPT@uu3qrKg zFT&L<^U?*2vJd(ZWS1WnNI9c&4d*N&$--t*(2uC^+Y)-=d(QJdJm>wM7rtIU7aHIc z{c?E{L+a>#|Nh?FJqkl5`hyc;H#S#JCc$R3$ZpM4xo5joCs=-YHSh+0g-_B6XThU! zv%+;ZL2Eu8K#Mn{h+U&LJJMr4!??L_i1FJ+Nay&iD(;St^}sajiDUR=ekICrHo_{@ z>&%Q>%`;lm2mY*t+fE=x@ z&nuLtNFvFMOc{|=reKuXfO1Y?mbzKqk{i%w2K44YR*^qz!=T3K-@0vDLtMw#PtC=B z^_KxWXm3MVZn>U$u_(LT%)Fd$u%s~|y{dc}7cv1wbE-wjjids_v{Xw5H(~@!297lR z;^KmAO*Ni8uLGDuDa~r#1Pv!8+v{Q_*a#PbM2$iPUf29H9-bm|%W};$ReumLvO+Dj z4G}O(gfMDqIR~%NJZ~WcQK{D?dq!dvw9>QWd+hPGn3gDcv~Sa^t@wTFq+-k~Qk`Z}IMA3D?74gEO3tBVCc4&K-R z@E#j(HA-Lz;k(!1J=$@v2|{@M-e(qm<3apI1;hB!^IDF~G4&rHO;`Ue$e^i$$u=in zRb#bR+H#i^2w@s8k0oox3p>e2h$bJx3tlFWOHj_M$K;O4D?5Y`KVT+<+6NQ>fP4HO zWgy}U!-*`Mz*k1z0MujqXeB41FF*+54`XBOoFf3zX^vrMQ;<{8MI==G?!w_uR`?4D CU?u_p 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 "",