Work on CRUD v2 API calls. Added sessions without files report.
This commit is contained in:
@@ -97,7 +97,8 @@ let lq_kv__event_file_obj_li = liveQuery(
|
||||
class="">
|
||||
{#each $lq_kv__event_file_obj_li as event_file_obj}
|
||||
<tr
|
||||
class:dim={event_file_obj?.hide}>
|
||||
class:dim={event_file_obj?.hide}
|
||||
>
|
||||
<td class="px-4 py-2">
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,114 @@
|
||||
<script lang="ts">
|
||||
// Imports
|
||||
|
||||
import { onMount } from 'svelte';
|
||||
|
||||
import type { key_val } from '$lib/ae_stores';
|
||||
|
||||
import { liveQuery } from "dexie";
|
||||
import { browser } from '$app/environment';
|
||||
import { core_func } from '$lib/ae_core_functions';
|
||||
import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
|
||||
import { ae_util } from '$lib/ae_utils';
|
||||
// Imports - events specific
|
||||
import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
|
||||
import { db_events } from "$lib/db_events";
|
||||
import { events_func } from '$lib/ae_events_functions';
|
||||
|
||||
// Exports
|
||||
export let container_class_li: string|Array<string> = [];
|
||||
// export let link_to_type: string;
|
||||
// export let link_to_id: string;
|
||||
// export let event_presenter_id_random_li: Array<string> = [''];
|
||||
export let event_session_id_random_li: Array<string>;
|
||||
// export let allow_basic: boolean = false;
|
||||
// export let allow_moderator: boolean = false;
|
||||
|
||||
// export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher';
|
||||
|
||||
// Functions and Logic
|
||||
if (browser) {
|
||||
console.log('Pres Mgmt [comp]: +ae_comp__event_session_obj_tbl.svelte');
|
||||
}
|
||||
|
||||
let lq_kv__event_session_obj_li = liveQuery(
|
||||
() => db_events.sessions
|
||||
.bulkGet(event_session_id_random_li)
|
||||
);
|
||||
</script>
|
||||
|
||||
|
||||
<section class="ae_comp event_session_obj_tbl container {container_class_li}">
|
||||
|
||||
{#if event_session_id_random_li && event_session_id_random_li?.length > 0 && $events_slct.event_session_obj_li?.length == $lq_kv__event_session_obj_li?.length}
|
||||
|
||||
<div class="container overflow-auto">
|
||||
<h2 class="h3">
|
||||
<span class="text-base">
|
||||
Results:
|
||||
</span>
|
||||
|
||||
{#if $lq_kv__event_session_obj_li?.length}
|
||||
<span class="text-3xl font-bold bg-success-100 px-4 border rounded-lg border-success-200"
|
||||
title="Count {$lq_kv__event_session_obj_li.length ?? 'None'}"
|
||||
>
|
||||
<span class="fas fa-list-ol mx-4"></span>
|
||||
{$lq_kv__event_session_obj_li.length ?? 'None'}
|
||||
</span>
|
||||
{/if}
|
||||
</h2>
|
||||
|
||||
<table
|
||||
class="table table-auto table-striped table-hover w-full text-xs lg:text-sm"
|
||||
>
|
||||
<thead
|
||||
class=""
|
||||
>
|
||||
<tr>
|
||||
<th class="px-4 py-2">Name</th>
|
||||
<th class="px-4 py-2">Start Datetime</th>
|
||||
<th class="px-4 py-2">Location</th>
|
||||
<th class="px-4 py-2">Session Files</th>
|
||||
<th class="px-4 py-2">Presenter Files</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody
|
||||
class="">
|
||||
{#each $lq_kv__event_session_obj_li as event_session_obj, index}
|
||||
<tr
|
||||
class:dim={event_session_obj?.hide}
|
||||
>
|
||||
<td class="px-4 py-2">
|
||||
<a
|
||||
href="/events/pres_mgmt/{event_session_obj?.event_id_random}/session/{event_session_obj?.event_session_id_random}"
|
||||
class="text-blue-500 hover:text-blue-800 hover:underline"
|
||||
>
|
||||
{event_session_obj?.name}
|
||||
</a>
|
||||
</td>
|
||||
<td class="px-4 py-2">
|
||||
{ae_util.iso_datetime_formatter(event_session_obj?.start_datetime, 'datetime_us_no_seconds')}
|
||||
</td>
|
||||
<td class="px-4 py-2">
|
||||
{event_session_obj?.event_location_name}
|
||||
</td>
|
||||
<td class="px-4 py-2">
|
||||
{event_session_obj?.file_count ?? '0'}
|
||||
</td>
|
||||
<td class="px-4 py-2">
|
||||
{event_session_obj?.file_count_all ?? '0'}
|
||||
</td>
|
||||
</tr>
|
||||
{/each}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{:else}
|
||||
<p class="text-sm">
|
||||
No sessions found.
|
||||
</p>
|
||||
{/if}
|
||||
|
||||
|
||||
</section>
|
||||
@@ -11,6 +11,7 @@ import { ae_util } from '$lib/ae_utils';
|
||||
// import Element_ae_crud from '$lib/element_ae_crud.svelte';
|
||||
import Element_data_store from '$lib/element_data_store.svelte';
|
||||
import Comp_event_file_obj_tbl from '../../../ae_comp__event_file_obj_tbl.svelte';
|
||||
import Comp_event_session_obj_tbl from '../../../ae_comp__event_session_obj_tbl.svelte';
|
||||
// import Comp_event_presenter_obj_li from '../../../ae_comp__event_presenter_obj_li.svelte';
|
||||
import Comp_event_presenter_obj_tbl from '../../../ae_comp__event_presenter_obj_tbl.svelte';
|
||||
|
||||
@@ -37,10 +38,10 @@ let lq__event_obj = liveQuery(
|
||||
() => db_events.events.get($events_slct.event_id)
|
||||
);
|
||||
|
||||
let event_file_id_random_li: string[] = []; // ['NPKOzGFKZZU'];
|
||||
let event_session_id_random_li: string[] = ['VSBH-19-41-50'];
|
||||
let event_presentation_id_random_li: string[] = ['VSBH-19-41-50'];
|
||||
let event_presenter_id_random_li: string[] = [];// ['I245hLQ4aek'];
|
||||
let event_file_id_random_li: string[];
|
||||
let event_session_id_random_li: string[] = [];
|
||||
// let event_presentation_id_random_li: string[] = [];
|
||||
let event_presenter_id_random_li: string[] = [];
|
||||
|
||||
let load_obj_li_results: Promise<any>|key_val;
|
||||
let search_submit_results: Promise<any>|key_val;
|
||||
@@ -62,8 +63,6 @@ onMount(() => {
|
||||
|
||||
async function handle_search__event_file(
|
||||
{
|
||||
api_cfg,
|
||||
event_id,
|
||||
created_on = null,
|
||||
ft_search_str = '',
|
||||
lk_search_str = '',
|
||||
@@ -72,11 +71,9 @@ async function handle_search__event_file(
|
||||
'qry__hidden': $events_loc.pres_mgmt.qry_hidden ?? 'not_hidden',
|
||||
'qry__limit': $events_loc.pres_mgmt.qry_limit__session ?? 35,
|
||||
},
|
||||
try_cache=false,
|
||||
try_cache=true,
|
||||
log_lvl=0,
|
||||
}: {
|
||||
api_cfg: any,
|
||||
event_id: string,
|
||||
created_on?: null|string,
|
||||
ft_search_str?: string,
|
||||
lk_search_str?: string,
|
||||
@@ -141,23 +138,18 @@ async function handle_search__event_file(
|
||||
|
||||
async function handle_search__event_presenter(
|
||||
{
|
||||
api_cfg,
|
||||
event_id,
|
||||
agree = null,
|
||||
biography = null,
|
||||
ft_search_str = '',
|
||||
lk_search_str = '',
|
||||
search_delay = 0,
|
||||
max_tries = 5,
|
||||
params = {
|
||||
'qry__enabled': 'enabled',
|
||||
'qry__hidden': 'not_hidden',
|
||||
'qry__limit': 200,},
|
||||
try_cache=false,
|
||||
'qry__enabled': $events_loc.pres_mgmt.qry_enabled ?? 'enabled',
|
||||
'qry__hidden': $events_loc.pres_mgmt.qry_hidden ?? 'not_hidden',
|
||||
'qry__limit': $events_loc.pres_mgmt.qry_limit__presenters ?? 200,
|
||||
},
|
||||
try_cache=true,
|
||||
log_lvl=0,
|
||||
}: {
|
||||
api_cfg: any,
|
||||
event_id: string,
|
||||
agree?: null|boolean,
|
||||
biography?: null|boolean,
|
||||
ft_search_str?: string,
|
||||
@@ -226,19 +218,84 @@ async function handle_search__event_presenter(
|
||||
});
|
||||
}
|
||||
|
||||
// handle_search__event_presenter({
|
||||
// api_cfg: $ae_api,
|
||||
// event_id: $events_slct.event_id,
|
||||
// agree: true,
|
||||
// ft_search_str: '',
|
||||
// lk_search_str: '',
|
||||
// params: {
|
||||
// 'qry__enabled': 'enabled',
|
||||
// 'qry__hidden': 'not_hidden',
|
||||
// 'qry__limit': 35,},
|
||||
// try_cache: false,
|
||||
// log_lvl: 0,
|
||||
// });
|
||||
async function handle_qry__event_session(
|
||||
{
|
||||
qry_files = false,
|
||||
// file_count = false,
|
||||
// file_count_all = null,
|
||||
// ft_search_str = '',
|
||||
// lk_search_str = '',
|
||||
params = {
|
||||
'qry__enabled': $events_loc.pres_mgmt.qry_enabled ?? 'enabled',
|
||||
'qry__hidden': $events_loc.pres_mgmt.qry_hidden ?? 'not_hidden',
|
||||
'qry__limit': $events_loc.pres_mgmt.qry_limit__session ?? 150,
|
||||
},
|
||||
log_lvl=2,
|
||||
}: {
|
||||
qry_files?: boolean,
|
||||
// file_count?: boolean,
|
||||
// file_count_all?: null|number,
|
||||
// ft_search_str?: string,
|
||||
// lk_search_str?: string,
|
||||
params?: key_val,
|
||||
log_lvl?: number,
|
||||
}
|
||||
) {
|
||||
console.log('handle_qry__event_session()');
|
||||
|
||||
$events_sess.pres_mgmt.status_qry__search = 'loading';
|
||||
$events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt.show_report] = 'loading';
|
||||
|
||||
ae_promises.handle_qry__event_session = events_func.handle_qry__event_session({
|
||||
api_cfg: $ae_api,
|
||||
event_id: $events_slct.event_id,
|
||||
// file_count_all: file_count_all,
|
||||
// fulltext_search_qry_str: ft_search_str,
|
||||
// like_search_qry_str: lk_search_str,
|
||||
// external_event_id: $events_loc.pres_mgmt.default__external_registration_id,
|
||||
qry_files: qry_files,
|
||||
params: params,
|
||||
log_lvl: log_lvl,
|
||||
})
|
||||
.then(function (search_results) {
|
||||
// Processing the results from the search.
|
||||
$events_sess.pres_mgmt.status_qry__search = 'processing';
|
||||
$events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt.show_report] = 'processing';
|
||||
$events_slct.event_session_obj_li = search_results;
|
||||
console.log(search_results);
|
||||
// $events_sess.pres_mgmt.status_qry__search = 'done';
|
||||
})
|
||||
.finally(() => {
|
||||
if (log_lvl) {
|
||||
console.log('TEST SEARCH - Search done. Pulling out the event_session_id_randoms.');
|
||||
}
|
||||
// console.log(`TEST search: ${$lq_kv__event_session_obj_li}`);
|
||||
|
||||
event_session_id_random_li = [];
|
||||
|
||||
// We need to loop through the array of objects and get the event_session_id_random from each object a new list of event_session_id_randoms. Then we can use this list to get the full objects from the database.
|
||||
let tmp_li = []; // This is to prevent the array from constantly updating and triggering the liveQuery.
|
||||
if ($events_slct.event_session_obj_li) {
|
||||
for (let i = 0; i < $events_slct.event_session_obj_li.length; i++) {
|
||||
tmp_li.push($events_slct.event_session_obj_li[i].event_session_id_random);
|
||||
}
|
||||
}
|
||||
event_session_id_random_li = tmp_li;
|
||||
|
||||
// event_session_id_random_li = $events_slct.event_session_obj_li.map(session_obj => session_obj.event_session_id_random);
|
||||
|
||||
// Finally done with the search.
|
||||
$events_sess.pres_mgmt.status_qry__search = 'done';
|
||||
$events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt.show_report] = 'done';
|
||||
|
||||
if (log_lvl > 1) {
|
||||
console.log(`TEST SEARCH - event_session_id_random_li:`, event_session_id_random_li);
|
||||
// console.log(`TEST SEARCH - search live query: ${$lq_kv__event_session_obj_li}`);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
@@ -253,7 +310,7 @@ async function handle_search__event_presenter(
|
||||
<section
|
||||
class="
|
||||
ae_events_pres_mgmt_event
|
||||
h-full mx-auto
|
||||
md:container h-full mx-auto
|
||||
flex flex-col gap-1
|
||||
py-1 px-2 pb-16
|
||||
items-center
|
||||
@@ -280,23 +337,16 @@ async function handle_search__event_presenter(
|
||||
/>
|
||||
|
||||
|
||||
<div class="variant-ghost-success my-2 p-2 rounded-md flex flex-row items-center">
|
||||
<div class="variant-ghost-success my-2 p-2 rounded-md flex flex-row flex-wrap gap-1 items-center justify-center">
|
||||
|
||||
<button
|
||||
type="button"
|
||||
disabled={!$ae_loc.trusted_access}
|
||||
on:click={() => {
|
||||
ae_promises.handle_search__event_presenter = handle_search__event_presenter({
|
||||
api_cfg: $ae_api,
|
||||
event_id: $events_slct.event_id,
|
||||
agree: true,
|
||||
ft_search_str: '',
|
||||
lk_search_str: '',
|
||||
params: {
|
||||
'qry__enabled': 'enabled',
|
||||
'qry__hidden': 'not_hidden',
|
||||
'qry__limit': $events_sess.pres_mgmt.qry_limit__presenters,},
|
||||
try_cache: false,
|
||||
log_lvl: log_lvl,
|
||||
});
|
||||
$events_sess.pres_mgmt.show_report = 'presenters_agree';
|
||||
@@ -304,7 +354,7 @@ async function handle_search__event_presenter(
|
||||
// $events_sess.pres_mgmt.show_report__presenters_biography = false;
|
||||
// $events_sess.pres_mgmt.show_report__recent_files = false;
|
||||
}}
|
||||
class="btn btn-sm variant-ghost-success hover:variant-filled-success transition-all mx-1"
|
||||
class="btn btn-sm variant-ghost-success hover:variant-filled-success transition-all m-1"
|
||||
title="Show presenters who have agreed to present."
|
||||
>
|
||||
<!-- {#await ae_promises.handle_search__event_presenter}
|
||||
@@ -322,16 +372,9 @@ async function handle_search__event_presenter(
|
||||
disabled={!$ae_loc.trusted_access}
|
||||
on:click={() => {
|
||||
handle_search__event_presenter({
|
||||
api_cfg: $ae_api,
|
||||
event_id: $events_slct.event_id,
|
||||
biography: true,
|
||||
ft_search_str: '',
|
||||
lk_search_str: '',
|
||||
params: {
|
||||
'qry__enabled': 'enabled',
|
||||
'qry__hidden': 'not_hidden',
|
||||
'qry__limit': $events_sess.pres_mgmt.qry_limit__presenters,},
|
||||
try_cache: false,
|
||||
log_lvl: log_lvl,
|
||||
});
|
||||
$events_sess.pres_mgmt.show_report = 'presenters_biography';
|
||||
@@ -339,7 +382,7 @@ async function handle_search__event_presenter(
|
||||
// $events_sess.pres_mgmt.show_report__presenters_agree = false;
|
||||
// $events_sess.pres_mgmt.show_report__recent_files = false;
|
||||
}}
|
||||
class="btn btn-sm variant-ghost-success hover:variant-filled-success transition-all mx-1"
|
||||
class="btn btn-sm variant-ghost-success hover:variant-filled-success transition-all m-1"
|
||||
title="NOT READY YET: Show presenters with bios."
|
||||
>
|
||||
{#if $events_sess.pres_mgmt?.show_report == 'presenters_biography' && $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt?.show_report] == 'loading'}
|
||||
@@ -354,17 +397,9 @@ async function handle_search__event_presenter(
|
||||
disabled={!$ae_loc.trusted_access}
|
||||
on:click={() => {
|
||||
handle_search__event_file({
|
||||
api_cfg: $ae_api,
|
||||
event_id: $events_slct.event_id,
|
||||
created_on: null,
|
||||
ft_search_str: '',
|
||||
lk_search_str: '',
|
||||
params: {
|
||||
'qry__enabled': $events_loc.pres_mgmt.qry_enabled ?? 'enabled',
|
||||
'qry__hidden': $events_loc.pres_mgmt.qry_hidden ?? 'not_hidden',
|
||||
'qry__limit': $events_loc.pres_mgmt.qry_limit__files ?? 35,
|
||||
},
|
||||
try_cache: false,
|
||||
log_lvl: log_lvl,
|
||||
});
|
||||
$events_sess.pres_mgmt.show_report = 'recent_files';
|
||||
@@ -372,7 +407,7 @@ async function handle_search__event_presenter(
|
||||
// $events_sess.pres_mgmt.show_report__presenters_biography = false;
|
||||
// $events_sess.pres_mgmt.show_report__recent_files = !$events_sess.pres_mgmt.show_report__recent_files;
|
||||
}}
|
||||
class="btn btn-sm variant-ghost-success hover:variant-filled-success transition-all mx-1"
|
||||
class="btn btn-sm variant-ghost-success hover:variant-filled-success transition-all m-1"
|
||||
title="Show recent file uploads."
|
||||
>
|
||||
{#if $events_sess.pres_mgmt?.show_report == 'recent_files' && $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt?.show_report] == 'loading'}
|
||||
@@ -387,23 +422,12 @@ async function handle_search__event_presenter(
|
||||
type="button"
|
||||
disabled={!$ae_loc.administrator_access}
|
||||
on:click={() => {
|
||||
handle_search__event_session({
|
||||
api_cfg: $ae_api,
|
||||
event_id: $events_slct.event_id,
|
||||
created_on: null,
|
||||
ft_search_str: '',
|
||||
lk_search_str: '',
|
||||
params: {
|
||||
'qry__enabled': $events_loc.pres_mgmt.qry_enabled ?? 'enabled',
|
||||
'qry__hidden': $events_loc.pres_mgmt.qry_hidden ?? 'not_hidden',
|
||||
'qry__limit': $events_loc.pres_mgmt.qry_limit__files ?? 35,
|
||||
},
|
||||
try_cache: false,
|
||||
log_lvl: log_lvl,
|
||||
handle_qry__event_session({
|
||||
qry_files: false,
|
||||
});
|
||||
$events_sess.pres_mgmt.show_report = 'session_no_files';
|
||||
}}
|
||||
class="btn btn-sm variant-ghost-success hover:variant-filled-success transition-all mx-1"
|
||||
class="btn btn-sm variant-ghost-success hover:variant-filled-success transition-all m-1"
|
||||
title="Show sessions without files uploaded."
|
||||
>
|
||||
{#if $events_sess.pres_mgmt?.show_report == 'session_no_files' && $events_sess.pres_mgmt.status_rpt[$events_sess.pres_mgmt?.show_report] == 'loading'}
|
||||
@@ -459,7 +483,7 @@ async function handle_search__event_presenter(
|
||||
{/if}
|
||||
|
||||
<!-- Show recently uploaded files -->
|
||||
{#if $events_sess.pres_mgmt.show_report == 'recent_files' && event_file_id_random_li?.length > 0}
|
||||
{#if $events_sess.pres_mgmt.show_report == 'recent_files' && event_file_id_random_li}
|
||||
<h3 class="h4 text-center">Recent File Uploads</h3>
|
||||
|
||||
<Comp_event_file_obj_tbl
|
||||
@@ -472,12 +496,23 @@ async function handle_search__event_presenter(
|
||||
</Comp_event_file_obj_tbl>
|
||||
{/if}
|
||||
|
||||
|
||||
<!-- Show sessions without files -->
|
||||
{#if $events_sess.pres_mgmt.show_report == 'session_no_files' && event_session_id_random_li?.length > 0}
|
||||
<h3 class="h4 text-center">Sessions without Files</h3>
|
||||
|
||||
<Comp_event_session_obj_tbl
|
||||
bind:event_session_id_random_li={event_session_id_random_li}
|
||||
>
|
||||
</Comp_event_session_obj_tbl>
|
||||
{/if}
|
||||
|
||||
</section>
|
||||
|
||||
|
||||
<style lang="postcss">
|
||||
/* Use the div.ae_quick_modal_container to block background clicks when using the section.ae_quick_popover. */
|
||||
div.ae_quick_modal_container {
|
||||
/* div.ae_quick_modal_container {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
@@ -485,10 +520,10 @@ div.ae_quick_modal_container {
|
||||
height: 100%;
|
||||
z-index: 100;
|
||||
background-color: hsla(0, 0%, 0%, .5);
|
||||
}
|
||||
} */
|
||||
|
||||
/* The section.ae_quick_popover should be above the rest of the content and centered on the page. */
|
||||
section.ae_quick_popover {
|
||||
/* section.ae_quick_popover {
|
||||
position: fixed;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
@@ -501,5 +536,5 @@ section.ae_quick_popover {
|
||||
|
||||
min-height: 30%;
|
||||
min-width: 80%;
|
||||
}
|
||||
} */
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user