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

@@ @@ -103,49 +103,49 @@ class MembershipForm(FlaskForm): @@
                     "Student and Starving Hacker are mutually exclusive! Please select only one of them."
                 ),
             ),
         ],
+    )
     starving = BooleanField(
         lazy_gettext(
             "I am a starving hacker and cannot afford the membership! (Please get in touch with us at info@c3l.lu before filling out this membership form)"
+        )
+    )
     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)],
+    )
     country = StringField(
         lazy_gettext("Country"),
         validators=[Optional(), Length(max=500)],
+    )
     terms = BooleanField(
         lazy_gettext(
             'By submitting this membership application, you agree to have read and understood the <a href="http://statutes.c3l.lu">statutes of the Chaos Computer Club Lëtzebuerg A.S.B.L.</a>.'
         ),
         validators=[InputRequired()],

c3l_membership/templates/index.html

➞

Show inline comments

@@ @@ -120,50 +120,50 @@ @@
                 </div>
                 <div class="pure-g">
                   <div class="pure-u-1-1">
                     <b>{{ form.birthday.label }}</b>
                     {{ form.birthday(class="pure-input-1 field-error" if form.birthday.errors else "pure-input-1") }}
                   </div>
                   <div class="pure-u-1-1">
                     <h4>{% trans %}Why do you ask for the birthday?{% endtrans %}</h4>
                     <p>{% trans %}This information helps us with a few different things:{% endtrans %}</p>
                     <ul>
                       <li>{% trans %}We need to know if you are underage. If so your legal representatives needs to sign this membership application.{% endtrans %}</li>
                       <li>{% trans %}We ask the city of Luxembourg every year for a financial grant and they ask how many members we have over the age of 26 and how many under the age of 26.{% endtrans %}</li>
                     </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") }}
                   </div>
                 </div>
                 <div class="pure-g">
                   <div class="pure-u-1-1">
                     <b>{{ form.country.label }}</b>
                     {{ form.country(class="pure-input-1 field-error" if form.country.errors else "pure-input-1") }}
                   </div>
                 </div>
                 <legend></legend>
                 <div class="pure-g">
                   <div class="pure-u-1-1">
                     <label for="{{ form.terms.id }}" class="pure-checkbox text-justify">

c3l_membership/templates/member.html

➞

Show inline comments

@@ @@ -15,50 +15,50 @@ @@
     </div>
     <h1>{% trans %}Membership Application{% endtrans %}</h1>
     <div class="data">
       <div>
         <div>{% trans %}Username:{% endtrans %}</div>
         <div>{{ form.username.data }}</div>
       </div>
       <div>
         <div>{% trans %}E-Mail:{% endtrans %}</div>
         <div>{{ form.email.data }}</div>
       </div>
       <div>
         <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>
       </div>
       <div>
         <div>{% trans %}Membership Plan:{% endtrans%}</div>
         <div>{{ form.membership.data }}</div>
       </div>
       <div>
         <div>{% trans %}Voting rights:{% endtrans%}</div>
         <div>{{ _("Yes") if voting else _("No") }}</div>
       </div>
       <div>
         <div>{% trans %}Student:{% endtrans %}</div>
         <div>{{ _("Yes") if form.student.data else _("No") }}</div>

c3l_membership/views.py

➞

Show inline comments

@@ @@ -88,49 +88,49 @@ def index(): @@
             else:
                 current_conversion = current_conversion_r.json()
                 commodity = current_app.config["CRYPTOCURRENCIES"][form.payment.data][
                     "COMMODITY"
+                ]
                 price = current_conversion[commodity][status.upper()]
         elif form.payment.data in ("digicash", "satispay"):
             price = price * 100
         today = date.today()
         xml_data = {
             "status": status,
             "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",
             form=form,
             price=price,
             year=today.year,
             voting=True if form.membership.data == "regular" else False,
             xml=xml_template.format(**xml_data),
             minor_member=minor_member,
+        )
         if current_app.debug:
             return render_pdf(HTML(string=html))
         else:
             return render_pdf(

0 comments (0 inline, 0 general)