diff --git a/tasks/components/layout/PatientDetails.tsx b/tasks/components/layout/PatientDetails.tsx
index 3b48dad4c..b8f389a29 100644
--- a/tasks/components/layout/PatientDetails.tsx
+++ b/tasks/components/layout/PatientDetails.tsx
@@ -1,6 +1,7 @@
import { useContext, useEffect, useState } from 'react'
import type { Translation } from '@helpwave/hightide'
+import { Label } from '@helpwave/hightide'
import {
LoadingAndErrorComponent,
type PropsForTranslation,
@@ -171,7 +172,6 @@ export const PatientDetail = ({
+
+
{personalTaskTemplatesData && wardTaskTemplatesData && (
- {
deleteTaskMutation.mutate(task.id)
setIsShowingDeleteDialog(false)
- onClose()
+ onClose?.()
}}
onCancel={() => setIsShowingDeleteDialog(false)}
buttonOverwrites={[{}, {}, { color: 'negative' }]}
+ className="!z-200"
/>
- setTask({ ...task, name })}
+ onEditCompleted={(text) => updateTaskLocallyAndExternally({ ...task, name: text })}
+ className="text-2xl font-bold"
+ minLength={minTaskNameLength}
+ maxLength={maxTaskNameLength}
+ size={20}
+ />
+ )}
+
+ onClose={onClose}
+
+ className={clsx('gap-y-2 min-h-192 min-w-180 max-w-[calc(100vw_-_128rem_-_2rem)]]', {
'rounded-l-none': isCreating,
}, className)}
- headerProps={{
- title: (
- setTask({ ...task, name })}
- onEditCompleted={(text) => updateTaskLocallyAndExternally({ ...task, name: text })}
- labelClassName="text-2xl font-bold"
- minLength={minTaskNameLength}
- maxLength={maxTaskNameLength}
- size={20}
- />
- )
- }}
- onClose={onClose}
>
{isCreating && templateSidebar}
{tasksDetails}
{buttons}
-
+
)
}
diff --git a/tasks/components/selects/AssigneeSelect.tsx b/tasks/components/selects/AssigneeSelect.tsx
index 2695d7951..e994f606a 100644
--- a/tasks/components/selects/AssigneeSelect.tsx
+++ b/tasks/components/selects/AssigneeSelect.tsx
@@ -1,11 +1,12 @@
import type { SelectProps } from '@helpwave/hightide'
-import { Avatar, LoadingAndErrorComponent, Select } from '@helpwave/hightide'
-import clsx from 'clsx'
+import { Avatar, LoadingAndErrorComponent, Select, SelectOption } from '@helpwave/hightide'
import { useMembersByOrganizationQuery } from '@helpwave/api-services/mutations/users/organization_member_mutations'
import type { OrganizationMember } from '@helpwave/api-services/types/users/organization_member'
+import clsx from 'clsx'
-export type AssigneeSelectProps = Omit, 'options' | 'value'> & {
+export type AssigneeSelectProps = Omit & {
value?: string,
+ onValueChanged?: (user: OrganizationMember) => void,
}
/**
@@ -13,8 +14,7 @@ export type AssigneeSelectProps = Omit, 'options
*/
export const AssigneeSelect = ({
value,
- className,
- onChange,
+ onValueChanged,
...selectProps
}: AssigneeSelectProps) => {
const { data, isLoading, isError } = useMembersByOrganizationQuery()
@@ -26,26 +26,48 @@ export const AssigneeSelect = ({
className="min-h-10 w-full"
>
)
}
diff --git a/tasks/components/selects/RoomBedSelect.tsx b/tasks/components/selects/RoomBedSelect.tsx
index 4d26025ac..5b25aa50d 100644
--- a/tasks/components/selects/RoomBedSelect.tsx
+++ b/tasks/components/selects/RoomBedSelect.tsx
@@ -2,6 +2,7 @@ import { useEffect, useRef, useState } from 'react'
import { Undo2, X } from 'lucide-react'
import clsx from 'clsx'
import type { Translation } from '@helpwave/hightide'
+import { SelectOption } from '@helpwave/hightide'
import {
LoadingAndErrorComponent,
noop,
@@ -38,8 +39,8 @@ const defaultRoomBedSelectTranslation: Translation = {
de: {
saved: 'gespeichert',
unsaved: 'nicht gespeichert',
- valid: 'okay',
- invalid: 'nicht okay',
+ valid: 'Zulässig',
+ invalid: 'Nicht zulässig',
room: 'Raum',
bed: 'Bett',
revert: 'Rückgängig',
@@ -96,32 +97,43 @@ export const RoomBedSelect = ({
const roomSelect = (data && (
))
const bedSelect = (
)
const isShowingClear = isClearable && !isSubmitting && touched
const isShowingRevert = touched && hasChanges && !isSubmitting && !isCreating && !isClearable
const changesAndSaveRow = (
-
+
{isShowingRevert && (
-
+
{translation('revert')}
@@ -165,7 +193,7 @@ export const RoomBedSelect = ({
}}
color="negative"
>
-
+
{translation('revert')}
@@ -210,27 +238,27 @@ export const RoomBedSelect = ({
}
)}
>
-
+
-
+
{translation('room')}
{roomSelect}
-
+
{translation('bed')}
{bedSelect}
diff --git a/tasks/components/selects/TaskStatusSelect.tsx b/tasks/components/selects/TaskStatusSelect.tsx
index c81cfd157..3915a2260 100644
--- a/tasks/components/selects/TaskStatusSelect.tsx
+++ b/tasks/components/selects/TaskStatusSelect.tsx
@@ -1,4 +1,4 @@
-import { Select, type SelectProps } from '@helpwave/hightide'
+import { Select, SelectOption, type SelectProps } from '@helpwave/hightide'
import { useTranslation, type PropsForTranslation } from '@helpwave/hightide'
import type { TaskStatus } from '@helpwave/api-services/types/tasks/task'
@@ -24,11 +24,12 @@ const defaultTaskStatusSelectTranslation = {
}
}
-type TaskStatusSelectProps = Omit, 'options'> & {
+type TaskStatusSelectProps = Omit & {
/**
* All entries within this array will be removed as options
*/
removeOptions?: TaskStatus[],
+ onValueChanged?: (task: TaskStatus) => void,
}
/**
@@ -40,6 +41,7 @@ export const TaskStatusSelect = ({
overwriteTranslation,
removeOptions = [],
value,
+ onValueChanged,
...selectProps
}: PropsForTranslation) => {
const translation = useTranslation([defaultTaskStatusSelectTranslation], overwriteTranslation)
@@ -58,9 +60,21 @@ export const TaskStatusSelect = ({
return (
+ value={value}
+ onValueChanged={(value) => onValueChanged?.(value as TaskStatus)}
+ buttonProps={{
+ selectedDisplay: (value => {
+ const option = filteredOptions.find(status => status.value === value)
+ return option ? option.label : '-'
+ })
+ }}
+ >
+ {filteredOptions.map((option) => (
+
+ {option.label}
+
+ ))}
+
)
}
diff --git a/tasks/components/selects/TaskVisibilitySelect.tsx b/tasks/components/selects/TaskVisibilitySelect.tsx
index ecc12ea41..6728d183e 100644
--- a/tasks/components/selects/TaskVisibilitySelect.tsx
+++ b/tasks/components/selects/TaskVisibilitySelect.tsx
@@ -1,4 +1,4 @@
-import { Select, type SelectProps } from '@helpwave/hightide'
+import { Select, SelectOption, type SelectProps } from '@helpwave/hightide'
import { useTranslation, type PropsForTranslation } from '@helpwave/hightide'
type TaskVisibilitySelectTranslation = {
@@ -17,7 +17,10 @@ const defaultTaskVisibilitySelectTranslation = {
}
}
-type TaskVisibilitySelectProps = Omit, 'options'>
+type TaskVisibilitySelectProps = Omit & {
+ value?: boolean,
+ onValueChanged?: (isVisible: boolean) => void,
+}
/**
* A component for selecting a TaskVisibility
@@ -27,19 +30,36 @@ type TaskVisibilitySelectProps = Omit, 'options'>
export const TaskVisibilitySelect = ({
overwriteTranslation,
value,
+ onValueChanged,
...selectProps
}: PropsForTranslation) => {
const translation = useTranslation([defaultTaskVisibilitySelectTranslation], overwriteTranslation)
const options = [
- { value: true, label: translation('public') },
- { value: false, label: translation('private') },
+ { value: 'public', label: translation('public') },
+ { value: 'private', label: translation('private') },
]
return (
+ value={value ? 'public' : 'private'}
+ onValueChanged={(value: string) => onValueChanged?.(value === 'public')}
+ buttonProps={{
+ ...selectProps.buttonProps,
+ selectedDisplay: (value: string) => {
+ const option = options.find(option => option.value === value)
+ if(option) {
+ return option.label
+ }
+ return '-'
+ },
+ }}
+ >
+ {options.map((option, index) => (
+
+ {option.label}
+
+ ))}
+
)
}
diff --git a/tasks/globals.css b/tasks/globals.css
index 01769ef78..a876ade79 100644
--- a/tasks/globals.css
+++ b/tasks/globals.css
@@ -1,5 +1,5 @@
@import 'tailwindcss';
-@import '@helpwave/hightide/css/uncompiled/globals.css';
+@import '@helpwave/hightide/style/uncompiled/globals.css';
@source "./node_modules/@helpwave/hightide";
@@ -19,11 +19,11 @@
/* Header */
--color-header-background: var(--color-white);
- --color-header-text: var(--color-text-default);
+ --color-header-text: var(--color-black);
/* TaskModalSidebar */
- --color-task-modal-sidebar-background: var(--color-background);
- --color-task-modal-sidebar-text: var(--color-text-default);
+ --color-task-modal-sidebar-background: var(--color-surface-variant);
+ --color-task-modal-sidebar-text: var(--color-on-surface);
/* TwoColumn */
--color-twocolum-background: #C6C6C6;
@@ -35,6 +35,7 @@
@variant dark {
/* Header */
--color-header-background: var(--color-black);
+ --color-header-text: var(--color-white);
/* TwoColumn */
--color-twocolum-background: #363636;
diff --git a/tasks/package.json b/tasks/package.json
index 1f8481de3..46b3f1a87 100644
--- a/tasks/package.json
+++ b/tasks/package.json
@@ -15,22 +15,22 @@
"@dnd-kit/sortable": "7.0.2",
"@dnd-kit/modifiers": "9.0.0",
"@helpwave/api-services": "workspace:*",
- "@helpwave/hightide": "^0.1.25",
- "@tailwindcss/postcss": "^4.1.3",
- "@tanstack/react-query": "^4.36.1",
- "@tanstack/react-query-devtools": "^4.36.1",
- "@tanstack/react-table": "^8.21.3",
- "clsx": "^2.1.1",
+ "@helpwave/hightide": "0.1.36",
+ "@tailwindcss/postcss": "4.1.3",
+ "@tanstack/react-query": "4.36.1",
+ "@tanstack/react-query-devtools": "4.36.1",
+ "@tanstack/react-table": "8.21.3",
+ "clsx": "2.1.1",
"lucide-react": "0.468.0",
- "next": "^15.3.2",
- "postcss": "^8.5.3",
+ "next": "15.4.7",
+ "postcss": "8.5.3",
"react": "18.3.1",
"react-custom-scrollbars-2": "4.5.0",
"react-device-detect": "2.2.3",
"react-dom": "18.3.1",
- "tailwindcss": "^4.1.3",
+ "tailwindcss": "4.1.3",
"typescript": "5.7.2",
- "zod": "^3.25.73"
+ "zod": "3.25.73"
},
"devDependencies": {
"@helpwave/eslint-config": "^0.0.11",
diff --git a/tasks/pages/404.tsx b/tasks/pages/404.tsx
index e3393839f..b6b6d3c7b 100644
--- a/tasks/pages/404.tsx
+++ b/tasks/pages/404.tsx
@@ -1,10 +1,8 @@
-import { Helpwave } from '@helpwave/hightide'
import type { NextPage } from 'next'
import Link from 'next/link'
import Head from 'next/head'
-import type { Translation } from '@helpwave/hightide'
-import type { PropsForTranslation } from '@helpwave/hightide'
-import { useTranslation } from '@helpwave/hightide'
+import type { PropsForTranslation, Translation } from '@helpwave/hightide'
+import { HelpwaveLogo, useTranslation } from '@helpwave/hightide'
import titleWrapper from '@/utils/titleWrapper'
import { PageWithHeader } from '@/components/layout/PageWithHeader'
@@ -12,7 +10,7 @@ type NotFoundTranslation = {
notFound: string,
notFoundDescription1: string,
notFoundDescription2: string,
- homePage:string,
+ homePage: string,
}
const defaultNotFoundTranslation: Translation = {
@@ -37,13 +35,14 @@ const NotFound: NextPage = ({ overwriteTranslation }: PropsForTranslation
{titleWrapper()}
-
-
-
-
{translation('notFound')}
-
{translation('notFoundDescription1')}...
-
{translation('notFoundDescription2')} {translation('homePage')}.
-
+
+
+
{translation('notFound')}
+
{translation('notFoundDescription1')}...
+
{translation('notFoundDescription2')} {translation('homePage')}.
)
diff --git a/tasks/pages/index.tsx b/tasks/pages/index.tsx
index ed5f9927e..ddb549df1 100644
--- a/tasks/pages/index.tsx
+++ b/tasks/pages/index.tsx
@@ -51,7 +51,7 @@ const Dashboard: NextPage
{
setLastTimeStagingDisclaimerDismissed(new Date().getTime())
@@ -87,8 +87,10 @@ const Dashboard: NextPage
) => {
const translation = useTranslation([defaultWardsPageTranslation], overwriteTranslation)
const [contextState, setContextState] = useState(emptyOrganizationOverviewContextState)
- const [usedQueryParam, setUsedQueryParam] = useState(false)
const { organizationId, wardId } = useRouteParameters<'organizationId', 'wardId'>()
const { data: organization } = useOrganizationQuery(organizationId)
- if (wardId && !usedQueryParam) {
- setContextState({
- ...emptyOrganizationOverviewContextState,
- wardId,
- organizationId
- })
- setUsedQueryParam(true)
- }
+ useEffect(() => {
+ if(wardId && organizationId) {
+ setContextState({
+ ...emptyOrganizationOverviewContextState,
+ wardId,
+ organizationId
+ })
+ }
+ }, [wardId, organizationId])
useEffect(() => {
setContextState(contextState => ({ ...contextState, organizationId }))
diff --git a/tasks/utils/news.ts b/tasks/utils/news.ts
index 2a184d723..f1f37953a 100644
--- a/tasks/utils/news.ts
+++ b/tasks/utils/news.ts
@@ -1,6 +1,49 @@
-import { localizedNewsSchema, type LocalizedNews } from '@helpwave/hightide'
import { getConfig } from './config'
+import { z } from 'zod'
+import type { Language } from '@helpwave/hightide'
+import { LanguageUtil } from '@helpwave/hightide'
+
+export type News = {
+ title: string,
+ date: Date,
+ description: (string | URL)[],
+ externalResource?: URL,
+ keys: string[],
+}
+
+export type LocalizedNews = Record
+
+export const newsSchema = z.object({
+ title: z.string(),
+ description: z.string(),
+ date: z.string(),
+ image: z.string().url().optional(),
+ externalResource: z.string().url().optional(),
+ keys: z.array(z.string())
+}).transform((obj) => {
+ let description: (string | URL)[] = [obj.description]
+ if (obj.image) {
+ description = [new URL(obj.image), ...description]
+ }
+
+ return {
+ title: obj.title,
+ date: new Date(obj.date),
+ description,
+ externalResource: obj.externalResource ? new URL(obj.externalResource) : undefined,
+ keys: obj.keys
+ }
+})
+
+export const newsListSchema = z.array(newsSchema)
+
+export const localizedNewsSchema = z.record(z.enum(LanguageUtil.languages), newsListSchema)
+
+export const filterNews = (localizedNews: News[], requiredKeys: string[]) => {
+ return localizedNews.filter(news => requiredKeys.every(value => news.keys.includes(value)))
+}
+
export const fetchLocalizedNews = (): Promise => {
const { featuresFeedUrl } = getConfig()
return fetch(featuresFeedUrl)