From a0343f50e00f99d69945c6db8167c88fca3a74cc Mon Sep 17 00:00:00 2001
From: Scott Idem <stidem@gmail.com>
Date: Fri, 22 Apr 2022 19:26:15 -0400
Subject: [PATCH] Work on exhibit tracking

---
 app/routers/event_exhibit_tracking.py | 78 +++++++++++++++++++--------
 1 file changed, 57 insertions(+), 21 deletions(-)

diff --git a/app/routers/event_exhibit_tracking.py b/app/routers/event_exhibit_tracking.py
index 6dbed38..1a1d62b 100644
--- a/app/routers/event_exhibit_tracking.py
+++ b/app/routers/event_exhibit_tracking.py
@@ -256,7 +256,36 @@ async def get_event_exhibit_obj_tracking_list(
                     ):
                 event_exhibit_tracking_result_list.append(load_event_exhibit_tracking_result)
 
-                data_dict = load_event_exhibit_tracking_result.dict(by_alias=True, exclude_unset=True)
+                data_dict = load_event_exhibit_tracking_result.dict(by_alias=True, exclude_unset=False)
+
+                data_dict['person_informal_name'] = data_dict.pop('event_badge_informal_name')
+                data_dict['person_title_names'] = data_dict.pop('event_badge_title_names')
+
+                data_dict['person_given_name'] = data_dict.pop('event_badge_given_name')
+                data_dict['person_middle_name'] = data_dict.pop('event_badge_middle_name')
+                data_dict['person_family_name'] = data_dict.pop('event_badge_family_name')
+
+                data_dict['person_designations'] = data_dict.pop('event_badge_designations')
+                data_dict['person_professional_title'] = data_dict.pop('event_badge_professional_title')
+                data_dict['person_display_professional_title'] = data_dict.pop('event_badge_display_professional_title')
+
+                data_dict['person_display_name'] = data_dict.pop('event_badge_display_name')
+                data_dict['person_full_name'] = data_dict.pop('event_badge_full_name')
+
+                data_dict['person_affiliations'] = data_dict.pop('event_badge_affiliations')
+                data_dict['person_display_affiliations'] = data_dict.pop('event_badge_display_affiliations')
+
+                data_dict['person_email'] = data_dict.pop('event_badge_email')
+                data_dict['person_city'] = data_dict.pop('event_badge_city')
+                data_dict['person_country_subdivision_code'] = data_dict.pop('event_badge_country_subdivision_code')
+                data_dict['person_state_province_abb'] = data_dict.pop('event_badge_state_province_abb')
+                data_dict['person_state_province'] = data_dict.pop('event_badge_state_province')
+                data_dict['person_country_alpha_2_code'] = data_dict.pop('event_badge_country_alpha_2_code')
+                data_dict['person_country'] = data_dict.pop('event_badge_country')
+
+                data_dict['person_location'] = data_dict.pop('event_badge_location')
+                data_dict['person_display_location'] = data_dict.pop('event_badge_display_location')
+
                 data_dict_list_for_export.append(data_dict)
             else:
                 event_exhibit_tracking_result_list.append(None)
@@ -265,32 +294,39 @@ async def get_event_exhibit_obj_tracking_list(
             'event_exhibit_tracking_id_random',
             'event_badge_id_random',
 
-            # 'event_badge_pronouns',
-            'event_badge_informal_name',
-            'event_badge_title_names',
+            # 'person_pronouns',
+            'person_informal_name',
+            'person_title_names',
 
-            'event_badge_given_name',
-            'event_badge_middle_name',
-            'event_badge_family_name',
+            'person_given_name',
+            'person_middle_name',
+            'person_family_name',
 
-            'event_badge_designations',
-            'event_badge_professional_title', 'event_badge_display_professional_title',
+            'person_designations',
+            'person_professional_title', 'person_display_professional_title',
 
-            'event_badge_display_name',
-            'event_badge_full_name',
+            'person_display_name',
+            'person_full_name',
 
-            'event_badge_affiliations',
-            'event_badge_display_affiliations',
-            'event_badge_email',
+            'person_affiliations',
+            'person_display_affiliations',
 
-            'event_badge_city',
-            'event_badge_country_subdivision_code', 'event_badge_state_province_abb',
-            'event_badge_state_province',
-            'event_badge_country_alpha_2_code',
-            'event_badge_country',
+            'person_email',
 
-            'event_badge_location',
-            'event_badge_display_location',
+            'person_city',
+            'person_country_subdivision_code', 'person_state_province_abb',
+            'person_state_province',
+            'person_country_alpha_2_code',
+            'person_country',
+
+            'person_location',
+            'person_display_location',
+
+            'priority',
+            'sort',
+            'exhibitor_notes',
+            'created_on',
+            'updated_on',
             ]
 
         datetime_format='%Y-%m-%d_%H%M'