Work on the new session POC functions and permissions. General code clean up and bug fixes.

This commit is contained in:
Scott Idem
2024-09-13 13:20:04 -04:00
parent e7e532f61a
commit 7e610ead67
16 changed files with 264 additions and 128 deletions

View File

@@ -4,7 +4,7 @@ export let log_lvl = 1;
import { clipboard } from '@skeletonlabs/skeleton';
import { liveQuery } from "dexie";
import { Button, Modal } from 'flowbite-svelte';
import { Modal } from 'flowbite-svelte';
// const dispatch = createEventDispatcher();
@@ -183,7 +183,7 @@ $: if ($lq__event_session_obj) {
<strong class="text-sm">Name/Title:</strong> {$lq__event_session_obj.name}
</Element_ae_crud>
{#if !$lq__event_obj?.mod_pres_mgmt_json?.hide__session_code && $events_loc.pres_mgmt.show_content__session_code}
{#if !$events_loc.pres_mgmt?.hide__session_code}
<Element_ae_crud
api_cfg={$ae_api}
object_type={'event_session'}
@@ -421,7 +421,7 @@ $: if ($lq__event_session_obj) {
{/if}
</li>
<li
class:hidden={$lq__event_obj?.mod_pres_mgmt_json.hide__session_poc}
class:hidden={$events_loc.pres_mgmt?.hide__session_poc}
>
<strong class="text-sm">{$events_loc.pres_mgmt?.label__session_poc_name}:</strong>
{#if $lq__event_session_obj?.poc_person_id_random}
@@ -435,7 +435,9 @@ $: if ($lq__event_session_obj) {
</a>
{/if}
{#if $ae_loc.trusted_access}
{#if
$ae_loc.trusted_access ||
$events_loc.auth__kv.session[$lq__event_session_obj?.event_session_id_random] === true}
<!-- Modal toggle -->
<button
class="btn btn-sm variant-soft-primary hover:variant-filled-primary"
@@ -477,14 +479,17 @@ $: if ($lq__event_session_obj) {
</Modal>
{#if $events_loc.pres_mgmt?.require__session_agree}
<!-- Modal toggle -->
<button
type="button"
disabled={!$ae_loc.trusted_access && !$ae_loc.edit_mode}
class="btn btn-sm variant-ghost-primary hover:variant-filled-primary"
class:variant-soft-warning={!$lq__event_session_obj?.poc_kv_json[poc_type]?.agree}
disabled={!$ae_loc.trusted_access &&
!$events_loc.auth__kv.session[$lq__event_session_obj?.event_session_id_random] === true}
class="btn btn-sm hover:variant-filled-success"
class:variant-soft-success={$lq__event_session_obj?.poc_agree}
class:variant-ghost-warning={!$lq__event_session_obj?.poc_agree}
on:click={() => ($events_loc.pres_mgmt.show__session_poc_agree = true)}>
{#if !$lq__event_session_obj?.poc_kv_json[poc_type]?.agree}
{#if !$lq__event_session_obj?.poc_agree}
<span class="fas fa-times bg-red-500 text-white px-1 mx-1" title="Not agreed to terms and conditions"></span>
Not yet agreed
{:else}
@@ -499,7 +504,7 @@ $: if ($lq__event_session_obj) {
bind:open={$events_loc.pres_mgmt.show__session_poc_agree}
autoclose={false}
>
{#if !$lq__event_session_obj?.poc_kv_json[poc_type]?.agree}
{#if !$lq__event_session_obj?.poc_agree}
<div
class="text-center text-red-500"
>
@@ -517,21 +522,30 @@ $: if ($lq__event_session_obj) {
</div>
{/if}
<div class="bg-gray-100 p-4 border border-gray-200 rounded-md">
Agreement text goes here
<div class="bg-gray-100 p-4 border border-gray-200 rounded-md space-y-4">
<Element_data_store
ds_code="event_session_poc_agree_text"
ds_type="html"
class_li="p-2"
/>
</div>
<div class="text-center w-full">
{#if !$lq__event_session_obj?.poc_kv_json[poc_type]?.agree}
{#if !$lq__event_session_obj?.poc_agree}
<button
disabled={!$ae_loc.administrator_access}
disabled={!$ae_loc.administrator_access &&
!$events_loc.auth__kv.session[$lq__event_session_obj?.event_session_id_random] === true}
on:click={() => {
console.log('Agree to the terms and conditions.');
let event_session_data = {poc_kv_json: $lq__event_session_obj?.poc_kv_json};
console.log('event_session_data:', event_session_data);
let event_session_data = {
poc_agree: true,
}
event_session_data.poc_kv_json[poc_type]['agree'] = true;
// Use this in the future if we need to store the agreements in a more complex way?
// let event_session_data = {poc_kv_json: $lq__event_session_obj?.poc_kv_json};
// console.log('event_session_data:', event_session_data);
// event_session_data.poc_kv_json[poc_type]['agree'] = true;
ae_promises.update__event_session_obj = events_func.update_ae_obj__event_session({
api_cfg: $ae_api,
@@ -555,10 +569,14 @@ $: if ($lq__event_session_obj) {
on:click={() => {
console.log('Change to not agreed.');
let event_session_data = {poc_kv_json: $lq__event_session_obj?.poc_kv_json};
console.log('event_session_data:', event_session_data);
let event_session_data = {
poc_agree: false,
}
event_session_data.poc_kv_json[poc_type]['agree'] = false;
// Use this in the future if we need to store the agreements in a more complex way?
// let event_session_data = {poc_kv_json: $lq__event_session_obj?.poc_kv_json};
// console.log('event_session_data:', event_session_data);
// event_session_data.poc_kv_json[poc_type]['agree'] = false;
ae_promises.update__event_session_obj = events_func.update_ae_obj__event_session({
api_cfg: $ae_api,
@@ -596,6 +614,7 @@ $: if ($lq__event_session_obj) {
</svelte:fragment>
</Modal>
{/if}
<!-- </div> -->
@@ -756,7 +775,7 @@ $: if ($lq__event_session_obj) {
{#if $events_loc.auth__kv.session[$events_slct.event_session_id] === true}
<span class="text-green-500">Signed In</span>
{/if}
{#if $lq__event_session_obj.poc_person_primary_email && ($ae_loc.trusted_access || !$events_loc.auth__person.id && $lq__event_obj?.mod_pres_mgmt_json?.show__email_access_link)}
{#if $lq__event_session_obj.poc_person_primary_email && ($ae_loc.trusted_access || !$events_loc.auth__person.id && $events_loc.pres_mgmt?.show__email_access_link)}
<button
type="button"
@@ -933,7 +952,7 @@ $: if ($lq__event_session_obj) {
<!-- {#if $ae_loc.trusted_access || $events_loc.auth__kv.session[$lq__event_session_obj?.event_session_id_random] || ($events_loc.auth__kv.presenter[$events_slct.event_presenter_id] && $lq__event_presenter_obj?.agree)} -->
{#if
$ae_loc.trusted_access ||
($events_loc.auth__kv.session[$lq__event_session_obj?.event_session_id_random]) === true ||
$events_loc.auth__kv.session[$lq__event_session_obj?.event_session_id_random] === true ||
($events_loc.auth__kv.session[$lq__event_session_obj?.event_session_id_random] == 'read' && $lq__auth__event_presenter_obj?.agree)
}
<!-- Message if they have agreed -->