Fix waiver date timezone

We're just not going to store dates in UTC format. Nothing else in the app does!
magfest · Apr 5, 2024 · a7a2b49 · a7a2b49
1 parent a0a4958
commit a7a2b49
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/magstock/forms.py b/magstock/forms.py
@@ -75,10 +75,10 @@ class Consents:
     waiver_signature = StringField(
         'Electronic Signature',
         validators=[validators.DataRequired("You must sign your full legal name to consent to the waiver.")])
-    waiver_date_display = DateField('Date of Signature', render_kw={'disabled': True})
-    waiver_date = HiddenField('Date of Signature (UTC)',
-                              validators=[validators.DataRequired("No date of signature. "
-                                                                  "Please refresh the page or contact us.")])
+    waiver_date = DateField('Date of Signature',
+                            validators=[validators.DataRequired("No date of signature. "
+                                                                "Please refresh the page or contact us.")],
+                            render_kw={'readonly': True})
     waiver_consent = BooleanField(
         Markup('<strong>Yes</strong>, I understand that checking this box constitutes a legal signature '
                'confirming that I acknowledge and agree to the above waiver.'),
@@ -113,7 +113,6 @@ class PreregOtherInfo:
     legal_name = HiddenField('Legal Name')
     acknowledged_checkin_policy = Consents.acknowledged_checkin_policy
     waiver_signature = Consents.waiver_signature
-    waiver_date_display = Consents.waiver_date_display
     waiver_date = Consents.waiver_date
     waiver_consent = Consents.waiver_consent
 

diff --git a/magstock/templates/forms/attendee/consents.html b/magstock/templates/forms/attendee/consents.html
@@ -20,8 +20,7 @@
 <div class="row g-sm-3">
     <div class="col-12 col-sm-6">{{ form_macros.form_input(consents.waiver_signature) }}</div>
     <div class="col-12 col-sm-6">
-        {{ form_macros.form_input(consents.waiver_date_display, value=now()|datetime_local("%Y-%m-%d")) }}
-        {{ form_macros.form_input(consents.waiver_date, value=now()|datetime("%Y-%m-%d")) }}
+        {{ form_macros.form_input(consents.waiver_date, value=now()|datetime_local("%Y-%m-%d")) }}
     </div>
 </div>
 

diff --git a/magstock/templates/forms/attendee/prereg_other_info.html b/magstock/templates/forms/attendee/prereg_other_info.html
@@ -24,8 +24,7 @@
 <div class="row g-sm-3">
     <div class="col-12 col-sm-6">{{ form_macros.form_input(other_info.waiver_signature) }}</div>
     <div class="col-12 col-sm-6">
-        {{ form_macros.form_input(other_info.waiver_date_display, value=now()|datetime_local("%Y-%m-%d")) }}
-        {{ form_macros.form_input(other_info.waiver_date, value=now()|datetime("%Y-%m-%d")) }}
+        {{ form_macros.form_input(other_info.waiver_date, value=now()|datetime_local("%Y-%m-%d")) }}
     </div>
 </div>