bo/worklenz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/Worklenz/worklenz into release-v2.1.5

Browse Source
This commit is contained in:
chamiakJ
2025-07-29 19:11:33 +05:30
parent 01a580d992 8d17490f7e
commit 8a829c659f
5 changed files with 10 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
worklenz-backend/src/controllers/reporting/reporting-members-controller.ts
View File

@@ -324,8 +324,8 @@ export default class ReportingMembersController extends ReportingControllerBaseW
(SELECT color_code FROM project_phases WHERE id = (SELECT phase_id FROM task_phase WHERE task_id = t.id)) AS phase_color,
(total_minutes * 60) AS total_minutes,
(SELECT SUM(time_spent) FROM task_work_log WHERE task_id = t.id AND ta.team_member_id = $1) AS time_logged,
((SELECT SUM(time_spent) FROM task_work_log WHERE task_id = t.id AND ta.team_member_id = $1) - (total_minutes * 60)) AS overlogged_time`;
(SELECT SUM(time_spent) FROM task_work_log twl WHERE twl.task_id = t.id AND twl.user_id = (SELECT user_id FROM team_members WHERE id = $1)) AS time_logged,
((SELECT SUM(time_spent) FROM task_work_log twl WHERE twl.task_id = t.id AND twl.user_id = (SELECT user_id FROM team_members WHERE id = $1)) - (total_minutes * 60)) AS overlogged_time`;
}
protected static getActivityLogsOverdue(key: string, dateRange: string[]) {

7
worklenz-backend/src/socket.io/commands/on-quick-assign-or-remove.ts
View File

@@ -75,7 +75,7 @@ export async function on_quick_assign_or_remove(_io: Server, socket: Socket, dat
assign_type: type
});
if (userId !== assignment.user_id) {
if (assignment && userId !== assignment.user_id) {
NotificationsService.createTaskUpdate(
type,
userId as string,
@@ -109,6 +109,11 @@ export async function assignMemberIfNot(taskId: string, userId: string, teamId:
const result = await db.query(q, [taskId, userId, teamId]);
const [data] = result.rows;
if (!data) {
log_error(new Error(`No team member found for userId: ${userId}, teamId: ${teamId}`));
return;
}
const body = {
team_member_id: data.team_member_id,
project_id: data.project_id,