diff --git a/models/process/src/index.ts b/models/process/src/index.ts index 9b04243839..81e61e4178 100644 --- a/models/process/src/index.ts +++ b/models/process/src/index.ts @@ -188,8 +188,6 @@ export class TExecution extends TDoc implements Execution { export class TProcessToDo extends TToDo implements ProcessToDo { execution!: Ref - state!: Ref - @Prop(TypeBoolean(), process.string.Rollback) withRollback!: boolean } @@ -823,6 +821,12 @@ export function createModel (builder: Builder): void { label: process.string.Step, presenter: process.component.ExecutonProgressPresenter }, + { + key: '', + presenter: process.component.ExecutionMyToDos, + label: process.string.ToDo, + displayProps: { key: 'todos' } + }, { key: '', presenter: process.component.ExecutonPresenter, displayProps: { grow: true } }, { key: 'modifiedOn', @@ -881,6 +885,12 @@ export function createModel (builder: Builder): void { label: process.string.Step, presenter: process.component.ExecutonProgressPresenter }, + { + key: '', + presenter: process.component.ExecutionMyToDos, + label: process.string.ToDo, + displayProps: { key: 'todos' } + }, { key: '', presenter: process.component.ExecutonPresenter, displayProps: { grow: true } }, { key: 'modifiedOn', diff --git a/models/time/src/index.ts b/models/time/src/index.ts index fde4b5cff7..bf5717c712 100644 --- a/models/time/src/index.ts +++ b/models/time/src/index.ts @@ -119,7 +119,7 @@ export class TToDo extends TAttachedDoc implements ToDo { @Index(IndexKind.FullText) description!: Markup - doneOn?: Timestamp | null + doneOn!: Timestamp | null @Prop(TypeRef(contactPlugin.mixin.Employee), contactPlugin.string.Employee) @Index(IndexKind.Indexed) diff --git a/plugins/process-resources/package.json b/plugins/process-resources/package.json index 63fbd491d0..951608b950 100644 --- a/plugins/process-resources/package.json +++ b/plugins/process-resources/package.json @@ -51,6 +51,7 @@ "@hcengineering/workbench-resources": "^0.6.1", "@hcengineering/core": "^0.6.32", "@hcengineering/ui": "^0.6.15", + "@hcengineering/time": "^0.6.0", "@hcengineering/rank": "^0.6.4", "@hcengineering/platform": "^0.6.11", "@hcengineering/process": "^0.6.0", diff --git a/plugins/process-resources/src/components/ExecutionAllToDos.svelte b/plugins/process-resources/src/components/ExecutionAllToDos.svelte new file mode 100644 index 0000000000..cd8164973a --- /dev/null +++ b/plugins/process-resources/src/components/ExecutionAllToDos.svelte @@ -0,0 +1,56 @@ + + + +
+ {#each todos as todo (todo._id)} +
+ + +
+ {/each} +
diff --git a/plugins/process-resources/src/components/ExecutionDetails.svelte b/plugins/process-resources/src/components/ExecutionDetails.svelte index 907f80717e..23a9ca40ff 100644 --- a/plugins/process-resources/src/components/ExecutionDetails.svelte +++ b/plugins/process-resources/src/components/ExecutionDetails.svelte @@ -28,6 +28,7 @@ import { createEventDispatcher } from 'svelte' import NextTriggers from './NextTriggers.svelte' import process from '../plugin' + import ExecutionAllToDos from './ExecutionAllToDos.svelte' export let execution: Execution @@ -130,6 +131,7 @@ on:close > +
diff --git a/plugins/process-resources/src/components/ExecutionMyToDos.svelte b/plugins/process-resources/src/components/ExecutionMyToDos.svelte new file mode 100644 index 0000000000..4ef8922b5d --- /dev/null +++ b/plugins/process-resources/src/components/ExecutionMyToDos.svelte @@ -0,0 +1,45 @@ + + + +{#each todos as todo (todo._id)} + +{/each} diff --git a/plugins/process-resources/src/components/NextTriggers.svelte b/plugins/process-resources/src/components/NextTriggers.svelte index 8352855f84..5ce33d3f57 100644 --- a/plugins/process-resources/src/components/NextTriggers.svelte +++ b/plugins/process-resources/src/components/NextTriggers.svelte @@ -39,10 +39,12 @@ {:else if execution.status === ExecutionStatus.Cancelled}