From 3e66395e83780aee3b64220dce438cf30d0cd684 Mon Sep 17 00:00:00 2001
From: Federico Denkena <federico.denkena@posteo.de>
Date: Wed, 4 Oct 2023 21:35:26 +0200
Subject: [PATCH] add slug and modify address, fill "anmeldung"

---
 templates/anmeldung.html                      |  34 +++++++++---------
 website/__pycache__/models.cpython-311.pyc    | Bin 5217 -> 5847 bytes
 website/__pycache__/views.cpython-311.pyc     | Bin 4507 -> 4687 bytes
 ...egistrant_slug_alter_registrant_address.py |  24 +++++++++++++
 website/models.py                             |  10 ++++--
 website/views.py                              |   5 +--
 6 files changed, 52 insertions(+), 21 deletions(-)
 create mode 100644 website/migrations/0003_registrant_slug_alter_registrant_address.py

diff --git a/templates/anmeldung.html b/templates/anmeldung.html
index 645138c5..509bedb2 100644
--- a/templates/anmeldung.html
+++ b/templates/anmeldung.html
@@ -9,28 +9,28 @@
 <div class="dc-container dc-round-small">
 <form action=""  style="margin:auto" class="dc-container dc-form" method="post">
 {% csrf_token %}
-<input type="hidden" name="form_type" value="reservierung">
-{{ reservierung_form.non_field_errors }}
+<input type="hidden" name="form_type" value="register">
+{{ register_form.non_field_errors }}
 <div class="dc-container">
-{{ reservierung_form.name.errors }}
-<label class="dc-half" for="{{ reservierung_form.name.id_for_label }}">Name:</label>
-<div class="dc-half">{{ reservierung_form.name }}</div></div>
+{{ register_form.name.errors }}
+<label class="dc-half" for="{{ register_form.name.id_for_label }}">Name:</label>
+<div class="dc-half">{{ register_form.name }}</div></div>
 <div class="dc-container dc-padding-top">
-{{ reservierung_form.mail.errors }}
-<label class="dc-half" for="{{ reservierung_form.mail.id_for_label }}">Mail-Adresse:</label>
-<div class="dc-half">{{reservierung_form.mail }}</div></div>
+{{ register_form.mail.errors }}
+<label class="dc-half" for="{{ register_form.mail.id_for_label }}">Mail-Adresse:</label>
+<div class="dc-half">{{register_form.mail }}</div></div>
 <div class="dc-container dc-padding-top">
-{{ reservierung_form.anzahl_b.errors }}
-<label class="dc-half" for="{{ reservierung_form.anzahl_b.id_for_label }}">Anzahl Sitzplätze Böblingen (max. 7):</label>
-<div class="dc-half">Reservierung nicht mehr möglich!</div></div>
+{{ register_form.phone.errors }}
+<label class="dc-half" for="{{ register_form.phone.id_for_label }}">Telefonnummer:</label>
+<div class="dc-half">{{ register_form.phone }}</div></div>
 <div class="dc-container dc-padding-top">
-{{ reservierung_form.anzahl_w.errors }}
-<label class="dc-half" for="{{ reservierung_form.anzahl_w.id_for_label }}">Anzahl Sitzplätze Wuppertal (max. 7):</label>
-<div class="dc-half">Reservierung nicht mehr möglich!</div></div>
+{{ register_form.rate_reduced.errors }}
+<label class="dc-half" for="{{ register_form.rate_reduced.id_for_label }}">Anspruch auf ermäßigten Teilnahmebeitrag?</label>
+<div class="dc-half">{{ register_form.rate_reduced }}</div></div>
 <div class="dc-container dc-padding-top">
-{{ reservierung_form.anzahl_l.errors }}
-<label class="dc-half" for="{{ reservierung_form.anzahl_l.id_for_label }}">Anzahl Sitzplätze Lübeck (max. 7):</label>
-<div style="padding-bottom:7px" class="dc-half">{{reservierung_form.anzahl_l }}</div></div>
+{{ register_form.address.errors }}
+<label class="dc-half" for="{{ register_form.address.id_for_label }}">Adresse:</label>
+<div style="padding-bottom:7px" class="dc-half">{{register_form.address }}</div></div>
 
 <input style="width:100%" class="dc-padding-small dc-border-small dc-button dc-border-white" type="submit" value="Senden">
 </form>
