From 34e54fa4afdf17e7258cbc5ccac5a3d094ee161b Mon Sep 17 00:00:00 2001
From: ThetaDev <thetadev@magenta.de>
Date: Sat, 18 May 2024 01:33:18 +0200
Subject: [PATCH 1/4] fix: dont create entry executions if entry is only
 postponed

---
 src/lib/components/ui/EntryTodoButton.svelte  | 17 ++++++++++++++++-
 src/lib/server/query/util.ts                  |  4 ++++
 src/lib/shared/util/util.ts                   |  8 +++++++-
 src/routes/(app)/entry/[id]/+page.server.ts   | 19 +++++++++++--------
 src/routes/(app)/entry/[id]/+page.svelte      |  3 +--
 .../entry/[id]/editExecution/+page.server.ts  |  5 +----
 .../entry/[id]/editExecution/+page.svelte     |  5 +++--
 7 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/src/lib/components/ui/EntryTodoButton.svelte b/src/lib/components/ui/EntryTodoButton.svelte
index 6bedd3e..8e185cc 100644
--- a/src/lib/components/ui/EntryTodoButton.svelte
+++ b/src/lib/components/ui/EntryTodoButton.svelte
@@ -1,6 +1,21 @@
+<script lang="ts">
+  import { humanDate } from "$lib/shared/util";
+
+  function dateIn(n: number): string {
+    const date = new Date();
+    date.setDate(date.getDate() + n);
+    return humanDate(date);
+  }
+</script>
+
 <div class="join">
   {#each { length: 4 } as _, i}
-    <button name="todo" class="join-item btn btn-sm" type="submit" value={i}>
+    <button
+      name="todo"
+      class="join-item btn btn-sm"
+      title={i > 0 ? `Eintrag auf ${dateIn(i)} verschieben` : undefined}
+      type="submit"
+      value={i}>
       {#if i === 0}
         Notiz
       {:else}
diff --git a/src/lib/server/query/util.ts b/src/lib/server/query/util.ts
index e10bc0d..c7782da 100644
--- a/src/lib/server/query/util.ts
+++ b/src/lib/server/query/util.ts
@@ -130,6 +130,10 @@ class SearchQueryComponents {
  * Supported search syntax:
  * - Negative query `-word`
  * - Exact query `"word"`
+ *
+ * The last word in a search query is prefix-matched (i.e.
+ * the search returns all results starting with the given characters).
+ * This allows for meaningful results in Search-as-you-type applications.
  */
 export function parseSearchQuery(q: string): SearchQueryComponents {
   const regexpParts = /(-)?(?:"([^"]*)"|([^"\s]+))(?:\s|$)/g;
diff --git a/src/lib/shared/util/util.ts b/src/lib/shared/util/util.ts
index dc60691..836ca23 100644
--- a/src/lib/shared/util/util.ts
+++ b/src/lib/shared/util/util.ts
@@ -158,7 +158,11 @@ export function defaultVisitUrl(): string {
   }, URL_VISIT);
 }
 
-export async function moveEntryTodoDate(id: number, nTodoDays: number, init?: TRPCClientInit) {
+export async function moveEntryTodoDate(
+  id:number,
+  nTodoDays: number,
+  init?: TRPCClientInit,
+): Promise<Date | null> {
   if (nTodoDays > 0) {
     const entry = await trpc(init).entry.get.query(id);
     const newDate = new Date();
@@ -171,5 +175,7 @@ export async function moveEntryTodoDate(id: number, nTodoDays: number, init?: TR
         date: utcDateToYMD(newDate),
       },
     });
+    return newDate;
   }
+  return null;
 }
diff --git a/src/routes/(app)/entry/[id]/+page.server.ts b/src/routes/(app)/entry/[id]/+page.server.ts
index 49aa997..3f7e31c 100644
--- a/src/routes/(app)/entry/[id]/+page.server.ts
+++ b/src/routes/(app)/entry/[id]/+page.server.ts
@@ -5,7 +5,7 @@ import { superValidate, message } from "sveltekit-superforms";
 
 import { ZUrlEntityId } from "$lib/shared/model/validation";
 import { trpc } from "$lib/shared/trpc";
-import { loadWrap, moveEntryTodoDate } from "$lib/shared/util";
+import { humanDate, loadWrap, moveEntryTodoDate } from "$lib/shared/util";
 
 import { SchemaNewExecution } from "./schema";
 
