elections2021: Improve banner orders

- Fix legalese
- Add a note field
- Use stable export ordering

Signed-off-by: Jan Hamal Dvořák <mordae@anilinux.org>

elections2021/migrations/0040_rename_place_of_birth_bannerorder_residency.py

@@ -6,13 +6,13 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('elections2021', '0039_elections2021mappage_subtitle'),
+        ("elections2021", "0039_elections2021mappage_subtitle"),
     ]
 
     operations = [
         migrations.RenameField(
-            model_name='bannerorder',
-            old_name='place_of_birth',
-            new_name='residency',
+            model_name="bannerorder",
+            old_name="place_of_birth",
+            new_name="residency",
         ),
     ]

elections2021/migrations/0041_token.py

@@ -6,17 +6,25 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('elections2021', '0040_rename_place_of_birth_bannerorder_residency'),
+        ("elections2021", "0040_rename_place_of_birth_bannerorder_residency"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Token',
+            name="Token",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('scope', models.CharField(max_length=127)),
-                ('bearer', models.CharField(max_length=40)),
-                ('comment', models.CharField(max_length=255)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("scope", models.CharField(max_length=127)),
+                ("bearer", models.CharField(max_length=40)),
+                ("comment", models.CharField(max_length=255)),
             ],
         ),
     ]

elections2021/migrations/0042_bannerorder_note.py

+# Generated by Django 3.2.5 on 2021-08-18 14:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("elections2021", "0041_token"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="bannerorder",
+            name="note",
+            field=models.CharField(blank=True, max_length=255),
+        ),
+    ]

elections2021/models.py

@@ -2477,6 +2477,7 @@ class BannerOrder(models.Model):
     date_of_birth = models.DateField()
     phone = models.CharField(max_length=20)
     email = models.EmailField(max_length=70)
+    note = models.CharField(max_length=255, blank=True)
 
 
 class BannerForm(forms.ModelForm):
@@ -2490,6 +2491,7 @@ class BannerForm(forms.ModelForm):
             "date_of_birth",
             "phone",
             "email",
+            "note",
         ]
 
 

elections2021/templates/elections2021/banner_order_form.html

@@ -70,8 +70,9 @@
 
       <p class="my-5">
         Pokud nám pomůžete v&nbsp;kampani vyvěšením venkovní reklamy,
-        musíme o&nbsp;tomto Vašem nefinančním daru informovat stát,
-        který vaše údaje uveřejní.
+        jedná se o&nbsp;nefinační dar. Výše uvedené informace o&nbsp;vás
+        uveřejníme, abychom splnili svou zákonnou povinnost.
+        Tato data budeme uchovávat 10&nbsp;let od&nbsp;poskytnutí daru.
       </p>
 
       <h2 class="head-alt-sm my-5">Kontaktní údaje</h2>
@@ -95,12 +96,22 @@
           <div class="form-field__error">{{error}}</div>
           {% endfor %}
         </div>
+        <div class="form-field col-span-4 form-field-required {% if request.banner_form.errors.note %}form-field--error{% endif %}">
+          <label class="form-field__label" for="note">Poznámka</label>
+          <div class="form-field__wrapper form-field__wrapper--shadowed">
+            <input type="text" class="text-input form-field__control text-black" id="note" name="note" value="{{request.banner_form.note.value|default_if_none:""}}" placeholder="" />
+          </div>
+          {% for error in request.banner_form.errors.note %}
+          <div class="form-field__error">{{error}}</div>
+          {% endfor %}
+        </div>
       </div>
 
       <p class="my-5">
-        Kontaktní údaje využijí naši koordinátoři k tomu, aby se s vámi
-        domluvili na podrobnostech předání. Po skončení této volební kampaně
-        vaše kontaktní údaje vymažeme.
+        Kontaktní údaje využijí naší koordinátoři k tomu,
+        aby se s Vámi domluvili na podrobnostech předání.
+        Po skončení této volební kampaně Vaše kontaktní údaje vymažeme
+        a&nbsp;to nejpozději k&nbsp;1.&nbsp;1.&nbsp;2022.
       </p>
 
       <div class="mt-5 text-center lg:text-right">

elections2021/views.py

 import csv
-from .models import BannerOrder, Token
+
 from django.http import HttpResponse, HttpResponseForbidden
 
+from .models import BannerOrder, Token
+
 
 def banner_orders_csv(request):
-    response = HttpResponse(content_type='text/csv;charset=utf-8')
+    response = HttpResponse(content_type="text/csv;charset=utf-8")
 
-    tokens = Token.objects.filter(bearer=request.GET.get('token'), scope="banner-orders")
+    tokens = Token.objects.filter(
+        bearer=request.GET.get("token"), scope="banner-orders"
+    )
     if not tokens:
         return HttpResponseForbidden()
 
     w = csv.writer(response)
-    w.writerow(["ID", "Plachta", "Jméno", "Příjmení", "Bydliště", "Narozen", "Telefon", "Mail"])
+    w.writerow(
+        [
+            "ID",
+            "Plachta",
+            "Jméno",
+            "Příjmení",
+            "Bydliště",
+            "Narozen",
+            "Telefon",
+            "Mail",
+            "Poznámka",
+        ]
+    )
 
-    for row in BannerOrder.objects.all():
-        w.writerow([str(row.id), row.code, row.name, row.surname, row.residency,
-                    str(row.date_of_birth), row.phone, row.email])
+    for row in BannerOrder.objects.order_by("id").all():
+        w.writerow(
+            [
+                str(row.id),
+                row.code,
+                row.name,
+                row.surname,
+                row.residency,
+                str(row.date_of_birth),
+                row.phone,
+                row.email,
+                row.note,
+            ]
+        )
 
     return response