Skip to content

Commit f2d067b

Browse files
author
Hieu Lam - TMA
authored
feature-8788: Implement language form fields in the attendee form (#8903)
* fix-8740: Create migration Custom Form Ticket and update Custom Form * fix-8740: Create migration Custom Form Ticket and update Custom Form * feature-8740: Make attendee form ticket specific * feature-8470: Make attendee form ticket specific * feature-8470: Make attendee form ticket specific * feature-8470: Make attendee form ticket specific * feature-8470: Make attendee form ticket specific * feature-8470: Make attendee form ticket specific * feature-8470: Make attendee form ticket specific * feature-8470: Make attendee form ticket specific * feature-8470: Make attendee form ticket specific * feature-8470: Make attendee form ticket specific * feature-8470: Make attendee form ticket specific * feature-8470: Merge code development * feature-8470: Make attendee form ticket specific * feature-8470: Make attendee form ticket specific * feature-8470: Make attendee form ticket specific * Feature-8788: Implement language form fields in the attendee form * feature-8788: Implement language form fields in the attendee form * Add comma back
1 parent ab63f52 commit f2d067b

File tree

4 files changed

+37
-0
lines changed

4 files changed

+37
-0
lines changed

app/api/schema/attendees.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ def validate_json(self, data, original_data):
7171
is_checked_out = fields.Boolean()
7272
pdf_url = fields.Url(dump_only=True)
7373
complex_field_values = CustomFormValueField(allow_none=True)
74+
language_form_1 = fields.Str(allow_none=True)
75+
language_form_2 = fields.Str(allow_none=True)
7476
event = Relationship(
7577
self_view='v1.attendee_event',
7678
self_view_kwargs={'id': '<id>'},

app/models/custom_form.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
"age_group": {"include": 0, "require": 0},
6464
"home_wiki": {"include": 0, "require": 0},
6565
"accept_video_recording": {"include": 0, "require": 0},
66+
"language_form_1": {"include": 0, "require": 0},
67+
"language_form_2": {"include": 0, "require": 0},
6668
}
6769

6870
session_form_str = json.dumps(SESSION_FORM, separators=(',', ':'))
@@ -147,6 +149,8 @@
147149
"acceptVideoRecording": "Photo & video & text consent",
148150
"acceptShareDetails": "Partner contact consent",
149151
"acceptReceiveEmails": "Email consent",
152+
"language_form_1": "What is your native language, or what language are you most fluent in?",
153+
"language_form_2": "Are you fluent in any other of the following languages?",
150154
"home_wiki": "What is your home wiki"
151155
},
152156
}

app/models/ticket_holder.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ class TicketHolder(SoftDeletionModel):
6565
db.DateTime(timezone=True), default=datetime.utcnow, onupdate=datetime.utcnow
6666
)
6767
complex_field_values: str = db.Column(db.JSON)
68+
language_form_1: str = db.Column(db.JSON)
69+
language_form_2: str = db.Column(db.JSON)
6870
user = db.relationship(
6971
'User',
7072
foreign_keys=[email],
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
"""empty message
2+
3+
Revision ID: 9b6873db28df
4+
Revises: e5c599d64ef5
5+
Create Date: 2023-06-21 10:48:11.844162
6+
7+
"""
8+
9+
from alembic import op
10+
import sqlalchemy as sa
11+
12+
13+
# revision identifiers, used by Alembic.
14+
revision = '9b6873db28df'
15+
down_revision = 'e5c599d64ef5'
16+
17+
18+
def upgrade():
19+
# ### commands auto generated by Alembic - please adjust! ###
20+
op.add_column('ticket_holders', sa.Column('language_form_1', sa.JSON(), nullable=True))
21+
op.add_column('ticket_holders', sa.Column('language_form_2', sa.JSON(), nullable=True))
22+
# ### end Alembic commands ###
23+
24+
25+
def downgrade():
26+
# ### commands auto generated by Alembic - please adjust! ###
27+
op.drop_column('ticket_holders', 'language_form_2')
28+
op.drop_column('ticket_holders', 'language_form_1')
29+
# ### end Alembic commands ###

0 commit comments

Comments
 (0)