From 47c742d0049d0bf3f2efb7aff4867e3eac8a7732 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Thu, 11 Jul 2024 17:44:43 -0400 Subject: [PATCH] Wrapping up for the day. The first report looks pretty good. --- src/lib/ae_utils__datetime_format.ts | 44 +++++++++++-------- .../ae_comp__event_presenter_obj_tbl.svelte | 21 +++++++-- .../ae_comp__event_session_obj_li.svelte | 4 +- .../event/[slug]/reports/+page.svelte | 6 ++- .../session/[slug]/+page.svelte | 2 +- 5 files changed, 52 insertions(+), 25 deletions(-) diff --git a/src/lib/ae_utils__datetime_format.ts b/src/lib/ae_utils__datetime_format.ts index f3337532..f29408b6 100644 --- a/src/lib/ae_utils__datetime_format.ts +++ b/src/lib/ae_utils__datetime_format.ts @@ -17,29 +17,31 @@ export let iso_datetime_formatter = function iso_datetime_formatter( // ISO 8601 UTC: 2021-03-04T19:04:44Z // ISO 8601 UTC: 20210304T190444Z - //datetime_iso 'YYYY-MM-DD HH:mm:ss' - //datetime_iso_12 'YYYY-MM-DD hh:mm:ss A' - //datetime_iso_12_short 'YY-MM-DD hh:mm A' - //datetime_iso_tz 'YYYY-MM-DD HH:mm:ss' + // datetime_iso 'YYYY-MM-DD HH:mm:ss' + // datetime_iso_12 'YYYY-MM-DD hh:mm:ss A' + // datetime_iso_12_short 'YY-MM-DD hh:mm A' + // datetime_iso_tz 'YYYY-MM-DD HH:mm:ss' - //datetime_long 'dddd, MMMM D, YYYY hh:mm:ss A' - //datetime_medium 'ddd, MMM D, YYYY hh:mm:ss A' - //datetime_short 'MMM D, YY hh:mm A' + // datetime_us_no_seconds 'YYYY-MM-DD hh:mm A' - //date_iso 'YYYY-MM-DD' + // datetime_long 'dddd, MMMM D, YYYY hh:mm:ss A' + // datetime_medium 'ddd, MMM D, YYYY hh:mm:ss A' + // datetime_short 'MMM D, YY hh:mm A' - //date_long 'dddd, MMMM D, YYYY' - //date_medium 'ddd, MMM D, YYYY' - //date_short 'MMM D, YY' + // date_iso 'YYYY-MM-DD' - //time_iso 'HH:mm:ss' - //time_iso_12 'hh:mm:ss A' + // date_long 'dddd, MMMM D, YYYY' + // date_medium 'ddd, MMM D, YYYY' + // date_short 'MMM D, YY' - //time_long 'hh:mm:ss A' - //time_medium 'h:m:s A' - //time_short 'hh:mm A' + // time_iso 'HH:mm:ss' + // time_iso_12 'hh:mm:ss A' - //dayjs(raw_datetime).format('dddd, MMMM D, YYYY hh:mm:ss A'); + // time_long 'hh:mm:ss A' + // time_medium 'h:m:s A' + // time_short 'hh:mm A' + + // dayjs(raw_datetime).format('dddd, MMMM D, YYYY hh:mm:ss A'); if (!raw_datetime) { raw_datetime = new Date(); // Get the current datetime if one was not passed. @@ -60,6 +62,9 @@ export let iso_datetime_formatter = function iso_datetime_formatter( case 'datetime_iso_12_short_month': datetime_string = dayjs(raw_datetime).format('MM-DD hh:mm A'); break; + case 'datetime_us_no_seconds': + datetime_string = dayjs(raw_datetime).format('YYYY-MM-DD hh:mm A'); + break; case 'datetime_short': datetime_string = dayjs(raw_datetime).format('MMM D, YY hh:mm A'); break; @@ -106,11 +111,14 @@ export let iso_datetime_formatter = function iso_datetime_formatter( datetime_string = dayjs(raw_datetime).format('hh:mm:ss A'); break; case 'time_short': - datetime_string = dayjs(raw_datetime).format('hh:mm A'); + datetime_string = dayjs(raw_datetime).format('HH:mm'); break; case 'time_short_no_leading': datetime_string = dayjs(raw_datetime).format('h:mm A'); break; + case 'time_us_short': + datetime_string = dayjs(raw_datetime).format('hh:mm A'); + break; case 'week_long': datetime_string = dayjs(raw_datetime).format('dddd'); break; diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte index 787ee8c6..cc4178c7 100644 --- a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte @@ -1,6 +1,7 @@ -
+
{#if event_presenter_id_random_li && $lq_kv__event_presenter_obj_li && $lq_kv__event_presenter_obj_li?.length > 0} +
@@ -47,6 +49,7 @@ let lq_kv__event_presenter_obj_li = liveQuery( {/if} {#if show_presentation_fields} + {/if} @@ -60,6 +63,7 @@ let lq_kv__event_presenter_obj_li = liveQuery( class:dim={event_presenter_obj?.hide}> {#if show_session_fields} - + {/if} {#if show_presentation_fields} + {/if} - + {/each}
PresentationStart timeName Email + {event_presenter_obj?.event_session_start_datetime}{ae_util.iso_datetime_formatter(event_presenter_obj?.event_session_start_datetime, 'datetime_us_no_seconds')}{event_presenter_obj?.event_presentation_name}{ae_util.iso_datetime_formatter(event_presenter_obj?.event_presentation_start_time, 'time_us_short')} + {event_presenter_obj?.email} + + + {event_presenter_obj?.email} + + {event_presenter_obj?.agree ? 'Yes' : 'No'} {event_presenter_obj?.file_count ?? '0'}
+
{/if}
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 008bf64d..f0473b42 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 @@ -190,13 +190,13 @@ let lq_kv__event_session_obj_li = liveQuery( {#if session_obj?.start_datetime} - {ae_util.iso_datetime_formatter(session_obj?.start_datetime,'time_short')} + {ae_util.iso_datetime_formatter(session_obj?.start_datetime,'time_us_short')} – - {ae_util.iso_datetime_formatter(session_obj?.end_datetime,'time_short')} + {ae_util.iso_datetime_formatter(session_obj?.end_datetime,'time_us_short')} {:else} {@html ae_snip.html__not_set} diff --git a/src/routes/events_pres_mgmt/event/[slug]/reports/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/reports/+page.svelte index ca4869a6..3910fa34 100644 --- a/src/routes/events_pres_mgmt/event/[slug]/reports/+page.svelte +++ b/src/routes/events_pres_mgmt/event/[slug]/reports/+page.svelte @@ -156,7 +156,7 @@ handle_search__event_presenter({ - Event: {ae_util.shorten_string({string: $lq__event_obj?.name, max_length: 12})} + Reports: {ae_util.shorten_string({string: $lq__event_obj?.name, max_length: 12})} ({$lq__event_obj?.event_id}) - Pres Mgmt - {$events_loc?.title} @@ -303,12 +303,16 @@ handle_search__event_presenter({ {#if $events_loc.pres_mgmt.show_report__presenters_agree && event_presenter_id_random_li?.length > 0} + +
+
+ {/if}