Scott.Idem/OSIT-AE-App-Svelte
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trying to make the slightly newer event session search page load consistently.

Browse Source
This commit is contained in:
Scott Idem
2024-09-27 13:08:31 -04:00
parent 25a28d4ff6
commit 495dd0e6d9
12 changed files with 618 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
src/routes/events/[event_id]/(launcher)/+layout.svelte
View File

@@ -8,10 +8,11 @@ import { sineIn } from 'svelte/easing';
import { liveQuery } from "dexie";
import { Drawer, Footer } from 'flowbite-svelte';
import { ae_util } from '$lib/ae_utils/ae_utils';
import { db_events } from "$lib/db_events";
import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
import { db_events } from '$lib/db_events';
import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger, time } from '$lib/ae_stores';
import { events_loc, events_sess, events_slct, events_trigger, events_trig } from '$lib/ae_events_stores';
import Element_websocket_v2 from '$lib/element_websocket_v2.svelte';
import Event_launcher_menu from './launcher_menu.svelte';
import Event_launcher_session_view from './launcher_session_view.svelte';
@@ -135,9 +136,10 @@ console.log(`BROWSER Events - [event_id] launcher +layout.svelte start`);
"
>
<h3 class="h4 text-center italic">&AElig; Presentation Launcher</h3>
<h2 class="h3 text-center">{$lq__event_obj?.name}</h2>
<h3 class="h4 text-center italic">{$lq__event_location_obj?.name}
{$events_slct.event_location_id}
<h2 class="h3 text-center">{$lq__event_obj.cfg_json?.short_name}</h2>
<h3 class="h4 text-center italic">
{$lq__event_location_obj?.name}
<!-- {$events_slct.event_location_id} -->
</h3>
</header>
{/if}
@@ -276,8 +278,8 @@ console.log(`BROWSER Events - [event_id] launcher +layout.svelte start`);
[Help]
</div>
<div>
[Session Name]
<div class="slct_location_name">
{$lq__event_location_obj?.name}
</div>
<div>
@@ -285,18 +287,27 @@ console.log(`BROWSER Events - [event_id] launcher +layout.svelte start`);
</div>
<div>
[Recording]
{#if $events_loc.launcher?.av_recording}
<span class="fas fa-video"></span> AV Recording Active
{:else}
<span class="fas fa-video-slash"></span> AV Recording Inactive
{/if}
</div>
<div>
[Date and Time]
<div class="current_datetime">
{ae_util.iso_datetime_formatter($time,'date_full_no_year')}
{#if $events_loc.launcher?.time_hours == 12}
{ae_util.iso_datetime_formatter($time,'time_12_long')}
{:else}
{ae_util.iso_datetime_formatter($time,'time_long')}
{/if}
</div>
</Footer>
<Drawer
bgColor="bg-blue"
class="bg-orange-100 opacity-75 hover:opacity-95 transition-all duration-1000"
class="bg-orange-100 opacity-90 hover:opacity-95 transition-all duration-1000"
placement="left"
transitionType="fly"
transitionParams={
@@ -326,11 +337,71 @@ console.log(`BROWSER Events - [event_id] launcher +layout.svelte start`);
</button>
</div>
<h3
<hr>
<section class="controller">
<h3>
<button
on:click={() => {
$events_loc.launcher.show_section__controller = !$events_loc.launcher.show_section__controller;
}}
class="ae_btn btn_sm btn_seamless"
>
Controller:
{#if $events_loc.launcher.show_section__controller}
<span class="fas fa-chevron-down"></span>
{:else}
<span class="fas fa-chevron-right"></span>
{/if}
</button>
</h3>
<div
class:hidden={!$events_loc.launcher.show_section__controller}
>
<select
bind:value={$events_loc.launcher.controller}
class="select"
>
<option value="local">Locally Controlled</option>
<option value="remote">Remotely Controlled</option>
<option value="local_push">Controller</option>
</select>
<input
bind:value={$events_loc.launcher.controller_group_code}
placeholder="Controller group code"
class="input"
>
</div>
{#if $events_loc.launcher.controller_group_code}
<!-- {$ae_api.base_url} -->
<Element_websocket_v2
ws_server={$ae_api.fqdn}
group_id={$events_loc.launcher.controller_group_code}
cmd={$events_loc.launcher.controller_cmd}
type={'cmd'}
trigger_send={$events_loc.launcher.controller_trigger_send}
/>
<!-- on:ws_conn={handle_ws_conn} -->
<!-- on:ws_recv={handle_ws_recv} -->
<!-- on:ws_sent={handle_ws_sent} -->
{/if}
</section>
<hr>
<!-- <h3
class="text-center mb-4 text-sm font-semibold"
>
Controller
</h3>
</h3> -->
<h3
class="text-center mb-4 text-sm font-semibold"
@@ -431,6 +502,10 @@ console.log(`BROWSER Events - [event_id] launcher +layout.svelte start`);
<pre class="text-xs">
{JSON.stringify($events_loc.launcher, null, 2)}
</pre>
<hr />
<pre class="text-xs">
{JSON.stringify($ae_api, null, 2)}
</pre>
</div>
</Drawer>

47
src/routes/events/[event_id]/+layout.svelte Normal file
View File

@@ -0,0 +1,47 @@
<script lang="ts">
/** @type {import('./$types').LayoutData} */
export let data: any;
let log_lvl = 2;
// console.log(`ae_events_pres_mgmt event [event_id] +page.svelte data:`, data);
import { browser } from '$app/environment';
// import { goto, invalidate, pushState, replaceState } from '$app/navigation';
import type { key_val } from '$lib/ae_stores';
import { ae_util } from '$lib/ae_utils/ae_utils';
// import Element_data_store from '$lib/element_data_store_v2.svelte';
// import Comp_event_session_obj_li from '../../events_pres_mgmt/ae_comp__event_session_obj_li.svelte';
import { liveQuery } from "dexie";
import { core_func } from '$lib/ae_core_functions';
import { db_events } from "$lib/db_events";
import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
import { events_func } from '$lib/ae_events_functions';
import Event_page_menu from '../event_page_menu.svelte';
// Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other.
$slct.account_id = data.account_id;
// console.log(`$slct.account_id = `, $slct.account_id);
let ae_acct = data[$slct.account_id];
console.log(`ae_acct = `, ae_acct);
console.log(`event_id layout A: ${data.params.event_id}`);
console.log(`event_id layout B: ${ae_acct.slct.event_id}`);
console.log(`event_id layout C: ${$events_slct.event_id}`);
// $: event_id = data.params.event_id;
// console.log(`event_id layout D: ${event_id}`);
// $events_slct.event_id = event_id;
// $events_slct.event_obj = ae_acct.slct.event_obj;
$events_slct.event_session_obj_li = ae_acct.slct.event_session_obj_li;
$events_slct.event_location_obj_li = ae_acct.slct.event_location_obj_li;
</script>
<slot />

76
src/routes/events/[event_id]/+layout.ts Normal file
View File

@@ -0,0 +1,76 @@
/** @type {import('./$types').LayoutLoad} */
console.log(`Events - [event_id] launcher +layout.ts start`);
import { error } from '@sveltejs/kit';
import { browser } from '$app/environment';
import { events_func } from '$lib/ae_events_functions';
export async function load({ params, parent }) { // route
let log_lvl = 0;
let data = await parent();
// console.log(`ae events_pres_mgmt event [event_id] +page.ts data:`, data);
data.log_lvl = log_lvl;
let account_id = data.account_id;
let ae_acct = data[account_id];
// console.log(`ae_acct = `, ae_acct);
// if (!account_id) {
// console.log(`events_pres_mgmt_event [event_id] +page.ts: The account_id was not found in the data!!!`);
// return false;
// }
// data.ae_events_pres_mgmt_event_event_id_page_ts = true;
let event_id = params.event_id;
if (!event_id) {
console.log(`ae Events - [event_id] +page.ts: The event_id was not found in the params.event_id!!!`);
error(404, {
message: 'Event ID not found'
});
}
ae_acct.slct.event_id = event_id;
// let load_event_obj = events_func.handle_load_ae_obj_id__event({
// api_cfg: ae_acct.api, event_id: event_id, try_cache: true
// });
// ae_acct.slct.event_obj = await load_event_obj;
if (browser) {
let load_event_obj = events_func.handle_load_ae_obj_id__event({
api_cfg: ae_acct.api, event_id: event_id, try_cache: true
});
console.log(`load_event_obj = `, load_event_obj);
ae_acct.slct.event_obj = load_event_obj;
let load_event_session_obj_li = events_func.load_ae_obj_li__event_session({
api_cfg: ae_acct.api,
for_obj_type: 'event',
for_obj_id: event_id,
params: {qry__enabled: 'enabled', qry__hidden: 'all', qry__limit: 200},
try_cache: true,
log_lvl: 1
});
console.log(`load_event_session_obj_li = `, load_event_session_obj_li);
ae_acct.slct.event_session_obj_li = load_event_session_obj_li;
let load_event_location_obj_li = events_func.load_ae_obj_li__event_location({
api_cfg: ae_acct.api,
for_obj_type: 'event',
for_obj_id: event_id,
params: {qry__enabled: 'enabled', qry__hidden: 'all', qry__limit: 200},
try_cache: true,
log_lvl: 1
});
console.log(`load_event_location_obj_li = `, load_event_location_obj_li);
ae_acct.slct.event_location_obj_li = load_event_location_obj_li;
}
// WARNING: Precaution against shared data between sites and sessions.
data[account_id] = ae_acct;
return data;
}

14
src/routes/events/[event_id]/+page.svelte
View File

@@ -25,16 +25,19 @@ import Event_page_menu from '../event_page_menu.svelte';
// Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other.
$slct.account_id = data.account_id;
// $slct.account_id = data.account_id;
// console.log(`$slct.account_id = `, $slct.account_id);
let ae_acct = data[$slct.account_id];
console.log(`ae_acct = `, ae_acct);
console.log(`event_id: ${data.params.event_id}`);
console.log(`event_id layout A: ${data.params.event_id}`);
console.log(`event_id layout B: ${ae_acct.slct.event_id}`);
console.log(`event_id layout C: ${$events_slct.event_id}`);
$: event_id = data.params.event_id;
$events_slct.event_id = data.params.event_id;
// $events_slct.event_id = data.params.event_id;
// $events_slct.event_obj = ae_acct.slct.event_obj;
$events_slct.event_session_obj_li = ae_acct.slct.event_session_obj_li;
// $events_slct.event_session_obj_li = ae_acct.slct.event_session_obj_li;
// import Leads_add_scan from './leads_add_scan.svelte';
// import Sessions_list from './sessions_list.svelte';
@@ -42,8 +45,9 @@ $events_slct.event_session_obj_li = ae_acct.slct.event_session_obj_li;
// import Leads_payment from './leads_payment.svelte';
$: lq__event_obj = liveQuery(async () => {
console.log(`*** LiveQuery: lq__event_obj *** event_id=${$events_slct.event_id}`);
let results = await db_events.events
.get($events_slct.event_id)
.get($events_slct.event_id)
return results;
});

116
src/routes/events/[event_id]/+page.ts
View File

@@ -1,76 +1,76 @@
/** @type {import('./$types').PageLoad} */
console.log(`Events - [event_id] +page.ts start`);
import { error } from '@sveltejs/kit';
import { browser } from '$app/environment';
import { events_func } from '$lib/ae_events_functions';
// import { error } from '@sveltejs/kit';
// import { browser } from '$app/environment';
// import { events_func } from '$lib/ae_events_functions';
export async function load({ params, parent }) { // route
let log_lvl = 0;
// let log_lvl = 0;
let data = await parent();
// console.log(`ae events_pres_mgmt event [event_id] +page.ts data:`, data);
data.log_lvl = log_lvl;
// let data = await parent();
// // console.log(`ae events_pres_mgmt event [event_id] +page.ts data:`, data);
// data.log_lvl = log_lvl;
let account_id = data.account_id;
let ae_acct = data[account_id];
// console.log(`ae_acct = `, ae_acct);
// let account_id = data.account_id;
// let ae_acct = data[account_id];
// // console.log(`ae_acct = `, ae_acct);
// if (!account_id) {
// console.log(`events_pres_mgmt_event [event_id] +page.ts: The account_id was not found in the data!!!`);
// return false;
// // if (!account_id) {
// // console.log(`events_pres_mgmt_event [event_id] +page.ts: The account_id was not found in the data!!!`);
// // return false;
// // }
// // data.ae_events_pres_mgmt_event_event_id_page_ts = true;
// let event_id = params.event_id;
// if (!event_id) {
// console.log(`ae Events - [event_id] +page.ts: The event_id was not found in the params.event_id!!!`);
// error(404, {
// message: 'Event ID not found'
// });
// }
// data.ae_events_pres_mgmt_event_event_id_page_ts = true;
// // ae_acct.slct.event_id = event_id;
let event_id = params.event_id;
if (!event_id) {
console.log(`ae Events - [event_id] +page.ts: The event_id was not found in the params.event_id!!!`);
error(404, {
message: 'Event ID not found'
});
}
// // let load_event_obj = events_func.handle_load_ae_obj_id__event({
// // api_cfg: ae_acct.api, event_id: event_id, try_cache: true
// // });
// ae_acct.slct.event_id = event_id;
// // ae_acct.slct.event_obj = await load_event_obj;
// let load_event_obj = events_func.handle_load_ae_obj_id__event({
// api_cfg: ae_acct.api, event_id: event_id, try_cache: true
// });
// if (browser) {
// let load_event_obj = events_func.handle_load_ae_obj_id__event({
// api_cfg: ae_acct.api, event_id: event_id, try_cache: true
// });
// console.log(`load_event_obj = `, load_event_obj);
// ae_acct.slct.event_obj = load_event_obj;
// ae_acct.slct.event_obj = await load_event_obj;
// let load_event_session_obj_li = events_func.load_ae_obj_li__event_session({
// api_cfg: ae_acct.api,
// for_obj_type: 'event',
// for_obj_id: event_id,
// params: {qry__enabled: 'enabled', qry__hidden: 'all', qry__limit: 200},
// try_cache: true,
// log_lvl: 1
// });
// console.log(`load_event_session_obj_li = `, load_event_session_obj_li);
// ae_acct.slct.event_session_obj_li = load_event_session_obj_li;
if (browser) {
let load_event_obj = events_func.handle_load_ae_obj_id__event({
api_cfg: ae_acct.api, event_id: event_id, try_cache: true
});
console.log(`load_event_obj = `, load_event_obj);
ae_acct.slct.event_obj = load_event_obj;
// let load_event_location_obj_li = events_func.load_ae_obj_li__event_location({
// api_cfg: ae_acct.api,
// for_obj_type: 'event',
// for_obj_id: event_id,
// params: {qry__enabled: 'enabled', qry__hidden: 'all', qry__limit: 200},
// try_cache: true,
// log_lvl: 1
// });
// console.log(`load_event_location_obj_li = `, load_event_location_obj_li);
// ae_acct.slct.event_location_obj_li = load_event_location_obj_li;
// }
let load_event_session_obj_li = events_func.load_ae_obj_li__event_session({
api_cfg: ae_acct.api,
for_obj_type: 'event',
for_obj_id: event_id,
params: {qry__enabled: 'enabled', qry__hidden: 'all', qry__limit: 200},
try_cache: true,
log_lvl: 1
});
console.log(`load_event_session_obj_li = `, load_event_session_obj_li);
ae_acct.slct.event_session_obj_li = load_event_session_obj_li;
// // WARNING: Precaution against shared data between sites and sessions.
// data[account_id] = ae_acct;
let load_event_location_obj_li = events_func.load_ae_obj_li__event_location({
api_cfg: ae_acct.api,
for_obj_type: 'event',
for_obj_id: event_id,
params: {qry__enabled: 'enabled', qry__hidden: 'all', qry__limit: 200},
try_cache: true,
log_lvl: 1
});
console.log(`load_event_location_obj_li = `, load_event_location_obj_li);
ae_acct.slct.event_location_obj_li = load_event_location_obj_li;
}
// WARNING: Precaution against shared data between sites and sessions.
data[account_id] = ae_acct;
return data;
// return data;
}