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

Better (less) logging and other clean up

Browse Source
This commit is contained in:
Scott Idem
2024-06-24 15:51:30 -04:00
parent 0c4185f74c
commit c6b7c7e803
18 changed files with 1240 additions and 768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1814
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

5
src/lib/ae_events__event.ts
View File

@@ -106,9 +106,10 @@ export async function handle_load_ae_obj_li__event(
console.log('No results returned or failed.', error);
});
console.log('ae_promises.load__event_obj_li:', ae_promises.load__event_obj_li);
if (log_lvl) {
console.log('ae_promises.load__event_obj_li:', ae_promises.load__event_obj_li);
}
return ae_promises.load__event_obj_li;
}

4
src/lib/ae_events__event_badge.ts
View File

@@ -261,7 +261,9 @@ export async function handle_search__event_badge(
// return badge_obj_li_get_result;
});
console.log('ae_promises.search__event_badge:', ae_promises.search__event_badge);
if (log_lvl) {
console.log('ae_promises.search__event_badge:', ae_promises.search__event_badge);
}
return ae_promises.search__event_badge;
}

4
src/lib/ae_events__event_file.ts
View File

@@ -107,7 +107,9 @@ export async function handle_load_ae_obj_li__event_file(
console.log('No results returned or failed.', error);
});
console.log('ae_promises.load__event_file_obj_li:', ae_promises.load__event_file_obj_li);
if (log_lvl) {
console.log('ae_promises.load__event_file_obj_li:', ae_promises.load__event_file_obj_li);
}
return ae_promises.load__event_file_obj_li;
}

4
src/lib/ae_events__event_presentation.ts
View File

@@ -106,7 +106,9 @@ export async function handle_load_ae_obj_li__event_presentation(
console.log('No results returned or failed.', error);
});
console.log('ae_promises.load__event_presentation_obj_li:', ae_promises.load__event_presentation_obj_li);
if (log_lvl) {
console.log('ae_promises.load__event_presentation_obj_li:', ae_promises.load__event_presentation_obj_li);
}
return ae_promises.load__event_presentation_obj_li;
}

8
src/lib/ae_events__event_presenter.ts
View File

@@ -106,7 +106,9 @@ export async function handle_load_ae_obj_li__event_presenter(
console.log('No results returned or failed.', error);
});
console.log('ae_promises.load__event_presenter_obj_li:', ae_promises.load__event_presenter_obj_li);
if (log_lvl) {
console.log('ae_promises.load__event_presenter_obj_li:', ae_promises.load__event_presenter_obj_li);
}
return ae_promises.load__event_presenter_obj_li;
}
@@ -153,7 +155,9 @@ export async function handle_update_ae_obj__event_presenter(
.finally(function () {
});
console.log('ae_promises.update__event_presenter_obj:', ae_promises.update__event_presenter_obj);
if (log_lvl) {
console.log('ae_promises.update__event_presenter_obj:', ae_promises.update__event_presenter_obj);
}
return ae_promises.update__event_presenter_obj;
}

8
src/lib/ae_events__event_session.ts
View File

@@ -107,7 +107,9 @@ export async function handle_load_ae_obj_li__event_session(
console.log('No results returned or failed.', error);
});
console.log('ae_promises.load__event_session_obj_li:', ae_promises.load__event_session_obj_li);
if (log_lvl) {
console.log('ae_promises.load__event_session_obj_li:', ae_promises.load__event_session_obj_li);
}
return ae_promises.load__event_session;
}
@@ -225,7 +227,9 @@ export async function handle_search__event_session(
.finally(function () {
});
console.log('ae_promises.load__event_session_obj_li:', ae_promises.load__event_session_obj_li);
if (log_lvl) {
console.log('ae_promises.load__event_session_obj_li:', ae_promises.load__event_session_obj_li);
}
return ae_promises.load__event_session_obj_li;
}

62
src/lib/ae_events__exhibit.ts
View File

