Priorität
{/if}
+ {#if entry.execution && !entry.execution.done}
+ Notiz
+ {/if}
+ {#if entry.patient.room}
+ {entry.patient.room.name}
+ {/if}
{formatPatientName(entry.patient)}
diff --git a/src/lib/components/ui/PaginationButtons.svelte b/src/lib/components/ui/PaginationButtons.svelte
index 3e49d40..f6133da 100644
--- a/src/lib/components/ui/PaginationButtons.svelte
+++ b/src/lib/components/ui/PaginationButtons.svelte
@@ -4,14 +4,21 @@
} from "@mdi/js";
import { PAGINATION_LIMIT } from "$lib/shared/constants";
- import type { Pagination, PaginationRequest } from "$lib/shared/model";
+ import type { PaginationRequest } from "$lib/shared/model";
import { screenWidthSmall } from "$lib/stores";
import Icon from "./Icon.svelte";
+ type PaginationX = {
+ items?: unknown[];
+ nItems?: number;
+ total: number;
+ offset: number;
+ };
+
export let paginationData: PaginationRequest | null | undefined;
- export let data: Pagination- {data.offset + 1}-{data.offset + data.items.length} von {data.total} + {data.offset + 1}-{data.offset + (data.items?.length ?? data.nItems ?? 0)} von {data.total}
diff --git a/src/lib/components/ui/WeekSelector.svelte b/src/lib/components/ui/WeekSelector.svelte
index ce4008d..8bc29b7 100644
--- a/src/lib/components/ui/WeekSelector.svelte
+++ b/src/lib/components/ui/WeekSelector.svelte
@@ -1,11 +1,13 @@
- weekFilterItems()}
- onClose={stopEditing}
- onSelect={(item) => {
- if (typeof item.id === "string") {
- const parsed = DateRange.parse(item.id);
- if (parsed) dateRange = parsed;
- onSelect(dateRange);
- }
- return { close: true, newValue: "" };
- }}
- partOfFilterbar
- selection={{ id: dateRange.toString(), name: dateRange.format() }} />
- {:else}
-
- {/if}
- addDays(true, false)} />
+ addDays(false, false)} />
+
+ addDays(false, true)} />
+ addDays(true, true)} />
diff --git a/src/lib/shared/model/validation.ts b/src/lib/shared/model/validation.ts
index 95e9d47..bde6428 100644
--- a/src/lib/shared/model/validation.ts
+++ b/src/lib/shared/model/validation.ts
@@ -153,7 +153,9 @@ export const ZEntriesFilter = returnDataInSameOrderAsPassed(z
})
.partial());
-export const ZEntriesQuery = paginatedQuery(ZEntriesFilter);
+export const ZEntriesQuery = paginatedQuery(ZEntriesFilter).extend({
+ group: z.string().optional(),
+});
export const ZPatientsFilter = returnDataInSameOrderAsPassed(z
.object({
diff --git a/src/lib/shared/util/date.test.ts b/src/lib/shared/util/date.test.ts
index eca9cc9..38c0401 100644
--- a/src/lib/shared/util/date.test.ts
+++ b/src/lib/shared/util/date.test.ts
@@ -1,7 +1,14 @@
import { expect, it, vi } from "vitest";
import {
- DateRange, dateFromYMD, dateToYMD, formatDate, humanDate, utcDateToYMD,
+ DateRange,
+ dateFromHuman,
+ dateFromYMD,
+ dateToYMD,
+ formatDate,
+ humanDate,
+ shiftDateRange,
+ utcDateToYMD,
} from "./date";
const MINUTE = 60000;
@@ -72,3 +79,64 @@ it.each([
expect(res.toString()).toBe(s);
}
});
+
+it.each([
+ // Open ranges
+ {
+ r: "..2024-04-14", week: true, fwd: true, exp: "2024-04-15..2024-04-21",
+ },
+ {
+ r: "..2024-04-14", week: true, fwd: false, exp: "2024-04-08..2024-04-14",
+ },
+ {
+ r: "2024-04-08..", week: true, fwd: true, exp: "2024-04-08..2024-04-14",
+ },
+ {
+ r: "2024-04-08..", week: true, fwd: false, exp: "2024-04-01..2024-04-07",
+ },
+ // Full week
+ {
+ r: "2024-04-08..2024-04-14", week: true, fwd: true, exp: "2024-04-15..2024-04-21",
+ },
+ {
+ r: "2024-04-08..2024-04-14", week: true, fwd: false, exp: "2024-04-01..2024-04-07",
+ },
+ // Partial week
+ {
+ r: "2024-04-13..2024-04-16", week: true, fwd: true, exp: "2024-04-15..2024-04-21",
+ },
+ {
+ r: "2024-04-13..2024-04-16", week: true, fwd: false, exp: "2024-04-08..2024-04-14",
+ },
+
+ // Days
+ {
+ r: "2024-04-13..2024-04-13", week: false, fwd: true, exp: "2024-04-14..2024-04-14",
+ },
+ {
+ r: "2024-04-13..2024-04-13", week: false, fwd: false, exp: "2024-04-12..2024-04-12",
+ },
+ // Full range to day
+ {
+ r: "2024-04-08..2024-04-14", week: false, fwd: true, exp: "2024-04-14..2024-04-14", // TODO: inc date (15)
+ },
+ {
+ r: "2024-04-08..2024-04-14", week: false, fwd: false, exp: "2024-04-08..2024-04-08", // TODO: dec date (7)
+ },
+ // Open range to day
+ {
+ r: "..2024-04-14", week: false, fwd: true, exp: "2024-04-15..2024-04-15",
+ },
+])("shiftDateRange $r", ({
+ r, week, fwd, exp,
+}) => {
+ const range = DateRange.parse(r, true)!;
+ const expected = DateRange.parse(exp, true);
+ shiftDateRange(range, week, fwd);
+ expect(range).toStrictEqual(expected);
+});
+
+it("dateFromHuman", () => {
+ expect(dateFromHuman("04.12.2023")).toStrictEqual(new Date(2023, 11, 4));
+ expect(dateFromHuman("04.12.")).toStrictEqual(new Date(new Date().getFullYear(), 11, 4));
+});
diff --git a/src/lib/shared/util/date.ts b/src/lib/shared/util/date.ts
index 1e21442..731ea29 100644
--- a/src/lib/shared/util/date.ts
+++ b/src/lib/shared/util/date.ts
@@ -42,6 +42,22 @@ export function dateFromYMD(s: string): Date {
return NaN;
}
+export function dateFromHuman(s: string): Date {
+ const parts = s.split(".").filter((x) => x.length > 0).map((x) => parseInt(x));
+ if (parts.length > 0 && parts.length < 4) {
+ const [d, m, y] = parts;
+ const now = new Date();
+ return new Date(
+ // eslint-disable-next-line no-nested-ternary
+ y ? y < 1000 ? y + 2000 : y : now.getFullYear(),
+ m ? m - 1 : now.getMonth(),
+ d,
+ );
+ }
+ // @ts-expect-error emulate behavior of date constructor
+ return NaN;
+}
+
/** Convert the given date to a string (using the internal UTC format) */
export function utcDateToYMD(date: Date): string {
return date.toISOString().slice(0, 10);
@@ -61,19 +77,25 @@ function dateDiffInDays(a: Date, b: Date): number {
return Math.round((ts2 - ts1) / MS_PER_DAY);
}
-export function humanDate(date: Date | string, time = false): string {
+export function humanDate(date: Date | string, time = false, cap = false): string {
const now = new Date();
const dt = coerceDate(date);
const threshold = 302400000; // 3.5 * 24 * 3_600_000
const diff = Number(dt) - Number(now); // pos: Future, neg: Past
- if (Math.abs(diff) > threshold) return `am ${formatDate(date, time)}`;
+ if (Math.abs(diff) > threshold) {
+ const datestr = formatDate(date, time);
+ return cap ? datestr : "am" + datestr;
+ }
const intl = new Intl.RelativeTimeFormat(LOCALE);
+ const outstr = cap ? (s: string) => {
+ return s.charAt(0).toUpperCase() + s.slice(1);
+ } : (s: string) => s;
const diffDays = dateDiffInDays(now, dt);
if (diffDays !== 0) {
- if (diffDays === 1) return "morgen";
- if (diffDays === -1) return "gestern";
+ if (diffDays === 1) return outstr("morgen");
+ if (diffDays === -1) return outstr("gestern");
return intl.format(diffDays, "day");
}
@@ -85,7 +107,7 @@ export function humanDate(date: Date | string, time = false): string {
if (diffMinutes !== 0) return intl.format(diffMinutes, "minute");
}
- return time ? "jetzt gerade" : "heute";
+ return outstr(time ? "jetzt gerade" : "heute");
}
export class DateRange {
@@ -106,14 +128,19 @@ export class DateRange {
return new DateRange(start, end);
}
+ /** Get a date range of the week containing the given date */
+ static weekOf(day: Date, offset = 0): DateRange {
+ const thisDay = new Date(day);
+ const todayWd = thisDay.getDay();
+ // Day starts at Sunday (0)
+ const daysMinus = (todayWd === 0 ? 6 : todayWd - 1) - offset * 7;
+ thisDay.setDate(thisDay.getDate() - daysMinus);
+ return DateRange.withLength(thisDay, 6);
+ }
+
/** Create a date range of the current calendar week */
static thisWeek(): DateRange {
- const dayStart = new Date();
- const todayWd = dayStart.getDay();
- // Day starts at Sunday (0)
- const daysMinus = todayWd === 0 ? 6 : todayWd - 1;
- dayStart.setDate(dayStart.getDate() - daysMinus);
- return DateRange.withLength(dayStart, 6);
+ return DateRange.weekOf(new Date());
}
/** Parse a date range from a string
@@ -124,10 +151,23 @@ export class DateRange {
* - Range with 1 end: `2024-04-13..`; `..2024-04-20`
*/
static parse(s: string, utc = false): DateRange | null {
- const parts = s.split("..", 2);
+ return DateRange.parseInternal(s, "..", (p) => utc ? new Date(p) : dateFromYMD(p));
+ }
+
+ /** Parse a date range from human input */
+ static parseHuman(s: string): DateRange | null {
+ return DateRange.parseInternal(s, "-", dateFromHuman);
+ }
+
+ private static parseInternal(
+ s: string,
+ split: string | RegExp,
+ dateParser: (s: string) => Date,
+ ): DateRange | null {
+ const parts = s.split(split, 2);
const parsed = parts.map((p) => {
if (p.length === 0) return null;
- return utc ? new Date(p) : dateFromYMD(p);
+ return dateParser(p);
});
if (parsed.length === 0
@@ -145,8 +185,8 @@ export class DateRange {
/** Shift the range by the given number of days. This modifies the range in-place */
addDays(n: number): void {
- this.start?.setDate(this.start.getDate() + n);
- this.end?.setDate(this.end.getDate() + n);
+ this.start?.setUTCDate(this.start.getUTCDate() + n);
+ this.end?.setUTCDate(this.end.getUTCDate() + n);
}
/** Return a parsable string representation */
@@ -162,6 +202,54 @@ export class DateRange {
format(): string {
if (this.start === null) return "bis " + formatDate(this.end!);
if (this.end === null) return "ab " + formatDate(this.start);
+ if (this.start.getFullYear() === this.end.getFullYear()
+ && this.start.getMonth() === this.end.getMonth()
+ && this.start.getDate() === this.end.getDate()) return formatDate(this.start);
return formatDate(this.start) + " \u2013 " + formatDate(this.end);
}
+
+ eq(b: DateRange): boolean {
+ return dateEq(this.start, b.start) && dateEq(this.end, b.end);
+ }
+}
+
+function dateEq(d1: Date | null, d2: Date | null): boolean {
+ if (!d1 || !d2) return d1 === d2;
+ return d1.getUTCFullYear() === d2.getUTCFullYear()
+ && d1.getUTCMonth() === d2.getUTCMonth()
+ && d1.getUTCDate() === d2.getUTCDate();
+}
+
+export function shiftDateRange(dateRange: DateRange, week: boolean, fwd: boolean) {
+ let modDir = null;
+ if (dateRange.start === null) {
+ dateRange.start = new Date(dateRange.end!);
+ modDir = true;
+ }
+ if (dateRange.end === null) {
+ dateRange.end = new Date(dateRange.start!);
+ modDir = false;
+ }
+
+ const inc = fwd ? 1 : -1;
+ const leader = fwd ? dateRange.end : dateRange.start;
+
+ if (week) {
+ // Align range with week
+ const lweek = DateRange.weekOf(leader);
+ if (dateRange.eq(lweek)) {
+ if (modDir === null || modDir === fwd) dateRange.addDays(inc * 7);
+ } else {
+ dateRange.start = lweek.start;
+ dateRange.end = lweek.end;
+ if (modDir === fwd) dateRange.addDays(inc * 7);
+ }
+ } else {
+ if (dateEq(dateRange.start, dateRange.end)) {
+ dateRange.addDays(inc);
+ } else {
+ dateRange.start = leader;
+ dateRange.end = leader;
+ }
+ }
}
diff --git a/src/lib/shared/util/util.test.ts b/src/lib/shared/util/util.test.ts
index f94ce78..c1ea818 100644
--- a/src/lib/shared/util/util.test.ts
+++ b/src/lib/shared/util/util.test.ts
@@ -20,7 +20,7 @@ it("getQueryUrl", () => {
};
const queryUrl = getQueryUrl(query, "");
- expect(queryUrl).toBe("?filter%5Bauthor%5D%5B0%5D%5Bid%5D=2&filter%5Bauthor%5D%5B0%5D%5Bname%5D=Max&filter%5Bcategory%5D%5B0%5D%5Bid%5D=1&filter%5Bcategory%5D%5B0%5D%5Bname%5D=Blutabnahme&filter%5Bcategory%5D%5B1%5D%5Bid%5D=2&filter%5Bcategory%5D%5B1%5D%5Bname%5D=Labortests&filter%5Bdone%5D=true&filter%5Bsearch%5D=Hello%20World&pagination%5Blimit%5D=10&pagination%5Boffset%5D=20&sort%5Bfield%5D=room&sort%5Basc%5D=true");
+ expect(queryUrl).toBe("?filter%5Bauthor%5D%5B0%5D%5Bid%5D=2&filter%5Bauthor%5D%5B0%5D%5Bname%5D=Max&filter%5Bcategory%5D%5B0%5D%5Bid%5D=1&filter%5Bcategory%5D%5B0%5D%5Bname%5D=Blutabnahme&filter%5Bcategory%5D%5B1%5D%5Bid%5D=2&filter%5Bcategory%5D%5B1%5D%5Bname%5D=Labortests&filter%5Bdone%5D=true&filter%5Bsearch%5D=Hello%20World&pagination%5Blimit%5D=10&pagination%5Boffset%5D=20&sort%5B0%5D=room");
const decoded = ZEntriesQuery.parse(parseQueryUrl(queryUrl));
expect(decoded).toStrictEqual(query);
diff --git a/src/lib/shared/util/util.ts b/src/lib/shared/util/util.ts
index afe25b4..33204f1 100644
--- a/src/lib/shared/util/util.ts
+++ b/src/lib/shared/util/util.ts
@@ -161,7 +161,7 @@ export function defaultVisitUrl(): string {
export async function moveEntryTodoDate(id: number, nTodoDays: number, init?: TRPCClientInit) {
if (nTodoDays > 0) {
const entry = await trpc(init).entry.get.query(id);
- const newDate = new Date(entry.current_version.date);
+ const newDate = new Date();
newDate.setDate(newDate.getDate() + nTodoDays);
await trpc(init).entry.newVersion.mutate({
diff --git a/src/routes/(app)/about/+page.svelte b/src/routes/(app)/about/+page.svelte
index 0ef0423..57482f6 100644
--- a/src/routes/(app)/about/+page.svelte
+++ b/src/routes/(app)/about/+page.svelte
@@ -1,4 +1,6 @@
+ {#if editing}
+ weekFilterItems()}
+ noAutoselect1
+ onClose={stopEditing}
+ onSelect={(item) => {
+ if (typeof item.id === "string") {
+ const parsed = DateRange.parse(item.id);
+ if (parsed) dateRange = parsed;
+ onSelect(dateRange);
+ }
+ return { close: true, newValue: "" };
+ }}
+ {onTextInput}
+ partOfFilterbar
+ selection={{ id: dateRange.toString(), name: dateRange.format() }} />
+ {:else}
+
+ {/if}
+
+
+
+ 
= {};
@@ -20,20 +27,49 @@ export const load: PageLoad = async (event) => {
redirect(302, defaultVisitUrl());
}
+ const groupByStation = query.group === "station";
+
// Sort entries by date
- if (!query.sort) {
- query.sort = ["priority:dsc", "date"];
- }
+ query.sort = ["date", "room"];
+ if (groupByStation) query.sort.reverse();
const entries = await trpc(event).entry.list.query(query);
- // Move prioritized items to the front
- entries.items.forEach((itm, i) => {
- if (itm.current_version.priority) {
- entries.items.unshift(entries.items.splice(i, 1)[0]);
- }
- });
+ // Group items by date
+ const getGroupKey = groupByStation
+ ? (e: EntryItem) => e.patient.room?.station.id
+ : (e: EntryItem) => e.current_version.date;
- return { query, entries };
+ const groups: EntryGroup[] = [];
+ let dg = null;
+ let items: EntryItems = [];
+ let prio: EntryItems = [];
+
+ for (const entry of entries.items) {
+ // New group
+ if (getGroupKey(entry) !== dg) {
+ dg = getGroupKey(entry);
+ if (items.length > 0 || prio.length > 0) {
+ groups.push({ items, prio });
+ items = [];
+ prio = [];
+ }
+ }
+ if (entry.current_version.priority) {
+ prio.push(entry);
+ } else {
+ items.push(entry);
+ }
+ }
+ if (items.length > 0 || prio.length > 0) {
+ groups.push({ items, prio });
+ }
+
+ return {
+ query,
+ groups,
+ pagination: { offset: entries.offset, total: entries.total, nItems: entries.items.length },
+ groupByStation,
+ };
});
};
diff --git a/static/favicon.png b/static/favicon.png
index 825b9e6..33a689f 100644
Binary files a/static/favicon.png and b/static/favicon.png differ
Visitenbuch
Version: {version}
Letzte Änderung: {lastmod}
diff --git a/src/routes/(app)/entry/[id]/+page.server.ts b/src/routes/(app)/entry/[id]/+page.server.ts index bfd54cc..49aa997 100644 --- a/src/routes/(app)/entry/[id]/+page.server.ts +++ b/src/routes/(app)/entry/[id]/+page.server.ts @@ -7,7 +7,7 @@ import { ZUrlEntityId } from "$lib/shared/model/validation"; import { trpc } from "$lib/shared/trpc"; import { loadWrap, moveEntryTodoDate } from "$lib/shared/util"; -import { SchemaNewExecution } from "./editExecution/schema"; +import { SchemaNewExecution } from "./schema"; export const actions: Actions = { default: async (event) => loadWrap(async () => { diff --git a/src/routes/(app)/entry/[id]/+page.svelte b/src/routes/(app)/entry/[id]/+page.svelte index 8da72e7..6828514 100644 --- a/src/routes/(app)/entry/[id]/+page.svelte +++ b/src/routes/(app)/entry/[id]/+page.svelte @@ -10,7 +10,7 @@ import EntryTodoButton from "$lib/components/ui/EntryTodoButton.svelte"; import MarkdownInput from "$lib/components/ui/markdown/MarkdownInput.svelte"; - import { SchemaNewExecution } from "./editExecution/schema"; + import { SchemaNewExecution } from "./schema"; export let data: PageData; diff --git a/src/routes/(app)/entry/[id]/+page.ts b/src/routes/(app)/entry/[id]/+page.ts index 3e48be4..98499b7 100644 --- a/src/routes/(app)/entry/[id]/+page.ts +++ b/src/routes/(app)/entry/[id]/+page.ts @@ -6,7 +6,7 @@ import { ZUrlEntityId } from "$lib/shared/model/validation"; import { trpc } from "$lib/shared/trpc"; import { loadWrap } from "$lib/shared/util"; -import { SchemaNewExecution } from "./editExecution/schema"; +import { SchemaNewExecution } from "./schema"; export const load: PageLoad = async (event) => { const entry = await loadWrap(async () => { diff --git a/src/routes/(app)/entry/[id]/editExecution/+page.server.ts b/src/routes/(app)/entry/[id]/editExecution/+page.server.ts index 2fd0dbe..92b9b6c 100644 --- a/src/routes/(app)/entry/[id]/editExecution/+page.server.ts +++ b/src/routes/(app)/entry/[id]/editExecution/+page.server.ts @@ -7,7 +7,7 @@ import { ZUrlEntityId } from "$lib/shared/model/validation"; import { trpc } from "$lib/shared/trpc"; import { loadWrap, moveEntryTodoDate } from "$lib/shared/util"; -import { SchemaNewExecution } from "./schema"; +import { SchemaNewExecution } from "../schema"; export const actions: Actions = { default: async (event) => loadWrap(async () => { diff --git a/src/routes/(app)/entry/[id]/editExecution/+page.svelte b/src/routes/(app)/entry/[id]/editExecution/+page.svelte index 6815372..d67ec0f 100644 --- a/src/routes/(app)/entry/[id]/editExecution/+page.svelte +++ b/src/routes/(app)/entry/[id]/editExecution/+page.svelte @@ -10,7 +10,7 @@ import EntryTodoButton from "$lib/components/ui/EntryTodoButton.svelte"; import MarkdownInput from "$lib/components/ui/markdown/MarkdownInput.svelte"; - import { SchemaNewExecution } from "./schema"; + import { SchemaNewExecution } from "../schema"; export let data: PageData; diff --git a/src/routes/(app)/entry/[id]/editExecution/+page.ts b/src/routes/(app)/entry/[id]/editExecution/+page.ts index 98499b7..dcaced1 100644 --- a/src/routes/(app)/entry/[id]/editExecution/+page.ts +++ b/src/routes/(app)/entry/[id]/editExecution/+page.ts @@ -6,7 +6,7 @@ import { ZUrlEntityId } from "$lib/shared/model/validation"; import { trpc } from "$lib/shared/trpc"; import { loadWrap } from "$lib/shared/util"; -import { SchemaNewExecution } from "./schema"; +import { SchemaNewExecution } from "../schema"; export const load: PageLoad = async (event) => { const entry = await loadWrap(async () => { diff --git a/src/routes/(app)/entry/[id]/editExecution/schema.ts b/src/routes/(app)/entry/[id]/editExecution/schema.ts deleted file mode 100644 index dd65863..0000000 --- a/src/routes/(app)/entry/[id]/editExecution/schema.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { zod } from "sveltekit-superforms/adapters"; - -import { ZEntryExecutionNew, fields } from "$lib/shared/model/validation"; - -export const SchemaNewExecution = zod( - ZEntryExecutionNew.extend({ - old_execution_id: fields.EntityId().optional(), - }), -); diff --git a/src/routes/(app)/entry/[id]/schema.ts b/src/routes/(app)/entry/[id]/schema.ts index 5613684..dd65863 100644 --- a/src/routes/(app)/entry/[id]/schema.ts +++ b/src/routes/(app)/entry/[id]/schema.ts @@ -1,10 +1,9 @@ import { zod } from "sveltekit-superforms/adapters"; -import { z } from "zod"; -import { fields } from "$lib/shared/model/validation"; +import { ZEntryExecutionNew, fields } from "$lib/shared/model/validation"; -const ZEntryDone = z.object({ - text: fields.TextString(), -}); - -export const SchemaEntryExecution = zod(ZEntryDone); +export const SchemaNewExecution = zod( + ZEntryExecutionNew.extend({ + old_execution_id: fields.EntityId().optional(), + }), +); diff --git a/src/routes/(app)/visit/+page.svelte b/src/routes/(app)/visit/+page.svelte index ef23819..08aa4fe 100644 --- a/src/routes/(app)/visit/+page.svelte +++ b/src/routes/(app)/visit/+page.svelte @@ -3,13 +3,18 @@ import { goto } from "$app/navigation"; import type { PageData } from "./$types"; + import { mdiCalendar, mdiDomain } from "@mdi/js"; + import { URL_VISIT } from "$lib/shared/constants"; import type { PaginationRequest, Station } from "$lib/shared/model"; import { trpc } from "$lib/shared/trpc"; - import { DateRange, getQueryUrl } from "$lib/shared/util"; + import { + DateRange, dateFromYMD, getQueryUrl, humanDate, + } from "$lib/shared/util"; import Autocomplete from "$lib/components/filter/Autocomplete.svelte"; import EntryCard from "$lib/components/ui/EntryCard.svelte"; + import IconButton from "$lib/components/ui/IconButton.svelte"; import PaginationButtons from "$lib/components/ui/PaginationButtons.svelte"; import WeekSelector from "$lib/components/ui/WeekSelector.svelte"; @@ -40,9 +45,12 @@ selection = null; } + $: groupByStation = data.query.group === "station"; + function paginationUpdate(pagination: PaginationRequest): void { updateQuery({ filter: data.query.filter, + group: data.query.group, pagination, }); } @@ -54,6 +62,14 @@ station: selection ? [selection] : undefined, date: dateRange ? [{ id: dateRange.toString() }] : undefined, }, + group: data.query.group, + }); + } + + function toggleGroup(): void { + updateQuery({ + ...data.query, + group: groupByStation ? undefined : "station", }); } @@ -74,30 +90,53 @@
- Woche:
+
-
- Station:
- trpc().station.list.query()}
- onSelect={filterUpdate}
- onUnselect={filterUpdate}
- bind:selection />
+
+
+ Gruppierung:
+
+
+ Station:
+ trpc().station.list.query()}
+ onSelect={filterUpdate}
+ onUnselect={filterUpdate}
+ bind:selection />
+
- {#each data.entries.items as entry}
-
+ {#if data.groupByStation}
+ {#if first.patient.room}
+ Station {first.patient.room?.station.name}
+ {:else}
+ Keine Station
+ {/if}
+ {:else}
+ {humanDate(dateFromYMD(first.current_version.date), false, true)}
+ {/if}
+
+ {#each group.prio as entry}
+