From 020f3cbd740bca83faa244520d80b02e0ea49408 Mon Sep 17 00:00:00 2001 From: Dovi Cowan Date: Wed, 1 Nov 2023 21:28:48 +0000 Subject: [PATCH] support months split type + fix requireloggedin bug --- src/routes/Lists/ListCreate.svelte | 17 +++++++++++++++-- src/routes/Lists/ListView.svelte | 20 +++++++++++++------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/routes/Lists/ListCreate.svelte b/src/routes/Lists/ListCreate.svelte index 0862bdc..52bbe04 100644 --- a/src/routes/Lists/ListCreate.svelte +++ b/src/routes/Lists/ListCreate.svelte @@ -15,6 +15,7 @@ let listname = ""; let requireLoggedIn = false; + let list_type = ""; function createList(e) { e.preventDefault(); @@ -22,8 +23,9 @@ database .createDocument("tehillim-split", "lists", ID.unique(), { title: listname, - require_logged_in: requireLoggedIn, + require_logged_in: !!requireLoggedIn, owner_id: loggedInUser["$id"], + list_type: list_type }) .then((r) => { teams.create(r["$id"], listname, ["owner"]).then((r) => { @@ -66,13 +68,24 @@ Create new list
+
+ { + if (r.list_type == "perakim") elementsNumbers = 151; + if (r.list_type == "month") elementsNumbers = 31; + }); let perakim = []; let perakimPromise = database .listDocuments("tehillim-split", "perakim", [Query.equal("list_id", [id])]) @@ -142,6 +149,7 @@ Loading... {:then list}

List {list.title}

+

List split by {list.list_type=="perakim"?"perek":""}{list.list_type=="month"?"days of month":""}


Members {#await teamDetails then team} @@ -155,17 +163,17 @@ {/if} {/await}
{#await perakimPromise then perakimResolved} - {#each Array.from(Array(150 + 1).keys()).slice(1) as i} + {#each Array.from(Array(elementsNumbers).keys()).slice(1) as i} + {list.list_type == "perakim" ? "Perek " + i : ""} + {list.list_type == "month" ? "Day " + i : ""} {#if perekIndex(i) !== -1} {#if perakim[perekIndex(i)].taken == false} - Perek {i} {:else if perakim[perekIndex(i)].taken_by == loggedInUser["$id"] && perakim[perekIndex(i)].completed !== true} - Perek {i} {:else if perakim[perekIndex(i)].taken_by == loggedInUser["$id"] && perakim[perekIndex(i)].completed == true} - Perek {i} {:else if perakim[perekIndex(i)].completed == false} - Perek {i} - Taken by {perakim[perekIndex(i)].taken_by_name} + - Taken by {perakim[perekIndex(i)].taken_by_name} {:else} - Perek {i} - Completed by {perakim[perekIndex(i)].taken_by_name} + - Completed by {perakim[perekIndex(i)].taken_by_name} {/if} {:else} - Perek {i}