C3L/C3L-Membership-Online-Form Changeset - c4c5ab9a2bb8 · Chaos Computer Club Lëtzebuerg Projects

Changeset - c4c5ab9a2bb8

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Dennis Fink - 3 years ago 2022-08-30 10:16:18
dennis.fink@c3l.lu

Rename zip to postal

4 files changed with 6 insertions and 6 deletions:

c3l_membership/forms.py

c3l_membership/templates/index.html

c3l_membership/templates/member.html

c3l_membership/views.py

0 comments (0 inline, 0 general)

c3l_membership/forms.py

➞

Show inline comments

@@ @@ -115,25 +115,25 @@ class MembershipForm(FlaskForm): @@
     payment = RadioField(
         lazy_gettext("Payment Options"),
         validators=[InputRequired(lazy_gettext("Please select one of the options!"))],
+    )
     birthday = DateField(lazy_gettext("Birthday"), validators=[InputRequired()])
     street = StringField(
         lazy_gettext("Nr., Street"),
         validators=[Optional(), Length(max=4000)],
+    )
-    zip = StringField(
+    postal = StringField(
         lazy_gettext("Postal Code"),
         validators=[Optional(), Length(max=30)],
+    )
     city = StringField(
         lazy_gettext("City/Town"),
         validators=[Optional(), Length(max=500)],
+    )
     state = StringField(
         lazy_gettext("State/County/Province"),
         validators=[Optional(), Length(max=500)],

c3l_membership/templates/index.html

➞

Show inline comments

@@ @@ -132,26 +132,26 @@ @@
                     </ul>
                   </div>
                 </div>
                 <legend>{% trans %}Additional information (Optional){% endtrans %}</legend>
                 <div class="pure-g">
                   <div class="pure-u-1-1">
                     <b>{{ form.street.label }}</b>
                     {{ form.street(class="pure-input-1 field-error" if form.street.errors else "pure-input-1") }}
                   </div>
                 </div>
                 <div class="pure-g">
                   <div class="pure-u-1-1">
                     <b>{{ form.zip.label }}</b>
                     {{ form.zip(class="pure-input-1 field-error" if form.zip.errors else "pure-input-1") }}
                     <b>{{ form.postal.label }}</b>
                     {{ form.postal(class="pure-input-1 field-error" if form.postal.errors else "pure-input-1") }}
                   </div>
                 </div>
                 <div class="pure-g">
                   <div class="pure-u-1-1">
                     <b>{{ form.city.label }}</b>
                     {{ form.city(class="pure-input-1 field-error" if form.city.errors else "pure-input-1") }}
                   </div>
                 </div>
                 <div class="pure-g">
                   <div class="pure-u-1-1">
                     <b>{{ form.state.label }}</b>
                     {{ form.state(class="pure-input-1 field-error" if form.state.errors else "pure-input-1") }}

c3l_membership/templates/member.html

➞

Show inline comments

@@ @@ -27,26 +27,26 @@ @@
         <div>{% trans %}Full Name:{% endtrans %}</div>
         <div>{{ form.fullname.data }}</div>
       </div>
       <div>
         <div>{% trans %}Birthday:{% endtrans %}</div>
         <div>{{ form.birthday.data }}</div>
       </div>
       <div>
         <div>{% trans %}Street:{% endtrans %}</div>
         <div>{{ form.street.data if form.street.data else "".join(["<i>",_("Not specified"),"</i>"])|safe }}</div>
       </div>
       <div>
         <div>{% trans %}ZIP-Code:{% endtrans %}</div>
         <div>{{ form.zip.data if form.zip.data else "".join(["<i>",_("Not specified"),"</i>"])|safe }}</div>
         <div>{% trans %}Postal Code:{% endtrans %}</div>
         <div>{{ form.postal.data if form.postal.data else "".join(["<i>",_("Not specified"),"</i>"])|safe }}</div>
       </div>
       <div>
         <div>{% trans %}City:{% endtrans %}</div>
         <div>{{ form.city.data if form.city.data else "".join(["<i>",_("Not specified"),"</i>"])|safe }}</div>
       </div>
       <div>
         <div>{% trans %}State/County/Province:{% endtrans %}</div>
         <div>{{ form.state.data if form.state.data else "".join(["<i>",_("Not specified"),"</i>"])|safe }}</div>
       </div>
       <div>
         <div>{% trans %}Country:{% endtrans %}</div>
         <div>{{ form.country.data if form.country.data else "".join(["<i>",_("Not specified"),"</i>"])|safe }}</div>

c3l_membership/views.py

➞

Show inline comments

@@ @@ -100,25 +100,25 @@ def index(): @@
             "name": form.fullname.data,
             "birthday": form.birthday.data
             if form.birthday.data is not None
             else date(9999, 12, 12),
             "username": form.username.data,
             "email": form.email.data,
             "address": re.sub(
                 "\s+",
                 " ",
                 " ".join(
+                    (
                         form.street.data,
-                        form.zip.data,
+                        form.postal.data,
                         form.city.data,
                         form.state.data,
                         form.country.data,
+                    )
                 ),
             ),
             "voting": 1 if form.membership.data == "regular" else 0,
             "date": today,
+        }
         html = render_template(
             "member.html",

0 comments (0 inline, 0 general)