diff --git a/src/lib/ae_journals/ae_journals__journal.ts b/src/lib/ae_journals/ae_journals__journal.ts index eb0b087e..909f9a42 100644 --- a/src/lib/ae_journals/ae_journals__journal.ts +++ b/src/lib/ae_journals/ae_journals__journal.ts @@ -599,7 +599,7 @@ export function db_save_ae_obj_li__journal( // tmp_sort_2: `${obj.group}_${obj.original_datetime}_${obj.priority}_${obj.sort}`, // From SQL view - // journal_other_count: obj.journal_other_count, + journal_entry_count: obj.journal_entry_count, // A key value list of the others // journal_other_kv: obj.journal_other_kv, diff --git a/src/lib/ae_journals/db_journals.ts b/src/lib/ae_journals/db_journals.ts index 84e89ae9..a31ed4df 100644 --- a/src/lib/ae_journals/db_journals.ts +++ b/src/lib/ae_journals/db_journals.ts @@ -97,6 +97,8 @@ export interface Journal { journal_location_code?: null|string; journal_location_name?: null|string; + journal_entry_count?: null|number; + // A key value list of the entries journal_entry_kv?: null|key_val; journal_entry_li?: null|[]; diff --git a/src/routes/journals/+page.svelte b/src/routes/journals/+page.svelte index a1a8c7d1..2ab75bf6 100644 --- a/src/routes/journals/+page.svelte +++ b/src/routes/journals/+page.svelte @@ -8,7 +8,11 @@ import { onMount } from 'svelte'; import { goto } from '$app/navigation'; // *** Import other supporting libraries -import { BookPlus, FolderPlus } from '@lucide/svelte'; +import { + BookPlus, + FolderPlus, Library, + SquareLibrary + } from '@lucide/svelte'; import { liveQuery } from "dexie"; import { Modal } from 'flowbite-svelte'; @@ -82,6 +86,14 @@ onMount(() => { }); async function create_journal() { + // Confirm before creating a new journal + if (confirm('Are you sure you want to create a new journal?')) { + console.log('Creating new journal...'); + } else { + console.log('Journal creation cancelled.'); + return; + } + if ($journals_sess.journal.new_journal_name && $journals_sess.journal.new_journal_type_code) { $journals_slct.journal_id = null; try { @@ -130,7 +142,11 @@ async function create_journal() {
-

Journals for {$ae_loc.account_name ?? 'Æ loading...'}

+

+ + + Journals for {$ae_loc.account_name ?? 'Æ loading...'} +

@@ -233,8 +249,16 @@ async function create_journal() {
diff --git a/src/routes/journals/[journal_id]/+layout.svelte b/src/routes/journals/[journal_id]/+layout.svelte index 78dd5d0d..3d8897c4 100644 --- a/src/routes/journals/[journal_id]/+layout.svelte +++ b/src/routes/journals/[journal_id]/+layout.svelte @@ -10,6 +10,7 @@ import { Check, FilePlus, Library, Minus, Notebook, Pencil, Plus, + SquareLibrary, X } from '@lucide/svelte'; @@ -130,7 +131,8 @@ async function handle_update_journal() { title="View all journals" > - + + diff --git a/src/routes/journals/ae_comp__journal_obj_id_view.svelte b/src/routes/journals/ae_comp__journal_obj_id_view.svelte index bf97c6e8..5b1a5082 100644 --- a/src/routes/journals/ae_comp__journal_obj_id_view.svelte +++ b/src/routes/journals/ae_comp__journal_obj_id_view.svelte @@ -1,6 +1,11 @@