Working on dealing with the QR codes re-generating too easily.

This commit is contained in:
Scott Idem
2024-08-15 18:04:14 -04:00
parent 46cc89ad92
commit 002c283c68
5 changed files with 71 additions and 22 deletions

View File

@@ -1,9 +1,11 @@
<script lang="ts">
console.log(`ae_events_pres_mgmt presenter_view.svelte`);
export let log_lvl = 1;
import { createEventDispatcher, onMount } from 'svelte';
import { clipboard, FileDropzone } from '@skeletonlabs/skeleton';
import { liveQuery } from "dexie";
import { browser } from '$app/environment';
const dispatch = createEventDispatcher();
@@ -29,6 +31,7 @@ export let lq__event_presentation_obj: any;
let ae_placeholder_li: key_val = {};
let ae_promises: key_val = {}; // Promise<any>;
let ae_promises_2: key_val = {}; // Promise<any>;
let ae_tmp: key_val = {};
ae_tmp.show__file_li = true;
@@ -67,9 +70,16 @@ let lq__event_file_obj_li = liveQuery(
// ae_tmp.biography = '';
ae_tmp.biography = null;
console.log(`ae_tmp.biography:`, ae_tmp.biography);
$: if ($lq__event_presenter_obj?.biography && ae_tmp.biography === null) {
// WHAT WAS THIS FOR HERE??? // ae_tmp.biography = JSON.parse(JSON.stringify($lq__event_presenter_obj?.biography ?? ''));
// ae_tmp.biography = $lq__event_presenter_obj?.biography ?? '';
// console.log(`ae_tmp.biography:`, ae_tmp.biography);
// $: if ($lq__event_presenter_obj?.biography && ae_tmp.biography === null) {
// // WHAT WAS THIS FOR HERE??? // ae_tmp.biography = JSON.parse(JSON.stringify($lq__event_presenter_obj?.biography ?? ''));
// ae_tmp.biography = $lq__event_presenter_obj?.biography ?? '';
// console.log(`ae_tmp.biography:`, ae_tmp.biography);
// }
$: if (browser && ae_tmp.biography === null && $lq__event_presenter_obj?.biography) {
ae_tmp.biography = $lq__event_presenter_obj?.biography ?? '';
console.log(`ae_tmp.biography:`, ae_tmp.biography);
}
@@ -168,7 +178,7 @@ async function handle_input_upload_files(input_upload_files) {
api_cfg: $ae_api,
hosted_file_id: hosted_file_id,
data: event_file_data,
log_lvl: 2
log_lvl: 1
})
.then(function (create_result) {
console.log(create_result); // NOTE: This should be the event_file_id string
@@ -250,10 +260,19 @@ async function handle_delete__event_file({event_file_id}) {
return ae_promises.delete__event_file_obj;
}
// $events_slct.event_presenter_obj = $lq__event_presenter_obj
ae_promises.generate_qr_code_url = null;
$: if ($lq__event_presenter_obj) {
if (log_lvl) {
console.log(`$lq__event_presenter_obj:`, $lq__event_presenter_obj);
}
// Generate a QR code for the object ID.
// ae_promises.generate_qr_code_obj_id = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'obj', qr_id: $lq__event_presenter_obj?.event_presenter_id_random, obj_type: 'event_presenter', obj_id: $lq__event_presenter_obj?.event_presenter_id_random});
// if ($lq__event_presenter_obj?.updated_on != $events_slct?.event_presenter_obj?.updated_on) {
// Generate a QR code for the URL.
let qr_id_url = `${$lq__event_presenter_obj?.event_presenter_id_random}_url`;
@@ -261,7 +280,23 @@ $: if ($lq__event_presenter_obj) {
let url_str = `${$ae_loc.url_origin}/events_pres_mgmt/presenter/${$lq__event_presenter_obj?.event_presenter_id_random}`;
url_str = encodeURI(url_str);
ae_promises.generate_qr_code_url = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'str', qr_id: qr_id_url, str: url_str});
// if ($events_sess.pres_mgmt.presenter__url_str == url_str) {
if ($lq__event_presenter_obj.updated_on == $events_sess.pres_mgmt.presenter__updated_on) {
if (log_lvl > 1) {
console.log('Updated on is the same.');
}
} else {
if (log_lvl) {
console.log('Updated on is different.');
}
ae_promises.generate_qr_code_url = core_func.generate_qr_code({api_cfg: $ae_api, account_id: $slct.account_id, qr_type: 'str', qr_id: qr_id_url, str: url_str});
$events_sess.pres_mgmt.presenter__url_str = url_str;
$events_sess.pres_mgmt.presenter__updated_on = $lq__event_presenter_obj.updated_on;
}
}
</script>
@@ -397,35 +432,29 @@ $: if ($lq__event_presenter_obj) {
</h3>
{#await ae_promises.generate_qr_code_obj_id}
<!-- {#await ae_promises.generate_qr_code_obj_id}
Generating...
{:then result}
{#if ae_promises.generate_qr_code_obj_id}
<!-- {img_obj_url} -->
<span class="float-right flex flex-col items-center justify-center">
<img
class="qr_code qr_type_obj_id h-32 w-32 hover:h-48 hover:w-48 hidden"
class="qr_code qr_type_obj_id h-32 w-32 hover:h-48 hover:w-48"
class:hidden={!$ae_loc.manager_access}
style=""
src={result}
alt="Object ID QR code"
/>
<!-- src="{$cfg.api['base_url']}/qr/{$client.account_id}/{event_badge_obj.event_badge_id_random}?filename=qr_{$client.account_id}_{event_badge_obj.event_badge_id_random}_mecard.png" -->
<!-- src={qr_img_src} -->
<!-- on:dblclick={() => {
// (hide_qr) ? hide_qr = !hide_qr : hide_qr;
(hide_qr) ? hide_qr = false : hide_qr = true;
}} -->
<span>
<span class="fas fa-qrcode"></span>
Presenter ID
</span>
</span>
{/if}
{/await}
{/await} -->
{#await ae_promises.generate_qr_code_url}
Generating...
<!-- Generating... -->
{:then result}
{#if ae_promises.generate_qr_code_url && $ae_loc.trusted_access}
<span class="float-right m-1 p-1 flex flex-col items-center justify-center outline outline-gray-200 *:hover:inline">