From 3eebb67f17dde5cab5a9ccc6e085c155f3b6b1b1 Mon Sep 17 00:00:00 2001
From: tyu-avo <thomas.yu@avocette.com>
Date: Tue, 25 Jan 2022 14:21:14 -0800
Subject: [PATCH 1/7] auto select first office

---
 .../src/components/appointment/LocationsList.vue                 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appointment-frontend/src/components/appointment/LocationsList.vue b/appointment-frontend/src/components/appointment/LocationsList.vue
index 0a217c710..e9fa01898 100644
--- a/appointment-frontend/src/components/appointment/LocationsList.vue
+++ b/appointment-frontend/src/components/appointment/LocationsList.vue
@@ -16,6 +16,7 @@
             @change="officeSelection"
             @input="clickSelection"
             @keyup="setKeyPressed"
+            auto-select-first="true"
             hide-details
           >
           </v-combobox>

From 6e52f7e1cd53e26841a0a2af0c6fbaec82a31a28 Mon Sep 17 00:00:00 2001
From: tyu-avo <thomas.yu@avocette.com>
Date: Tue, 25 Jan 2022 14:48:49 -0800
Subject: [PATCH 2/7] service list auto select first

---
 .../src/components/appointment/ServiceSelection.vue              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appointment-frontend/src/components/appointment/ServiceSelection.vue b/appointment-frontend/src/components/appointment/ServiceSelection.vue
index cab459896..258ec87c4 100644
--- a/appointment-frontend/src/components/appointment/ServiceSelection.vue
+++ b/appointment-frontend/src/components/appointment/ServiceSelection.vue
@@ -16,6 +16,7 @@
             @change="serviceSelection"
             @input="clickSelection"
             @keyup="setKeyPressed"
+            auto-select-first="true"
             hide-details
           >
             <template v-slot:selection="data">

From db70014f1c5cdda400455707277f7cdf5fb37f4b Mon Sep 17 00:00:00 2001
From: tyu-avo <thomas.yu@avocette.com>
Date: Wed, 26 Jan 2022 11:57:08 -0800
Subject: [PATCH 3/7] exam invig fix

---
 frontend/src/components/Booking/booking-modal.vue | 2 +-
 frontend/src/store/getters/getters-model.ts       | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Booking/booking-modal.vue b/frontend/src/components/Booking/booking-modal.vue
index 60a7c3e41..5ba4efd14 100644
--- a/frontend/src/components/Booking/booking-modal.vue
+++ b/frontend/src/components/Booking/booking-modal.vue
@@ -87,7 +87,7 @@
                   <div class="ai-modal-title">
                     Selected:
                     <strong class="mr-2">{{
-                      invigilatorDetails.invigilator_name
+                      invigilatorDetails.name
                     }}</strong>
                   </div>
                   <div class="info-display-grid-container mt-1">
diff --git a/frontend/src/store/getters/getters-model.ts b/frontend/src/store/getters/getters-model.ts
index 1ed223dea..ad03d5474 100644
--- a/frontend/src/store/getters/getters-model.ts
+++ b/frontend/src/store/getters/getters-model.ts
@@ -100,7 +100,10 @@ export const commonGetters: any = {
       invigilators.push({
         value: i.invigilator_id,
         name: i.invigilator_name,
-        shadow_count: i.shadow_count
+        shadow_count: i.shadow_count,
+        contact_phone: i.contact_phone,
+        contact_email: i.contact_email,
+        invigilator_notes: i.invigilator_notes
       })
     })
     return invigilators.filter(i => i.shadow_count == 2)

From 6847e2b20a781b7ea27249a3f0254622ee3d14a3 Mon Sep 17 00:00:00 2001
From: tyu-avo <thomas.yu@avocette.com>
Date: Thu, 27 Jan 2022 09:17:29 -0800
Subject: [PATCH 4/7] removing snowplow print statement

---
 api/app/utilities/snowplow.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/api/app/utilities/snowplow.py b/api/app/utilities/snowplow.py
index 9116d5bbe..035b3d2b1 100644
--- a/api/app/utilities/snowplow.py
+++ b/api/app/utilities/snowplow.py
@@ -211,8 +211,6 @@ def get_csr(csr, office, csr_id = 1000001, counter_name = "Counter", role_name="
                                     "role": role_name,
                                     "counter_type": counter_name
                                    })