@@ -146,53 +146,13 @@ export async function handle_load_ae_obj_li__exhibit(
// return exhibit_obj_li_get_result;
});
console.log('ae_promises.load__event_exhibit_obj_li:', ae_promises.load__event_exhibit_obj_li);
if (log_lvl) {
console.log('ae_promises.load__event_exhibit_obj_li:', ae_promises.load__event_exhibit_obj_li);
}
return ae_promises.load__event_exhibit_obj_li;
}
// // This function will loop through the badge_obj_li and save each one to the DB.
// function handle_db_save_ae_obj_li({obj_type, obj_li}) {
// console.log(`*** handle_db_save_ae_obj_li() ***`);
// if (obj_li && obj_li.length) {
// obj_li.forEach(async function (obj) {
// // console.log(`ae_obj ${obj_type}:`, obj);
// try {
// const id_random = await db_events.badges.put({
// id_random: obj.event_badge_id_random,
// full_name: obj.full_name,
// full_name_override: obj.full_name_override,
// email: obj.email,
// email_override: obj.email_override,
// affiliations: obj.affiliations,
// affiliations_override: obj.affiliations_override,
// badge_type: obj.badge_type,
// badge_type_override: obj.badge_type_override,
// badge_type_code: obj.badge_type_code,
// badge_type_code_override: obj.badge_type_code_override,
// external_event_id: obj.external_event_id,
// external_id: obj.external_id,
// external_person_id: obj.external_person_id,
// created_on: obj.created_on,
// updated_on: obj.updated_on,
// });
// console.log(`Put obj with ID: ${obj.event_badge_id_random} or ${id_random}`);
// } catch (error) {
// let status = `Failed to put ${obj.event_badge_id_random}: ${error}`;
// console.log(status);
// }
// // const id_random = await db_events.badges.put(obj);
// // console.log(`Put obj with ID: ${obj.event_badge_id_random}`);
// });
// return true;
// }
// }
export async function handle_load_ae_obj_id__exhibit_tracking(
{
api_cfg,
@@ -299,7 +259,9 @@ export async function handle_load_ae_obj_li__exhibit_tracking(
// return exhibit_tracking_obj_li_get_result;
});
console.log('ae_promises.load__event_exhibit_tracking_obj_li:', ae_promises.load__event_exhibit_tracking_obj_li);
if (log_lvl) {
console.log('ae_promises.load__event_exhibit_tracking_obj_li:', ae_promises.load__event_exhibit_tracking_obj_li);
}
return ae_promises.load__event_exhibit_tracking_obj_li;
}
@@ -360,7 +322,9 @@ export async function handle_create_ae_obj__exhibit_tracking(
// return exhibit_tracking_obj_create_result;
});
console.log('ae_promises.create__event_exhibit_tracking:', ae_promises.create__event_exhibit_tracking);
if (log_lvl) {
console.log('ae_promises.create__event_exhibit_tracking:', ae_promises.create__event_exhibit_tracking);
}
return ae_promises.create__event_exhibit_tracking;
}
@@ -407,7 +371,9 @@ export async function handle_update_ae_obj__exhibit_tracking(
.finally(function () {
});
console.log('ae_promises.update__event_exhibit_tracking:', ae_promises.update__event_exhibit_tracking);
if (log_lvl) {
console.log('ae_promises.update__event_exhibit_tracking:', ae_promises.update__event_exhibit_tracking);
}
return ae_promises.update__event_exhibit_tracking;
}
@@ -451,7 +417,9 @@ export async function handle_download_export__event_exhibit_tracking(
log_lvl: log_lvl
});
console.log('ae_promises.download__event_exhibit_tracking_export_file:', ae_promises.download__event_exhibit_tracking_export_file);
if (log_lvl) {
console.log('ae_promises.download__event_exhibit_tracking_export_file:', ae_promises.download__event_exhibit_tracking_export_file);
}
return ae_promises.download__event_exhibit_tracking_export_file;
}

13
src/lib/api_get_object.ts
View File

