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

Add issueType && taskStatus fields #8531

Merged
merged 2 commits into from
Nov 8, 2024
Merged

Add issueType && taskStatus fields #8531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9b09f7
Add issueType && taskStatus fields
samuelmbabhazi Nov 8, 2024
df95833
fix: removed spaces
rahul-rocket Nov 8, 2024
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
2 changes: 2 additions & 0 deletions packages/contracts/src/task.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
rahul-rocket marked this conversation as resolved.
Show resolved Hide resolved

parent?: ITask;
parentId?: ID; // Optional field for specifying the parent task ID
children?: ITask[];
Expand Down
36 changes: 27 additions & 9 deletions packages/core/src/time-tracking/time-log/time-log.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,18 @@ export class TimeLogService extends TenantAwareCrudService<TimeLog> {
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,
Expand Down Expand Up @@ -346,7 +357,18 @@ export class TimeLogService extends TenantAwareCrudService<TimeLog> {
},
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,
Expand All @@ -373,15 +395,11 @@ export class TimeLogService extends TenantAwareCrudService<TimeLog> {
},
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
Expand Down
Loading