-        print('returning snowplow data:')
-        pprint(vars(agent))
         return agent
 
     @staticmethod

From 1ac84ad3cdd64db8cf79ecd2f5d78b02a17caf3a Mon Sep 17 00:00:00 2001
From: tyu-avo <thomas.yu@avocette.com>
Date: Thu, 27 Jan 2022 09:24:58 -0800
Subject: [PATCH 5/7] undo commit

---
 api/app/utilities/snowplow.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/api/app/utilities/snowplow.py b/api/app/utilities/snowplow.py
index 035b3d2b1..9116d5bbe 100644
--- a/api/app/utilities/snowplow.py
+++ b/api/app/utilities/snowplow.py
@@ -211,6 +211,8 @@ def get_csr(csr, office, csr_id = 1000001, counter_name = "Counter", role_name="
                                     "role": role_name,
                                     "counter_type": counter_name
                                    })
+        print('returning snowplow data:')
+        pprint(vars(agent))
         return agent
 
     @staticmethod

From 16e7410a468bd343b7216a4feaf61f6e627b711c Mon Sep 17 00:00:00 2001
From: tyu-avo <thomas.yu@avocette.com>
Date: Thu, 27 Jan 2022 09:26:09 -0800
Subject: [PATCH 6/7] snowplow remove print statements

---
 api/app/utilities/snowplow.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/api/app/utilities/snowplow.py b/api/app/utilities/snowplow.py
index 9116d5bbe..035b3d2b1 100644
--- a/api/app/utilities/snowplow.py
+++ b/api/app/utilities/snowplow.py
@@ -211,8 +211,6 @@ def get_csr(csr, office, csr_id = 1000001, counter_name = "Counter", role_name="
                                     "role": role_name,
                                     "counter_type": counter_name
                                    })
-        print('returning snowplow data:')
-        pprint(vars(agent))
         return agent
 
     @staticmethod

From db0b3102601f335da8fd5c54fe92267bbd1b406c Mon Sep 17 00:00:00 2001
From: tyu-avo <thomas.yu@avocette.com>
Date: Thu, 27 Jan 2022 11:27:08 -0800
Subject: [PATCH 7/7] table values, empty field handling

---
 frontend/src/components/Booking/booking-modal.vue | 14 ++++++++------
 frontend/src/store/getters/getters-model.ts       |  6 +++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/Booking/booking-modal.vue b/frontend/src/components/Booking/booking-modal.vue
index 5ba4efd14..9b09cd5ef 100644
--- a/frontend/src/components/Booking/booking-modal.vue
+++ b/frontend/src/components/Booking/booking-modal.vue
@@ -246,12 +246,14 @@ export default class BookingModal extends Vue {
   public booking_contact_information: any = ''
   public invigilator: any = null
   public formStep: any = 1
-  public fields: any = {
-    invigilator_name: {
-      label: 'Name',
-      thClass: 'd-none'
-    }
-  }
+  public fields: Array<any> = [
+    {key: 'value'},
+    {key: 'name'},
+    {key: 'shadow_count'},
+    {key: 'contact_phone', thClass: 'd-none', tdClass: 'd-none' },
+    {key: 'contact_email', thClass: 'd-none', tdClass: 'd-none' },
+    {key: 'invigilator_notes', thClass: 'd-none', tdClass: 'd-none' },
+  ]
 
   public savedRef: any = 'contact_information'
   public selectedOption: any = null
diff --git a/frontend/src/store/getters/getters-model.ts b/frontend/src/store/getters/getters-model.ts
index ad03d5474..81bfad6af 100644
--- a/frontend/src/store/getters/getters-model.ts
+++ b/frontend/src/store/getters/getters-model.ts
@@ -101,9 +101,9 @@ export const commonGetters: any = {
         value: i.invigilator_id,
         name: i.invigilator_name,
         shadow_count: i.shadow_count,
-        contact_phone: i.contact_phone,
-        contact_email: i.contact_email,
-        invigilator_notes: i.invigilator_notes
+        contact_phone: i.contact_phone || '',
+        contact_email: i.contact_email || '',
+        invigilator_notes: i.invigilator_notes || ''
       })
     })
     return invigilators.filter(i => i.shadow_count == 2)