@@ -22,18 +22,21 @@ export const actions: Actions = {
     const done = todoDays === null;
     const nTodoDays = todoDays ? parseInt(todoDays.toString()) : 0;
 
-    await loadWrap(async () => {
+    if (form.data.text.length > 0) {
       await trpc(event).entry.newExecution.mutate({
         id,
         old_execution_id: form.data.old_execution_id,
         execution: { text: form.data.text, done: todoDays === null },
       });
-      await moveEntryTodoDate(id, nTodoDays, event);
-    });
-
-    if (nTodoDays > 0) {
-      return message(form, `Eintrag um ${nTodoDays} Tage in die Zukunft verschoben`);
     }
-    return message(form, done ? "Eintrag erledigt" : "Eintrag mit Notiz versehen");
+    const newTodoDate = await moveEntryTodoDate(id, nTodoDays, event);
+
+    if (newTodoDate) {
+      return message(form, `Eintrag auf ${humanDate(newTodoDate)} verschoben`);
+    }
+    if (form.data.text.length > 0) {
+      return message(form, done ? "Eintrag erledigt" : "Eintrag mit Notiz versehen");
+    }
+    return { form };
   }),
 };
diff --git a/src/routes/(app)/entry/[id]/+page.svelte b/src/routes/(app)/entry/[id]/+page.svelte
index f93e323..3616ca3 100644
--- a/src/routes/(app)/entry/[id]/+page.svelte
+++ b/src/routes/(app)/entry/[id]/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-
   import type { PageData } from "./$types";
 
   import { superForm } from "sveltekit-superforms";
@@ -33,7 +32,7 @@
       label="Eintrag erledigen"
       bind:value={$form.text}
     >
-      <div class="row c-vlight gap-2">
+      <div class="row c-vlight gap-2 flex-wrap">
         <button class="btn btn-sm btn-primary" type="submit">Erledigt</button>
         <EntryTodoButton />
       </div>
diff --git a/src/routes/(app)/entry/[id]/editExecution/+page.server.ts b/src/routes/(app)/entry/[id]/editExecution/+page.server.ts
index 92b9b6c..679da3b 100644
--- a/src/routes/(app)/entry/[id]/editExecution/+page.server.ts
+++ b/src/routes/(app)/entry/[id]/editExecution/+page.server.ts
@@ -5,7 +5,7 @@ import { superValidate } from "sveltekit-superforms";
 
 import { ZUrlEntityId } from "$lib/shared/model/validation";
 import { trpc } from "$lib/shared/trpc";
-import { loadWrap, moveEntryTodoDate } from "$lib/shared/util";
+import { loadWrap } from "$lib/shared/util";
 
 import { SchemaNewExecution } from "../schema";
 
@@ -29,9 +29,6 @@ export const actions: Actions = {
       old_execution_id: form.data.old_execution_id,
     });
 
-    const nTodoDays = todoDays ? parseInt(todoDays.toString()) : 0;
-    await moveEntryTodoDate(id, nTodoDays, event);
-
     redirect(302, `/entry/${id}`);
   }),
 };
diff --git a/src/routes/(app)/entry/[id]/editExecution/+page.svelte b/src/routes/(app)/entry/[id]/editExecution/+page.svelte
index d67ec0f..971eb7a 100644
--- a/src/routes/(app)/entry/[id]/editExecution/+page.svelte
+++ b/src/routes/(app)/entry/[id]/editExecution/+page.svelte
@@ -7,7 +7,6 @@
   import { superformConfig } from "$lib/shared/util";
 
   import EntryBody from "$lib/components/entry/EntryBody.svelte";
-  import EntryTodoButton from "$lib/components/ui/EntryTodoButton.svelte";
   import MarkdownInput from "$lib/components/ui/markdown/MarkdownInput.svelte";
 
   import { SchemaNewExecution } from "../schema";
@@ -32,7 +31,9 @@
   >
     <div class="row c-vlight gap-2">
       <button class="btn btn-sm btn-primary" type="submit">Speichern</button>
-      <EntryTodoButton />
+      <button name="todo" class="join-item btn btn-sm" type="submit" value="0">
+        Notiz
+      </button>
     </div>
   </MarkdownInput>
   <input name="old_execution_id" type="hidden" bind:value={$form.old_execution_id} />

From f4f03ab4914f850b15acf7bb39da34b1abb587a7 Mon Sep 17 00:00:00 2001
From: ThetaDev <thetadev@magenta.de>
Date: Sat, 18 May 2024 02:00:42 +0200
Subject: [PATCH 2/4] fix: humanDate capitalization

---
 src/lib/shared/util/date.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/lib/shared/util/date.ts b/src/lib/shared/util/date.ts
index 16d4b5f..e2389f1 100644
--- a/src/lib/shared/util/date.ts
+++ b/src/lib/shared/util/date.ts
@@ -77,6 +77,13 @@ function dateDiffInDays(a: Date, b: Date): number {
   return Math.round((ts2 - ts1) / MS_PER_DAY);
 }
 
