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

Removing old code. Standardizing the event related IDB table names. Getting badge printing ready again....

Browse Source
This commit is contained in:
Scott Idem
2025-10-06 14:04:46 -04:00
parent cd03d9e488
commit c3992d8711
10 changed files with 60 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "osit-aether-app-svelte",
"version": "3.6.1",
"version": "3.7.0",
"description": "One Sky IT's Aether App created with Svelte, SvelteKit, Tailwind CSS, Lucide, Font Awesome, and Skeleton UI. -Scott Idem",
"homepage": "https://oneskyit.com/",
"private": true,

8
src/lib/ae_events/ae_events__event.ts
View File

@@ -69,7 +69,7 @@ export async function load_ae_obj_id__event(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'events',
table_name: 'event',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -291,7 +291,7 @@ export async function load_ae_obj_li__event(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'events',
table_name: 'event',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -603,7 +603,7 @@ export async function create_ae_obj__event(
}
db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'events',
table_name: 'event',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -730,7 +730,7 @@ export async function update_ae_obj__event(
}
db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'events',
table_name: 'event',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,

250
src/lib/ae_events/ae_events__event_badge.ts
View File

@@ -41,7 +41,7 @@ export async function load_ae_obj_id__event_badge({
});
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'badges',
table_name: 'badge',
obj_li: processed_obj_li,
properties_to_save,
log_lvl,
@@ -113,7 +113,7 @@ export async function load_ae_obj_li__event_badge({
});
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'badges',
table_name: 'badge',
obj_li: processed_obj_li,
properties_to_save,
log_lvl,
@@ -171,7 +171,7 @@ export async function create_ae_obj__event_badge({
});
db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'badges',
table_name: 'badge',
obj_li: processed_obj_li,
properties_to_save,
log_lvl,
@@ -270,7 +270,7 @@ export async function update_ae_obj__event_badge({
});
db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'badges',
table_name: 'badge',
obj_li: processed_obj_li,
properties_to_save,
log_lvl,
@@ -436,7 +436,7 @@ export async function search__event_badge({
});
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'badges',
table_name: 'badge',
obj_li: processed_obj_li,
properties_to_save,
log_lvl,
@@ -454,242 +454,6 @@ export async function search__event_badge({
}
export async function handle_search__event_badge(
{
api_cfg,
event_id,
type_code = null,
fulltext_search_qry_str,
like_search_qry_str = null,
external_event_id,
params = {},
try_cache = true,
log_lvl = 0
}: {
api_cfg: any,
event_id: any,
type_code: any,
fulltext_search_qry_str: any,
like_search_qry_str: any,
external_event_id: any,
params: any,
try_cache: boolean,
log_lvl: number
}
) {
console.log(`*** handle_search__event_badge() *** event_id=${event_id}`);
let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled
let hidden: string = (params.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden
let limit: number = (params.qry__limit ?? 25); // 99
let offset: number = (params.qry__offset ?? 0); // 0
let params_json: key_val = {};
if (!fulltext_search_qry_str && !like_search_qry_str) {
console.log('No search string provided!!!');
return false; // Returning false instead of [] because no search was performed.
}
if (fulltext_search_qry_str && fulltext_search_qry_str.length > 2) {
params_json['ft_qry'] = {
'default_qry_str': fulltext_search_qry_str,
// 'location_address_json_ext': fulltext_search_qry_str, // JSON extracted text DB field
// 'contact_li_json_ext': fulltext_search_qry_str, // JSON extracted text DB field
};
}
if (like_search_qry_str && like_search_qry_str.length > 2) {
// Old Python version that needs to be in JS
// # Strip (left right) whitespace then commas then semicolons
// query_str = query_str.strip().strip(',').strip(';')
// # Replace commas, semicolons, and then spaces with %
// query_str_like = query_str.replace(',', ' ').replace(';', ' ').replace(' ', '%').replace(' ', '%')
// # data['query_str'] = f'%{query_str}%'
// log.debug(query_str_like)
// data['query_str'] = f'%{query_str_like}%'
// let like_search_qry_str_new = like_search_qry_str.trim().replace(',', ' ').replace(';', ' ').replace(' ', '%').replace(' ', '%');
// like_search_qry_str_new = `%${like_search_qry_str_new}%`;
// console.log('like_search_qry_str_new:', like_search_qry_str_new);
params_json['and_like'] = {
'default_qry_str': like_search_qry_str,
};
}
params_json['and_qry'] = {};
if (external_event_id) {
params_json['and_qry']['external_event_id'] = external_event_id;
}
if (type_code) { // This is the event_badge.badge_type_code. There is also a member_type_code and registration_type_code that could be referenced in the future.
params_json['and_qry']['badge_type_code'] = type_code;
}
let order_by_li = {'print_count': 'ASC', 'priority': 'DESC', 'sort': 'DESC', 'given_name': 'ASC', 'family_name': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'};
// $events_sess.badges.status_qry__search = 'loading';
ae_promises.search__event_badge = await api.get_ae_obj_li_for_obj_id_crud({
api_cfg: api_cfg,
obj_type: 'event_badge',
for_obj_type: 'event',
for_obj_id: event_id,
use_alt_table: false, // NOTE: This will use the table_name_alt value instead of the table_name value in the API config.
use_alt_base: false, // NOTE: This will use the base_name_alt value instead of the base_name value in the API config.
enabled: enabled,
hidden: hidden,
order_by_li: order_by_li,
// order_by_li: {'priority': 'DESC', 'sort': 'DESC', 'created_on': 'DESC', 'updated_on': 'DESC'},
limit: limit,
offset: offset,
params_json: params_json,
params: params,
log_lvl: log_lvl
})
.then(function (badge_obj_li_get_result) {
// console.log('Badge list:', badge_obj_li_get_result);
if (badge_obj_li_get_result) {
// $slct.badge_obj_li = badge_obj_li_get_result;
handle_db_save_ae_obj_li__badge({obj_type: 'event_badge', obj_li: badge_obj_li_get_result});
return badge_obj_li_get_result;
} else {
// $slct.badge_obj_li = [];
return [];
}
})
.catch(function (error) {
console.log('No results returned or failed.', error);
})
.finally(function () {
// $events_sess.badges.status_qry__search = 'done';
// console.log('Badge list:', badge_obj_li_get_result);
// return badge_obj_li_get_result;
});
if (log_lvl) {
console.log('ae_promises.search__event_badge:', ae_promises.search__event_badge);
}
return ae_promises.search__event_badge;
}
// This function will loop through the badge_obj_li and save each one to the DB.
export function handle_db_save_ae_obj_li__badge(
{
obj_type,
obj_li,
log_lvl = 0
}: {
obj_type: string,
obj_li: any,
log_lvl?: number
}
) {
if (log_lvl) {
console.log(`*** handle_db_save_ae_obj_li__badge() ***`);
}
if (obj_li && obj_li.length) {
obj_li.forEach(async function (obj: any) {
if (log_lvl) {
console.log(`ae_obj ${obj_type}:`, obj);
}
try {
const id_random = await db_events.badges.put({
id: obj.event_badge_id_random,
// id_random: obj.event_badge_id_random,
event_badge_id: obj.event_badge_id_random,
event_badge_id_random: obj.event_badge_id_random,
event_id: obj.event_id_random,
event_id_random: obj.event_id_random,
pronouns: obj.pronouns,
informal_name: obj.informal_name,
title_names: obj.title_names,
given_name: obj.given_name,
middle_name: obj.middle_name,
family_name: obj.family_name,
designations: obj.designations,
professional_title: obj.professional_title,
professional_title_override: obj.professional_title_override,
full_name: obj.full_name,
full_name_override: obj.full_name_override,
affiliations: obj.affiliations,
affiliations_override: obj.affiliations_override,
email: obj.email,
email_override: obj.email_override,
address_line_1: obj.address_line_1,
address_line_2: obj.address_line_2,
address_line_3: obj.address_line_3,
city: obj.city,
country_subdivision_code: obj.country_subdivision_code,
state_province: obj.state_province,
state_province_abb: obj.state_province_abb,
postal_code: obj.postal_code,
country_alpha_2_code: obj.country_alpha_2_code,
country: obj.country,
full_address: obj.full_address,
location: obj.location,
location_override: obj.location_override,
query_str: obj.query_str,
badge_type: obj.badge_type,
badge_type_code: obj.badge_type_code,
badge_type_override: obj.badge_type_override,
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,
alert: obj.alert,
enable: obj.enable,
hide: obj.hide,
priority: obj.priority,
sort: obj.sort,
group: obj.group,
notes: obj.notes,
created_on: obj.created_on,
updated_on: obj.updated_on,
tmp_sort_1: obj.tmp_sort_1,
tmp_sort_2: obj.tmp_sort_2,
person_external_id: obj.person_external_id,
person_external_sys_id: obj.person_external_sys_id,
person_given_name: obj.person_given_name,
person_family_name: obj.person_family_name,
person_full_name: obj.person_full_name,
person_professional_title: obj.person_professional_title,
person_affiliations: obj.person_affiliations,
person_primary_email: obj.person_primary_email,
person_passcode: obj.person_passcode,
});
// 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;
}
}
// Updated 2025-10-06
export async function db_save_ae_obj_li__event_badge({
obj_type,
@@ -709,7 +473,7 @@ export async function db_save_ae_obj_li__event_badge({
}
return await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'badges',
table_name: 'badge',
obj_li,
properties_to_save,
log_lvl,
@@ -894,4 +658,4 @@ export async function process_ae_obj__event_badge_props({
processed_obj_li.push(processed_obj);
}
return processed_obj_li;
}
}

8
src/lib/ae_events/ae_events__event_device.ts
View File

@@ -53,7 +53,7 @@ export async function load_ae_obj_id__event_device(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'devices',
table_name: 'device',
obj_li: processed_obj_li,
properties_to_save,
log_lvl,
@@ -181,7 +181,7 @@ export async function load_ae_obj_li__event_device(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'devices',
table_name: 'device',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -290,7 +290,7 @@ export async function create_ae_obj__event_device(
}
db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'devices',
table_name: 'device',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -422,7 +422,7 @@ export async function update_ae_obj__event_device(
}
db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'devices',
table_name: 'device',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,

10
src/lib/ae_events/ae_events__event_file.ts
View File

@@ -53,7 +53,7 @@ export async function load_ae_obj_id__event_file(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'files',
table_name: 'file',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -156,7 +156,7 @@ export async function load_ae_obj_li__event_file(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'files',
table_name: 'file',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -353,7 +353,7 @@ export async function update_ae_obj__event_file(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'files',
table_name: 'file',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -494,7 +494,7 @@ export async function qry__event_file(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'files',
table_name: 'file',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -646,7 +646,7 @@ export async function search__event_file(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'files',
table_name: 'file',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,

8
src/lib/ae_events/ae_events__event_location.ts
View File

@@ -57,7 +57,7 @@ export async function load_ae_obj_id__event_location(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'locations',
table_name: 'location',
obj_li: processed_obj_li,
properties_to_save,
log_lvl,
@@ -219,7 +219,7 @@ export async function load_ae_obj_li__event_location(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'locations',
table_name: 'location',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -393,7 +393,7 @@ export async function create_ae_obj__event_location(
}
db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'locations',
table_name: 'location',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -525,7 +525,7 @@ export async function update_ae_obj__event_location(
}
db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'locations',
table_name: 'location',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,

8
src/lib/ae_events/ae_events__event_presentation.ts
View File

@@ -68,7 +68,7 @@ export async function load_ae_obj_id__event_presentation(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'presentations',
table_name: 'presentation',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -245,7 +245,7 @@ export async function load_ae_obj_li__event_presentation(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'presentations',
table_name: 'presentation',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -398,7 +398,7 @@ export async function create_ae_obj__event_presentation(
}
db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'presentations',
table_name: 'presentation',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -530,7 +530,7 @@ export async function update_ae_obj__event_presentation(
}
db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'presentations',
table_name: 'presentation',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,

8
src/lib/ae_events/ae_events__event_presenter.ts
View File

@@ -65,7 +65,7 @@ export async function load_ae_obj_id__event_presenter(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'presenters',
table_name: 'presenter',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -198,7 +198,7 @@ export async function load_ae_obj_li__event_presenter(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'presenters',
table_name: 'presenter',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -318,7 +318,7 @@ export async function create_ae_obj__event_presenter(
}
db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'presenters',
table_name: 'presenter',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -450,7 +450,7 @@ export async function update_ae_obj__event_presenter(
}
db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'presenters',
table_name: 'presenter',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,

12
src/lib/ae_events/ae_events__event_session.ts
View File

@@ -73,7 +73,7 @@ export async function load_ae_obj_id__event_session(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'sessions',
table_name: 'session',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -254,7 +254,7 @@ export async function load_ae_obj_li__event_session(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'sessions',
table_name: 'session',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -414,7 +414,7 @@ export async function create_ae_obj__event_session(
}
db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'sessions',
table_name: 'session',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -547,7 +547,7 @@ export async function update_ae_obj__event_session(
}
db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'sessions',
table_name: 'session',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -737,7 +737,7 @@ export async function qry__event_session(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'presenters',
table_name: 'presenter',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,
@@ -914,7 +914,7 @@ export async function search__event_session(
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'sessions',
table_name: 'session',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl,

41
src/lib/ae_events/db_events.ts
View File

@@ -98,6 +98,7 @@ export interface Event {
}
// Updated 2025-10-06
export interface Badge {
id: number;
// id_random: string;
@@ -723,23 +724,23 @@ export interface Session {
// Updated 2024-10-16
export class MySubClassedDexie extends Dexie {
// 'badges' is added by dexie when declaring the stores()
// 'badge' is added by dexie when declaring the stores()
// We just tell the typing system this is the case
events!: Table<Event>;
badges!: Table<Badge>;
devices!: Table<Device>;
exhibits!: Table<Exhibit>;
event!: Table<Event>;
badge!: Table<Badge>;
device!: Table<Device>;
exhibit!: Table<Exhibit>;
exhibit_tracking!: Table<Exhibit_tracking>;
files!: Table<File>;
locations!: Table<Location>;
presentations!: Table<Presentation>;
presenters!: Table<Presenter>;
sessions!: Table<Session>;
file!: Table<File>;
location!: Table<Location>;
presentation!: Table<Presentation>;
presenter!: Table<Presenter>;
session!: Table<Session>;
constructor() {
super('ae_events_db');
this.version(5).stores({
events: `
event: `
id, event_id, event_id_random,
code,
account_id, account_id_random,
@@ -751,8 +752,8 @@ export class MySubClassedDexie extends Dexie {
tmp_sort_1, tmp_sort_2,
enable, hide, priority, sort, group, notes, created_on, updated_on`,
// badges: '++id, full_name, email' // Primary key and indexed props
badges: `
// badge: '++id, full_name, email' // Primary key and indexed props
badge: `
id, id_random, event_badge_id, event_badge_id_random,
event_id, event_id_random,
full_name, full_name_override, email, email_override,
@@ -763,7 +764,7 @@ export class MySubClassedDexie extends Dexie {
tmp_sort_1, tmp_sort_2,
enable, hide, priority, sort, group, notes, created_on, updated_on`,
devices: `
device: `
id, id_random, event_device_id_random, event_device_id,
event_id, event_id_random, event_location_id, event_location_id_random,
code, name,
@@ -772,7 +773,7 @@ export class MySubClassedDexie extends Dexie {
tmp_sort_1, tmp_sort_2,
enable, hide, priority, sort, group, notes, created_on, updated_on`,
exhibits: `
exhibit: `
id, id_random, event_exhibit_id, event_exhibit_id_random,
event_id, event_id_random,
code, name, description, staff_passcode,
@@ -787,7 +788,7 @@ export class MySubClassedDexie extends Dexie {
event_badge_full_name, event_badge_email,
enable, hide, priority, sort, group, notes, created_on, updated_on`,
files: `
file: `
id, id_random, event_file_id, event_file_id_random,
hosted_file_id, hosted_file_id_random,
hash_sha256,
@@ -799,7 +800,7 @@ export class MySubClassedDexie extends Dexie {
tmp_sort_1, tmp_sort_2,
enable, hide, priority, sort, group, created_on, updated_on`,
locations: `
location: `
id, event_location_id, event_location_id_random,
external_id, code,
event_id, event_id_random,
@@ -811,7 +812,7 @@ export class MySubClassedDexie extends Dexie {
tmp_sort_1, tmp_sort_2,
enable, hide, priority, sort, group, created_on, updated_on`,
presentations: `
presentation: `
id, event_presentation_id, event_presentation_id_random,
external_id, code,
for_type, for_id, for_id_random,
@@ -823,7 +824,7 @@ export class MySubClassedDexie extends Dexie {
tmp_sort_1, tmp_sort_2,
enable, hide, priority, sort, group, created_on, updated_on`,
presenters: `
presenter: `
id, event_presenter_id, event_presenter_id_random,
external_id, code,
event_id, event_session_id, event_person_id, event_presentation_id,
@@ -837,7 +838,7 @@ export class MySubClassedDexie extends Dexie {
tmp_sort_1, tmp_sort_2,
enable, hide, priority, sort, group, created_on, updated_on`,
sessions: `
session: `
id, event_session_id, event_session_id_random,
external_id, code,
for_type, for_id, for_id_random,