From fed5d2de6526649b355624442c2531ff1ec419be Mon Sep 17 00:00:00 2001
From: Scott Idem <stidem@gmail.com>
Date: Fri, 16 Aug 2024 10:06:16 -0400
Subject: [PATCH] Clean up based on notes. Adding some JSON event config
 options for presenter agree and presenter bio.

---
 .../ae_comp__event_presenter_obj_li.svelte    | 86 ++++++++++---------
 .../presenter/[slug]/+page.svelte             |  4 +
 .../presenter_page_menu.svelte                |  3 +
 .../events_pres_mgmt/presenter_view.svelte    |  6 +-
 .../session/[slug]/+page.svelte               |  5 ++
 .../events_pres_mgmt/session_view.svelte      | 12 ++-
 6 files changed, 71 insertions(+), 45 deletions(-)

diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte
index 2ebe8f90..9ee0aee1 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte
@@ -17,6 +17,7 @@ import { events_func } from '$lib/ae_events_functions';
 
 // Exports
 export let container_class_li: string|Array<string> = [];
+export let lq__event_obj: any;
 export let link_to_type: string;
 export let link_to_id: string;
 export let event_presenter_id_random_li: Array<string> = [''];
@@ -228,55 +229,56 @@ onMount(() => {
             </button>
             {/if}
 
+            {#if $lq__event_obj?.cfg_json?.presenter_require_agree}
+                {#if event_presenter_obj.agree}
+                    <!-- {#if $ae_loc.trusted_access || $events_loc.auth__kv.presenter[event_presenter_obj.event_presenter_id_random]} -->
+                    <button
+                        type="button"
+                        disabled={!$ae_loc.trusted_access && !$events_loc.auth__kv.presenter[event_presenter_obj.event_presenter_id_random]}
+                        on:click={
+                            () => {
+                                console.log('View terms and conditions');
+                                $events_slct.event_presentation_id = event_presenter_obj.event_presentation_id_random;
+                                $events_slct.event_presentation_obj = $lq__event_presentation_obj;
 
-            {#if event_presenter_obj.agree}
-                <!-- {#if $ae_loc.trusted_access || $events_loc.auth__kv.presenter[event_presenter_obj.event_presenter_id_random]} -->
-                <button
-                    type="button"
-                    disabled={!$ae_loc.trusted_access && !$events_loc.auth__kv.presenter[event_presenter_obj.event_presenter_id_random]}
-                    on:click={
-                        () => {
-                            console.log('View terms and conditions');
-                            $events_slct.event_presentation_id = event_presenter_obj.event_presentation_id_random;
-                            $events_slct.event_presentation_obj = $lq__event_presentation_obj;
+                                $events_slct.event_presenter_id = event_presenter_obj.event_presenter_id_random;
+                                $events_slct.event_presenter_obj = event_presenter_obj;
 
-                            $events_slct.event_presenter_id = event_presenter_obj.event_presenter_id_random;
-                            $events_slct.event_presenter_obj = event_presenter_obj;
-
-                            $events_sess.pres_mgmt.show_content__agree_text = event_presenter_obj.event_presenter_id_random;
+                                $events_sess.pres_mgmt.show_content__agree_text = event_presenter_obj.event_presenter_id_random;
+                            }
                         }
-                    }
-                    class="btn variant-ghost-success hover:variant-filled-success my-0.5"
-                    class:btn-sm={display_mode != 'default'}
-                    title="Agreed to terms and conditions"
-                    >
-                    <span class="fas fa-check text-green-500 px-1" title="Agreed to terms and conditions"></span>
-                    Agreed
-                </button>
-            {:else}
-                <button
-                    type="button"
-                    disabled={!$ae_loc.trusted_access && !$events_loc.auth__kv.presenter[event_presenter_obj.event_presenter_id_random]}
-                    on:click={
-                        () => {
-                            console.log('View terms and conditions');
+                        class="btn variant-ghost-success hover:variant-filled-success my-0.5"
+                        class:btn-sm={display_mode != 'default'}
+                        title="Agreed to terms and conditions"
+                        >
+                        <span class="fas fa-check text-green-500 px-1" title="Agreed to terms and conditions"></span>
+                        Agreed
+                    </button>
+                {:else}
+                    <button
+                        type="button"
+                        disabled={!$ae_loc.trusted_access && !$events_loc.auth__kv.presenter[event_presenter_obj.event_presenter_id_random]}
+                        on:click={
+                            () => {
+                                console.log('View terms and conditions');
 
-                            $events_slct.event_presentation_id = event_presenter_obj.event_presentation_id_random;
-                            $events_slct.event_presentation_obj = $lq__event_presentation_obj;
+                                $events_slct.event_presentation_id = event_presenter_obj.event_presentation_id_random;
+                                $events_slct.event_presentation_obj = $lq__event_presentation_obj;
 
-                            $events_slct.event_presenter_id = event_presenter_obj.event_presenter_id_random;
-                            $events_slct.event_presenter_obj = event_presenter_obj;
+                                $events_slct.event_presenter_id = event_presenter_obj.event_presenter_id_random;
+                                $events_slct.event_presenter_obj = event_presenter_obj;
 
-                            $events_sess.pres_mgmt.show_content__agree_text = event_presenter_obj.event_presenter_id_random;
+                                $events_sess.pres_mgmt.show_content__agree_text = event_presenter_obj.event_presenter_id_random;
+                            }
                         }
-                    }
-                    class="btn variant-ghost-warning hover:variant-filled-warning my-0.5"
-                    class:btn-sm={display_mode != 'default'}
-                    title="View terms and conditions"
-                    >
-                    <span class="fas fa-times bg-red-500 text-white px-1 mx-1" title="Not agreed to terms and conditions"></span>
-                    Not yet agreed
-                </button>
+                        class="btn variant-ghost-warning hover:variant-filled-warning my-0.5"
+                        class:btn-sm={display_mode != 'default'}
+                        title="View terms and conditions"
+                        >
+                        <span class="fas fa-times bg-red-500 text-white px-1 mx-1" title="Not agreed to terms and conditions"></span>
+                        Not yet agreed
+                    </button>
+                {/if}
             {/if}
 
 
diff --git a/src/routes/events_pres_mgmt/presenter/[slug]/+page.svelte b/src/routes/events_pres_mgmt/presenter/[slug]/+page.svelte
index 978fa2c3..486f8582 100644
--- a/src/routes/events_pres_mgmt/presenter/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/presenter/[slug]/+page.svelte
@@ -44,6 +44,9 @@ $events_slct.event_file_obj_li = ae_acct.slct.event_file_obj_li;
 $events_sess.pres_mgmt.show_content__agree_text = false;
 $events_sess.pres_mgmt.show_content__presenter_start = false;
 
+let lq__event_obj = liveQuery(
+    () => db_events.events.get(ae_acct.slct.event_id)
+);
 let lq__event_presenter_obj = liveQuery(
     () => db_events.presenters.get(ae_acct.slct.event_presenter_id)
 );
@@ -82,6 +85,7 @@ if (!$ae_loc.authenticated_access && $events_loc.pres_mgmt.show_content__present
 
 <Presenter_page_menu
     data={data}
+    lq__event_obj={lq__event_obj}
     lq__event_presenter_obj={lq__event_presenter_obj}
     />
 
diff --git a/src/routes/events_pres_mgmt/presenter_page_menu.svelte b/src/routes/events_pres_mgmt/presenter_page_menu.svelte
index 34d99746..708bd7f5 100644
--- a/src/routes/events_pres_mgmt/presenter_page_menu.svelte
+++ b/src/routes/events_pres_mgmt/presenter_page_menu.svelte
@@ -13,6 +13,7 @@ import Element_data_store from '$lib/element_data_store.svelte';
 import Sign_in_out from './sign_in_out.svelte';
 
 
+export let lq__event_obj: any;
 export let lq__event_presenter_obj: any;
 
 let ae_tmp: key_val = {};
@@ -128,6 +129,7 @@ let ae_triggers: key_val = {};
         </button>
     </span>
 
+    {#if $lq__event_obj?.cfg_json?.presenter_require_agree}
     <span
         class="ae_menu__action_options flex flex-row items-center justify-around"
         >
@@ -176,6 +178,7 @@ let ae_triggers: key_val = {};
             </button>
         {/if}
     </span>
+    {/if}
 
 
     </div> <!-- END: The menu button options -->
diff --git a/src/routes/events_pres_mgmt/presenter_view.svelte b/src/routes/events_pres_mgmt/presenter_view.svelte
index f1b50e49..f29f33c8 100644
--- a/src/routes/events_pres_mgmt/presenter_view.svelte
+++ b/src/routes/events_pres_mgmt/presenter_view.svelte
@@ -330,7 +330,7 @@ $: if ($lq__event_presenter_obj) {
             <!-- ) -->
             (Not signed in as presenter)
         {:else}
-            ({@html $lq__event_presenter_obj.email ?? 'email '+ae_snip.html__not_set})
+            ({@html ($lq__event_presenter_obj?.email && $lq__event_presenter_obj?.email.length) ? $lq__event_presenter_obj?.email : 'email '+ae_snip.html__not_set})
         {/if}
     </span>
 
@@ -1350,7 +1350,9 @@ $: if ($lq__event_presenter_obj) {
     </li>
 
     <!-- The presenters biography. There should be a character counter. -->
-    <li>
+    <li
+        class:hidden={!$lq__event_obj?.cfg_json?.presenter_bio}
+        >
         <div class="label event_presenter__biography required space-y-4">
             <button
                 type="button"
diff --git a/src/routes/events_pres_mgmt/session/[slug]/+page.svelte b/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
index 40be9c64..cbecab88 100644
--- a/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
@@ -87,6 +87,10 @@ if (!$events_sess.pres_mgmt) {
 $events_sess.pres_mgmt.show_content__agree_text = false;
 $events_sess.pres_mgmt.show_content__presenter_start = false;
 
+let lq__event_obj = liveQuery(
+    () => db_events.events.get($events_slct.event_id)
+);
+
 let lq__event_session_obj = liveQuery(
     () => db_events.sessions.get(ae_acct.slct.event_session_id)
 );
@@ -262,6 +266,7 @@ onMount(() => {
 {#if !$events_loc.pres_mgmt.show_content__session_view || $events_loc.pres_mgmt.show_content__session_view == 'default'}
     <Session_view
         event_session_id={$lq__event_session_obj.event_session_id}
+        lq__event_obj={lq__event_obj}
         lq__event_session_obj={lq__event_session_obj}
         lq__auth__event_presenter_obj={lq__auth__event_presenter_obj}
         lq__event_presentation_obj_li={lq__event_presentation_obj_li}
diff --git a/src/routes/events_pres_mgmt/session_view.svelte b/src/routes/events_pres_mgmt/session_view.svelte
index 16dc3f51..13989177 100644
--- a/src/routes/events_pres_mgmt/session_view.svelte
+++ b/src/routes/events_pres_mgmt/session_view.svelte
@@ -43,6 +43,8 @@ if (!$events_sess.pres_mgmt) {
 $events_sess.pres_mgmt.show_content__agree_text = false;
 $events_sess.pres_mgmt.show_content__presenter_start = false;
 
+export let lq__event_obj: any;
+
 export let lq__event_session_obj: any;
 
 // let lq__event_session_obj = liveQuery(
@@ -281,9 +283,10 @@ $: if ($lq__event_session_obj) {
     </li>
     <li>
         <strong class="text-sm">Location/Room:</strong>
+        <!-- {$lq__event_session_obj.event_location_id_random} -->
         {#if $ae_loc.trusted_access}
             <a
-                href="/events_pres_mgmt/launcher/{$lq__event_session_obj.event_location_id_random}"
+                href="/events_pres_mgmt/launcher/{$lq__event_session_obj.event_id_random}"
                 class="text-blue-500 hover:text-blue-800 hover:underline"
                 title="Launcher: {$lq__event_session_obj?.event_location_name} {$lq__event_session_obj?.event_location_id_random}"
                 >
@@ -718,6 +721,9 @@ $: if ($lq__event_session_obj) {
     {#if $ae_loc.trusted_access || $events_loc.auth__kv.session[$events_slct.event_session_id] || ($events_loc.auth__kv.presenter[$events_slct.event_presenter_id] &&  $lq__event_presenter_obj?.agree)}
 
     <div class="min-w-max flex flex-col gap-1">
+
+    <!-- The account_id should not be hardcoded! -->
+    {#if $lq__event_session_obj?.account_id_random == 'xFP7AhU8Zlc'}
     <!-- This styling took a while and finally looks good on most sized screens. -->
     <a
         class="btn btn-md variant-ghost-primary hover:variant-filled-primary flex flex-row items-center justify-between max-w-xs md:max-w-full text-wrap md:text-nowrap"
@@ -741,6 +747,9 @@ $: if ($lq__event_session_obj) {
         LCI Speaker and Champion Congress Task List (Excel)
         </span>
     </a>
+    {:else}
+    <p>Please select your name below to upload presentation files.</p>
+    {/if}
     </div>
 
     {:else}
@@ -1003,6 +1012,7 @@ $: if ($lq__event_session_obj) {
         <!-- Show presenters for this presentation -->
         {#if event_presentation_obj.event_presentation_id_random}
             <Comp_event_presenter_obj_li
+                lq__event_obj={lq__event_obj}
                 link_to_type={'event_presentation'}
                 link_to_id={event_presentation_obj.event_presentation_id_random}
                 >