@hed-hog/operations 0.0.304 → 0.0.306

package/dist/operations.service.js

@@ -107,7 +107,7 @@ const FINANCIAL_TERM_TYPE_VALUES = ['value', 'payment', 'revenue', 'fine', 'othe
 const RECURRENCE_VALUES = ['one_time', 'monthly', 'quarterly', 'yearly', 'other'];
 const REVISION_TYPE_VALUES = ['amendment', 'renewal', 'revision', 'addendum', 'other'];
 const REVISION_STATUS_VALUES = ['draft', 'active', 'completed', 'cancelled'];
-const TASK_STATUS_VALUES = ['active', 'completed', 'archived'];
+const TASK_STATUS_VALUES = ['todo', 'doing', 'review', 'done'];
 let OperationsService = OperationsService_1 = class OperationsService {
     constructor(prisma, aiService, integrationApi, fileService, settingService, accessService, localeService) {
         this.prisma = prisma;
@@ -834,6 +834,20 @@ let OperationsService = OperationsService_1 = class OperationsService {
             if (data.equityParticipation !== undefined) {
                 await this.replaceCollaboratorEquityParticipation(tx, collaboratorId, data.equityParticipation);
             }
+            if (data.compensationAmount !== undefined ||
+                data.contractDescription !== undefined ||
+                data.autoGenerateContractDraft !== undefined ||
+                data.joinedAt !== undefined ||
+                data.weeklyCapacityHours !== undefined ||
+                data.supervisorCollaboratorId !== undefined ||
+                data.collaboratorType !== undefined ||
+                data.collaboratorTypeId !== undefined ||
+                data.collaboratorTypeSlug !== undefined ||
+                data.code !== undefined ||
+                data.personId !== undefined ||
+                data.displayName !== undefined) {
+                await this.syncHiringContractDraft(tx, actor.userId, collaboratorId, data);
+            }
         });
         return this.getCollaboratorByIdForUser(userId, collaboratorId);
     }
@@ -1021,8 +1035,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
               p.progress_percent AS "progressPercent",
               p.delivery_model AS "deliveryModel",
               p.budget_amount AS "budgetAmount",
-              p.start_date AS "startDate",
-              p.end_date AS "endDate",
+              TO_CHAR(p.start_date, 'YYYY-MM-DD') AS "startDate",
+              TO_CHAR(p.end_date, 'YYYY-MM-DD') AS "endDate",
               c.name AS "contractName",
               c.status AS "contractStatus",
               m.display_name AS "managerName",
@@ -1043,20 +1057,18 @@ let OperationsService = OperationsService_1 = class OperationsService {
         var _a, _b;
         const actor = await this.getActorContext(userId);
         this.ensureCollaborator(actor);
-        if (!actor.collaboratorId) {
-            throw new common_1.BadRequestException('Collaborator context is required.');
-        }
         const pagination = this.normalizePaginationParams(paginationParams, {
             defaultSortField: 'name',
             defaultSortOrder: 'asc',
             allowedSortFields: ['name', 'code', 'clientName', 'startDate', 'endDate'],
         });
-        const params = [actor.collaboratorId];
+        const filter = this.buildIdFilter(actor.visibleProjectIds, 'p.id', actor.isDirector);
+        const params = [...filter.params];
         const filters = [
             'p.deleted_at IS NULL',
             'pa.deleted_at IS NULL',
-            `pa.collaborator_id = $1`,
             `pa.status IN ('planned', 'active')`,
+            filter.clause,
         ];
         if (pagination.search) {
             const searchPlaceholder = this.param(params, `%${pagination.search}%`);
@@ -1090,8 +1102,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
               MAX(pa.id)::int AS "projectAssignmentId",
               MAX(pa.role_label) AS "roleLabel",
               p.status,
-              p.start_date AS "startDate",
-              p.end_date AS "endDate"
+              TO_CHAR(p.start_date, 'YYYY-MM-DD') AS "startDate",
+              TO_CHAR(p.end_date, 'YYYY-MM-DD') AS "endDate"
          FROM operations_project_assignment pa
          JOIN operations_project p
            ON p.id = pa.project_id
@@ -1106,21 +1118,25 @@ let OperationsService = OperationsService_1 = class OperationsService {
         var _a, _b;
         const actor = await this.getActorContext(userId);
         this.ensureCollaborator(actor);
-        if (!actor.collaboratorId) {
-            throw new common_1.BadRequestException('Collaborator context is required.');
-        }
         const pagination = this.normalizePaginationParams(paginationParams, {
             defaultSortField: 'name',
             defaultSortOrder: 'asc',
             allowedSortFields: ['name', 'projectName', 'status', 'createdAt'],
         });
-        const params = [actor.collaboratorId];
+        const projectFilter = this.buildIdFilter(actor.visibleProjectIds, 'COALESCE(t.project_id, pa.project_id)', actor.isDirector);
+        const params = [...projectFilter.params];
         const filters = [
             't.deleted_at IS NULL',
-            'pa.deleted_at IS NULL',
             'p.deleted_at IS NULL',
-            `pa.collaborator_id = $1`,
-            `pa.status IN ('planned', 'active')`,
+            projectFilter.clause,
+            `(
+        t.project_id IS NOT NULL
+        OR (
+          pa.id IS NOT NULL
+          AND pa.deleted_at IS NULL
+          AND pa.status IN ('planned', 'active')
+        )
+      )`,
         ];
         if (pagination.search) {
             const searchPlaceholder = this.param(params, `%${pagination.search}%`);
@@ -1135,7 +1151,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
             filters.push(`pa.id = ${this.param(params, paginationParams.projectAssignmentId)}`);
         }
         if (paginationParams.projectId) {
-            filters.push(`pa.project_id = ${this.param(params, paginationParams.projectId)}`);
+            filters.push(`COALESCE(t.project_id, pa.project_id) = ${this.param(params, paginationParams.projectId)}`);
         }
         if (paginationParams.status) {
             filters.push(`t.status = ${this.param(params, paginationParams.status)}`);
@@ -1143,10 +1159,10 @@ let OperationsService = OperationsService_1 = class OperationsService {
         const whereClause = filters.join(' AND ');
         const totalRow = await this.querySingle(`SELECT COUNT(*)::text AS total
          FROM operations_task t
-         JOIN operations_project_assignment pa
+         LEFT JOIN operations_project_assignment pa
            ON pa.id = t.project_assignment_id
          JOIN operations_project p
-           ON p.id = pa.project_id
+           ON p.id = COALESCE(t.project_id, pa.project_id)
         WHERE ${whereClause}`, params);
         const sortColumn = (_a = {
             name: 't.name',
@@ -1161,16 +1177,16 @@ let OperationsService = OperationsService_1 = class OperationsService {
               t.name,
               t.description,
               t.status,
-              pa.project_id AS "projectId",
+              COALESCE(t.project_id, pa.project_id) AS "projectId",
               pa.id AS "projectAssignmentId",
               p.name AS "projectName",
               p.code AS "projectCode",
               t.created_at AS "createdAt"
          FROM operations_task t
-         JOIN operations_project_assignment pa
+         LEFT JOIN operations_project_assignment pa
            ON pa.id = t.project_assignment_id
          JOIN operations_project p
-           ON p.id = pa.project_id
+           ON p.id = COALESCE(t.project_id, pa.project_id)
         WHERE ${whereClause}
         ORDER BY ${sortColumn} ${pagination.sortOrder.toUpperCase()}, t.id ASC
         LIMIT ${limitPlaceholder}
@@ -1178,52 +1194,84 @@ let OperationsService = OperationsService_1 = class OperationsService {
         return this.buildPaginationResult(rows.map((row) => (Object.assign(Object.assign({}, row), { label: [row.name, row.projectName].filter(Boolean).join(' • ') }))), Number((_b = totalRow === null || totalRow === void 0 ? void 0 : totalRow.total) !== null && _b !== void 0 ? _b : 0), pagination.page, pagination.pageSize);
     }
     async createTask(userId, data) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         const actor = await this.getActorContext(userId);
-        this.ensureCollaborator(actor);
+        if (!actor.isCollaborator && !actor.isDirector && !actor.isSupervisor) {
+            throw new common_1.ForbiddenException('Operations collaborator access is required.');
+        }
         this.requireFields(data, ['name']);
-        if (!actor.collaboratorId) {
-            throw new common_1.BadRequestException('Collaborator context is required.');
+        let assignmentId = null;
+        let projectId = null;
+        if (data.projectId || data.projectAssignmentId) {
+            const assignment = await this.resolveProjectAssignmentForActor(this.prisma, actor, {
+                projectId: (_a = data.projectId) !== null && _a !== void 0 ? _a : null,
+                projectAssignmentId: (_b = data.projectAssignmentId) !== null && _b !== void 0 ? _b : null,
+            });
+            await this.assertProjectAccess(actor, assignment.projectId);
+            assignmentId = assignment.id;
+            projectId = assignment.projectId;
+        }
+        else if (data.projectId) {
+            projectId = data.projectId;
+            await this.assertProjectAccess(actor, projectId);
+        }
+        else {
+            throw new common_1.BadRequestException('Either projectId or projectAssignmentId is required.');
+        }
+        if (!projectId) {
+            projectId = (_c = data.projectId) !== null && _c !== void 0 ? _c : null;
         }
-        const assignment = await this.resolveOwnedProjectAssignment(this.prisma, actor.collaboratorId, {
-            projectId: (_a = data.projectId) !== null && _a !== void 0 ? _a : null,
-            projectAssignmentId: (_b = data.projectAssignmentId) !== null && _b !== void 0 ? _b : null,
-        });
-        await this.assertProjectAccess(actor, assignment.projectId);
         const name = this.normalizeOptionalText(data.name);
         if (!name) {
             throw new common_1.BadRequestException('Field "name" is required.');
         }
+        const maxPositionRow = await this.querySingle(`SELECT MAX(position) AS max_pos
+         FROM operations_task
+        WHERE project_id = $1
+          AND status = $2::operations_task_status_574c143dbe_enum
+          AND deleted_at IS NULL`, [projectId, (_d = data.status) !== null && _d !== void 0 ? _d : 'todo']);
+        const nextPosition = ((_e = maxPositionRow === null || maxPositionRow === void 0 ? void 0 : maxPositionRow.max_pos) !== null && _e !== void 0 ? _e : -1) + 1;
         const created = await this.querySingle(`INSERT INTO operations_task (
+        project_id,
         project_assignment_id,
+        assignee_collaborator_id,
         name,
         description,
+        priority,
         status,
+        due_date,
+        estimate_hours,
+        position,
+        tags,
         created_at,
         updated_at
       ) VALUES (
-        $1,
-        $2,
-        $3,
-        $4,
-        NOW(),
-        NOW()
+        $1, $2, $3, $4, $5,
+        $6::operations_task_priority_394ab327eb_enum,
+        $7::operations_task_status_574c143dbe_enum,
+        $8::date, $9::decimal, $10, $11, NOW(), NOW()
       )
       RETURNING id`, [
-            assignment.id,
+            projectId,
+            assignmentId,
+            (_f = data.assigneeCollaboratorId) !== null && _f !== void 0 ? _f : null,
             name,
             this.normalizeOptionalText(data.description),
-            (_c = data.status) !== null && _c !== void 0 ? _c : 'active',
+            (_g = data.priority) !== null && _g !== void 0 ? _g : 'medium',
+            (_h = data.status) !== null && _h !== void 0 ? _h : 'todo',
+            (_j = data.dueDate) !== null && _j !== void 0 ? _j : null,
+            (_k = data.estimateHours) !== null && _k !== void 0 ? _k : null,
+            (_l = data.position) !== null && _l !== void 0 ? _l : nextPosition,
+            (_m = data.tags) !== null && _m !== void 0 ? _m : null,
         ]);
-        return this.getTaskOptionById(actor.collaboratorId, (_d = created === null || created === void 0 ? void 0 : created.id) !== null && _d !== void 0 ? _d : 0);
+        return this.getProjectBoardTask((_o = created === null || created === void 0 ? void 0 : created.id) !== null && _o !== void 0 ? _o : 0);
     }
     async updateTask(userId, taskId, data) {
         const actor = await this.getActorContext(userId);
-        this.ensureCollaborator(actor);
-        if (!actor.collaboratorId) {
-            throw new common_1.BadRequestException('Collaborator context is required.');
+        if (!actor.isCollaborator && !actor.isDirector && !actor.isSupervisor) {
+            throw new common_1.ForbiddenException('Operations collaborator access is required.');
         }
-        const current = await this.getOwnedTaskRecord(this.prisma, actor.collaboratorId, taskId);
+        const current = await this.getTaskRecordForActor(this.prisma, actor, taskId);
         await this.assertProjectAccess(actor, current.projectId);
         const nextName = data.name !== undefined
             ? this.normalizeOptionalText(data.name)
@@ -1232,42 +1280,50 @@ let OperationsService = OperationsService_1 = class OperationsService {
             throw new common_1.BadRequestException('Field "name" is required.');
         }
         await this.prisma.$transaction(async (tx) => {
-            var _a, _b, _c, _d;
-            const nextAssignment = data.projectId !== undefined || data.projectAssignmentId !== undefined
-                ? await this.resolveOwnedProjectAssignment(tx, actor.collaboratorId, {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            let nextAssignmentId = current.projectAssignmentId;
+            let nextProjectId = current.projectId;
+            if (data.projectId !== undefined || data.projectAssignmentId !== undefined) {
+                const nextAssignment = await this.resolveProjectAssignmentForActor(tx, actor, {
                     projectId: (_a = data.projectId) !== null && _a !== void 0 ? _a : null,
                     projectAssignmentId: (_b = data.projectAssignmentId) !== null && _b !== void 0 ? _b : null,
-                })
-                : {
-                    id: current.projectAssignmentId,
-                    projectId: current.projectId,
-                };
-            await this.assertProjectAccess(actor, nextAssignment.projectId);
+                });
+                await this.assertProjectAccess(actor, nextAssignment.projectId);
+                nextAssignmentId = nextAssignment.id;
+                nextProjectId = nextAssignment.projectId;
+            }
             await tx.$executeRawUnsafe(`UPDATE operations_task
-            SET project_assignment_id = $1,
-                name = $2,
-                description = $3,
-                status = $4,
+            SET project_id = $1,
+                project_assignment_id = $2,
+                assignee_collaborator_id = $3,
+                name = $4,
+                description = $5,
+                priority = $6::operations_task_priority_394ab327eb_enum,
+                status = $7::operations_task_status_574c143dbe_enum,
+                due_date = $8::date,
+                estimate_hours = $9::decimal,
+                position = $10,
+                tags = $11,
                 updated_at = NOW()
-          WHERE id = $5
-            AND deleted_at IS NULL`, nextAssignment.id, nextName, data.description !== undefined
+          WHERE id = $12
+            AND deleted_at IS NULL`, nextProjectId, nextAssignmentId, data.assigneeCollaboratorId !== undefined
+                ? ((_c = data.assigneeCollaboratorId) !== null && _c !== void 0 ? _c : null)
+                : current.assigneeCollaboratorId, nextName, data.description !== undefined
                 ? this.normalizeOptionalText(data.description)
-                : ((_c = current.description) !== null && _c !== void 0 ? _c : null), (_d = data.status) !== null && _d !== void 0 ? _d : current.status, taskId);
+                : ((_d = current.description) !== null && _d !== void 0 ? _d : null), (_e = data.priority) !== null && _e !== void 0 ? _e : current.priority, (_f = data.status) !== null && _f !== void 0 ? _f : current.status, data.dueDate !== undefined ? ((_g = data.dueDate) !== null && _g !== void 0 ? _g : null) : current.dueDate, data.estimateHours !== undefined ? ((_h = data.estimateHours) !== null && _h !== void 0 ? _h : null) : current.estimateHours, data.position !== undefined ? data.position : current.position, data.tags !== undefined ? ((_j = data.tags) !== null && _j !== void 0 ? _j : null) : current.tags, taskId);
         });
-        return this.getTaskOptionById(actor.collaboratorId, taskId);
+        return this.getProjectBoardTask(taskId);
     }
     async removeTask(userId, taskId) {
         const actor = await this.getActorContext(userId);
-        this.ensureCollaborator(actor);
-        if (!actor.collaboratorId) {
-            throw new common_1.BadRequestException('Collaborator context is required.');
+        if (!actor.isCollaborator && !actor.isDirector && !actor.isSupervisor) {
+            throw new common_1.ForbiddenException('Operations collaborator access is required.');
         }
-        const current = await this.getOwnedTaskRecord(this.prisma, actor.collaboratorId, taskId);
+        const current = await this.getTaskRecordForActor(this.prisma, actor, taskId);
         await this.assertProjectAccess(actor, current.projectId);
         await this.prisma.$transaction(async (tx) => {
             await tx.$executeRawUnsafe(`UPDATE operations_task
             SET deleted_at = COALESCE(deleted_at, NOW()),
-                status = 'archived',
                 updated_at = NOW()
           WHERE id = $1
             AND deleted_at IS NULL`, taskId);
@@ -1409,8 +1465,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
             const resolvedTask = data.taskId
                 ? await this.getOwnedTaskRecord(tx, actor.collaboratorId, data.taskId)
                 : null;
-            if (resolvedTask && resolvedTask.projectAssignmentId !== assignment.id) {
-                throw new common_1.BadRequestException('The selected task does not belong to the chosen project assignment.');
+            if (resolvedTask && resolvedTask.projectId !== assignment.projectId) {
+                throw new common_1.BadRequestException('The selected task does not belong to the chosen project.');
             }
             const activityLabel = (_e = (_d = (_c = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.name) !== null && _c !== void 0 ? _c : taskLabel) !== null && _d !== void 0 ? _d : assignment.roleLabel) !== null && _e !== void 0 ? _e : assignment.projectName;
             if (!activityLabel) {
@@ -1446,6 +1502,68 @@ let OperationsService = OperationsService_1 = class OperationsService {
         });
         return this.getTimesheetEntryByIdForActor(actor, createdEntryId);
     }
+    async updateTimesheetEntry(userId, entryId, data) {
+        var _a;
+        const actor = await this.getActorContext(userId);
+        this.ensureCollaborator(actor);
+        this.requireFields(data, ['workDate', 'duration']);
+        if (!actor.collaboratorId && !actor.isDirector) {
+            throw new common_1.BadRequestException('Collaborator context is required.');
+        }
+        const entry = await this.getTimesheetEntryByIdForActor(actor, entryId);
+        if (!actor.isDirector && entry.collaboratorId !== actor.collaboratorId) {
+            throw new common_1.ForbiddenException('Only the entry owner can update this timesheet entry.');
+        }
+        if (!['draft', 'rejected'].includes(entry.status)) {
+            throw new common_1.BadRequestException('Only draft or rejected timesheet entries can be edited.');
+        }
+        const collaboratorId = actor.isDirector
+            ? entry.collaboratorId
+            : actor.collaboratorId;
+        const durationMinutes = this.normalizeDurationMinutes(data.duration, data.unit);
+        const taskLabel = (_a = this.normalizeOptionalText(data.taskName)) !== null && _a !== void 0 ? _a : this.normalizeOptionalText(data.activityLabel);
+        const targetWeek = this.getWorkWeekRange(data.workDate);
+        const isSameWeek = entry.weekStartDate === targetWeek.weekStartDate &&
+            entry.weekEndDate === targetWeek.weekEndDate;
+        await this.prisma.$transaction(async (tx) => {
+            var _a, _b, _c, _d, _e, _f, _g;
+            const assignment = await this.resolveOwnedProjectAssignment(tx, collaboratorId, {
+                projectId: (_a = data.projectId) !== null && _a !== void 0 ? _a : null,
+                projectAssignmentId: (_b = data.projectAssignmentId) !== null && _b !== void 0 ? _b : null,
+            });
+            const resolvedTask = data.taskId
+                ? await this.getOwnedTaskRecord(tx, collaboratorId, data.taskId)
+                : null;
+            if (resolvedTask && resolvedTask.projectId !== assignment.projectId) {
+                throw new common_1.BadRequestException('The selected task does not belong to the chosen project.');
+            }
+            const activityLabel = (_e = (_d = (_c = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.name) !== null && _c !== void 0 ? _c : taskLabel) !== null && _d !== void 0 ? _d : assignment.roleLabel) !== null && _e !== void 0 ? _e : assignment.projectName;
+            if (!activityLabel) {
+                throw new common_1.BadRequestException('A task is required for the timesheet entry.');
+            }
+            const targetTimesheetId = isSameWeek
+                ? entry.timesheetId
+                : await this.getOrCreateTimesheetForWorkDate(tx, collaboratorId, data.workDate);
+            await tx.$executeRawUnsafe(`UPDATE operations_timesheet_entry
+            SET timesheet_id = $1,
+                project_assignment_id = $2,
+                task_id = $3,
+                activity_label = $4,
+                work_date = $5::date,
+                duration_minutes = $6,
+                hours = $7,
+                description = $8,
+                updated_at = NOW()
+          WHERE id = $9
+            AND deleted_at IS NULL`, targetTimesheetId, assignment.id, (_g = (_f = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.id) !== null && _f !== void 0 ? _f : data.taskId) !== null && _g !== void 0 ? _g : null, activityLabel, data.workDate, durationMinutes, Number((durationMinutes / 60).toFixed(2)), this.normalizeOptionalText(data.description), entryId);
+            await this.refreshTimesheetTotal(tx, entry.timesheetId);
+            if (targetTimesheetId !== entry.timesheetId) {
+                await this.refreshTimesheetTotal(tx, targetTimesheetId);
+            }
+            await this.cleanupEmptyEditableTimesheet(tx, entry.timesheetId);
+        });
+        return this.getTimesheetEntryByIdForActor(actor, entryId);
+    }
     async removeTimesheetEntry(userId, entryId) {
         const actor = await this.getActorContext(userId);
         this.ensureCollaborator(actor);
@@ -1466,6 +1584,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
           WHERE id = $1
             AND deleted_at IS NULL`, entryId);
             await this.refreshTimesheetTotal(tx, entry.timesheetId);
+            await this.cleanupEmptyEditableTimesheet(tx, entry.timesheetId);
         });
         return { success: true };
     }
@@ -1479,10 +1598,11 @@ let OperationsService = OperationsService_1 = class OperationsService {
         this.ensureDirector(actor);
         this.requireFields(data, ['code', 'name']);
         const createdProjectId = await this.prisma.$transaction(async (tx) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
             const created = await tx.$queryRawUnsafe(`INSERT INTO operations_project (
           contract_id,
           manager_collaborator_id,
+          client_person_id,
           code,
           name,
           client_name,
@@ -1496,33 +1616,33 @@ let OperationsService = OperationsService_1 = class OperationsService {
           created_at,
           updated_at
         ) VALUES (
-          $1, $2, $3, $4, $5, $6,
-          $7::operations_project_status_965e8d4b2d_enum,
-          $8,
-          $9::operations_project_delivery_model_75ee11b3b7_enum,
-          $10, $11::date, $12::date, NOW(), NOW()
+          $1, $2, $3, $4, $5, $6, $7,
+          $8::operations_project_status_965e8d4b2d_enum,
+          $9,
+          $10::operations_project_delivery_model_75ee11b3b7_enum,
+          $11, $12::date, $13::date, NOW(), NOW()
         )
-        RETURNING id`, (_a = data.contractId) !== null && _a !== void 0 ? _a : null, (_b = data.managerCollaboratorId) !== null && _b !== void 0 ? _b : null, data.code, data.name, (_c = data.clientName) !== null && _c !== void 0 ? _c : null, (_d = data.summary) !== null && _d !== void 0 ? _d : null, (_e = data.status) !== null && _e !== void 0 ? _e : 'planning', (_f = data.progressPercent) !== null && _f !== void 0 ? _f : null, (_g = data.deliveryModel) !== null && _g !== void 0 ? _g : 'project_delivery', (_h = data.budgetAmount) !== null && _h !== void 0 ? _h : null, (_j = data.startDate) !== null && _j !== void 0 ? _j : null, (_k = data.endDate) !== null && _k !== void 0 ? _k : null);
-            const projectId = (_l = created[0]) === null || _l === void 0 ? void 0 : _l.id;
-            if ((_m = data.teamAssignments) === null || _m === void 0 ? void 0 : _m.length) {
+        RETURNING id`, (_a = data.contractId) !== null && _a !== void 0 ? _a : null, (_b = data.managerCollaboratorId) !== null && _b !== void 0 ? _b : null, (_c = data.clientPersonId) !== null && _c !== void 0 ? _c : null, data.code, data.name, (_d = data.clientName) !== null && _d !== void 0 ? _d : null, (_e = data.summary) !== null && _e !== void 0 ? _e : null, (_f = data.status) !== null && _f !== void 0 ? _f : 'planning', (_g = data.progressPercent) !== null && _g !== void 0 ? _g : null, (_h = data.deliveryModel) !== null && _h !== void 0 ? _h : 'project_delivery', (_j = data.budgetAmount) !== null && _j !== void 0 ? _j : null, (_k = data.startDate) !== null && _k !== void 0 ? _k : null, (_l = data.endDate) !== null && _l !== void 0 ? _l : null);
+            const projectId = (_m = created[0]) === null || _m === void 0 ? void 0 : _m.id;
+            if ((_o = data.teamAssignments) === null || _o === void 0 ? void 0 : _o.length) {
                 await this.replaceProjectAssignments(tx, projectId, data.teamAssignments);
             }
             if (!data.contractId && data.autoGenerateContractDraft !== false) {
                 const contractId = await this.createProjectContractDraft(tx, actor.userId, {
                     projectId,
-                    contractTemplateId: (_o = data.contractTemplateId) !== null && _o !== void 0 ? _o : null,
+                    contractTemplateId: (_p = data.contractTemplateId) !== null && _p !== void 0 ? _p : null,
                     projectCode: data.code,
                     projectName: data.name,
-                    clientName: (_p = data.clientName) !== null && _p !== void 0 ? _p : data.name,
-                    managerCollaboratorId: (_q = data.managerCollaboratorId) !== null && _q !== void 0 ? _q : null,
-                    startDate: (_r = data.startDate) !== null && _r !== void 0 ? _r : null,
-                    endDate: (_s = data.endDate) !== null && _s !== void 0 ? _s : null,
-                    budgetAmount: (_t = data.budgetAmount) !== null && _t !== void 0 ? _t : null,
-                    monthlyHourCap: (_u = data.monthlyHourCap) !== null && _u !== void 0 ? _u : null,
-                    billingModel: (_v = data.billingModel) !== null && _v !== void 0 ? _v : 'time_and_material',
-                    contractCode: (_w = data.contractCode) !== null && _w !== void 0 ? _w : null,
-                    contractName: (_x = data.contractName) !== null && _x !== void 0 ? _x : null,
-                    description: (_z = (_y = data.contractDescription) !== null && _y !== void 0 ? _y : data.summary) !== null && _z !== void 0 ? _z : null,
+                    clientName: (_q = data.clientName) !== null && _q !== void 0 ? _q : data.name,
+                    managerCollaboratorId: (_r = data.managerCollaboratorId) !== null && _r !== void 0 ? _r : null,
+                    startDate: (_s = data.startDate) !== null && _s !== void 0 ? _s : null,
+                    endDate: (_t = data.endDate) !== null && _t !== void 0 ? _t : null,
+                    budgetAmount: (_u = data.budgetAmount) !== null && _u !== void 0 ? _u : null,
+                    monthlyHourCap: (_v = data.monthlyHourCap) !== null && _v !== void 0 ? _v : null,
+                    billingModel: (_w = data.billingModel) !== null && _w !== void 0 ? _w : 'time_and_material',
+                    contractCode: (_x = data.contractCode) !== null && _x !== void 0 ? _x : null,
+                    contractName: (_y = data.contractName) !== null && _y !== void 0 ? _y : null,
+                    description: (_0 = (_z = data.contractDescription) !== null && _z !== void 0 ? _z : data.summary) !== null && _0 !== void 0 ? _0 : null,
                 });
                 await tx.$executeRawUnsafe(`UPDATE operations_project
               SET contract_id = $1,
@@ -1541,18 +1661,19 @@ let OperationsService = OperationsService_1 = class OperationsService {
         const params = [];
         this.pushUpdate(updates, params, 'contract_id', data.contractId);
         this.pushUpdate(updates, params, 'manager_collaborator_id', data.managerCollaboratorId);
+        this.pushUpdate(updates, params, 'client_person_id', data.clientPersonId);
         this.pushUpdate(updates, params, 'code', data.code);
         this.pushUpdate(updates, params, 'name', data.name);
         this.pushUpdate(updates, params, 'client_name', data.clientName);
         this.pushUpdate(updates, params, 'summary', data.summary);
         this.pushUpdate(updates, params, 'status', data.status, 'operations_project_status_965e8d4b2d_enum');
         this.pushUpdate(updates, params, 'progress_percent', data.progressPercent);
-        this.pushUpdate(updates, params, 'delivery_model', data.deliveryModel, 'operations_project_delivery_model_75ee11b3b7_enum');
+        this.pushUpdate(updates, params, 'delivery_model', data.deliveryModel === '' ? null : data.deliveryModel, 'operations_project_delivery_model_75ee11b3b7_enum');
         this.pushUpdate(updates, params, 'budget_amount', data.budgetAmount);
         this.pushUpdate(updates, params, 'start_date', data.startDate, 'date');
         this.pushUpdate(updates, params, 'end_date', data.endDate, 'date');
         await this.prisma.$transaction(async (tx) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7;
             if (updates.length) {
                 params.push(projectId);
                 await tx.$executeRawUnsafe(`UPDATE operations_project
@@ -1565,30 +1686,46 @@ let OperationsService = OperationsService_1 = class OperationsService {
             }
             const nextContractId = data.contractId !== undefined
                 ? data.contractId
-                : ((_a = currentProject.contractId) !== null && _a !== void 0 ? _a : null);
+                : ((_b = (_a = currentProject.relatedContract) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : null);
             const shouldGenerateDraft = !nextContractId && data.autoGenerateContractDraft === true;
             if (shouldGenerateDraft) {
                 const contractId = await this.createProjectContractDraft(tx, actor.userId, {
                     projectId,
-                    contractTemplateId: (_b = data.contractTemplateId) !== null && _b !== void 0 ? _b : null,
-                    projectCode: (_c = data.code) !== null && _c !== void 0 ? _c : currentProject.code,
-                    projectName: (_d = data.name) !== null && _d !== void 0 ? _d : currentProject.name,
-                    clientName: (_f = (_e = data.clientName) !== null && _e !== void 0 ? _e : currentProject.clientName) !== null && _f !== void 0 ? _f : currentProject.name,
-                    managerCollaboratorId: (_h = (_g = data.managerCollaboratorId) !== null && _g !== void 0 ? _g : currentProject.managerCollaboratorId) !== null && _h !== void 0 ? _h : null,
-                    startDate: (_k = (_j = data.startDate) !== null && _j !== void 0 ? _j : currentProject.startDate) !== null && _k !== void 0 ? _k : null,
-                    endDate: (_m = (_l = data.endDate) !== null && _l !== void 0 ? _l : currentProject.endDate) !== null && _m !== void 0 ? _m : null,
-                    budgetAmount: (_p = (_o = data.budgetAmount) !== null && _o !== void 0 ? _o : currentProject.budgetAmount) !== null && _p !== void 0 ? _p : null,
-                    monthlyHourCap: (_s = (_q = data.monthlyHourCap) !== null && _q !== void 0 ? _q : (_r = currentProject.relatedContract) === null || _r === void 0 ? void 0 : _r.monthlyHourCap) !== null && _s !== void 0 ? _s : null,
-                    billingModel: (_v = (_t = data.billingModel) !== null && _t !== void 0 ? _t : (_u = currentProject.relatedContract) === null || _u === void 0 ? void 0 : _u.billingModel) !== null && _v !== void 0 ? _v : 'time_and_material',
-                    contractCode: (_y = (_w = data.contractCode) !== null && _w !== void 0 ? _w : (_x = currentProject.relatedContract) === null || _x === void 0 ? void 0 : _x.code) !== null && _y !== void 0 ? _y : null,
-                    contractName: (_1 = (_z = data.contractName) !== null && _z !== void 0 ? _z : (_0 = currentProject.relatedContract) === null || _0 === void 0 ? void 0 : _0.name) !== null && _1 !== void 0 ? _1 : null,
-                    description: (_6 = (_5 = (_4 = (_2 = data.contractDescription) !== null && _2 !== void 0 ? _2 : (_3 = currentProject.relatedContract) === null || _3 === void 0 ? void 0 : _3.description) !== null && _4 !== void 0 ? _4 : data.summary) !== null && _5 !== void 0 ? _5 : currentProject.summary) !== null && _6 !== void 0 ? _6 : null,
+                    contractTemplateId: (_c = data.contractTemplateId) !== null && _c !== void 0 ? _c : null,
+                    projectCode: (_d = data.code) !== null && _d !== void 0 ? _d : currentProject.code,
+                    projectName: (_e = data.name) !== null && _e !== void 0 ? _e : currentProject.name,
+                    clientName: (_g = (_f = data.clientName) !== null && _f !== void 0 ? _f : currentProject.clientName) !== null && _g !== void 0 ? _g : currentProject.name,
+                    managerCollaboratorId: (_j = (_h = data.managerCollaboratorId) !== null && _h !== void 0 ? _h : currentProject.managerCollaboratorId) !== null && _j !== void 0 ? _j : null,
+                    startDate: (_l = (_k = data.startDate) !== null && _k !== void 0 ? _k : currentProject.startDate) !== null && _l !== void 0 ? _l : null,
+                    endDate: (_o = (_m = data.endDate) !== null && _m !== void 0 ? _m : currentProject.endDate) !== null && _o !== void 0 ? _o : null,
+                    budgetAmount: (_q = (_p = data.budgetAmount) !== null && _p !== void 0 ? _p : currentProject.budgetAmount) !== null && _q !== void 0 ? _q : null,
+                    monthlyHourCap: (_t = (_r = data.monthlyHourCap) !== null && _r !== void 0 ? _r : (_s = currentProject.relatedContract) === null || _s === void 0 ? void 0 : _s.monthlyHourCap) !== null && _t !== void 0 ? _t : null,
+                    billingModel: (_w = (_u = data.billingModel) !== null && _u !== void 0 ? _u : (_v = currentProject.relatedContract) === null || _v === void 0 ? void 0 : _v.billingModel) !== null && _w !== void 0 ? _w : 'time_and_material',
+                    contractCode: (_z = (_x = data.contractCode) !== null && _x !== void 0 ? _x : (_y = currentProject.relatedContract) === null || _y === void 0 ? void 0 : _y.code) !== null && _z !== void 0 ? _z : null,
+                    contractName: (_2 = (_0 = data.contractName) !== null && _0 !== void 0 ? _0 : (_1 = currentProject.relatedContract) === null || _1 === void 0 ? void 0 : _1.name) !== null && _2 !== void 0 ? _2 : null,
+                    description: (_7 = (_6 = (_5 = (_3 = data.contractDescription) !== null && _3 !== void 0 ? _3 : (_4 = currentProject.relatedContract) === null || _4 === void 0 ? void 0 : _4.description) !== null && _5 !== void 0 ? _5 : data.summary) !== null && _6 !== void 0 ? _6 : currentProject.summary) !== null && _7 !== void 0 ? _7 : null,
                 });
                 await tx.$executeRawUnsafe(`UPDATE operations_project
               SET contract_id = $1,
                   updated_at = NOW()
             WHERE id = $2`, contractId, projectId);
             }
+            else if (nextContractId &&
+                (data.monthlyHourCap !== undefined || data.billingModel !== undefined)) {
+                const contractUpdates = [];
+                const contractParams = [];
+                this.pushUpdate(contractUpdates, contractParams, 'monthly_hour_cap', data.monthlyHourCap);
+                this.pushUpdate(contractUpdates, contractParams, 'billing_model', data.billingModel === ''
+                    ? null
+                    : data.billingModel, 'operations_contract_billing_model_409dc7fea2_enum');
+                if (contractUpdates.length) {
+                    contractParams.push(nextContractId);
+                    await tx.$executeRawUnsafe(`UPDATE operations_contract
+                SET ${contractUpdates.join(', ')},
+                    updated_at = NOW()
+              WHERE id = $${contractParams.length}`, ...contractParams);
+                }
+            }
         });
         return this.getProjectById(userId, projectId);
     }
@@ -1661,7 +1798,11 @@ let OperationsService = OperationsService_1 = class OperationsService {
           updated_at
         ) VALUES (
           $1, $2, $3, $4,
-          $5, $6, $7, $8, $9, $10, $11,
+          $5::text::operations_contract_template_contract_category_49bb07a713_enum,
+          $6::text::operations_contract_template_contract_type_3962dbda6a_enum,
+          $7::text::operations_contract_template_billing_model_384a7c60e2_enum,
+          $8::text::operations_contract_template_signature_status_56cb6d625b_enum,
+          $9, $10::text::operations_contract_template_status_c9d2e90231_enum, $11,
           NOW(), NOW()
         )
         RETURNING id`, await this.generateUniqueContractTemplateSlug(tx, name), nextCode, name, this.normalizeOptionalText(data.description), (_e = data.contractCategory) !== null && _e !== void 0 ? _e : 'client', (_f = data.contractType) !== null && _f !== void 0 ? _f : 'service_agreement', (_g = data.billingModel) !== null && _g !== void 0 ? _g : 'time_and_material', (_h = data.signatureStatus) !== null && _h !== void 0 ? _h : 'not_started', isActive, nextStatus, this.normalizeOptionalText(data.contentHtml)));
@@ -1703,12 +1844,12 @@ let OperationsService = OperationsService_1 = class OperationsService {
                 code = $2,
                 name = $3,
                 description = $4,
-                contract_category = $5,
-                contract_type = $6,
-                billing_model = $7,
-                signature_status = $8,
+                contract_category = $5::text::operations_contract_template_contract_category_49bb07a713_enum,
+                contract_type = $6::text::operations_contract_template_contract_type_3962dbda6a_enum,
+                billing_model = $7::text::operations_contract_template_billing_model_384a7c60e2_enum,
+                signature_status = $8::text::operations_contract_template_signature_status_56cb6d625b_enum,
                 is_active = $9,
-                status = $10,
+                status = $10::text::operations_contract_template_status_c9d2e90231_enum,
                 content_html = $11,
                 updated_at = NOW()
           WHERE id = $12`, nextSlug, nextCode, nextName, data.description !== undefined
@@ -2954,7 +3095,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
         return this.listSingleTimesheet(actor, timesheetId);
     }
     async submitTimesheet(userId, timesheetId) {
-        var _a, _b;
+        var _a, _b, _c;
         const actor = await this.getActorContext(userId);
         const current = await this.getTimesheetById(timesheetId);
         if (!actor.isDirector && current.collaboratorId !== actor.collaboratorId) {
@@ -2964,7 +3105,15 @@ let OperationsService = OperationsService_1 = class OperationsService {
             throw new common_1.BadRequestException('Only draft or rejected timesheets can be submitted.');
         }
         const collaborator = await this.getCollaboratorById(current.collaboratorId);
-        const approverId = (_b = (_a = current.approverCollaboratorId) !== null && _a !== void 0 ? _a : collaborator.supervisorId) !== null && _b !== void 0 ? _b : null;
+        const projectManagerRow = await this.querySingle(`SELECT p.manager_collaborator_id AS "managerCollaboratorId"
+         FROM operations_timesheet_entry e
+         LEFT JOIN operations_project_assignment pa ON pa.id = e.project_assignment_id
+         LEFT JOIN operations_project p ON p.id = pa.project_id
+        WHERE e.timesheet_id = $1
+          AND e.deleted_at IS NULL
+          AND p.manager_collaborator_id IS NOT NULL
+        LIMIT 1`, [timesheetId]);
+        const approverId = (_c = (_b = (_a = projectManagerRow === null || projectManagerRow === void 0 ? void 0 : projectManagerRow.managerCollaboratorId) !== null && _a !== void 0 ? _a : current.approverCollaboratorId) !== null && _b !== void 0 ? _b : collaborator.supervisorId) !== null && _c !== void 0 ? _c : null;
         if (!approverId) {
             throw new common_1.BadRequestException('An approver is required before submitting a timesheet.');
         }
@@ -3120,7 +3269,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
          FROM operations_schedule_adjustment_day
         WHERE schedule_adjustment_request_id = ANY($1::int[])
         ORDER BY id ASC`, [requests.map((item) => item.id)]);
-        const currentSchedule = await this.queryRows(`SELECT collaborator_id AS "collaboratorId",
+        const currentSchedule = await this.queryRows(`SELECT DISTINCT ON (collaborator_id, weekday)
+              collaborator_id AS "collaboratorId",
               weekday,
               is_working_day AS "isWorkingDay",
               start_time AS "startTime",
@@ -3128,7 +3278,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
               break_minutes AS "breakMinutes"
          FROM operations_collaborator_schedule_day
         WHERE collaborator_id = ANY($1::int[])
-        ORDER BY id ASC`, [this.uniqueNumbers(requests.map((item) => item.collaboratorId))]);
+        ORDER BY collaborator_id, weekday, id DESC`, [this.uniqueNumbers(requests.map((item) => item.collaboratorId))]);
         const grouped = this.groupBy(days, 'requestId');
         const currentScheduleByCollaborator = this.groupBy(currentSchedule, 'collaboratorId');
         return requests.map((request) => {
@@ -3452,17 +3602,44 @@ let OperationsService = OperationsService_1 = class OperationsService {
         };
     }
     async getCollaboratorByUserId(userId) {
-        return this.querySingle(`SELECT c.id,
+        return this.querySingle(`WITH linked_collaborator AS (
+         SELECT person_id
+           FROM operations_collaborator
+          WHERE user_id = $1
+            AND deleted_at IS NULL
+          ORDER BY id DESC
+          LIMIT 1
+       )
+       SELECT c.id,
+              c.user_id AS "userId",
+              c.person_id AS "personId",
               COALESCE(NULLIF(c.display_name, ''), person_record.name) AS "displayName",
               s.id AS "supervisorId",
-              s.display_name AS "supervisorName"
+              s.display_name AS "supervisorName",
+              COUNT(pa.id) FILTER (
+                WHERE pa.deleted_at IS NULL
+                  AND pa.status IN ('planned', 'active')
+              )::int AS "activeAssignments"
          FROM operations_collaborator c
          LEFT JOIN person person_record
            ON person_record.id = c.person_id
          LEFT JOIN operations_collaborator s
            ON s.id = c.supervisor_collaborator_id
-        WHERE c.user_id = $1
-          AND c.deleted_at IS NULL`, [userId]);
+         LEFT JOIN operations_project_assignment pa
+           ON pa.collaborator_id = c.id
+        WHERE c.deleted_at IS NULL
+          AND (
+            c.user_id = $1
+            OR (
+              c.person_id IS NOT NULL
+              AND c.person_id = (SELECT person_id FROM linked_collaborator)
+            )
+          )
+        GROUP BY c.id, person_record.id, s.id
+        ORDER BY "activeAssignments" DESC,
+                 CASE WHEN c.user_id = $1 THEN 0 ELSE 1 END,
+                 c.id ASC
+        LIMIT 1`, [userId]);
     }
     async getCollaboratorById(collaboratorId) {
         const collaborator = await this.querySingle(`SELECT c.id,
@@ -3930,6 +4107,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
         const project = await this.querySingle(`SELECT p.id,
               p.contract_id AS "contractId",
               p.manager_collaborator_id AS "managerCollaboratorId",
+              p.client_person_id AS "clientPersonId",
+              client_person.avatar_id AS "clientAvatarId",
               p.code,
               p.name,
               p.client_name AS "clientName",
@@ -3938,8 +4117,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
               p.progress_percent AS "progressPercent",
               p.delivery_model AS "deliveryModel",
               p.budget_amount AS "budgetAmount",
-              p.start_date AS "startDate",
-              p.end_date AS "endDate",
+              TO_CHAR(p.start_date, 'YYYY-MM-DD') AS "startDate",
+              TO_CHAR(p.end_date, 'YYYY-MM-DD') AS "endDate",
               c.name AS "contractName",
               c.status AS "contractStatus",
               c.contract_category AS "contractCategory",
@@ -3950,6 +4129,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
          FROM operations_project p
          LEFT JOIN operations_contract c ON c.id = p.contract_id
          LEFT JOIN operations_collaborator m ON m.id = p.manager_collaborator_id
+         LEFT JOIN person client_person ON client_person.id = p.client_person_id
          LEFT JOIN operations_project_assignment pa
            ON pa.project_id = p.id
           AND pa.deleted_at IS NULL
@@ -3965,24 +4145,29 @@ let OperationsService = OperationsService_1 = class OperationsService {
          ) project_role_locale ON TRUE
         WHERE p.id = $1
           AND p.deleted_at IS NULL
-        GROUP BY p.id, c.id, m.id`, [projectId, actorCollaboratorId !== null && actorCollaboratorId !== void 0 ? actorCollaboratorId : null]);
+        GROUP BY p.id, c.id, m.id, client_person.id`, [projectId, actorCollaboratorId !== null && actorCollaboratorId !== void 0 ? actorCollaboratorId : null]);
         if (!project) {
             throw new common_1.NotFoundException('Project not found.');
         }
         const [assignments, relatedContract, timesheetSummary, operationalIndicators] = await Promise.all([
             this.queryRows(`SELECT pa.id,
                   pa.collaborator_id AS "collaboratorId",
+              c.user_id AS "userId",
+              person_record.avatar_id AS "personAvatarId",
+              collaborator_user.photo_id AS "userPhotoId",
                   c.display_name AS "collaboratorName",
                   pa.project_role_id AS "projectRoleId",
                   COALESCE(project_role_locale.name, pa.role_label) AS "roleLabel",
                   pa.allocation_percent AS "allocationPercent",
                   pa.weekly_hours AS "weeklyHours",
                   pa.is_billable AS "isBillable",
-                  pa.start_date AS "startDate",
-                  pa.end_date AS "endDate",
+                  TO_CHAR(pa.start_date, 'YYYY-MM-DD') AS "startDate",
+                  TO_CHAR(pa.end_date, 'YYYY-MM-DD') AS "endDate",
                   pa.status
              FROM operations_project_assignment pa
              JOIN operations_collaborator c ON c.id = pa.collaborator_id
+             LEFT JOIN person person_record ON person_record.id = c.person_id
+             LEFT JOIN "user" collaborator_user ON collaborator_user.id = c.user_id
              LEFT JOIN operations_project_role project_role
                ON project_role.id = pa.project_role_id
               AND project_role.deleted_at IS NULL
@@ -4004,8 +4189,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
                       contract_category AS "contractCategory",
                       billing_model AS "billingModel",
                       status,
-                      start_date AS "startDate",
-                      end_date AS "endDate",
+                      TO_CHAR(start_date, 'YYYY-MM-DD') AS "startDate",
+                      TO_CHAR(end_date, 'YYYY-MM-DD') AS "endDate",
                       budget_amount AS "budgetAmount",
                       monthly_hour_cap AS "monthlyHourCap",
                       description,
@@ -4152,7 +4337,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
              FROM operations_contract c
             WHERE c.related_collaborator_id = $1
               AND c.deleted_at IS NULL
-            ORDER BY c.created_at DESC`, [collaboratorId]),
+            ORDER BY CASE WHEN c.origin_type = 'employee_hiring' THEN 0 ELSE 1 END,
+                     c.created_at DESC`, [collaboratorId]),
             this.queryRows(`SELECT weekday,
                   is_working_day AS "isWorkingDay",
                   start_time AS "startTime",
@@ -4260,34 +4446,148 @@ let OperationsService = OperationsService_1 = class OperationsService {
         }
         return assignment[0];
     }
+    async resolveProjectAssignmentForActor(client, actor, input) {
+        if (actor.collaboratorId && !actor.isDirector && !actor.isSupervisor) {
+            return this.resolveOwnedProjectAssignment(client, actor.collaboratorId, input);
+        }
+        if (!input.projectId && !input.projectAssignmentId) {
+            throw new common_1.BadRequestException('Either projectId or projectAssignmentId is required.');
+        }
+        const params = [];
+        const filters = ['pa.deleted_at IS NULL', 'p.deleted_at IS NULL'];
+        if (input.projectAssignmentId) {
+            filters.push(`pa.id = ${this.param(params, input.projectAssignmentId)}`);
+        }
+        if (input.projectId) {
+            filters.push(`pa.project_id = ${this.param(params, input.projectId)}`);
+        }
+        const assignment = (await client.$queryRawUnsafe(`SELECT pa.id,
+              pa.project_id AS "projectId",
+              p.name AS "projectName",
+              p.code AS "projectCode",
+              pa.role_label AS "roleLabel"
+         FROM operations_project_assignment pa
+         JOIN operations_project p
+           ON p.id = pa.project_id
+        WHERE ${filters.join(' AND ')}
+        ORDER BY CASE WHEN pa.status = 'active' THEN 0 ELSE 1 END,
+                 pa.start_date DESC NULLS LAST,
+                 pa.id DESC
+        LIMIT 1`, ...params));
+        if (!assignment[0]) {
+            throw new common_1.NotFoundException('Project assignment not found.');
+        }
+        return assignment[0];
+    }
     async getOwnedTaskRecord(client, collaboratorId, taskId) {
         const task = (await client.$queryRawUnsafe(`SELECT t.id,
               t.name,
               t.description,
+              t.priority,
               t.status,
+              t.due_date AS "dueDate",
+              t.estimate_hours AS "estimateHours",
+              t.position,
+              t.tags,
+              t.assignee_collaborator_id AS "assigneeCollaboratorId",
               t.project_assignment_id AS "projectAssignmentId",
-              pa.project_id AS "projectId",
+              COALESCE(t.project_id, pa.project_id) AS "projectId",
               p.name AS "projectName",
               p.code AS "projectCode"
          FROM operations_task t
-         JOIN operations_project_assignment pa
+         LEFT JOIN operations_project_assignment pa
            ON pa.id = t.project_assignment_id
           AND pa.deleted_at IS NULL
-         JOIN operations_project p
-           ON p.id = pa.project_id
+         LEFT JOIN operations_project p
+           ON p.id = COALESCE(t.project_id, pa.project_id)
           AND p.deleted_at IS NULL
         WHERE t.id = $1
           AND t.deleted_at IS NULL
-          AND pa.collaborator_id = $2
+          AND (
+            pa.collaborator_id = $2
+            OR t.project_id IN (
+              SELECT pa2.project_id FROM operations_project_assignment pa2
+               WHERE pa2.collaborator_id = $2 AND pa2.deleted_at IS NULL
+            )
+          )
         LIMIT 1`, taskId, collaboratorId));
         if (!task[0]) {
             throw new common_1.ForbiddenException('The selected task is not assigned to the authenticated collaborator.');
         }
         return task[0];
     }
-    async getTaskOptionById(collaboratorId, taskId) {
-        const task = await this.getOwnedTaskRecord(this.prisma, collaboratorId, taskId);
-        return Object.assign(Object.assign({}, task), { label: [task.name, task.projectName].filter(Boolean).join(' • ') });
+    async getTaskRecordForActor(client, actor, taskId) {
+        if (actor.collaboratorId && !actor.isDirector && !actor.isSupervisor) {
+            return this.getOwnedTaskRecord(client, actor.collaboratorId, taskId);
+        }
+        const task = await this.getProjectBoardTask(taskId);
+        if (!(task === null || task === void 0 ? void 0 : task.projectId)) {
+            throw new common_1.NotFoundException('Task not found.');
+        }
+        return task;
+    }
+    async listProjectBoardTasks(userId, projectId) {
+        const actor = await this.getActorContext(userId);
+        this.ensureCollaborator(actor);
+        await this.assertProjectAccess(actor, projectId);
+        const rows = await this.queryRows(`SELECT t.id,
+              t.name,
+              t.description,
+              t.priority,
+              t.status,
+              t.due_date AS "dueDate",
+              t.estimate_hours AS "estimateHours",
+              t.position,
+              t.tags,
+              t.assignee_collaborator_id AS "assigneeCollaboratorId",
+              ac.display_name AS "assigneeName",
+              au.photo_id AS "assigneeUserPhotoId",
+              ap.avatar_id AS "assigneePersonAvatarId",
+              t.project_assignment_id AS "projectAssignmentId",
+              t.created_at AS "createdAt"
+         FROM operations_task t
+         LEFT JOIN operations_collaborator ac
+           ON ac.id = t.assignee_collaborator_id AND ac.deleted_at IS NULL
+         LEFT JOIN "user" au
+           ON au.id = ac.user_id
+         LEFT JOIN person ap
+           ON ap.id = ac.person_id
+        WHERE COALESCE(t.project_id, (
+                SELECT pa.project_id FROM operations_project_assignment pa
+                 WHERE pa.id = t.project_assignment_id AND pa.deleted_at IS NULL
+                 LIMIT 1
+              )) = $1
+          AND t.deleted_at IS NULL
+        ORDER BY t.status ASC, t.position ASC, t.id ASC`, [projectId]);
+        return rows;
+    }
+    async getProjectBoardTask(taskId) {
+        var _a;
+        const rows = await this.queryRows(`SELECT t.id,
+              t.name,
+              t.description,
+              t.priority,
+              t.status,
+              t.due_date AS "dueDate",
+              t.estimate_hours AS "estimateHours",
+              t.position,
+              t.tags,
+              t.assignee_collaborator_id AS "assigneeCollaboratorId",
+              ac.display_name AS "assigneeName",
+              au.photo_id AS "assigneeUserPhotoId",
+              ap.avatar_id AS "assigneePersonAvatarId",
+              t.project_assignment_id AS "projectAssignmentId",
+              COALESCE(t.project_id, pa.project_id) AS "projectId",
+              t.created_at AS "createdAt"
+         FROM operations_task t
+         LEFT JOIN operations_collaborator ac
+           ON ac.id = t.assignee_collaborator_id AND ac.deleted_at IS NULL
+         LEFT JOIN "user" au ON au.id = ac.user_id
+         LEFT JOIN person ap ON ap.id = ac.person_id
+         LEFT JOIN operations_project_assignment pa
+           ON pa.id = t.project_assignment_id AND pa.deleted_at IS NULL
+        WHERE t.id = $1`, [taskId]);
+        return (_a = rows[0]) !== null && _a !== void 0 ? _a : null;
     }
     async getOrCreateTimesheetForWorkDate(client, collaboratorId, workDate) {
         var _a, _b, _c;
@@ -4389,7 +4689,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
         return timesheet;
     }
     async replaceTimesheetEntries(client, timesheetId, entries, collaboratorId) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         await client.$executeRawUnsafe(`UPDATE operations_timesheet_entry
           SET deleted_at = NOW()
         WHERE timesheet_id = $1
@@ -4399,17 +4699,19 @@ let OperationsService = OperationsService_1 = class OperationsService {
         const assignmentIds = entries
             .map((entry) => entry.projectAssignmentId)
             .filter((value) => typeof value === 'number');
+        const assignmentMap = new Map();
         if (assignmentIds.length) {
-            const assignments = (await client.$queryRawUnsafe(`SELECT id, collaborator_id AS "collaboratorId"
+            const assignments = (await client.$queryRawUnsafe(`SELECT id,
+                collaborator_id AS "collaboratorId",
+                project_id AS "projectId"
            FROM operations_project_assignment
           WHERE id = ANY($1::int[])
             AND deleted_at IS NULL`, assignmentIds));
-            const assignmentMap = new Map(assignments.map((assignment) => [
-                assignment.id,
-                assignment.collaboratorId,
-            ]));
+            assignments.forEach((assignment) => {
+                assignmentMap.set(assignment.id, assignment);
+            });
             for (const assignmentId of assignmentIds) {
-                if (assignmentMap.get(assignmentId) !== collaboratorId) {
+                if (((_a = assignmentMap.get(assignmentId)) === null || _a === void 0 ? void 0 : _a.collaboratorId) !== collaboratorId) {
                     throw new common_1.ForbiddenException('Timesheet entries must use assignments owned by the target collaborator.');
                 }
             }
@@ -4420,16 +4722,19 @@ let OperationsService = OperationsService_1 = class OperationsService {
             const resolvedTask = entry.taskId
                 ? await this.getOwnedTaskRecord(client, collaboratorId, entry.taskId)
                 : null;
+            const selectedAssignment = entry.projectAssignmentId
+                ? (_b = assignmentMap.get(entry.projectAssignmentId)) !== null && _b !== void 0 ? _b : null
+                : null;
             if (resolvedTask &&
-                entry.projectAssignmentId &&
-                resolvedTask.projectAssignmentId !== entry.projectAssignmentId) {
-                throw new common_1.BadRequestException('The selected task does not belong to the chosen project assignment.');
+                selectedAssignment &&
+                resolvedTask.projectId !== selectedAssignment.projectId) {
+                throw new common_1.BadRequestException('The selected task does not belong to the chosen project.');
             }
-            const resolvedAssignmentId = (_b = (_a = entry.projectAssignmentId) !== null && _a !== void 0 ? _a : resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.projectAssignmentId) !== null && _b !== void 0 ? _b : null;
+            const resolvedAssignmentId = (_d = (_c = entry.projectAssignmentId) !== null && _c !== void 0 ? _c : resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.projectAssignmentId) !== null && _d !== void 0 ? _d : null;
             if (entry.taskId && !resolvedAssignmentId) {
                 throw new common_1.BadRequestException('The selected task must belong to a project assignment.');
             }
-            const activityLabel = (_d = (_c = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.name) !== null && _c !== void 0 ? _c : this.normalizeOptionalText(entry.taskName)) !== null && _d !== void 0 ? _d : this.normalizeOptionalText(entry.activityLabel);
+            const activityLabel = (_f = (_e = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.name) !== null && _e !== void 0 ? _e : this.normalizeOptionalText(entry.taskName)) !== null && _f !== void 0 ? _f : this.normalizeOptionalText(entry.activityLabel);
             if (!entry.workDate) {
                 throw new common_1.BadRequestException('Timesheet entry workDate is required.');
             }
@@ -4444,7 +4749,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
           description,
           created_at,
           updated_at
-        ) VALUES ($1, $2, $3, $4, $5::date, $6, $7, $8, NOW(), NOW())`, timesheetId, resolvedAssignmentId, (_f = (_e = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.id) !== null && _e !== void 0 ? _e : entry.taskId) !== null && _f !== void 0 ? _f : null, activityLabel !== null && activityLabel !== void 0 ? activityLabel : null, entry.workDate, durationMinutes, hours, this.normalizeOptionalText(entry.description));
+        ) VALUES ($1, $2, $3, $4, $5::date, $6, $7, $8, NOW(), NOW())`, timesheetId, resolvedAssignmentId, (_h = (_g = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.id) !== null && _g !== void 0 ? _g : entry.taskId) !== null && _h !== void 0 ? _h : null, activityLabel !== null && activityLabel !== void 0 ? activityLabel : null, entry.workDate, durationMinutes, hours, this.normalizeOptionalText(entry.description));
         }
     }
     async refreshTimesheetTotal(client, timesheetId) {
@@ -4470,6 +4775,29 @@ let OperationsService = OperationsService_1 = class OperationsService {
               updated_at = NOW()
         WHERE id = $1`, timesheetId);
     }
+    async cleanupEmptyEditableTimesheet(client, timesheetId) {
+        var _a;
+        const candidate = (await client.$queryRawUnsafe(`SELECT t.id
+         FROM operations_timesheet t
+        WHERE t.id = $1
+          AND t.deleted_at IS NULL
+          AND t.status IN ('draft', 'rejected')
+          AND NOT EXISTS (
+            SELECT 1
+              FROM operations_timesheet_entry e
+             WHERE e.timesheet_id = t.id
+               AND e.deleted_at IS NULL
+          )
+        LIMIT 1`, timesheetId));
+        if (!((_a = candidate[0]) === null || _a === void 0 ? void 0 : _a.id)) {
+            return;
+        }
+        await client.$executeRawUnsafe(`UPDATE operations_timesheet
+          SET deleted_at = NOW(),
+              updated_at = NOW()
+        WHERE id = $1
+          AND deleted_at IS NULL`, timesheetId);
+    }
     async upsertApproval(client, input) {
         var _a, _b;
         const existing = (await client.$queryRawUnsafe(`SELECT id
@@ -4846,6 +5174,90 @@ let OperationsService = OperationsService_1 = class OperationsService {
             ? Math.round(Number(input.weeklyCapacityHours) * 4)
             : null, (_c = input.description) !== null && _c !== void 0 ? _c : null, createdByUserId);
     }
+    async syncHiringContractDraft(client, updatedByUserId, collaboratorId, data) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        const collaborator = await client.$queryRawUnsafe(`SELECT c.id,
+              c.code,
+              COALESCE(NULLIF(c.display_name, ''), person_record.name) AS "displayName",
+              collaborator_type.slug AS "collaboratorTypeSlug",
+              c.supervisor_collaborator_id AS "supervisorCollaboratorId",
+              c.joined_at AS "joinedAt",
+              c.weekly_capacity_hours AS "weeklyCapacityHours"
+         FROM operations_collaborator c
+         LEFT JOIN person person_record
+           ON person_record.id = c.person_id
+         LEFT JOIN operations_collaborator_type collaborator_type
+           ON collaborator_type.id = c.collaborator_type_id
+          AND collaborator_type.deleted_at IS NULL
+        WHERE c.id = $1
+          AND c.deleted_at IS NULL
+        LIMIT 1`, collaboratorId);
+        const currentCollaborator = (_a = collaborator[0]) !== null && _a !== void 0 ? _a : null;
+        if (!currentCollaborator) {
+            throw new common_1.NotFoundException('Collaborator not found.');
+        }
+        const hiringContracts = (await client.$queryRawUnsafe(`SELECT id,
+              budget_amount AS "budgetAmount",
+              description
+         FROM operations_contract
+        WHERE related_collaborator_id = $1
+          AND origin_type = 'employee_hiring'
+          AND deleted_at IS NULL
+        ORDER BY created_at DESC
+        LIMIT 1`, collaboratorId));
+        const hiringContract = (_b = hiringContracts[0]) !== null && _b !== void 0 ? _b : null;
+        const collaboratorCode = (_c = this.normalizeOptionalText(currentCollaborator.code)) !== null && _c !== void 0 ? _c : `COL-${collaboratorId}`;
+        const displayName = (_d = this.normalizeOptionalText(currentCollaborator.displayName)) !== null && _d !== void 0 ? _d : `Collaborator ${collaboratorId}`;
+        const collaboratorTypeSlug = (_e = this.normalizeOptionalText(currentCollaborator.collaboratorTypeSlug)) !== null && _e !== void 0 ? _e : 'other';
+        const startDate = data.joinedAt !== undefined
+            ? (_f = data.joinedAt) !== null && _f !== void 0 ? _f : null
+            : (_g = currentCollaborator.joinedAt) !== null && _g !== void 0 ? _g : null;
+        const weeklyCapacityHours = data.weeklyCapacityHours !== undefined
+            ? (_h = data.weeklyCapacityHours) !== null && _h !== void 0 ? _h : null
+            : (_j = currentCollaborator.weeklyCapacityHours) !== null && _j !== void 0 ? _j : null;
+        const compensationAmount = data.compensationAmount !== undefined
+            ? (_k = data.compensationAmount) !== null && _k !== void 0 ? _k : null
+            : (_l = hiringContract === null || hiringContract === void 0 ? void 0 : hiringContract.budgetAmount) !== null && _l !== void 0 ? _l : null;
+        const description = data.contractDescription !== undefined
+            ? this.normalizeOptionalText(data.contractDescription)
+            : (_m = hiringContract === null || hiringContract === void 0 ? void 0 : hiringContract.description) !== null && _m !== void 0 ? _m : null;
+        const supervisorCollaboratorId = data.supervisorCollaboratorId !== undefined
+            ? (_o = data.supervisorCollaboratorId) !== null && _o !== void 0 ? _o : null
+            : (_p = currentCollaborator.supervisorCollaboratorId) !== null && _p !== void 0 ? _p : null;
+        if (!hiringContract) {
+            if (data.autoGenerateContractDraft === false) {
+                return;
+            }
+            await this.createHiringContractDraft(client, updatedByUserId, {
+                collaboratorId,
+                collaboratorCode,
+                displayName,
+                collaboratorType: collaboratorTypeSlug,
+                supervisorCollaboratorId,
+                startDate,
+                weeklyCapacityHours,
+                compensationAmount,
+                description,
+            });
+            return;
+        }
+        await client.$executeRawUnsafe(`UPDATE operations_contract
+          SET code = $1,
+              name = $2,
+              contract_category = $3::operations_contract_contract_category_70d553ea09_enum,
+              contract_type = $4::operations_contract_contract_type_48331e2ebf_enum,
+              client_name = $5,
+              billing_model = $6::operations_contract_billing_model_409dc7fea2_enum,
+              account_manager_collaborator_id = $7,
+              start_date = $8::date,
+              effective_date = $8::date,
+              budget_amount = $9,
+              monthly_hour_cap = $10,
+              description = $11,
+              updated_by_user_id = $12,
+              updated_at = NOW()
+        WHERE id = $13`, `HIR-${collaboratorCode}`, this.buildHiringContractName(displayName, collaboratorTypeSlug), this.mapContractCategoryForCollaboratorType(collaboratorTypeSlug), this.mapContractTypeForCollaboratorType(collaboratorTypeSlug), displayName, this.mapBillingModelForCollaboratorType(collaboratorTypeSlug), supervisorCollaboratorId, startDate !== null && startDate !== void 0 ? startDate : new Date().toISOString().slice(0, 10), compensationAmount, weeklyCapacityHours ? Math.round(Number(weeklyCapacityHours) * 4) : null, description, updatedByUserId, hiringContract.id);
+    }
     async createProjectContractDraft(client, createdByUserId, input) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
         const templateRows = input.contractTemplateId