diff --git a/src/lib/ae_events_stores.ts b/src/lib/ae_events_stores.ts index 90a2a9c3..4a829373 100644 --- a/src/lib/ae_events_stores.ts +++ b/src/lib/ae_events_stores.ts @@ -263,6 +263,13 @@ let events_local_data_struct: key_val = { disable_submit__opt_out: true, submit_status__opt_out: null, + + device_kv: { + // 'LNDF-67-89-92': {'collapse': true}, + }, + location_kv: { + // 'LNDF-67-89-92': {'collapse': true}, + }, }, // Speakers Management (Collection) diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index bb188f27..61fefd58 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -94,8 +94,9 @@ $slct = { } // console.log(`$slct = `, $slct); -// Check if the last reload timestamp for $ae_loc.last_idb_reload is no more than 15 minutes ago. -let default_idb_reload_time = 120 * 60 * 1000; // 120 minutes +// IDB caches - Check if the last reload timestamp for $ae_loc.last_idb_reload is no more than 15 minutes ago. +let default_idb_reload_time = 120 * 60 * 1000; // 15 minutes? +let trusted_idb_reload_time = 4 * 60 * 60 * 1000; // 4 hours or 120 minutes? if (!$ae_loc.last_idb_reload) { console.log(`Last reload not found. Need to reset.`); @@ -116,7 +117,7 @@ if (!$ae_loc.last_idb_reload) { // window.location.reload(); } -} else if ($ae_loc.last_idb_reload && (Date.now() - $ae_loc.last_idb_reload) > default_idb_reload_time) { +} else if ($ae_loc.last_idb_reload && $ae_loc.trusted_access && (Date.now() - $ae_loc.last_idb_reload) > trusted_idb_reload_time) { console.log(`Last reload too old:`, $ae_loc.last_idb_reload); if (browser) { @@ -132,10 +133,25 @@ if (!$ae_loc.last_idb_reload) { // localStorage.removeItem('ae_loc'); // localStorage.removeItem('events_loc'); - // window.location.reload(); + window.location.reload(); + } +} else if ($ae_loc.last_idb_reload && (Date.now() - $ae_loc.last_idb_reload) > default_idb_reload_time) { + console.log(`Last reload too old:`, $ae_loc.last_idb_reload); + + if (browser) { + $ae_loc.last_idb_reload = Date.now(); + + // Clear Indexed DB as well + indexedDB.deleteDatabase('ae_core_db'); + indexedDB.deleteDatabase('ae_events_db'); + + // localStorage.removeItem('ae_loc'); + // localStorage.removeItem('events_loc'); + + window.location.reload(); } } else if (browser) { - console.log(`Last reload is recent:`, $ae_loc.last_idb_reload); + console.log(`Last reload is recent: ${$ae_loc.last_idb_reload}`); // Clear Indexed DB as well // indexedDB.deleteDatabase('ae_core_db'); // indexedDB.deleteDatabase('ae_events_db'); diff --git a/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte b/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte index d78a6711..8107fd62 100644 --- a/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte +++ b/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte @@ -25,6 +25,10 @@ if (log_lvl) { // let ae_tmp: key_val = {}; // let ae_triggers: key_val = {}; +if (!$events_loc.pres_mgmt?.device_kv) { + $events_loc.pres_mgmt.device_kv = {}; +} + // Functions and Logic @@ -38,7 +42,7 @@ if (log_lvl) { class:hidden={!$lq__event_device_obj_li?.length} title="Devices: {$lq__event_device_obj_li?.length ?? 'None'}" > - + {@html ($lq__event_device_obj_li?.length ? `${$lq__event_device_obj_li?.length}×` : '')} @@ -59,9 +63,12 @@ if (log_lvl) { {#each $lq__event_device_obj_li as event_device_obj}
  • -

    +

    + - {#if event_device_obj?.code} + {#if event_device_obj?.code && !$events_loc.pres_mgmt?.hide__device_code} @@ -102,128 +109,176 @@ if (log_lvl) { {event_device_obj?.code ?? ''} {/if} -

    + -
    -
    - - {event_device_obj?.alert ? 'Alert' : 'No Alert'} - -
    - {event_device_obj?.alert_msg ?? 'No Alert Message'} -
    -
    - - hostname: - {event_device_obj?.info_hostname} - - - IPs: - {event_device_obj?.info_ip_list} - -
    -
    - Last updated: - - - {ae_util.iso_datetime_formatter(event_device_obj?.updated_on, 'dddd')}, - - - {ae_util.iso_datetime_formatter(event_device_obj?.updated_on, 'date_long_month_day')} - - - @ + {#if event_device_obj?.alert} + - {ae_util.iso_datetime_formatter(event_device_obj?.updated_on, 'time_iso_12_tz')} + -
    -
    - - -
    - { - console.log(`ae_crud_updated:`, e.detail); - - events_func.load_ae_obj_id__event_device({api_cfg: $ae_api, event_device_id: event_device_obj.event_device_id_random, log_lvl: 1}); - }} - > - - Description: - - - {#if event_device_obj?.description} + {/if} + - 
    {event_device_obj.description}
    +
    - {:else} - {@html ae_snip.html__not_set} - {/if} - - -
    + + +
    + { + console.log(`ae_crud_updated:`, e.detail); + + events_func.load_ae_obj_id__event_device({api_cfg: $ae_api, event_device_id: event_device_obj.event_device_id_random, log_lvl: 1}); + }} + > + + Description: + + + {#if event_device_obj?.description} + + + 
    {event_device_obj.description}
    + + {:else} + {@html ae_snip.html__not_set} + {/if} + +     +
    + +
    • {/each} diff --git a/src/routes/events/[event_id]/locations/+page.svelte b/src/routes/events/[event_id]/locations/+page.svelte index d6a2eb79..53ad1afd 100644 --- a/src/routes/events/[event_id]/locations/+page.svelte +++ b/src/routes/events/[event_id]/locations/+page.svelte @@ -104,7 +104,6 @@ onMount(() => { - Locations/Rooms diff --git a/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte b/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte index d621b6ac..06b90aa6 100644 --- a/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte +++ b/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte @@ -27,6 +27,10 @@ if (log_lvl) { // let ae_tmp: key_val = {}; // let ae_triggers: key_val = {}; +if (!$events_loc.pres_mgmt?.location_kv) { + $events_loc.pres_mgmt.location_kv = {}; +} + // Functions and Logic @@ -74,7 +78,7 @@ if (log_lvl) { class:hidden={!$lq__event_location_obj_li?.length} title="Locations: {$lq__event_location_obj_li?.length ?? 'None'}" > - + {@html ($lq__event_location_obj_li?.length ? `${$lq__event_location_obj_li?.length}×` : '')} @@ -95,9 +99,12 @@ if (log_lvl) { {#each $lq__event_location_obj_li as event_location_obj}
  • -

    +

    + - {#if event_location_obj?.code} + {#if event_location_obj?.code && !$events_loc.pres_mgmt?.hide__location_code} @@ -138,114 +145,156 @@ if (log_lvl) { {event_location_obj?.code ?? ''} {/if} -

    + -
    - { - console.log(`ae_crud_updated:`, e.detail); - - events_func.load_ae_obj_id__event_location({api_cfg: $ae_api, event_location_id: event_location_obj.event_location_id_random, log_lvl: 1}); - }} - > - - Description: - - - {#if event_location_obj?.description} + - 
    {event_location_obj.description}
    +
    - {:else} - {@html ae_snip.html__not_set} - {/if} - +
    - {/if} --> -     + + {#if !$events_loc.pres_mgmt.show_content__location_devices_sessions || $events_loc.pres_mgmt.show_content__location_devices_sessions == 'default' || $events_loc.pres_mgmt.show_content__location_devices_sessions == 'sessions'} + + {#if event_location_obj?.event_location_id_random} + + + {/if} + {:else if $events_loc.pres_mgmt.show_content__location_devices_sessions == 'devices'} + + {#if event_location_obj?.event_location_id_random} + + + {/if} + {/if} + + + + + +
    - - - {#if event_location_obj?.event_location_id_random} - - - {/if} - - - - - - -
    • {/each} diff --git a/src/routes/events/[event_id]/locations/locations_page_menu.svelte b/src/routes/events/[event_id]/locations/locations_page_menu.svelte index bcf98348..7a903200 100644 --- a/src/routes/events/[event_id]/locations/locations_page_menu.svelte +++ b/src/routes/events/[event_id]/locations/locations_page_menu.svelte @@ -9,13 +9,14 @@ import { events_func } from '$lib/ae_events_functions'; import Element_ae_crud from '$lib/element_ae_crud.svelte'; import Element_data_store from '$lib/element_data_store_v2.svelte'; +import Comp__events_menu_nav from './../../ae_comp__events_menu_nav.svelte'; // export let event_location_id: string; export let lq__event_obj: any; // export let lq__auth__event_presenter_obj: any; -let ae_tmp: key_val = {}; -let ae_triggers: key_val = {}; +// let ae_tmp: key_val = {}; +// let ae_triggers: key_val = {}; @@ -30,18 +31,18 @@ let ae_triggers: key_val = {};
    - - - - Back to Session Search - - + + + + + + + + + + + +
    diff --git a/src/routes/events/[event_id]/reports/+page.svelte b/src/routes/events/[event_id]/reports/+page.svelte index fede6e70..cc1ca47e 100644 --- a/src/routes/events/[event_id]/reports/+page.svelte +++ b/src/routes/events/[event_id]/reports/+page.svelte @@ -503,12 +503,14 @@ async function handle_qry__event_session(
    @@ -516,19 +518,35 @@ async function handle_qry__event_session( xl:bg-green-200 --> -{#if $lq__event_obj} -
    - -

    Presentations - Reports

    -
    -{/if} - - +{#if !$lq__event_obj} + +
    + + Loading event information... +
    + +{:else} + +

    + + + Reports + + + {#if $lq__event_obj?.cfg_json?.short_name} + {@html $lq__event_obj?.cfg_json.short_name ?? ae_snip.html__not_set} + {:else} + {@html $lq__event_obj?.name ?? ae_snip.html__not_set} + {/if} +

    +
    @@ -933,6 +951,8 @@ async function handle_qry__event_session( {/if} +{/if} +
    diff --git a/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte b/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte index 36705a72..67721e33 100644 --- a/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte +++ b/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte @@ -32,8 +32,7 @@ let ae_triggers: key_val = {}; hide={!$ae_loc.authenticated_access} event_id={$lq__event_obj?.event_id} ae_core={$ae_loc.administrator_access} - events__locations={$ae_loc.administrator_access} - events__reports={$ae_loc.trusted_access} + events__locations={$ae_loc.trusted_access} events__session_search={$events_slct.event_id} /> diff --git a/src/routes/events/ae_comp__events_menu_nav.svelte b/src/routes/events/ae_comp__events_menu_nav.svelte index 040d5e57..9fa65f79 100644 --- a/src/routes/events/ae_comp__events_menu_nav.svelte +++ b/src/routes/events/ae_comp__events_menu_nav.svelte @@ -49,7 +49,8 @@ export let events__session_search: boolean = false; // event_id class="{ae_snip.classes__events_pres_mgmt_menu__button}" class:hidden={!events__locations} > - + + Locations diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte index e5741396..1c4ddd97 100644 --- a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte @@ -46,11 +46,13 @@ let ae_triggers: key_val = {}; +
    Pres Mgmt Reports + + + + Locations +