diff --git a/website/__pycache__/models.cpython-311.pyc b/website/__pycache__/models.cpython-311.pyc
index e62e0ce32a723d0fc671934c89575f88595bbb2d..29dfdecd35a2388ceee45ebaea0e0b7c8215cf17 100644
GIT binary patch
delta 987
zcmZ{i&u<bz6vt;57A(t;WhtNq+Eim(NNBB^8lwj_TB^0!V62gv7RpX3Z9y~O(ZIn2
zN672VdyOf2sRt7i{R2FikhJmElNS>q;cT3@8$|nKCi}^I-#7DqO!i=GFY0{baM%c6
z!OtPOWUD(*3(5NEPm^_Bs<-@bPPlSbBr&3SUJ<RIO4}wvcKBzkq^fxzlCW<#B@D^J
zTd3G;!?QdT7Qdf*Omi!nxy%~7ZwQu~1&uPw=3vs{9f=#Fv_P}z0()S1w%F#25-qGU
znq%`^%GBLnaY}@;bRE7p9(l}M)0bv$h}#11M1WsXG}hB4%|e|G>!B`PBB7@B|4%7L
zPPxJ38WvP&J3{c$c`MpG-`B0yt)KMi8U0;fv%wwLkV$UXA?q5q=)oWyNPcTbbMOap
z!fRJhBm#VJT^0sm!g>ZoB?6PmONm|JN#MN_7#raR8$}EtJP0=;(ZwZh6zAcGvJ7U~
z3k&YAfqgkpoodQ~Z*r(9hbp&m8&?ysD9`lS6EvGEmMDWA`C8fC^`@V({P-L#rNd74
z1k>L@BoT{<r-&s)3bBI7AT$I;tRk|AHI8`L!urwiB76wF?HF1!2tHK#->L4RnCC#F
zh;vu|?tNvTDz!wSro<NMv1-9>jEA@4>>lUg=h{FGfn|%+9NomT719z#36mbrwyt+h
zh#G}4b3E*Ui|TV_ncFOl(1+cCcWTI1<Uap5N%7NeQw<BI^IH?}+Y`yF!eEOWMa{Pr
ZY@^=k1tTT_n>?Pit8G2fIU%mM`3C{N%A)`P

delta 543
zcmcbv`%r^#IWI340}x!EA)D&JIgw9-(PX0f8%Ea2a*S?lDZ;@Fnj)Lq80EPcH776Q
znGoRxRI15ziz7TWGbtxCIituMBEaUDmy%kPTI2)bG6Pj`hoz>cmLwKs76TReLKLwA
z#S-(1{2)9o_ngv_)V#E!)XXCP$$h+%Od?E^*E1VWzQY^G$UXTkuQ)po6GJL<7B7gM
z$_Hk%0QG`F3QG!WD*qa`Wy}l=tAQ8-q6Dz062wp?gr<sp4bw74pgD|_zw>!dX5*J&
z6q|gIPf<`Dtd1LIdJ5;{e13Umt~K0~C-Upbr|<wnhxZm&P-=Q+aY<2PUdc-bpwc2a
zAn{U^VKSqD38T#911utwy#(}GiwuCmlPd*kC;t|ZmXiW06b2E3AR-V(7y}u_)|2f7
z<Jm6qDO}-Gn7l&ps$hd_gDXTeNTHvm(Bxc^0`6Flrg*T<$!|quxpIL_pf4DTTQ`e{
gYBB<2%t1`cQjk&U0|O>8L2Qc5N09gzERtZm0CqHY%m4rY

diff --git a/website/__pycache__/views.cpython-311.pyc b/website/__pycache__/views.cpython-311.pyc
index 932acc9d34bbb3babd2509e7dc8b000451de24ba..dad71b5463924612f4e8a4067677ce8f3529957a 100644
GIT binary patch
delta 996
zcma))PiWIn9LMvL^v{|!?Y26%b(^hIw(6*g>xMA9=@^@!6*fWGrNqA2b~LTNqyxvq
z9z2Rz-at?U_23_Nl3l%d@FaHNK>`C$^EMSdiJ-q<I>*2r{E>X}%lEzf{^a)__P;-*
zJr4#00@$0^y~de9UF#&Z`oQRn8JG_cfeO@9QcQJT1>bvHm=97PP@{feh_(R3GyrU+
z3b2i;z;+r0MyLkdSATkhc<S#C2OM?Q$QLc!V6V0^glPP<m{VFIG1CxXzA8?VF8)RQ
z)Y$=oMF26@33NRAl}goSef+Z&^LB%h6FDIf9+y{6wc!RSZ`e!%FCjDhn8grr#D0J!
z17cuqxTYTGTk<sNUK{Z|AXyB;+5wI<J#~p4#McPIgPM0yFI5d|cLK+My=t%<mSH;{
z*V`kH<FyQ(<qB+wAM-sS-F)3Q+tY(ldjY%qlM5BoU`amiKL8bF{XeAWaZKzlT3N_l
zq>gOqi$=39m6z3M+U;@_gPlN}L<}QR2)Ah;c-S;p^Edi(m9nkpY&N#`R^251d)A^*
z-8RZru28j?SeiGq7*zgEn~U$cyQOGeV}@l_O*X-eP)x?@)PHyQXW)5XunE5#h~6U0
zq)2XxHcn{UmIW#<i_bt=-BIU+gp_fDZ2OpGuU443r0HeTDA8&;pDfsBDIqciLNsR~
zHHUo`1-E4kwbO3P-!I4WY!VjE!)*-$YQjb&R?n<tY8O6+`W^=xTCz61p|su`Xhe^`
zxV)~UJ}9Y%oMPBaCegt+Ll+m^v`&~V=;eGRnX51(Y3juiQ(+J5Li8crGdF}@5;2BI
zBPI}7#!JDC>yG57f6T1VYRO2mbFhR*-ulHKg@*^H8p3~F{CoILk3>ek3je~*^9R&7
B=TZOw

delta 904
zcmaiy&ubGw6vua(O|r@6$EG!!n3Qh)RccB6RV-3%t+tJ*R76j`$hxyMDcP*P*{vXg
zIe7G7oP(ezJy<*lLcRJon1Tll2%bC(il8UoOE3s2IP83Q`*!C0e(n1M&-SM_lgYS(
z>&1G}c^hk`a_nAfVrG#kT;bt*+|^fgv?C9c)dY_slUzflcnq25aiqa@WQHe@!#s%`
z;VI;<*2}|8ZEYXiQrShulJd%sts58$l7zH;H*}umBny4XWziuR!h}7@PT0EX1wM?*
zUm=s_<zDsmsSNo;YmN^gv?f)cJ1|Bt3A+(OMVPp{Dm}mXI9y@*tqb9&tV|j(jOc_a
zOV?qXUPlOF@<leRdf<q@zBHoQ;-G9NA{-0sDon|R=yNrXSEZXeD-UVuVu8eph<}Sw
ztDfsXNnX{)Fp=BZk5J(V#nWoy28OKhjw-ATr<aZ{n~B0)x3-fcc9d|OaDp&R=;jnf
zi%P}S>si$H8op)wFuV0B@s(9}%thyx?=*y64g9-s1|^np3+h2r`K)IiO|%Q8ZN2<K
zFSpe)^lMvA8{<3b#cJ*?aD)h4n3s3b=6$+i(<J{cvT0)9BZw#XS6x#k*~+WIHpQ%l
z>(qJBSc7wT^fGQiMK+a>s@7cWCbKe`?HGLBYOHx>QT4#L1HU&gpwV{>`NlX_?H{o{
zaLTS#tAmbTAx9V`n1m@pi7-o`ZooW&!ovcAs_Az3w|3g~cu;rdpn^UsO8k_UGSmBJ
U+RA?(xtV!bWGwbg8ALb2A06Gmx&QzG

diff --git a/website/migrations/0003_registrant_slug_alter_registrant_address.py b/website/migrations/0003_registrant_slug_alter_registrant_address.py
new file mode 100644
index 00000000..cb2ed84d
--- /dev/null
+++ b/website/migrations/0003_registrant_slug_alter_registrant_address.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.2.6 on 2023-10-04 19:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('website', '0002_registrant'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='registrant',
+            name='slug',
+            field=models.SlugField(default='TEST'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='registrant',
+            name='address',
+            field=models.CharField(max_length=256),
+        ),
+    ]
diff --git a/website/models.py b/website/models.py
index b5a41dfe..44b7a8d5 100644
--- a/website/models.py
+++ b/website/models.py
@@ -41,7 +41,7 @@ class Contact(models.Model):
     def __str__(self):
         return self.pseudonym
 
-class ContactForm(ModelForm):
+class ContactForm(forms.ModelForm):
     class Meta:
         model = Contact
         fields = ["pseudonym", "mail", "betreff", "nachricht"]
@@ -53,7 +53,7 @@ class Registrant(models.Model):
     mail = models.EmailField()
     phone = models.CharField(max_length=21)
     rate_reduced = models.BooleanField()
-    address = models.TextField()
+    address = models.CharField(max_length=256)
     birthdate = models.DateField()
     gender = models.CharField(max_length=32, blank=False, choices=GESCHLECHTER)
     food = models.CharField(max_length=32, blank=False, choices=ERNÄHRUNG)
@@ -67,3 +67,9 @@ class Registrant(models.Model):
     timestamp = models.DateTimeField(auto_now_add=True)
     payed = models.BooleanField()
     slug = models.SlugField()
+
+
+class RegisterForm(ModelForm):
+    class Meta:
+        model = Registrant
+        fields = ["name","mail","phone","rate_reduced","address","birthdate","gender","food","music","cake","publish_address","publish_phone","info","message"]
diff --git a/website/views.py b/website/views.py
index 0b84577a..028b06be 100644
--- a/website/views.py
+++ b/website/views.py
@@ -1,6 +1,6 @@
 from django.shortcuts import render, redirect
 from django.db.models import Q
-from .models import Author, Category, Post, ContactForm
+from .models import Author, Category, Post, ContactForm, RegisterForm
 from django.core.mail import send_mail
 
 # Create your views here.
@@ -74,5 +74,6 @@ def impressum(request):
     return render(request, 'impressum.html')
 
 def anmeldung(request):
-    context = {}
+    register_form = RegisterForm()
+    context = {"register_form": register_form}
     return render(request, 'anmeldung.html', context)