+/** Format a date with a human-readable format
+ * - If the date is within +/- 3 days, output a textual format ("heute", "morgen", "vor 2 Tagen")
+ * - Otherwise, format it as DD.MM.YYYY (or DD.MM.YYYY, hh:mm if `time=true`)
+ *
+ * @param [time=false] Enable time display
+ * @param [cap=false] Enable capitalized format
+ */
 export function humanDate(date: Date | string, time = false, cap = false): string {
   const now = new Date();
   const dt = coerceDate(date);
@@ -96,7 +103,7 @@ export function humanDate(date: Date | string, time = false, cap = false): strin
   if (diffDays !== 0) {
     if (diffDays === 1) return outstr("morgen");
     if (diffDays === -1) return outstr("gestern");
-    return intl.format(diffDays, "day");
+    return outstr(intl.format(diffDays, "day"));
   }
 
   if (time) {

From 9ed5f15b9ef237cc400b069928baeb920b2d3681 Mon Sep 17 00:00:00 2001
From: ThetaDev <thetadev@magenta.de>
Date: Sat, 18 May 2024 16:10:31 +0200
Subject: [PATCH 3/4] fix: Filterbar does not exclude present filters from URL,
 text filters dont confirm when defocused

---
 src/lib/components/filter/FilterBar.svelte  |  5 +++++
 src/lib/components/filter/FilterChip.svelte | 17 +++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/lib/components/filter/FilterBar.svelte b/src/lib/components/filter/FilterBar.svelte
index 8a68b01..28b7542 100644
--- a/src/lib/components/filter/FilterBar.svelte
+++ b/src/lib/components/filter/FilterBar.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 
   import { mdiClose } from "@mdi/js";
+  import { onMount } from "svelte";
 
   import { Debouncer } from "$lib/shared/util";
 
@@ -192,6 +193,10 @@
       searchDebounce.now();
     }
   }
+
+  onMount(() => {
+    if (hiddenIds.size === 0) activeFilters = activeFilters;
+  });
 </script>
 
 <div class="filterbar-outer">
diff --git a/src/lib/components/filter/FilterChip.svelte b/src/lib/components/filter/FilterChip.svelte
index 260015c..60c0182 100644
--- a/src/lib/components/filter/FilterChip.svelte
+++ b/src/lib/components/filter/FilterChip.svelte
@@ -41,6 +41,15 @@
     }
   } : undefined;
 
+  function acceptTextInput(e: Event) {
+    // @ts-expect-error Event is from HTML input
+    if (e.target?.value) {
+      // @ts-expect-error Input value is checked
+      fdata.selection = { id: null, name: e.target.value };
+    }
+    stopEditing(true);
+  }
+
   $: if (fdata.editing && autocomplete) {
     autocomplete.open();
   }
@@ -118,14 +127,10 @@
           }}
           on:keypress={(e) => {
             if (e.key === "Enter") {
-              // @ts-expect-error Input value is checked
-              if (e.target?.value) {
-                // @ts-expect-error Input value is checked
-                fdata.selection = { id: null, name: e.target.value };
-              }
-              stopEditing(true);
+              acceptTextInput(e);
             }
           }}
+          on:blur={acceptTextInput}
         />
       {/if}
     {:else}

From ad796dcb578b79b566559d1c22c99f0231a03251 Mon Sep 17 00:00:00 2001
From: ThetaDev <thetadev@magenta.de>
Date: Sat, 18 May 2024 16:30:06 +0200
Subject: [PATCH 4/4] feat: focus filter bar when pressing F

---
 src/lib/components/filter/FilterBar.svelte  | 11 +++++++++++
 src/lib/components/filter/FilterChip.svelte |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/lib/components/filter/FilterBar.svelte b/src/lib/components/filter/FilterBar.svelte
index 28b7542..2791bb2 100644
--- a/src/lib/components/filter/FilterBar.svelte
+++ b/src/lib/components/filter/FilterBar.svelte
@@ -194,11 +194,22 @@
     }
   }
 
+  function onWindowKeyup(e: KeyboardEvent): void {
+    // Dont catch keybinds when inputting text
+    if (e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement) return;
+    if (e.key === "f") {
+      e.preventDefault();
+      focusInput();
+    }
+  }
+
   onMount(() => {
     if (hiddenIds.size === 0) activeFilters = activeFilters;
   });
 </script>
 
+<svelte:window on:keyup={onWindowKeyup} />
+
 <div class="filterbar-outer">
   <div class="filterbar-inner input input-sm input-bordered">
     {#each activeFilters as fdata, i}
diff --git a/src/lib/components/filter/FilterChip.svelte b/src/lib/components/filter/FilterChip.svelte
index 60c0182..4d869f2 100644
--- a/src/lib/components/filter/FilterChip.svelte
+++ b/src/lib/components/filter/FilterChip.svelte
@@ -41,7 +41,7 @@
     }
   } : undefined;
 
-  function acceptTextInput(e: Event) {
+  function acceptTextInput(e: Event): void {
     // @ts-expect-error Event is from HTML input
     if (e.target?.value) {
       // @ts-expect-error Input value is checked