diff --git a/app/models/event_badge_models.py b/app/models/event_badge_models.py index b2c77d8..31d298d 100644 --- a/app/models/event_badge_models.py +++ b/app/models/event_badge_models.py @@ -142,8 +142,8 @@ class Event_Badge_Base(BaseModel): # location_font_size: Optional[str] # Not currently used 2023-01-25 # css: Optional[str] # Not currently used 2023-01-25 - data_json: Optional[Union[Json, None]] # Not currently used 2024-03-25 - cfg_json: Optional[Union[Json, None]] # Store font size and similar per badge + cfg_json: Optional[Union[Json, None]] # Store per badge config options like font size; Not currently used 2024-06-11 + data_json: Optional[Union[Json, None]] # For key value data. Careful with overwriting existing fields! Not currently used 2024-06-11 hide: Optional[bool] priority: Optional[bool] diff --git a/app/models/event_device_models.py b/app/models/event_device_models.py index 0bf3dcb..a1ef9ad 100644 --- a/app/models/event_device_models.py +++ b/app/models/event_device_models.py @@ -93,6 +93,9 @@ class Event_Device_Base(BaseModel): info_ip_list: Optional[str] # string list of IPs separated by ; info_os: Optional[str] + cfg_json: Optional[Union[Json, None]] # Store per device config options like theme, language, etc + data_json: Optional[Union[Json, None]] # For key value data. Careful with overwriting existing fields! + enable: Optional[bool] # hide: Optional[bool] diff --git a/app/models/event_location_models.py b/app/models/event_location_models.py index 23b44b6..762c591 100644 --- a/app/models/event_location_models.py +++ b/app/models/event_location_models.py @@ -57,6 +57,9 @@ class Event_Location_Base(BaseModel): passcode: Optional[str] + cfg_json: Optional[Union[Json, None]] # Store per location config options + data_json: Optional[Union[Json, None]] # For key value data. Careful with overwriting existing fields! + file_count: Optional[int] internal_use_count: Optional[int] # Should be renamed to "internal_use_file_count"??? diff --git a/app/models/event_models.py b/app/models/event_models.py index 8cff8fd..576a86d 100644 --- a/app/models/event_models.py +++ b/app/models/event_models.py @@ -134,7 +134,9 @@ class Event_Base(BaseModel): mod_badges_json: Optional[Union[Json, None]] mod_exhibits_json: Optional[Union[Json, None]] mod_pres_mgmt_json: Optional[Union[Json, None]] - cfg_json: Optional[Union[Json, None]] + + cfg_json: Optional[Union[Json, None]] # Store per event config options; Not currently used 2024-06-11 + data_json: Optional[Union[Json, None]] # For key value data. Careful with overwriting existing fields! Not currently used 2024-06-11 hide: Optional[bool] # Also in Event_Cfg_Base model priority: Optional[bool] @@ -395,7 +397,9 @@ class Event_Meeting_Flat_Base(BaseModel): mod_badges_json: Optional[Union[Json, None]] mod_exhibits_json: Optional[Union[Json, None]] mod_pres_mgmt_json: Optional[Union[Json, None]] - cfg_json: Optional[Union[Json, None]] + + cfg_json: Optional[Union[Json, None]] # Store per event config options; Not currently used 2024-06-11 + data_json: Optional[Union[Json, None]] # For key value data. Careful with overwriting existing fields! Not currently used 2024-06-11 hide: Optional[bool] # Also in Event_Cfg_Base model priority: Optional[bool] diff --git a/app/models/event_person_models.py b/app/models/event_person_models.py index 68a5563..63fba56 100644 --- a/app/models/event_person_models.py +++ b/app/models/event_person_models.py @@ -69,6 +69,9 @@ class Event_Person_Base(BaseModel): passcode: Optional[str] # Passcode for accessing the event + cfg_json: Optional[Union[Json, None]] # Store per person config options like theme, language, etc + data_json: Optional[Union[Json, None]] # For key value data. Careful with overwriting existing fields! + file_count: Optional[int] priority: Optional[bool] diff --git a/app/models/event_presenter_models.py b/app/models/event_presenter_models.py index 3010026..e53887a 100644 --- a/app/models/event_presenter_models.py +++ b/app/models/event_presenter_models.py @@ -108,6 +108,9 @@ class Event_Presenter_Base(BaseModel): passcode: Optional[str] + cfg_json: Optional[Union[Json, None]] # Store per presenter config options like theme, language, etc + data_json: Optional[Union[Json, None]] # For key value data. Careful with overwriting existing fields! + file_count: Optional[int] # General catchall for agreement or consent @@ -312,6 +315,9 @@ class Event_Presenter_Out_Base(BaseModel): # role: Optional[str] + data_json: Optional[Union[Json, None]] # For key value data. Careful with overwriting existing fields! + cfg_json: Optional[Union[Json, None]] # Store per presenter config options like theme, language, etc + # file_count: Optional[int] # General catchall for agreement or consent diff --git a/app/routers/event_importing.py b/app/routers/event_importing.py index d94fbec..3a08843 100644 --- a/app/routers/event_importing.py +++ b/app/routers/event_importing.py @@ -948,6 +948,7 @@ async def pre_program_data_import( 'professional_title': str, 'Professional Title': str, 'affiliations': str, 'Affiliations': str, 'Company': str, 'affiliation': str, 'Affiliation': str, + 'passcode': str, 'Passcode': str, 'notes': str, 'Notes': str, 'data_json': str, } @@ -972,6 +973,7 @@ async def pre_program_data_import( 'Affiliation': 'affiliations', 'affiliation': 'affiliations', 'Company': 'affiliations', + 'Passcode': 'passcode', 'Notes': 'notes', }, inplace = True) @@ -1030,6 +1032,8 @@ def process_person_data(account_id, source_code, record): data['primary_email'] = record.get('email', None) + data['passcode'] = record.get('passcode', None) + data['notes'] = record.get('notes', None) data['data_json'] = record.get('data_json', None)