From 9b02b2f86c06d79368544afebf55926c5c98e70c Mon Sep 17 00:00:00 2001
From: Scott Idem <stidem@gmail.com>
Date: Fri, 15 Mar 2024 18:46:34 -0400
Subject: [PATCH] Bug fix for exhibit_id missing. Why?

---
 src/routes/events_leads/+page.svelte          | 48 +++++++++++--------
 .../events_leads/exhibit/[slug]/+page.svelte  |  6 +--
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/routes/events_leads/+page.svelte b/src/routes/events_leads/+page.svelte
index f1184550..27084ae4 100644
--- a/src/routes/events_leads/+page.svelte
+++ b/src/routes/events_leads/+page.svelte
@@ -81,9 +81,14 @@ function handle_check_event_exhibit_staff_passcode() {
 
     if ($events_slct.exhibit_obj && $events_sess.leads.entered_passcode && $events_sess.leads.entered_passcode.length >= 4) {
         if ($events_slct.exhibit_obj.staff_passcode == $events_sess.leads.entered_passcode) {
-            console.log('Passcode matched');
+            console.log(`Passcode matched for exhibit ${$events_slct.exhibit_obj.id_random} or ${$events_slct.exhibit_id}`);
             disable_open_lead_retrieval_btn = false;
 
+            // We should not need to be doing this here! Why???
+            if (!$events_slct.exhibit_id) {
+                $events_slct.exhibit_id = $events_slct.exhibit_obj.id_random;
+            }
+
             $events_sess.leads.entered_passcode = null;
             $events_loc.leads.auth_exhibit_kv[$events_slct.exhibit_id] = {
                 key: null,
@@ -132,9 +137,9 @@ function handle_check_event_exhibit_staff_passcode() {
 </script>
 
 
-<section class="ae_events_leads h-full w-full flex flex-col wrap align-begin justify-start space-y-4">
+<section class="ae_events_leads h-full w-full flex flex-col wrap align-begin justify-start items-center space-y-4">
 
-<h1 class="h2">Events - Leads</h1>
+<h1 class="h2">Events - Leads for exhibitors</h1>
 
 <Element_data_store
     ds_code="events__leads__overview"
@@ -149,7 +154,7 @@ function handle_check_event_exhibit_staff_passcode() {
 
 
 {#if $event_exhibit_obj_li}
-<h2 class="h3">Exhibits</h2>
+<h2 class="h3">Select your exhibit from the list</h2>
 <!-- <ul>
     {#each $event_exhibit_obj_li as exhibit_obj}
         <li>
@@ -166,38 +171,41 @@ function handle_check_event_exhibit_staff_passcode() {
             goto($events_sess.leads.open_href, {invalidateAll: true});
         }}
 
-        class="form-floating">
-    <h2>Exhibitor Lead Retrieval</h2>
+        class="flex flex-col items-center border-2 border-primary p-2">
+    <!-- <h2>Exhibitor Lead Retrieval</h2> -->
     <div>Select your exhibit booth from the list and enter passcode you were given.</div>
 
-    <div class="form-floating mb-1 col-md-12 col-lg-12">
+    <div class="m-2">
         <label for="exhibit_list" class="label">
-            Exhibit List:<br>
-        <select bind:value={$events_slct.exhibit_obj} id="exhibit_list" class="select max-w-md">
+            <!-- <span class="label">Exhibit List:</span> -->
+        <select
+            bind:value={$events_slct.exhibit_obj}
+            class="select w-96"
+            placeholder="Select your exhibit booth"
+            >
             <option value="" selected>-- Nothing Selected --</option>
             {#each $event_exhibit_obj_li as event_exhibit_obj, index}
                 <option value={event_exhibit_obj}>{event_exhibit_obj.name} (Booth #{event_exhibit_obj.code})</option>
             {/each}
-            </select>
+        </select>
 
 
         </label>
     </div>
 
-    <div class="container_group">
-        <!-- <input bind:value={$events_sess.leads.entered_passcode} type="text" id="exhibit_passcode" placeholder="Exhibit passcode" /> -->
+    <div class="container_group m-2">
 
         <input
+            type="text"
             bind:value={$events_sess.leads.entered_passcode}
-            class="input max-w-40"
+            class="input w-40"
             placeholder="Exhibit passcode"
             />
 
-        <!-- <button on:click={() => open_exhibit_tracking(exhibit_obj.event_exhibit_id_random, $events_sess.leads.entered_passcode)} id="open_lead_retrieval_btn" disabled={disable_open_lead_retrieval_btn} autofocus>Open Exhibitor Lead Retrieval</button> -->
         <button
             type="submit"
             disabled={disable_open_lead_retrieval_btn}
-            class="btn variant-filled-primary open_lead_retrieval_btn"
+            class="btn variant-ghost-primary open_lead_retrieval_btn"
             >
             <span class="fas fa-arrow-right mx-1"></span> Open Exhibitor Lead Retrieval
         </button>
@@ -212,24 +220,22 @@ function handle_check_event_exhibit_staff_passcode() {
     </form>
 
     {#if ($ae_loc.administrator_access && !$events_loc.show_details)}
-    <div class="">
-        <!-- <input bind:value={reset_passcode} type="text" id="reset_exhibit_passcode" placeholder="Reset exhibit passcode" /> -->
+    <div class="flex flex-col items-center">
 
+        <span>
         <input bind:value={reset_passcode} placeholder="Reset passcode" title="Reset exhibit passcode" class="input max-w-40" />
 
-        <!-- <button on:click={() => open_exhibit_tracking(exhibit_obj.event_exhibit_id_random, $events_sess.leads.entered_passcode)} id="open_lead_retrieval_btn" disabled={disable_open_lead_retrieval_btn} autofocus>Open Exhibitor Lead Retrieval</button> -->
-        <!-- <button type="button" id="reset_passcode_btn" disabled={disable_reset_passcode_btn} autofocus on:click={() => show_exhibit_tracking_add_modal=true}>Reset Passcode</button> -->
-
         <button
             type="button"
             disabled={disable_reset_passcode_btn}
             on:click={() => {
                 handle_update_event_exhibit_staff_passcode(exhibit_obj.event_exhibit_id_random, reset_passcode);
             }}
-            class="btn variant-filled-secondary reset_passcode_btn"
+            class="btn variant-ghost-warning reset_passcode_btn"
             >
             <span class="fas fa-undo mx-1"></span> Reset Passcode
         </button>
+        </span>
     </div>
     {/if}
 
diff --git a/src/routes/events_leads/exhibit/[slug]/+page.svelte b/src/routes/events_leads/exhibit/[slug]/+page.svelte
index 4dc12b92..94fc7038 100644
--- a/src/routes/events_leads/exhibit/[slug]/+page.svelte
+++ b/src/routes/events_leads/exhibit/[slug]/+page.svelte
@@ -627,9 +627,9 @@ export let get_event_exhibit_tracking_export = async function get_event_exhibit_
         <strong>{$event_exhibit_obj?.code ?? ''}</strong>
     </h2>
     <h3 class="h4">
-        {#if $events_loc?.leads.auth_exhibit_kv[$events_slct.exhibit_id].key}
+        {#if $events_loc.leads.auth_exhibit_kv[$events_slct.exhibit_id] && $events_loc.leads.auth_exhibit_kv[$events_slct.exhibit_id].key}
         <span class="fas fa-check text-green-500"></span>
-        {$events_loc.leads.auth_exhibit_kv[$events_slct.exhibit_id].key}
+        {$events_loc?.leads.auth_exhibit_kv[$events_slct.exhibit_id].key}
         <button
             type="button"
             class="btn btn-sm variant-soft-warning"
@@ -647,7 +647,7 @@ export let get_event_exhibit_tracking_export = async function get_event_exhibit_
     </h3>
 </div>
 
-{#if $events_loc?.leads.auth_exhibit_kv[$events_slct.exhibit_id].key}
+{#if $events_loc.leads.auth_exhibit_kv[$events_slct.exhibit_id] && $events_loc.leads.auth_exhibit_kv[$events_slct.exhibit_id].key}
 <p>
     You are logged in using the shared exhibit staff passcode and are using the license key for {$events_loc.leads.auth_exhibit_kv[$events_slct.exhibit_id].key}. Any leads you collect will be associated with this license key (email address).
 </p>