@@ -119,12 +119,16 @@ export let get_object = async function get_object(
let percent_completed = Math.round(
(progressEvent.loaded * 100) / progressEvent.total
);
console.log('GET Data Progress:', progressEvent.progress, 'Total:', progressEvent.total, 'Loaded:', progressEvent.loaded, 'Percent Completed', percent_completed);
if (log_lvl) {
console.log('GET Data Progress:', progressEvent.progress, 'Total:', progressEvent.total, 'Loaded:', progressEvent.loaded, 'Percent Completed', percent_completed);
}
temp_get_object_percent_completed = percent_completed;
// WARNING: This needs to be tied to an object type and ID. This is a temporary solution.
try {
// Check if window is defined. This is to prevent errors in SvelteKit.
if (typeof window !== 'undefined') {
window.postMessage({
type: 'api_download_data',
status: 'downloading',
@@ -137,6 +141,7 @@ export let get_object = async function get_object(
},
'*'
);
}
} catch (error) {
console.log('Error posting message to window:', error);
}
@@ -153,6 +158,7 @@ export let get_object = async function get_object(
// Post file download message
try {
if (typeof window !== 'undefined') {
window.postMessage({
type: 'api_download_data',
status: 'complete',
@@ -165,6 +171,7 @@ export let get_object = async function get_object(
},
'*'
);
}
} catch (error) {
console.log('Error posting message to window:', error);
}
@@ -287,6 +294,7 @@ export let get_object = async function get_object(
// WARNING: This needs to be tied to an object type and ID. This is a temporary solution.
try {
if (typeof window !== 'undefined') {
window.postMessage({
type: 'api_download_blob',
status: 'downloading',
@@ -299,6 +307,7 @@ export let get_object = async function get_object(
},
'*'
);
}
} catch (error) {
console.log('Error posting message to window:', error);
}
@@ -325,6 +334,7 @@ export let get_object = async function get_object(
// WARNING: This needs to be tied to an object type and ID. This is a temporary solution.
try {
if (typeof window !== 'undefined') {
window.postMessage({
type: 'api_download_blob',
status: 'complete',
@@ -337,6 +347,7 @@ export let get_object = async function get_object(
},
'*'
);
}
} catch (error) {
console.log('Error posting message to window:', error);
}

16
src/lib/db_events.ts
View File

@@ -44,6 +44,7 @@ export interface Event {
file_count: number;
}
export interface Badge {
// id?: number;
id_random: string;
@@ -104,6 +105,7 @@ export interface Badge {
updated_on: null|Date;
}
export interface Exhibit {
// id?: number;
id_random: string;
@@ -135,6 +137,7 @@ export interface Exhibit {
updated_on: null|Date;
}
export interface Exhibit_tracking {
// id?: number;
id_random: string;
@@ -184,6 +187,11 @@ export interface Exhibit_tracking {
updated_on: null|Date;
}
export interface Registration {
// Nothing here yet
}
export interface File {
id: string;
id_random: string;
@@ -229,6 +237,12 @@ export interface File {
hosted_file_size: number; // In bytes
}
export interface Location {
// Nothing here yet
}
// Updated 2024-06-19
export interface Session {
id: string;
@@ -295,6 +309,7 @@ export interface Session {
event_location_name: null|string;
}
// Updated 2024-06-10
export interface Presentation {
id: string;
@@ -346,6 +361,7 @@ export interface Presentation {
event_session_name: null|string;
}
// Updated 2024-06-10
export interface Presenter {
id: string;

11
src/lib/element_data_store.svelte
View File

@@ -18,15 +18,15 @@ export let for_type: null|string = null;
export let for_id: null|string = null;
console.log(`ae_e_data_store ${ds_code} for_type=${for_type} for_id=${for_id} account_id=${$ae_loc.account_id}`);
export let store: string = 'local';
export let display: string = 'block';
// export let store: string = 'local';
// export let display: string = 'block';
export let class_li: string = ''; // : string[] = [];
export let try_cache: boolean = true;
export let show_edit: boolean = false;
export let show_edit_btn: boolean = true;
export let show_view: boolean = true;
export let show_delete_btn: boolean = false;
// export let show_delete_btn: boolean = false;
export let ds_loaded: boolean = false;
@@ -410,7 +410,7 @@ async function handle_create__data_store({
obj_type: obj_type,
fields: data,
key: $ae_api.api_crud_super_key,
log_lvl: 2
log_lvl: 1
})
.then(async function (create__obj_result) {
if (!create__obj_result) {
@@ -750,8 +750,7 @@ async function handle_update__data_store({
<!-- {/if} -->
{:else}
<!-- Nothing to see yet -->
{/if}
<!-- Text:

2
src/routes/+layout.svelte
View File

@@ -89,7 +89,7 @@ $slct = {
...$slct,
...ae_acct.slct,
}
console.log(`$slct = `, $slct);
// console.log(`$slct = `, $slct);
if ($ae_loc.site_cfg_json.slct__event_id) {
$events_slct.event_id = $ae_loc.site_cfg_json.slct__event_id;

2
src/routes/events_pres_mgmt/+layout.svelte
View File

@@ -24,7 +24,7 @@ $events_loc.qry__offset = 0;
$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(`ae_acct = `, ae_acct);
$events_slct.event_id = ae_acct.slct.event_id;
$events_slct.event_obj = ae_acct.slct.event_obj;

10
src/routes/events_pres_mgmt/+layout.ts
View File

@@ -5,20 +5,22 @@ import { events_func } from '$lib/ae_events_functions';
export async function load({ parent }) {
let log_lvl = 0;
let data = await parent();
// console.log(`ae_events_pres_mgmt +layout.ts data:`, data);
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 +layout.ts: The account_id was not found in the data!!!`);
return false;
}
let ae_acct = data[account_id];
if (log_lvl) {
console.log(`ae_acct = `, ae_acct);
}
// // Should we limit these to event.conference = true?
// let load_event_obj_li = events_func.handle_load_ae_obj_li__event({
// api_cfg: ae_acct.api,

4
src/routes/events_pres_mgmt/+page.svelte
View File

@@ -1,6 +1,6 @@
<script lang="ts">
export let data: any;
console.log(`ae_events_pres_mgmt +page data:`, data);
// console.log(`ae_events_pres_mgmt +page data:`, data);
// console.log(`ae_events_pres_mgmt Data Params:`, data.url.searchParams.get('event_id'));
import { onMount } from 'svelte';
@@ -12,7 +12,7 @@ import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores';
import { ae_util } from '$lib/ae_utils';
import Element_data_store from '$lib/element_data_store.svelte';
// import Element_data_store from '$lib/element_data_store.svelte';
let ae_acct = data[$slct.account_id];

9
src/routes/events_pres_mgmt/+page.ts
View File

@@ -1,12 +1,21 @@
/** @type {import('./$types').PageLoad} */
import { error } from '@sveltejs/kit';
import { events_func } from '$lib/ae_events_functions';
export async function load({ parent }) {
let log_lvl = 0;
let data = await parent();
let account_id = data.account_id;
if (!account_id) {
console.log(`events_pres_mgmt +page.ts: The account_id was not found in the data!!!`);
error(500, {
message: 'Not found'
});
}
let ae_acct = data[account_id];
// Should we limit these to event.conference = true?

9
src/routes/events_pres_mgmt/session/[slug]/+page.svelte
View File

@@ -4,15 +4,14 @@ export let data: any;
// console.log(`ae_events_pres_mgmt event [slug] +page.svelte data:`, data);
import { onMount } from 'svelte';
import { goto, invalidate, pushState, replaceState } from '$app/navigation';
import { clipboard, FileDropzone, getModalStore, localStorageStore, ProgressRadial, RadioGroup, RadioItem, TabGroup, Tab, TabAnchor } from '@skeletonlabs/skeleton';
import { clipboard } from '@skeletonlabs/skeleton';
import type { key_val } from '$lib/ae_stores';
import { ae_util } from '$lib/ae_utils';
import { api, send_email } from '$lib/api';
import Element_data_store from '$lib/element_data_store.svelte';
import Element_ae_crud from '$lib/element_ae_crud.svelte';
// import Element_data_store from '$lib/element_data_store.svelte';
let ae_promises: key_val = {};
let ae_tmp: key_val = {};
@@ -30,9 +29,9 @@ import Presenter_view from './presenter_view.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);
// console.log(`$slct.account_id = `, $slct.account_id);
let ae_acct = data[$slct.account_id];
console.log(`ae_acct = `, ae_acct);
// console.log(`ae_acct = `, ae_acct);
$ae_loc.url_origin = data.url.origin;

23
src/routes/events_pres_mgmt/session/[slug]/+page.ts
View File

@@ -4,6 +4,7 @@ console.log(`ae_events_pres_mgmt_event [slug] +page.ts start`);
import { events_func } from '$lib/ae_events_functions';
export async function load({ parent }) { // route
let log_lvl = 0;
// console.log(`ae_events_pres_mgmt_event +page.ts data.params:`, params);
// console.log(`ae_events_pres_mgmt_event +page.ts data.route:`, route);
// console.log(`ae_events_pres_mgmt_event +page.ts data.url:`, url);
@@ -13,7 +14,7 @@ export async function load({ parent }) { // route
let account_id = data.account_id;
let ae_acct = data[account_id];
console.log(`ae_acct = `, ae_acct);
// console.log(`ae_acct = `, ae_acct);
if (!account_id) {
console.log(`events_pres_mgmt_event [slug] +page.ts: The account_id was not found in the data!!!`);
@@ -43,7 +44,9 @@ export async function load({ parent }) { // route
try_cache: false
})
.then((event_presentation_obj_li) => {
console.log(`event_presentation_obj_li = `, event_presentation_obj_li);
if (log_lvl) {
console.log(`event_presentation_obj_li = `, event_presentation_obj_li);
}
for (let index = 0; index < event_presentation_obj_li.length; index++) {
let event_presentation_obj = event_presentation_obj_li[index];
let event_presentation_id = event_presentation_obj.event_presentation_id_random;
@@ -54,7 +57,9 @@ export async function load({ parent }) { // route
params: {enabled: 'all', qry__limit: 15},
try_cache: false
});
console.log(`load_event_presenter_obj_li = `, load_event_presenter_obj_li);
if (log_lvl) {
console.log(`load_event_presenter_obj_li = `, load_event_presenter_obj_li);
}
event_presentation_obj_li[index].event_presenter_li = load_event_presenter_obj_li;
// ae_acct.slct.event_presentation_obj_li[index].event_presenter_obj_li = load_event_presenter_obj_li;
}
@@ -63,7 +68,9 @@ export async function load({ parent }) { // route
return event_presentation_obj_li;
});
console.log(`load_event_presentation_obj_li = `, load_event_presentation_obj_li);
if (log_lvl) {
console.log(`load_event_presentation_obj_li = `, load_event_presentation_obj_li);
}
ae_acct.slct.event_presentation_obj_li = load_event_presentation_obj_li;
let load_event_file_obj_li = await events_func.handle_load_ae_obj_li__event_file({
@@ -73,10 +80,14 @@ export async function load({ parent }) { // route
try_cache: false
})
.then((event_file_obj_li) => {
console.log(`event_file_obj_li = `, event_file_obj_li);
if (log_lvl) {
console.log(`event_file_obj_li = `, event_file_obj_li);
}
return event_file_obj_li;
});
console.log(`load_event_file_obj_li = `, load_event_file_obj_li);
if (log_lvl) {
console.log(`load_event_file_obj_li = `, load_event_file_obj_li);
}
ae_acct.slct.event_file_obj_li = load_event_file_obj_li;
// WARNING: Precaution against shared data between sites and presentations.