diff --git a/packages/contracts/src/task.model.ts b/packages/contracts/src/task.model.ts index 441710a0036..11cd0c92dfa 100644 --- a/packages/contracts/src/task.model.ts +++ b/packages/contracts/src/task.model.ts @@ -41,6 +41,8 @@ export interface ITask creatorId?: ID; isDraft?: boolean; // Define if task is still draft (E.g : Task description not completed yet) + issueType?: string; + parent?: ITask; parentId?: ID; // Optional field for specifying the parent task ID children?: ITask[]; diff --git a/packages/core/src/time-tracking/time-log/time-log.service.ts b/packages/core/src/time-tracking/time-log/time-log.service.ts index 3bb908331cf..544e48a6572 100644 --- a/packages/core/src/time-tracking/time-log/time-log.service.ts +++ b/packages/core/src/time-tracking/time-log/time-log.service.ts @@ -93,7 +93,18 @@ export class TimeLogService extends TenantAwareCrudService { task: { id: true, title: true, - estimate: true + estimate: true, + taskStatus: { + name: true, + value: true, + description: true, + icon: true, + color: true, + order: true, + isCollapsed: true, + isDefault: true + }, + issueType: true }, organizationContact: { id: true, @@ -346,7 +357,18 @@ export class TimeLogService extends TenantAwareCrudService { }, task: { id: true, - title: true + title: true, + taskStatus: { + name: true, + value: true, + description: true, + icon: true, + color: true, + order: true, + isCollapsed: true, + isDefault: true + }, + issueType: true }, timeSlots: { id: true, @@ -373,15 +395,11 @@ export class TimeLogService extends TenantAwareCrudService { }, relations: { // Related entities to be included in the result - project: { - organizationContact: true - }, - task: true, + project: { organizationContact: true }, + task: { taskStatus: true }, timeSlots: true, organizationContact: true, - employee: { - user: true - } + employee: { user: true } }, order: { // Order results by the 'startedAt' field in ascending order