Skip to content

Commit 84b9c40

Browse files
odkhangnorbusan
authored andcommitted
feature-8830
Attendee Form: Implement scholarship question with dropdown
1 parent dde6c83 commit 84b9c40

File tree

4 files changed

+32
-0
lines changed

4 files changed

+32
-0
lines changed

app/api/schema/attendees.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ def validate_json(self, data, original_data):
6060
validate=validate.OneOf(choices=AGE_GROUP_CHOICES), allow_none=True
6161
)
6262
home_wiki = fields.Str(allow_none=True)
63+
wiki_scholarship = fields.Str(allow_none=True)
6364
birth_date = fields.DateTime(allow_none=True)
6465

6566
ticket_id = fields.Str(allow_none=True)

app/models/custom_form.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"gender": {"include": 0, "require": 0},
6363
"age_group": {"include": 0, "require": 0},
6464
"home_wiki": {"include": 0, "require": 0},
65+
"wiki_scholarship": {"include": 0, "require": 0},
6566
"accept_video_recording": {"include": 0, "require": 0},
6667
"is_consent_of_refund_policy": {"include": 0, "require": 0},
6768
"language_form_1": {"include": 0, "require": 0},
@@ -156,6 +157,7 @@
156157
"language_form_1": "What is your native language, or what language are you most fluent in?",
157158
"language_form_2": "Are you fluent in any other of the following languages?",
158159
"home_wiki": "What is your home wiki",
160+
"wiki_scholarship": "Have you received a Wikimedia scholarship?",
159161
},
160162
}
161163

app/models/ticket_holder.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class TicketHolder(SoftDeletionModel):
4545
accept_receive_emails: bool = db.Column(db.Boolean)
4646
age_group: str = db.Column(db.String)
4747
home_wiki: str = db.Column(db.String)
48+
wiki_scholarship: str = db.Column(db.String)
4849
birth_date: datetime = db.Column(db.DateTime(timezone=True))
4950
pdf_url: str = db.Column(db.String)
5051
ticket_id: int = db.Column(
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
"""empty message
2+
3+
Revision ID: 7a4ac439ef4d
4+
Revises: a15294581397
5+
Create Date: 2023-06-26 18:45:58.326001
6+
7+
"""
8+
9+
from alembic import op
10+
import sqlalchemy as sa
11+
import sqlalchemy_utils
12+
13+
14+
# revision identifiers, used by Alembic.
15+
revision = '7a4ac439ef4d'
16+
down_revision = 'a15294581397'
17+
18+
19+
def upgrade():
20+
# ### commands auto generated by Alembic - please adjust! ###
21+
op.add_column('ticket_holders', sa.Column('wiki_scholarship', sa.String(), 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', 'wiki_scholarship')
28+
# ### end Alembic commands ###

0 commit comments

Comments
 (0)