From a7915cbb5f3b071e55960ab59c6ef35b1a96b81e Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Wed, 25 Jan 2023 18:36:54 -0500 Subject: [PATCH] Badge related changes --- app/models/event_badge_models.py | 17 +++++++++++------ app/models/event_badge_template_models.py | 1 + app/routers/event_badge_importing.py | 1 + 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/models/event_badge_models.py b/app/models/event_badge_models.py index 5277a50..1621be2 100644 --- a/app/models/event_badge_models.py +++ b/app/models/event_badge_models.py @@ -47,17 +47,15 @@ class Event_Badge_Base(BaseModel): external_sys_id: Optional[str] # NOTE: Deprecated; Move to external_person_id. Person ID generated by external system (should be stable and not change) pronouns: Optional[str] # Preferred pronouns + pronouns_override: Optional[str] # Override pronouns + informal_name: Optional[str] title_names: Optional[str] # Title for generation, official position, or professional or academic qualification, other honorific, or other name prefix given_name: Optional[str] middle_name: Optional[str] family_name: Optional[str] - designations: Optional[str] # Temporary or long-term designations related to family, relationships, person differentiation (Junior/Senior), location, social status, professional qualifications, legal status, or other name suffix - - # degree: Optional[str] # NOTE: Phasing out! Use *designations* instead. - # degrees: Optional[str] # NOTE: Phasing out! Use *designations* instead. - # credentials: Optional[str] # NOTE: Phasing out! Use *designations* instead. + designations: Optional[str] # Temporary or long-term designations related to family, relationships, person differentiation (Junior/Senior), location, social status, professional qualifications, legal status, or other name suffix (degrees and credentials) professional_title: Optional[str] # Professional title display_professional_title: Optional[str] # NOTE: Deprecated! Phasing out! Use *full_name_override* instead. @@ -77,9 +75,9 @@ class Event_Badge_Base(BaseModel): affiliations_override: Optional[str] # Override affiliations email: Optional[str] + email_override: Optional[str] phone: Optional[str] - display_phone: Optional[str] # NOTE: Deprecated! Phasing out! Use *phone_override* instead. phone_override: Optional[str] address_line_1: Optional[str] @@ -143,6 +141,13 @@ class Event_Badge_Base(BaseModel): print_last_datetime: Optional[datetime.datetime] = None print_count: Optional[int] + # full_name_font_size: Optional[str] # Not currently used 2023-01-25 + # professional_title_font_size: Optional[str] # Not currently used 2023-01-25 + # affiliations_font_size: Optional[str] # Not currently used 2023-01-25 + # location_font_size: Optional[str] # Not currently used 2023-01-25 + # css: Optional[str] # Not currently used 2023-01-25 + # other_json: Optional[str] # Not currently used 2023-01-25 + hide: Optional[bool] priority: Optional[bool] sort: Optional[int] diff --git a/app/models/event_badge_template_models.py b/app/models/event_badge_template_models.py index 81a9e75..1153a1c 100644 --- a/app/models/event_badge_template_models.py +++ b/app/models/event_badge_template_models.py @@ -49,6 +49,7 @@ class Event_Badge_Template_Base(BaseModel): badge_type_list: Optional[Json] + ticket_list: Optional[Json] ticket_1_text: Optional[str] ticket_2_text: Optional[str] ticket_3_text: Optional[str] diff --git a/app/routers/event_badge_importing.py b/app/routers/event_badge_importing.py index f7db996..1bd8817 100644 --- a/app/routers/event_badge_importing.py +++ b/app/routers/event_badge_importing.py @@ -156,6 +156,7 @@ async def event_id_badge_import( 'email': str, 'Email Address': str, 'phone': str, 'Phone': str, + 'address_line_1': str, 'Address Line 1': str, 'address_line_2': str, 'Address Line 2': str, 'address_line_3': str, 'Address Line 3': str,