Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

reenable duedate field #590

Merged
merged 8 commits into from
Aug 14, 2023
Merged

reenable duedate field #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
159bbbf
feat: reenable duedate field
DasProffi Aug 6, 2023
7a4454a
feat: remove delete duedate for now and update proto
DasProffi Aug 8, 2023
e0e8f1b
Merge branch 'main' into issue/557-Due-date-for-task
DasProffi Aug 8, 2023
5b39b4a
Merge branch 'main' into issue/557-Due-date-for-task
DasProffi Aug 10, 2023
33ca1f5
refactor: improve code style
DasProffi Aug 14, 2023
ae4c426
Merge branch 'main' into issue/557-Due-date-for-task
DasProffi Aug 14, 2023
08a3077
chore: merge and update protos
DasProffi Aug 14, 2023
8df1b88
fix: fix failing type check
DasProffi Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

71 changes: 52 additions & 19 deletions tasks/components/layout/TaskDetailView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { PropsWithLanguage } from '@helpwave/common/hooks/useTranslation'
import { useTranslation } from '@helpwave/common/hooks/useTranslation'
import { tw } from '@helpwave/common/twind'
import { tw, tx } from '@helpwave/common/twind'
import { ToggleableInput } from '@helpwave/common/components/user_input/ToggleableInput'
import { Textarea } from '@helpwave/common/components/user_input/Textarea'
import { Select } from '@helpwave/common/components/user_input/Select'
Expand All @@ -14,23 +14,25 @@ import { TaskTemplateListColumn } from '../TaskTemplateListColumn'
import { Input } from '@helpwave/common/components/user_input/Input'
import type { Languages } from '@helpwave/common/hooks/useLanguage'
import type { TaskTemplateDTO } from '../../mutations/task_template_mutations'
import {
usePersonalTaskTemplateQuery,
useWardTaskTemplateQuery
} from '../../mutations/task_template_mutations'
import { usePersonalTaskTemplateQuery, useWardTaskTemplateQuery } from '../../mutations/task_template_mutations'
import { useAuth } from '../../hooks/useAuth'
import { useRouter } from 'next/router'
import type { TaskDTO } from '../../mutations/task_mutations'
import {
emptyTask,
useSubTaskAddMutation,
useTaskCreateMutation, useTaskDeleteMutation,
useTaskCreateMutation,
useTaskDeleteMutation,
useTaskQuery,
useTaskToDoneMutation,
useTaskToInProgressMutation,
useTaskToToDoMutation,
useTaskUpdateMutation
} from '../../mutations/task_mutations'
import { useEffect, useState } from 'react'
import { LoadingAnimation } from '@helpwave/common/components/LoadingAnimation'
import { tx } from '@twind/core'
import { GetPatientDetailsResponse } from '@helpwave/proto-ts/proto/services/task_svc/v1/patient_svc_pb'
import TaskStatus = GetPatientDetailsResponse.TaskStatus
import { LoadingAndErrorComponent } from '@helpwave/common/components/LoadingAndErrorComponent'

type TaskDetailViewTranslation = {
Expand Down Expand Up @@ -121,6 +123,9 @@ export const TaskDetailView = ({

const updateTaskMutation = useTaskUpdateMutation()
const deleteTaskMutation = useTaskDeleteMutation(onClose)
const toToDoMutation = useTaskToToDoMutation()
const toInProgressMutation = useTaskToInProgressMutation()
const toDoneMutation = useTaskToDoneMutation()

useEffect(() => {
if (data && taskID) {
Expand Down Expand Up @@ -179,8 +184,8 @@ export const TaskDetailView = ({
</div>
{ /* TODO create a new component for this */}
<div className={tw('flex flex-col justify-between min-w-[250px]')}>
<div className={tw('flex flex-col gap-y-4 hidden')}>
<div>
<div className={tw('flex flex-col gap-y-4')}>
<div className={tw('hidden')} /* TODO enable later */ >
<label><Span type="labelMedium">{translation.assignee}</Span></label>
<Select
value={task.assignee}
Expand All @@ -197,20 +202,48 @@ export const TaskDetailView = ({
</div>
<div>
<label><Span type="labelMedium">{translation.dueDate}</Span></label>
<Input
value={formatDate(task.dueDate)}
type="datetime-local"
onChange={value => {
const dueDate = new Date(value)
setTask({ ...task, dueDate })
}}
/>
<div className={tw('flex flex-row items-center gap-x-2')}>
<Input
value={task.dueDate ? formatDate(task.dueDate) : ''}
type="datetime-local"
onChange={value => {
const dueDate = new Date(value)
setTask({ ...task, dueDate })
// Maybe add some auto save here after a validation
}}
/>
{ /* TODO reenable when backend has implemented a remove duedate
<Button
onClick={() => setTask({ ...task, dueDate: undefined })}
variant="textButton"
color="negative"
disabled={!task.dueDate}
>
<X size={24}/>
</Button>
*/ }
</div>
</div>
<div>
<label><Span type="labelMedium">{translation.status}</Span></label>
<TaskStatusSelect value={task.status} onChange={status => setTask({ ...task, status })}/>
<TaskStatusSelect value={task.status} onChange={status => {
switch (status) {
case TaskStatus.TASK_STATUS_TODO:
toToDoMutation.mutate(task.id)
break
case TaskStatus.TASK_STATUS_IN_PROGRESS:
toInProgressMutation.mutate(task.id)
break
case TaskStatus.TASK_STATUS_DONE:
toDoneMutation.mutate(task.id)
break
default:
break
}
setTask({ ...task, status })
}}/>
</div>
<div>
<div className={tw('hidden')} /* TODO enable later */>
<label><Span type="labelMedium">{translation.visibility}</Span></label>
<Select
value={task.isPublicVisible}
Expand Down
Loading