From 80b394f16ba1b82ee3fc29da11ca51ec5be713b6 Mon Sep 17 00:00:00 2001
From: Scott Idem <stidem@gmail.com>
Date: Mon, 23 Sep 2024 15:29:23 -0400
Subject: [PATCH] Better sorting for files

---
 src/lib/element_manage_event_file_li.svelte      | 14 +-------------
 src/lib/element_manage_event_file_li_all.svelte  | 15 ++++++---------
 .../element_manage_event_file_li_direct.svelte   | 16 ++++++----------
 3 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/src/lib/element_manage_event_file_li.svelte b/src/lib/element_manage_event_file_li.svelte
index dd7ea3c7..73e548ea 100644
--- a/src/lib/element_manage_event_file_li.svelte
+++ b/src/lib/element_manage_event_file_li.svelte
@@ -32,22 +32,10 @@ ae_tmp.show__file_li = true;
 ae_tmp.show__direct_download = false;
 // let ae_triggers: key_val = {};
 
-// let dq__where_val: string = `${link_to_type}_id_random`;
-// let dq__where_eq_val: string = link_to_id;
-
-// let lq__event_file_obj_li = liveQuery(
-//     async () => await db_events.files
-//     .where(dq__where_val)
-//     .equals(dq__where_eq_val)
-//     .toArray()
-// );
-
 onMount(() => {
     // console.log('Element - Manage Event File List');
     console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
     console.log(`allow_basic: ${allow_basic}; allow_moderator: ${allow_moderator}`);
-
-    // $slct_trigger = 'load__event_file_obj_li';
 });
 </script>
 
@@ -540,7 +528,7 @@ onMount(() => {
                 </strong>
                 {ae_util.iso_datetime_formatter(event_file_obj.created_on, 'date_iso')}
                 at
-                <strong>{ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_12_short_no_leading')}</strong>
+                <strong>{ae_util.iso_datetime_formatter(event_file_obj.created_on, 'time_long')}</strong>
                 <!-- {event_file_obj.updated_on} -->
              {:else}
                 <!-- <span class="fas fa-calendar-day mx-1"></span> -->
diff --git a/src/lib/element_manage_event_file_li_all.svelte b/src/lib/element_manage_event_file_li_all.svelte
index 0ee754c2..060fb018 100644
--- a/src/lib/element_manage_event_file_li_all.svelte
+++ b/src/lib/element_manage_event_file_li_all.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { onMount } from 'svelte';
+// import { onMount } from 'svelte';
 // import { clipboard } from '@skeletonlabs/skeleton';
 import { liveQuery } from "dexie";
 
@@ -35,19 +35,16 @@ ae_tmp.show__direct_download = false;
 let dq__where_val: string = `${link_to_type}_id_random`;
 let dq__where_eq_val: string = link_to_id;
 
+// This should include all files that are associated with an object (event, location, session, presenter, etc.)
+// I am not sure why, but doing reverse() and then sortBy() seems to sort in descending order.
 let lq__event_file_obj_li = liveQuery(
     async () => await db_events.files
     .where(dq__where_val)
     .equals(dq__where_eq_val)
-    .toArray()
+    .reverse()
+    .sortBy('created_on')
+    // .toArray()
 );
-
-onMount(() => {
-    // console.log('Element - Manage Event File List');
-    // console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
-
-    $slct_trigger = 'load__event_file_obj_li';
-});
 </script>
 
 
diff --git a/src/lib/element_manage_event_file_li_direct.svelte b/src/lib/element_manage_event_file_li_direct.svelte
index 50b3e5e6..75fa1f54 100644
--- a/src/lib/element_manage_event_file_li_direct.svelte
+++ b/src/lib/element_manage_event_file_li_direct.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { onMount } from 'svelte';
+// import { onMount } from 'svelte';
 // import { clipboard } from '@skeletonlabs/skeleton';
 import { liveQuery } from "dexie";
 
@@ -36,21 +36,17 @@ let dq__where_val: string = `for_type`;
 let dq__where_eq_val: string = link_to_type;
 let dq__where_for_id_eq_val: string = link_to_id;
 
-
+// This should only include files that are directly linked to an object (event, location, session, presenter, etc.).
+// I am not sure why, but doing reverse() and then sortBy() seems to sort in descending order.
 let lq__event_file_obj_li = liveQuery(
     async () => await db_events.files
     .where(dq__where_val)
     .equals(dq__where_eq_val)
     .and(file => file.for_id_random == dq__where_for_id_eq_val)
-    .toArray()
+    .reverse()
+    .sortBy('created_on')
+    // .toArray()
 );
-
-onMount(() => {
-    // console.log('Element - Manage Event File List');
-    // console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
-
-    $slct_trigger = 'load__event_file_obj_li';
-});
 </script>