diff --git a/src/lib/ae_events_stores.ts b/src/lib/ae_events_stores.ts index 19263be1..1fc0b360 100644 --- a/src/lib/ae_events_stores.ts +++ b/src/lib/ae_events_stores.ts @@ -117,7 +117,9 @@ let events_local_data_struct: key_val = { show_content__presentation_code: true, show_content__presenter_code: true, - time_format: 'time_us_short', // 'time_short', 'time_us_short' + datetime_format: 'datetime_12_long', + time_format: 'time_12_short', + time_hours: 12, // 12 or 24 slct: { event_id: null, @@ -179,6 +181,10 @@ let events_local_data_struct: key_val = { // Presentation Management (Distributing) 'pres_mgmt': { + datetime_format: 'datetime_12_long', + time_format: 'time_12_short', + time_hours: 12, // 12 or 24 + qry_enabled: 'enabled', // all, disabled, enabled qry_hidden: 'not_hidden', // all, hidden, not_hidden qry_limit__files: 75, @@ -232,7 +238,7 @@ let events_local_data_struct: key_val = { show_report__presenters_agree: false, show_report__recent_files: false, - // time_format: 'time_us_short', // 'time_short', 'time_us_short' + // time_format: 'time_12_short', // 'time_short', 'time_12_short' disable_submit__opt_out: true, submit_status__opt_out: null, diff --git a/src/lib/ae_utils__datetime_format.ts b/src/lib/ae_utils__datetime_format.ts index d08e32b0..51c871f3 100644 --- a/src/lib/ae_utils__datetime_format.ts +++ b/src/lib/ae_utils__datetime_format.ts @@ -3,6 +3,7 @@ import dayjs from 'dayjs'; export let iso_datetime_formatter = function iso_datetime_formatter( raw_datetime: null|string|Date = null, named_format: string = 'datetime_iso_no_seconds', // date_iso, datetime_iso_no_seconds + time_24_hours: boolean = false ) { // console.log('*** iso_datetime_formatter() ***'); @@ -22,7 +23,7 @@ export let iso_datetime_formatter = function iso_datetime_formatter( // datetime_iso_12_short 'YY-MM-DD hh:mm A' // datetime_iso_tz 'YYYY-MM-DD HH:mm:ss' - // datetime_us_no_seconds 'YYYY-MM-DD hh:mm A' + // datetime_12_no_seconds 'YYYY-MM-DD hh:mm A' // datetime_long 'dddd, MMMM D, YYYY hh:mm:ss A' // datetime_medium 'ddd, MMM D, YYYY hh:mm:ss A' @@ -62,16 +63,25 @@ 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': + case 'datetime_12_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'); + break; + case 'datetime_12_short': datetime_string = dayjs(raw_datetime).format('MMM D, YY hh:mm A'); break; case 'datetime_medium': + datetime_string = dayjs(raw_datetime).format('MMM D, YYYY H:mm'); + break; + case 'datetime_12_medium': datetime_string = dayjs(raw_datetime).format('MMM D, YYYY h:mm A'); break; case 'datetime_long': + datetime_string = dayjs(raw_datetime).format('MMMM D, YYYY HH:mm'); + break; + case 'datetime_12_long': datetime_string = dayjs(raw_datetime).format('MMMM D, YYYY hh:mm A'); break; case 'datetime_short_month': @@ -116,10 +126,10 @@ export let iso_datetime_formatter = function iso_datetime_formatter( case 'time_short_no_leading': datetime_string = dayjs(raw_datetime).format('H:mm'); break; - case 'time_us_short': + case 'time_12_short': datetime_string = dayjs(raw_datetime).format('hh:mm A'); break; - case 'time_us_short_no_leading': + case 'time_12_short_no_leading': datetime_string = dayjs(raw_datetime).format('h:mm A'); break; case 'week_long': diff --git a/src/lib/element_manage_event_file_li.svelte b/src/lib/element_manage_event_file_li.svelte index ffe905aa..a54e3320 100644 --- a/src/lib/element_manage_event_file_li.svelte +++ b/src/lib/element_manage_event_file_li.svelte @@ -540,14 +540,14 @@ onMount(() => { {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'date_iso')} at - {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_us_short_no_leading')} + {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_12_short_no_leading')} {:else} {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'date_short')} - {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_us_short_no_leading')} + {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_12_short_no_leading')} {/if} diff --git a/src/routes/core/ae_comp__person_obj_tbl.svelte b/src/routes/core/ae_comp__person_obj_tbl.svelte index 31b2c5b4..4f6f6df3 100644 --- a/src/routes/core/ae_comp__person_obj_tbl.svelte +++ b/src/routes/core/ae_comp__person_obj_tbl.svelte @@ -122,9 +122,9 @@ let lq_kv__person_obj_li = liveQuery( {/if} - {ae_util.iso_datetime_formatter(person_obj?.created_on, 'datetime_us_no_seconds')} + {ae_util.iso_datetime_formatter(person_obj?.created_on, 'datetime_12_no_seconds')}
- {ae_util.iso_datetime_formatter(person_obj?.updated_on, 'datetime_us_no_seconds')} + {ae_util.iso_datetime_formatter(person_obj?.updated_on, 'datetime_12_no_seconds')} {/each} diff --git a/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte b/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte index 667e401f..14b4ad91 100644 --- a/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte +++ b/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte @@ -82,7 +82,7 @@ $: if ($events_slct.exhibit_id) {
Started: - {ae_util.iso_datetime_formatter($events_loc.leads.auth_exhibit_kv[$events_slct.exhibit_id].updated_on, 'datetime_long')} + {ae_util.iso_datetime_formatter($events_loc.leads.auth_exhibit_kv[$events_slct.exhibit_id].updated_on, 'datetime_12_long')}
diff --git a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_session_view.svelte b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_session_view.svelte index d95e0323..58b0ddc6 100644 --- a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_session_view.svelte +++ b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/launcher_session_view.svelte @@ -145,23 +145,24 @@ ae_promises[$events_loc.launcher.slct.event_session_id] = events_func.load_ae_ob class="event_session_datetimes" >

@@ -314,7 +315,7 @@ ae_promises[$events_loc.launcher.slct.event_session_id] = events_func.load_ae_ob
{#if event_presentation_obj?.start_datetime} - {ae_util.iso_datetime_formatter(event_presentation_obj?.start_datetime, 'time_us_short_no_leading')} + {ae_util.iso_datetime_formatter(event_presentation_obj?.start_datetime, 'time_12_short_no_leading')} {/if} {event_presentation_obj?.name} diff --git a/src/routes/events_pres_mgmt/ae_comp__event_file_obj_tbl.svelte b/src/routes/events_pres_mgmt/ae_comp__event_file_obj_tbl.svelte index 19532537..ee5192e3 100644 --- a/src/routes/events_pres_mgmt/ae_comp__event_file_obj_tbl.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__event_file_obj_tbl.svelte @@ -186,7 +186,7 @@ let lq_kv__event_file_obj_li = liveQuery(
- {ae_util.iso_datetime_formatter(event_file_obj?.created_on, 'time_us_short')} + {ae_util.iso_datetime_formatter(event_file_obj?.created_on, 'time_12_short')} {#if show_location_fields} @@ -210,7 +210,7 @@ let lq_kv__event_file_obj_li = liveQuery( {event_file_obj?.event_session_name} - {ae_util.iso_datetime_formatter(event_file_obj?.event_session_start_datetime, 'datetime_us_no_seconds')} + {ae_util.iso_datetime_formatter(event_file_obj?.event_session_start_datetime, 'datetime_12_no_seconds')} {/if} {#if show_presentation_fields} @@ -222,7 +222,7 @@ let lq_kv__event_file_obj_li = liveQuery( {#if event_file_obj?.event_presentation_id_random} - {ae_util.iso_datetime_formatter(event_file_obj?.event_presentation_start_datetime, 'time_us_short')} + {ae_util.iso_datetime_formatter(event_file_obj?.event_presentation_start_datetime, 'time_12_short')} {:else} {@html ae_snip.html__not_set} {/if} 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 cf76b375..467a0b6e 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 @@ -116,15 +116,15 @@ let lq_kv__event_presenter_obj_li = liveQuery( {event_presenter_obj?.event_session_name} - {ae_util.iso_datetime_formatter(event_presenter_obj?.event_session_start_datetime, 'datetime_us_no_seconds')} + {ae_util.iso_datetime_formatter(event_presenter_obj?.event_session_start_datetime, 'datetime_12_no_seconds')} {/if} {#if show_presentation_fields} {event_presenter_obj?.event_presentation_name} - {ae_util.iso_datetime_formatter(event_presenter_obj?.event_presentation_start_datetime, 'time_us_short')} + {ae_util.iso_datetime_formatter(event_presenter_obj?.event_presentation_start_datetime, 'time_12_short')} {/if} - {ae_util.iso_datetime_formatter(event_presenter_obj?.updated_on, 'datetime_us_no_seconds')} + {ae_util.iso_datetime_formatter(event_presenter_obj?.updated_on, 'datetime_12_no_seconds')} {/each} 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 06208a82..aa66d394 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 @@ -215,13 +215,13 @@ let lq_kv__event_session_obj_li = liveQuery( {#if session_obj?.start_datetime} - {ae_util.iso_datetime_formatter(session_obj?.start_datetime,'time_us_short')} + {ae_util.iso_datetime_formatter(session_obj?.start_datetime,'time_12_short')} - {ae_util.iso_datetime_formatter(session_obj?.end_datetime,'time_us_short')} + {ae_util.iso_datetime_formatter(session_obj?.end_datetime,'time_12_short')} {:else} {@html ae_snip.html__not_set} diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li_v2.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li_v2.svelte index 14de5097..253f1562 100644 --- a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li_v2.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li_v2.svelte @@ -209,13 +209,13 @@ if (browser) { {#if session_obj?.start_datetime} - {ae_util.iso_datetime_formatter(session_obj?.start_datetime,'time_us_short')} + {ae_util.iso_datetime_formatter(session_obj?.start_datetime,'time_12_short')} - {ae_util.iso_datetime_formatter(session_obj?.end_datetime,'time_us_short')} + {ae_util.iso_datetime_formatter(session_obj?.end_datetime,'time_12_short')} {:else} {@html ae_snip.html__not_set} diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_tbl.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_tbl.svelte index 3a14346b..d5ab976d 100644 --- a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_tbl.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_tbl.svelte @@ -87,7 +87,7 @@ let lq_kv__event_session_obj_li = liveQuery( - {ae_util.iso_datetime_formatter(event_session_obj?.start_datetime, 'datetime_us_no_seconds')} + {ae_util.iso_datetime_formatter(event_session_obj?.start_datetime, 'datetime_12_no_seconds')} {event_session_obj?.event_location_name} diff --git a/src/routes/events_pres_mgmt/session_view.svelte b/src/routes/events_pres_mgmt/session_view.svelte index 4179409b..c598f08a 100644 --- a/src/routes/events_pres_mgmt/session_view.svelte +++ b/src/routes/events_pres_mgmt/session_view.svelte @@ -252,7 +252,22 @@ $: if ($lq__event_session_obj) { }} > {ae_util.iso_datetime_formatter($lq__event_session_obj.start_datetime, 'dddd')}, - {ae_util.iso_datetime_formatter($lq__event_session_obj.start_datetime, 'datetime_long')} + - - {ae_util.iso_datetime_formatter($lq__event_session_obj.end_datetime, 'time_us_short')} + {ae_util.iso_datetime_formatter($lq__event_session_obj.end_datetime, $events_loc.launcher.time_format)}