General checks and clean up of things

This commit is contained in:
Scott Idem
2024-03-10 16:01:53 -04:00
parent b6ba167a86
commit 1559bae11c
3 changed files with 52 additions and 28 deletions

View File

@@ -101,6 +101,14 @@ let ae_event_presenter_obj_li_get_promise: Promise<any>;
let ae_event_presenter_obj_get_promise: Promise<any>; let ae_event_presenter_obj_get_promise: Promise<any>;
// This might need to be reviewed and compared to sponsorships version again
if ($ae_loc.mod.events.event_id) {
$slct.event_id = $ae_loc.mod.events.event_id;
// handle_load_ae_obj_id__event({event_id: $slct.event_id, try_cache: false});
handle_load_ae_obj_li__event_presenter({event_id: $slct.event_id, try_cache: false});
}
onMount(() => { onMount(() => {
console.log('Events - Speakers: +page.svelte'); console.log('Events - Speakers: +page.svelte');
@@ -116,7 +124,9 @@ onMount(() => {
ae_util.handle_url_and_message('event_id', $slct.event_id); ae_util.handle_url_and_message('event_id', $slct.event_id);
ae_util.handle_url_and_message('event_presenter_id', $slct.event_presenter_id); ae_util.handle_url_and_message('event_presenter_id', $slct.event_presenter_id);
if ($slct.event_presenter_id) { if ($slct.event_presenter_id) {
console.log(`Got an ID. Let's show the modal!`); console.log(`Got an ID. Let's clear the modal store just in case!`);
modalStore.clear();
// console.log(`Got an ID. Let's show the modal!`);
// modalStore.trigger(modal_edit__event_presenter_obj); // modalStore.trigger(modal_edit__event_presenter_obj);
// $slct_trigger = 'load__event_presenter_obj'; // $slct_trigger = 'load__event_presenter_obj';
} }
@@ -159,25 +169,12 @@ $: if ($slct_trigger == 'show_view__event_presenter_obj' && $ae_loc.mod.events.s
// console.log('Message sent to parent (iframe):', message); // console.log('Message sent to parent (iframe):', message);
} }
// This might need to be reviewed and compared to sponsorships version again
if ($ae_loc.mod.events.event_id) {
$slct.event_id = $ae_loc.mod.events.event_id;
// handle_load_ae_obj_id__event({event_id: $slct.event_id, try_cache: false});
handle_load_ae_obj_li__event_presenter({event_id: $slct.event_id, try_cache: false});
}
// if ($slct.event_id && !$slct.event_presenter_obj_li) {
// console.log(`No presenter list was found for Event ID: ${$slct.event_id}`);
// $slct_trigger = 'load__event_presenter_obj_li';
// }
$: if ($slct_trigger == 'load__event_presenter_obj_li' && $slct.event_id) { $: if ($slct_trigger == 'load__event_presenter_obj_li' && $slct.event_id) {
console.log(`load__event_presenter_obj_li event_id: ${$slct.event_id}`); console.log(`load__event_presenter_obj_li event_id: ${$slct.event_id}`);
$slct_trigger = null; $slct_trigger = null;
// $slct.event_id = $ae_loc.event_id;
// handle_load_ae_obj_id__event({event_id: $slct.event_id, try_cache: false}); // handle_load_ae_obj_id__event({event_id: $slct.event_id, try_cache: false});
handle_load_ae_obj_li__event_presenter({event_id: $slct.event_id, try_cache: false}); handle_load_ae_obj_li__event_presenter({event_id: $slct.event_id, try_cache: false});
} }

View File

@@ -91,6 +91,14 @@ let ae_sponsorship_obj_li_get_promise: Promise<any>;
let ae_sponsorship_obj_get_promise: Promise<any>; let ae_sponsorship_obj_get_promise: Promise<any>;
// This might need to be reviewed and compared to speakers version again
if ($ae_loc.account_id) {
$slct.account_id = $ae_loc.account_id;
// handle_load_ae_obj_id__account({account_id: $slct.account_id, try_cache: false});
handle_load_ae_obj_li__sponsorship({account_id: $slct.account_id, try_cache: false});
}
onMount(() => { onMount(() => {
console.log('Sponsorships: +page.svelte'); console.log('Sponsorships: +page.svelte');
@@ -151,10 +159,12 @@ $: if ($slct_trigger == 'show_view__sponsorship_obj' && $ae_loc.mod.sponsorships
// console.log('Message sent to parent (iframe):', message); // console.log('Message sent to parent (iframe):', message);
} }
// This might need to be reviewed and compared to speakers version again
if ($ae_loc.account_id) { $: if ($slct_trigger == 'load__sponsorship_obj_li') {
$slct.account_id = $ae_loc.account_id; console.log(`load__sponsorship_obj_li account_id=${$slct.account_id}`);
// handle_load_ae_obj_id__account({account_id: $slct.account_id, try_cache: false});
$slct_trigger = null;
handle_load_ae_obj_li__sponsorship({account_id: $slct.account_id, try_cache: false}); handle_load_ae_obj_li__sponsorship({account_id: $slct.account_id, try_cache: false});
} }
@@ -205,7 +215,7 @@ async function handle_load_ae_obj_li__sponsorship({account_id, try_cache=true})
}) })
.finally(function () { .finally(function () {
$ae_loc.mod.sponsorships.qry_status = 'done'; $ae_loc.mod.sponsorships.qry_status = 'done';
// console.log('Sponsorship list:', $slct.sponsorship_obj_li); console.log('Object list:', $slct.sponsorship_obj_li);
}); });
return ae_sponsorship_obj_li_get_promise; return ae_sponsorship_obj_li_get_promise;
@@ -325,6 +335,13 @@ async function handle_load_ae_obj_id__sponsorship({sponsorship_id, try_cache=fal
}) })
.then(function (sponsorship_obj_get_result) { .then(function (sponsorship_obj_get_result) {
if (sponsorship_obj_get_result) { if (sponsorship_obj_get_result) {
if (!sponsorship_obj_get_result.sponsorship_id_random || !sponsorship_obj_get_result.sponsorship_cfg_id_random) {
console.log('WARNING: These results do not seem correct. Trigger a reload of the object.');
$slct_trigger = 'load__sponsorship_obj';
return false;
}
$slct.sponsorship_obj = sponsorship_obj_get_result; $slct.sponsorship_obj = sponsorship_obj_get_result;
console.log(`sponsorship object:`, $slct.sponsorship_obj); console.log(`sponsorship object:`, $slct.sponsorship_obj);
} }

View File

@@ -77,7 +77,18 @@ if ($slct.sponsorship_id) {
logo_li_json: null, logo_li_json: null,
media_li_json: null, media_li_json: null,
questions_li_json: {}, questions_li_json: {
accommodations_text: null,
public_recognition: null,
social_email: null,
dedicated_promos: null,
table_exhibit: null,
table_power: null,
plenary_session: null,
plenary_opening: null,
virtual_session: null,
// promo_video: null,
},
social_li_json: null, social_li_json: null,
@@ -996,7 +1007,7 @@ async function handle_delete_sponsorship_obj({sponsorship_id, hosted_file_id=nul
regionTab={!$slct.sponsorship_id || $slct.sponsorship_obj.level_num < 2 ? 'text-slate-400' : ''} regionTab={!$slct.sponsorship_id || $slct.sponsorship_obj.level_num < 2 ? 'text-slate-400' : ''}
> >
<svelte:fragment slot="lead"> <svelte:fragment slot="lead">
{#if $slct.sponsorship_obj.questions_li_json && $slct.sponsorship_obj.questions_li_json.table_exhibit} {#if $slct.sponsorship_obj.questions_li_json && ($slct.sponsorship_obj.questions_li_json.table_exhibit || $slct.sponsorship_obj.questions_li_json.table_exhibit === 0)}
<span class="fas fa-check text-green-500"></span> <span class="fas fa-check text-green-500"></span>
{/if} {/if}
<span class="fas fa-store"></span> <span class="fas fa-store"></span>
@@ -1751,7 +1762,6 @@ async function handle_delete_sponsorship_obj({sponsorship_id, hosted_file_id=nul
<input <input
class="radio" class="radio"
type="radio" type="radio"
checked
name="q_table_power" name="q_table_power"
value={0} value={0}
bind:group={$slct.sponsorship_obj.questions_li_json.table_power} bind:group={$slct.sponsorship_obj.questions_li_json.table_power}
@@ -1805,16 +1815,16 @@ async function handle_delete_sponsorship_obj({sponsorship_id, hosted_file_id=nul
<p>If you select "Yes", our CHOW Manager, Shannon Colbert will review your selection and be in touch with more details.</p> <p>If you select "Yes", our CHOW Manager, Shannon Colbert will review your selection and be in touch with more details.</p>
</div> --> </div> -->
<div class="font-bold">Are you interested in hosting a CHOW plenary session?</div> <div class="font-bold input_required">Are you interested in hosting a CHOW plenary session?</div>
<div class="space-y-2"> <div class="space-y-2">
<label class="flex items-center space-x-2"> <label class="flex items-center space-x-2">
<input <input
class="radio variant-glass-warning" class="radio variant-glass-warning"
type="radio" type="radio"
checked
name="q_plenary_session" name="q_plenary_session"
value={1} value={1}
bind:group={$slct.sponsorship_obj.questions_li_json.plenary_session} bind:group={$slct.sponsorship_obj.questions_li_json.plenary_session}
required
/> />
<span class="fas fa-check"></span> <span class="fas fa-check"></span>
<span>Yes, we are interested in hosting a plenary session.</span> <span>Yes, we are interested in hosting a plenary session.</span>
@@ -1838,16 +1848,16 @@ async function handle_delete_sponsorship_obj({sponsorship_id, hosted_file_id=nul
<p class="text-sm">If you select "Yes", our CHOW Manager, Shannon Colbert will review your selection and be in touch with more details.</p> <p class="text-sm">If you select "Yes", our CHOW Manager, Shannon Colbert will review your selection and be in touch with more details.</p>
</div> </div>
<div class="font-bold">Are you interested in hosting the CHOW 2024 Opening Remarks at a Plenary Session?</div> <div class="font-bold input_required">Are you interested in hosting the CHOW 2024 Opening Remarks at a Plenary Session?</div>
<div class="space-y-2"> <div class="space-y-2">
<label class="flex items-center space-x-2"> <label class="flex items-center space-x-2">
<input <input
class="radio variant-glass-warning" class="radio variant-glass-warning"
type="radio" type="radio"
checked
name="q_plenary_opening" name="q_plenary_opening"
value={1} value={1}
bind:group={$slct.sponsorship_obj.questions_li_json.plenary_opening} bind:group={$slct.sponsorship_obj.questions_li_json.plenary_opening}
required
/> />
<span class="fas fa-check"></span> <span class="fas fa-check"></span>
<span>Yes, we are interested in opening remarks.</span> <span>Yes, we are interested in opening remarks.</span>
@@ -1887,16 +1897,16 @@ async function handle_delete_sponsorship_obj({sponsorship_id, hosted_file_id=nul
<p>If you select "Yes", our CHOW Manager, Shannon Colbert will review your selection and be in touch with more details. Once confirmed, a draft session form must be submitted by Thursday, April 13 and a final session form must be submitted no later than Thursday, May 4.</p> <p>If you select "Yes", our CHOW Manager, Shannon Colbert will review your selection and be in touch with more details. Once confirmed, a draft session form must be submitted by Thursday, April 13 and a final session form must be submitted no later than Thursday, May 4.</p>
</div> --> </div> -->
<div class="font-bold">Are you interested in hosting a CHOW virtual session?</div> <div class="font-bold input_required">Are you interested in hosting a CHOW virtual session?</div>
<div class="space-y-2"> <div class="space-y-2">
<label class="flex items-center space-x-2"> <label class="flex items-center space-x-2">
<input <input
class="radio variant-glass-warning" class="radio variant-glass-warning"
type="radio" type="radio"
checked
name="q_virtual_session" name="q_virtual_session"
value={1} value={1}
bind:group={$slct.sponsorship_obj.questions_li_json.virtual_session} bind:group={$slct.sponsorship_obj.questions_li_json.virtual_session}
required
/> />
<span class="fas fa-check"></span> <span class="fas fa-check"></span>
<span>Yes, we are interested in hosting a virtual session.</span> <span>Yes, we are interested in hosting a virtual session.</span>