@hed-hog/operations 0.0.303 → 0.0.305

package/dist/operations.service.js

@@ -14,9 +14,11 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 var OperationsService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationsService = void 0;
+const api_locale_1 = require("@hed-hog/api-locale");
 const api_prisma_1 = require("@hed-hog/api-prisma");
 const core_1 = require("@hed-hog/core");
 const common_1 = require("@nestjs/common");
+const operations_access_service_1 = require("./services/shared/operations-access.service");
 const COLLABORATOR_ROLE = 'admin-operations-collaborator';
 const SUPERVISOR_ROLE = 'admin-operations-supervisor';
 const DIRECTOR_ROLE = 'admin-operations-director';
@@ -105,15 +107,238 @@ 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 = ['todo', 'doing', 'review', 'done'];
 let OperationsService = OperationsService_1 = class OperationsService {
-    constructor(prisma, aiService, integrationApi, fileService, settingService) {
+    constructor(prisma, aiService, integrationApi, fileService, settingService, accessService, localeService) {
         this.prisma = prisma;
         this.aiService = aiService;
         this.integrationApi = integrationApi;
         this.fileService = fileService;
         this.settingService = settingService;
+        this.accessService = accessService;
+        this.localeService = localeService;
         this.logger = new common_1.Logger(OperationsService_1.name);
     }
+    normalizeLocaleCode(locale) {
+        var _a, _b;
+        const rawLocale = String(locale !== null && locale !== void 0 ? locale : '').trim();
+        if (!rawLocale) {
+            return null;
+        }
+        return (((_b = (_a = rawLocale.split(',')[0]) === null || _a === void 0 ? void 0 : _a.split('-')[0]) === null || _b === void 0 ? void 0 : _b.trim().toLowerCase()) || null);
+    }
+    async resolvePreferredLocaleId(client = this.prisma) {
+        var _a, _b;
+        const candidateCodes = [
+            this.normalizeLocaleCode((0, core_1.getLocaleFromContext)()),
+            'en',
+            'pt',
+        ].filter((code, index, values) => Boolean(code) && values.indexOf(code) === index);
+        for (const code of candidateCodes) {
+            const localeRecord = this.localeService
+                ? await this.localeService.getByCode(code)
+                : null;
+            if (localeRecord === null || localeRecord === void 0 ? void 0 : localeRecord.id) {
+                return Number(localeRecord.id);
+            }
+        }
+        const fallbackLocales = (await client.$queryRawUnsafe(`SELECT id
+         FROM locale
+        ORDER BY CASE WHEN enabled = true THEN 0 ELSE 1 END ASC,
+                 CASE
+                   WHEN code = 'en' THEN 0
+                   WHEN code = 'pt' THEN 1
+                   ELSE 2
+                 END ASC,
+                 id ASC
+        LIMIT 1`));
+        return (_b = (_a = fallbackLocales[0]) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : null;
+    }
+    async listCollaboratorTypes(userId, filters) {
+        const actor = await this.getActorContext(userId);
+        this.ensureCollaborator(actor);
+        return this.queryRows(`SELECT ct.id,
+              ct.slug,
+              ct.name,
+              ct.description,
+              ct.category,
+              ct.is_active AS "isActive",
+              ct.sort_order AS "sortOrder",
+              CASE
+                WHEN ct.deleted_at IS NULL AND ct.is_active THEN 'active'
+                ELSE 'inactive'
+              END AS status,
+              COUNT(DISTINCT c.id)::int AS "collaboratorCount",
+              ct.created_at AS "createdAt",
+              ct.updated_at AS "updatedAt"
+         FROM operations_collaborator_type ct
+         LEFT JOIN operations_collaborator c
+           ON c.deleted_at IS NULL
+          AND c.collaborator_type_id = ct.id
+        WHERE ($1::boolean = false OR (ct.deleted_at IS NULL AND ct.is_active = true))
+        GROUP BY ct.id
+        ORDER BY CASE
+                   WHEN ct.deleted_at IS NULL AND ct.is_active THEN 0
+                   ELSE 1
+                 END ASC,
+                 ct.sort_order ASC,
+                 ct.name ASC`, [Boolean(filters === null || filters === void 0 ? void 0 : filters.active)]);
+    }
+    async createCollaboratorType(userId, data) {
+        const actor = await this.getActorContext(userId);
+        this.ensureDirector(actor);
+        const name = this.normalizeOptionalText(data.name);
+        if (!name) {
+            throw new common_1.BadRequestException('Collaborator type name is required.');
+        }
+        return this.prisma.$transaction(async (tx) => {
+            var _a, _b;
+            await this.assertCollaboratorTypeNameAvailable(tx, name);
+            const nextSlug = await this.buildCollaboratorTypeSlug(tx, name, data.slug);
+            const nextIsActive = (_a = data.isActive) !== null && _a !== void 0 ? _a : (data.status ? data.status === 'active' : true);
+            const created = (await tx.$queryRawUnsafe(`INSERT INTO operations_collaborator_type (
+          slug,
+          name,
+          description,
+          category,
+          is_active,
+          sort_order,
+          deleted_at,
+          created_at,
+          updated_at
+        ) VALUES (
+          $1, $2, $3, $4, $5, $6,
+          CASE WHEN $5::boolean THEN NULL ELSE NOW() END,
+          NOW(), NOW()
+        )
+        RETURNING id`, nextSlug, name, this.normalizeOptionalText(data.description), this.normalizeOptionalText(data.category), nextIsActive, Number.isFinite(Number(data.sortOrder)) ? Number(data.sortOrder) : 0));
+            const createdCollaboratorTypeId = (_b = created[0]) === null || _b === void 0 ? void 0 : _b.id;
+            if (!createdCollaboratorTypeId) {
+                throw new common_1.BadRequestException('Unable to create the collaborator type.');
+            }
+            return this.getCollaboratorTypeById(tx, createdCollaboratorTypeId, true);
+        });
+    }
+    async updateCollaboratorType(userId, collaboratorTypeId, data) {
+        const actor = await this.getActorContext(userId);
+        this.ensureDirector(actor);
+        return this.prisma.$transaction(async (tx) => {
+            var _a, _b, _c, _d, _e;
+            const current = await this.getCollaboratorTypeById(tx, collaboratorTypeId, true);
+            const nextName = data.name !== undefined
+                ? this.normalizeOptionalText(data.name)
+                : current.name;
+            if (!nextName) {
+                throw new common_1.BadRequestException('Collaborator type name is required.');
+            }
+            if (String(nextName).toLowerCase() !== String(current.name).toLowerCase()) {
+                await this.assertCollaboratorTypeNameAvailable(tx, nextName, collaboratorTypeId);
+            }
+            const nextSlug = await this.buildCollaboratorTypeSlug(tx, nextName, data.slug !== undefined ? data.slug : current.slug, collaboratorTypeId);
+            const nextDescription = data.description !== undefined
+                ? this.normalizeOptionalText(data.description)
+                : ((_a = current.description) !== null && _a !== void 0 ? _a : null);
+            const nextCategory = data.category !== undefined
+                ? this.normalizeOptionalText(data.category)
+                : ((_b = current.category) !== null && _b !== void 0 ? _b : null);
+            const nextSortOrder = data.sortOrder !== undefined && Number.isFinite(Number(data.sortOrder))
+                ? Number(data.sortOrder)
+                : ((_c = current.sortOrder) !== null && _c !== void 0 ? _c : 0);
+            const nextIsActive = (_d = data.isActive) !== null && _d !== void 0 ? _d : (data.status ? data.status === 'active' : ((_e = current.isActive) !== null && _e !== void 0 ? _e : true));
+            await tx.$executeRawUnsafe(`UPDATE operations_collaborator_type
+            SET slug = $1,
+                name = $2,
+                description = $3,
+                category = $4,
+                is_active = $5,
+                sort_order = $6,
+                deleted_at = CASE
+                  WHEN $5::boolean THEN NULL
+                  ELSE COALESCE(deleted_at, NOW())
+                END,
+                updated_at = NOW()
+          WHERE id = $7`, nextSlug, nextName, nextDescription, nextCategory, nextIsActive, nextSortOrder, collaboratorTypeId);
+            return this.getCollaboratorTypeById(tx, collaboratorTypeId, true);
+        });
+    }
+    async listProjectRoles(userId) {
+        const actor = await this.getActorContext(userId);
+        this.ensureCollaborator(actor);
+        const localeId = await this.resolvePreferredLocaleId();
+        return this.queryRows(`SELECT pr.id,
+              pr.slug,
+              pr.code,
+              COALESCE(prl.name, pr.code, pr.slug) AS name,
+              prl.description,
+              pr.is_active AS "isActive",
+              pr.sort_order AS "sortOrder",
+              pr.created_at AS "createdAt",
+              pr.updated_at AS "updatedAt"
+         FROM operations_project_role pr
+         LEFT JOIN LATERAL (
+           SELECT pr_locale.name,
+                  pr_locale.description
+             FROM operations_project_role_locale pr_locale
+            WHERE pr_locale.operations_project_role_id = pr.id
+            ORDER BY CASE
+                       WHEN $1::int IS NOT NULL AND pr_locale.locale_id = $1 THEN 0
+                       ELSE 1
+                     END ASC,
+                     pr_locale.id ASC
+            LIMIT 1
+         ) prl ON TRUE
+        WHERE pr.deleted_at IS NULL
+        ORDER BY pr.sort_order ASC,
+                 COALESCE(prl.name, pr.code, pr.slug) ASC`, [localeId]);
+    }
+    async createProjectRole(userId, data) {
+        const actor = await this.getActorContext(userId);
+        this.ensureDirector(actor);
+        const name = this.normalizeOptionalText(data.name);
+        if (!name) {
+            throw new common_1.BadRequestException('Project role name is required.');
+        }
+        const description = this.normalizeOptionalText(data.description);
+        return this.prisma.$transaction(async (tx) => {
+            var _a, _b, _c, _d;
+            await this.assertProjectRoleNameAvailable(tx, name);
+            const normalizedCode = (_b = (_a = this.normalizeOptionalText(data.code)) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : null;
+            if (normalizedCode) {
+                await this.assertProjectRoleCodeAvailable(tx, normalizedCode);
+            }
+            const localeId = await this.resolvePreferredLocaleId(tx);
+            if (!localeId) {
+                throw new common_1.BadRequestException('No locale is configured to create project roles.');
+            }
+            const created = (await tx.$queryRawUnsafe(`INSERT INTO operations_project_role (
+          slug,
+          code,
+          is_active,
+          sort_order,
+          deleted_at,
+          created_at,
+          updated_at
+        ) VALUES (
+          $1, $2, $3, $4,
+          CASE WHEN $3::boolean THEN NULL ELSE NOW() END,
+          NOW(), NOW()
+        )
+        RETURNING id`, await this.generateUniqueProjectRoleSlug(tx, name), normalizedCode, (_c = data.isActive) !== null && _c !== void 0 ? _c : true, Number.isFinite(Number(data.sortOrder)) ? Number(data.sortOrder) : 0));
+            const createdProjectRoleId = (_d = created[0]) === null || _d === void 0 ? void 0 : _d.id;
+            if (!createdProjectRoleId) {
+                throw new common_1.BadRequestException('Unable to create the project role.');
+            }
+            await tx.$executeRawUnsafe(`INSERT INTO operations_project_role_locale (
+          operations_project_role_id,
+          locale_id,
+          name,
+          description,
+          created_at,
+          updated_at
+        ) VALUES ($1, $2, $3, $4, NOW(), NOW())`, createdProjectRoleId, localeId, name, description);
+            return this.getProjectRoleById(tx, createdProjectRoleId, true);
+        });
+    }
     async getDashboard(userId) {
         var _a, _b, _c, _d, _e, _f, _g;
         const actor = await this.getActorContext(userId);
@@ -192,13 +417,16 @@ let OperationsService = OperationsService_1 = class OperationsService {
               c.user_id AS "userId",
               c.person_id AS "personId",
               c.code,
-              c.collaborator_type AS "collaboratorType",
+              c.collaborator_type_id AS "collaboratorTypeId",
+              collaborator_type.slug AS "collaboratorTypeSlug",
+              collaborator_type.name AS "collaboratorType",
               COALESCE(NULLIF(c.display_name, ''), person_record.name) AS "displayName",
               person_record.name AS "personName",
               person_record.avatar_id AS "personAvatarId",
               c.department_id AS "departmentId",
               COALESCE(NULLIF(department_record.name, ''), NULLIF(c.department, '')) AS "department",
-              c.title,
+              c.job_title_id AS "jobTitleId",
+              COALESCE(NULLIF(job_title_record.name, ''), NULLIF(c.title, '')) AS "title",
               c.level_label AS "levelLabel",
               c.weekly_capacity_hours AS "weeklyCapacityHours",
               c.status,
@@ -209,13 +437,20 @@ let OperationsService = OperationsService_1 = class OperationsService {
               s.display_name AS "supervisorName",
               hiring_contract.id AS "contractId",
               hiring_contract.status AS "contractStatus",
+              hiring_contract.budget_amount AS "compensationAmount",
               COUNT(DISTINCT pa.id)::int AS "activeAssignments"
          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
          LEFT JOIN operations_department department_record
            ON department_record.id = c.department_id
           AND department_record.deleted_at IS NULL
+         LEFT JOIN operations_job_title job_title_record
+           ON job_title_record.id = c.job_title_id
+          AND job_title_record.deleted_at IS NULL
          LEFT JOIN operations_collaborator s
            ON s.id = c.supervisor_collaborator_id
          LEFT JOIN operations_project_assignment pa
@@ -223,7 +458,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
           AND pa.deleted_at IS NULL
           AND pa.status IN ('planned', 'active')
          LEFT JOIN LATERAL (
-           SELECT oc.id, oc.status
+           SELECT oc.id, oc.status, oc.budget_amount
              FROM operations_contract oc
             WHERE oc.related_collaborator_id = c.id
               AND oc.deleted_at IS NULL
@@ -233,7 +468,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
          ) hiring_contract ON TRUE
         WHERE c.deleted_at IS NULL
           AND ${filter.clause}
-        GROUP BY c.id, person_record.id, department_record.id, s.id, hiring_contract.id, hiring_contract.status
+        GROUP BY c.id, person_record.id, collaborator_type.id, department_record.id, job_title_record.id, s.id, hiring_contract.id, hiring_contract.status, hiring_contract.budget_amount
         ORDER BY COALESCE(NULLIF(c.display_name, ''), person_record.name) ASC`, filter.params);
     }
     async getMyCollaborator(userId) {
@@ -273,13 +508,16 @@ let OperationsService = OperationsService_1 = class OperationsService {
               c.user_id AS "userId",
               c.person_id AS "personId",
               c.code,
+              c.collaborator_type_id AS "collaboratorTypeId",
+              collaborator_type.slug AS "collaboratorTypeSlug",
+              collaborator_type.name AS "collaboratorType",
               COALESCE(NULLIF(c.display_name, ''), person_record.name) AS "displayName",
               person_record.name AS "personName",
               person_record.avatar_id AS "personAvatarId",
-              c.collaborator_type AS "collaboratorType",
               c.department_id AS "departmentId",
               COALESCE(NULLIF(department_record.name, ''), NULLIF(c.department, '')) AS "department",
-              c.title,
+              c.job_title_id AS "jobTitleId",
+              COALESCE(NULLIF(job_title_record.name, ''), NULLIF(c.title, '')) AS "title",
               c.status,
               COUNT(DISTINCT pa.id)::int AS "activeAssignments",
               COUNT(DISTINCT a.id) FILTER (WHERE a.status = 'pending')::int AS "pendingApprovals",
@@ -288,9 +526,15 @@ let OperationsService = OperationsService_1 = class OperationsService {
          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
          LEFT JOIN operations_department department_record
            ON department_record.id = c.department_id
           AND department_record.deleted_at IS NULL
+         LEFT JOIN operations_job_title job_title_record
+           ON job_title_record.id = c.job_title_id
+          AND job_title_record.deleted_at IS NULL
          LEFT JOIN operations_project_assignment pa
            ON pa.collaborator_id = c.id
           AND pa.deleted_at IS NULL
@@ -308,7 +552,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
           AND sar.deleted_at IS NULL
           AND sar.status = 'submitted'
         WHERE c.deleted_at IS NULL AND ${teamFilter.clause}
-        GROUP BY c.id, person_record.id, department_record.id
+        GROUP BY c.id, person_record.id, collaborator_type.id, department_record.id, job_title_record.id
         ORDER BY COALESCE(NULLIF(c.display_name, ''), person_record.name) ASC`, teamFilter.params);
         const [teamProjects, pendingApprovalQueue, pendingTimeOffRequests, pendingScheduleAdjustmentRequests] = await Promise.all([
             this.queryRows(`SELECT p.id,
@@ -459,26 +703,36 @@ let OperationsService = OperationsService_1 = class OperationsService {
             ? await this.getPersonById(Number(data.personId))
             : null;
         const resolvedDisplayName = (_d = (_b = (_a = resolvedPerson === null || resolvedPerson === void 0 ? void 0 : resolvedPerson.name) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : (_c = data.displayName) === null || _c === void 0 ? void 0 : _c.trim()) !== null && _d !== void 0 ? _d : '';
+        const normalizedStatus = data.status === 'draft' ? 'active' : data.status;
         if (!resolvedDisplayName) {
             throw new common_1.BadRequestException('Field "personId" is required.');
         }
         const collaboratorId = 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;
+            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;
             const normalizedCode = String((_a = data.code) !== null && _a !== void 0 ? _a : '').trim() ||
                 (await this.generateCollaboratorCode(tx));
             const resolvedDepartment = await this.resolveDepartmentReference(tx, {
                 departmentId: (_b = data.departmentId) !== null && _b !== void 0 ? _b : null,
                 departmentName: data.department,
             });
+            const resolvedJobTitle = await this.resolveJobTitleReference(tx, {
+                jobTitleId: (_c = data.jobTitleId) !== null && _c !== void 0 ? _c : null,
+                jobTitleName: data.title,
+            });
+            const resolvedCollaboratorType = await this.resolveCollaboratorTypeReference(tx, {
+                collaboratorTypeId: (_d = data.collaboratorTypeId) !== null && _d !== void 0 ? _d : null,
+                collaboratorTypeSlug: (_f = (_e = data.collaboratorTypeSlug) !== null && _e !== void 0 ? _e : data.collaboratorType) !== null && _f !== void 0 ? _f : null,
+            });
             const created = (await tx.$queryRawUnsafe(`INSERT INTO operations_collaborator (
           user_id,
           person_id,
           supervisor_collaborator_id,
           code,
-          collaborator_type,
+          collaborator_type_id,
           display_name,
           department,
           department_id,
+          job_title_id,
           title,
           level_label,
           weekly_capacity_hours,
@@ -489,26 +743,26 @@ let OperationsService = OperationsService_1 = class OperationsService {
           created_at,
           updated_at
         ) VALUES (
-          $1, $2, $3, $4,
-          $5::operations_collaborator_collaborator_type_7dd7b0ada2_enum,
-          $6, $7, $8, $9, $10, $11,
-          $12::operations_collaborator_status_ef779877d4_enum,
-          $13::date, $14::date, $15, NOW(), NOW()
+          $1, $2, $3, $4, $5,
+          $6, $7, $8, $9, $10, $11, $12,
+          $13::operations_collaborator_status_ef779877d4_enum,
+          $14::date, $15::date, $16, NOW(), NOW()
         )
-        RETURNING id`, (_c = data.userId) !== null && _c !== void 0 ? _c : null, (_d = resolvedPerson === null || resolvedPerson === void 0 ? void 0 : resolvedPerson.id) !== null && _d !== void 0 ? _d : null, (_e = data.supervisorCollaboratorId) !== null && _e !== void 0 ? _e : null, normalizedCode, (_f = data.collaboratorType) !== null && _f !== void 0 ? _f : 'other', resolvedDisplayName, (_g = resolvedDepartment === null || resolvedDepartment === void 0 ? void 0 : resolvedDepartment.name) !== null && _g !== void 0 ? _g : null, (_h = resolvedDepartment === null || resolvedDepartment === void 0 ? void 0 : resolvedDepartment.id) !== null && _h !== void 0 ? _h : null, (_j = data.title) !== null && _j !== void 0 ? _j : null, (_k = data.levelLabel) !== null && _k !== void 0 ? _k : null, (_l = data.weeklyCapacityHours) !== null && _l !== void 0 ? _l : null, (_m = data.status) !== null && _m !== void 0 ? _m : 'active', (_o = data.joinedAt) !== null && _o !== void 0 ? _o : null, (_p = data.leftAt) !== null && _p !== void 0 ? _p : null, (_q = data.notes) !== null && _q !== void 0 ? _q : null));
-            const createdCollaboratorId = (_r = created[0]) === null || _r === void 0 ? void 0 : _r.id;
+        RETURNING id`, (_g = data.userId) !== null && _g !== void 0 ? _g : null, (_h = resolvedPerson === null || resolvedPerson === void 0 ? void 0 : resolvedPerson.id) !== null && _h !== void 0 ? _h : null, (_j = data.supervisorCollaboratorId) !== null && _j !== void 0 ? _j : null, normalizedCode, (_k = resolvedCollaboratorType === null || resolvedCollaboratorType === void 0 ? void 0 : resolvedCollaboratorType.id) !== null && _k !== void 0 ? _k : null, resolvedDisplayName, (_l = resolvedDepartment === null || resolvedDepartment === void 0 ? void 0 : resolvedDepartment.name) !== null && _l !== void 0 ? _l : null, (_m = resolvedDepartment === null || resolvedDepartment === void 0 ? void 0 : resolvedDepartment.id) !== null && _m !== void 0 ? _m : null, (_o = resolvedJobTitle === null || resolvedJobTitle === void 0 ? void 0 : resolvedJobTitle.id) !== null && _o !== void 0 ? _o : null, (_p = resolvedJobTitle === null || resolvedJobTitle === void 0 ? void 0 : resolvedJobTitle.name) !== null && _p !== void 0 ? _p : this.normalizeOptionalText(data.title), (_q = data.levelLabel) !== null && _q !== void 0 ? _q : null, (_r = data.weeklyCapacityHours) !== null && _r !== void 0 ? _r : null, normalizedStatus !== null && normalizedStatus !== void 0 ? normalizedStatus : 'active', (_s = data.joinedAt) !== null && _s !== void 0 ? _s : null, (_t = data.leftAt) !== null && _t !== void 0 ? _t : null, (_u = data.notes) !== null && _u !== void 0 ? _u : null));
+            const createdCollaboratorId = (_v = created[0]) === null || _v === void 0 ? void 0 : _v.id;
             await this.replaceCollaboratorScheduleDays(tx, createdCollaboratorId, data.weeklySchedule);
+            await this.replaceCollaboratorEquityParticipation(tx, createdCollaboratorId, data.equityParticipation);
             if (data.autoGenerateContractDraft !== false) {
                 await this.createHiringContractDraft(tx, actor.userId, {
                     collaboratorId: createdCollaboratorId,
                     collaboratorCode: normalizedCode,
                     displayName: resolvedDisplayName,
-                    collaboratorType: (_s = data.collaboratorType) !== null && _s !== void 0 ? _s : 'other',
-                    supervisorCollaboratorId: (_t = data.supervisorCollaboratorId) !== null && _t !== void 0 ? _t : null,
-                    startDate: (_u = data.joinedAt) !== null && _u !== void 0 ? _u : null,
-                    weeklyCapacityHours: (_v = data.weeklyCapacityHours) !== null && _v !== void 0 ? _v : null,
-                    compensationAmount: (_w = data.compensationAmount) !== null && _w !== void 0 ? _w : null,
-                    description: (_y = (_x = data.contractDescription) !== null && _x !== void 0 ? _x : data.notes) !== null && _y !== void 0 ? _y : null,
+                    collaboratorType: ((_x = (_w = resolvedCollaboratorType === null || resolvedCollaboratorType === void 0 ? void 0 : resolvedCollaboratorType.slug) !== null && _w !== void 0 ? _w : data.collaboratorType) !== null && _x !== void 0 ? _x : 'other'),
+                    supervisorCollaboratorId: (_y = data.supervisorCollaboratorId) !== null && _y !== void 0 ? _y : null,
+                    startDate: (_z = data.joinedAt) !== null && _z !== void 0 ? _z : null,
+                    weeklyCapacityHours: (_0 = data.weeklyCapacityHours) !== null && _0 !== void 0 ? _0 : null,
+                    compensationAmount: (_1 = data.compensationAmount) !== null && _1 !== void 0 ? _1 : null,
+                    description: (_3 = (_2 = data.contractDescription) !== null && _2 !== void 0 ? _2 : data.notes) !== null && _3 !== void 0 ? _3 : null,
                 });
             }
             return createdCollaboratorId;
@@ -526,30 +780,46 @@ let OperationsService = OperationsService_1 = class OperationsService {
             ? await this.getPersonById(Number(data.personId))
             : null;
         const resolvedDisplayName = (_d = (_b = (_a = resolvedPerson === null || resolvedPerson === void 0 ? void 0 : resolvedPerson.name) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : (_c = data.displayName) === null || _c === void 0 ? void 0 : _c.trim()) !== null && _d !== void 0 ? _d : undefined;
+        const normalizedStatus = data.status === 'draft' ? 'active' : data.status;
         this.pushUpdate(updates, params, 'user_id', data.userId);
         this.pushUpdate(updates, params, 'person_id', data.personId);
         this.pushUpdate(updates, params, 'supervisor_collaborator_id', data.supervisorCollaboratorId);
         this.pushUpdate(updates, params, 'code', (_e = data.code) === null || _e === void 0 ? void 0 : _e.trim());
-        this.pushUpdate(updates, params, 'collaborator_type', data.collaboratorType, 'operations_collaborator_collaborator_type_7dd7b0ada2_enum');
         if (data.personId !== undefined || data.displayName !== undefined) {
             this.pushUpdate(updates, params, 'display_name', resolvedDisplayName !== null && resolvedDisplayName !== void 0 ? resolvedDisplayName : null);
         }
-        this.pushUpdate(updates, params, 'title', data.title);
         this.pushUpdate(updates, params, 'level_label', data.levelLabel);
         this.pushUpdate(updates, params, 'weekly_capacity_hours', data.weeklyCapacityHours);
-        this.pushUpdate(updates, params, 'status', data.status, 'operations_collaborator_status_ef779877d4_enum');
+        this.pushUpdate(updates, params, 'status', normalizedStatus, 'operations_collaborator_status_ef779877d4_enum');
         this.pushUpdate(updates, params, 'joined_at', data.joinedAt, 'date');
         this.pushUpdate(updates, params, 'left_at', data.leftAt, 'date');
         this.pushUpdate(updates, params, 'notes', data.notes);
         await this.prisma.$transaction(async (tx) => {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            if (data.collaboratorType !== undefined ||
+                data.collaboratorTypeId !== undefined ||
+                data.collaboratorTypeSlug !== undefined) {
+                const resolvedCollaboratorType = await this.resolveCollaboratorTypeReference(tx, {
+                    collaboratorTypeId: (_a = data.collaboratorTypeId) !== null && _a !== void 0 ? _a : null,
+                    collaboratorTypeSlug: (_c = (_b = data.collaboratorTypeSlug) !== null && _b !== void 0 ? _b : data.collaboratorType) !== null && _c !== void 0 ? _c : null,
+                });
+                this.pushUpdate(updates, params, 'collaborator_type_id', (_d = resolvedCollaboratorType === null || resolvedCollaboratorType === void 0 ? void 0 : resolvedCollaboratorType.id) !== null && _d !== void 0 ? _d : null);
+            }
             if (data.department !== undefined || data.departmentId !== undefined) {
                 const resolvedDepartment = await this.resolveDepartmentReference(tx, {
-                    departmentId: (_a = data.departmentId) !== null && _a !== void 0 ? _a : null,
+                    departmentId: (_e = data.departmentId) !== null && _e !== void 0 ? _e : null,
                     departmentName: data.department,
                 });
-                this.pushUpdate(updates, params, 'department', (_b = resolvedDepartment === null || resolvedDepartment === void 0 ? void 0 : resolvedDepartment.name) !== null && _b !== void 0 ? _b : null);
-                this.pushUpdate(updates, params, 'department_id', (_c = resolvedDepartment === null || resolvedDepartment === void 0 ? void 0 : resolvedDepartment.id) !== null && _c !== void 0 ? _c : null);
+                this.pushUpdate(updates, params, 'department', (_f = resolvedDepartment === null || resolvedDepartment === void 0 ? void 0 : resolvedDepartment.name) !== null && _f !== void 0 ? _f : null);
+                this.pushUpdate(updates, params, 'department_id', (_g = resolvedDepartment === null || resolvedDepartment === void 0 ? void 0 : resolvedDepartment.id) !== null && _g !== void 0 ? _g : null);
+            }
+            if (data.title !== undefined || data.jobTitleId !== undefined) {
+                const resolvedJobTitle = await this.resolveJobTitleReference(tx, {
+                    jobTitleId: (_h = data.jobTitleId) !== null && _h !== void 0 ? _h : null,
+                    jobTitleName: data.title,
+                });
+                this.pushUpdate(updates, params, 'job_title_id', (_j = resolvedJobTitle === null || resolvedJobTitle === void 0 ? void 0 : resolvedJobTitle.id) !== null && _j !== void 0 ? _j : null);
+                this.pushUpdate(updates, params, 'title', (_k = resolvedJobTitle === null || resolvedJobTitle === void 0 ? void 0 : resolvedJobTitle.name) !== null && _k !== void 0 ? _k : this.normalizeOptionalText(data.title));
             }
             if (updates.length) {
                 params.push(collaboratorId);
@@ -561,6 +831,23 @@ let OperationsService = OperationsService_1 = class OperationsService {
             if (data.weeklySchedule) {
                 await this.replaceCollaboratorScheduleDays(tx, collaboratorId, data.weeklySchedule);
             }
+            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);
     }
@@ -590,6 +877,67 @@ let OperationsService = OperationsService_1 = class OperationsService {
         ORDER BY CASE WHEN d.deleted_at IS NULL THEN 0 ELSE 1 END ASC,
                  d.name ASC`);
     }
+    async listJobTitles(userId) {
+        const actor = await this.getActorContext(userId);
+        this.ensureCollaborator(actor);
+        return this.queryRows(`SELECT jt.id,
+              jt.slug,
+              jt.code,
+              jt.name,
+              jt.description,
+              CASE WHEN jt.deleted_at IS NULL THEN 'active' ELSE 'inactive' END AS status,
+              COUNT(DISTINCT c.id)::int AS "collaboratorCount",
+              jt.created_at AS "createdAt",
+              jt.updated_at AS "updatedAt"
+         FROM operations_job_title jt
+         LEFT JOIN operations_collaborator c
+           ON c.deleted_at IS NULL
+          AND (
+            c.job_title_id = jt.id
+            OR (
+              c.job_title_id IS NULL
+              AND LOWER(COALESCE(c.title, '')) = LOWER(jt.name)
+            )
+          )
+        GROUP BY jt.id
+        ORDER BY CASE WHEN jt.deleted_at IS NULL THEN 0 ELSE 1 END ASC,
+                 jt.name ASC`);
+    }
+    async createJobTitle(userId, data) {
+        const actor = await this.getActorContext(userId);
+        this.ensureDirector(actor);
+        const name = this.normalizeOptionalText(data.name);
+        if (!name) {
+            throw new common_1.BadRequestException('Job title name is required.');
+        }
+        return this.prisma.$transaction(async (tx) => {
+            var _a, _b, _c, _d;
+            await this.assertJobTitleNameAvailable(tx, name);
+            const normalizedCode = (_b = (_a = this.normalizeOptionalText(data.code)) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : null;
+            if (normalizedCode) {
+                await this.assertJobTitleCodeAvailable(tx, normalizedCode);
+            }
+            const created = (await tx.$queryRawUnsafe(`INSERT INTO operations_job_title (
+          slug,
+          code,
+          name,
+          description,
+          deleted_at,
+          created_at,
+          updated_at
+        ) VALUES (
+          $1, $2, $3, $4,
+          CASE WHEN $5 = 'inactive' THEN NOW() ELSE NULL END,
+          NOW(), NOW()
+        )
+        RETURNING id`, await this.generateUniqueJobTitleSlug(tx, name), normalizedCode, name, this.normalizeOptionalText(data.description), (_c = data.status) !== null && _c !== void 0 ? _c : 'active'));
+            const createdJobTitleId = (_d = created[0]) === null || _d === void 0 ? void 0 : _d.id;
+            if (!createdJobTitleId) {
+                throw new common_1.BadRequestException('Unable to create the job title.');
+            }
+            return this.getJobTitleById(tx, createdJobTitleId, true);
+        });
+    }
     async createDepartment(userId, data) {
         const actor = await this.getActorContext(userId);
         this.ensureDirector(actor);
@@ -687,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",
@@ -705,6 +1053,476 @@ let OperationsService = OperationsService_1 = class OperationsService {
         GROUP BY p.id, c.id, m.id
         ORDER BY p.name ASC`, [...assignmentParams, ...filter.params]);
     }
+    async listProjectOptions(userId, paginationParams) {
+        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 filters = [
+            'p.deleted_at IS NULL',
+            'pa.deleted_at IS NULL',
+            `pa.collaborator_id = $1`,
+            `pa.status IN ('planned', 'active')`,
+        ];
+        if (pagination.search) {
+            const searchPlaceholder = this.param(params, `%${pagination.search}%`);
+            filters.push(`(
+        COALESCE(p.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(p.code, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(p.client_name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(pa.role_label, '') ILIKE ${searchPlaceholder}
+      )`);
+        }
+        const whereClause = filters.join(' AND ');
+        const totalRow = await this.querySingle(`SELECT COUNT(DISTINCT p.id)::text AS total
+         FROM operations_project_assignment pa
+         JOIN operations_project p
+           ON p.id = pa.project_id
+        WHERE ${whereClause}`, params);
+        const sortColumn = (_a = {
+            name: 'p.name',
+            code: 'p.code',
+            clientName: 'p.client_name',
+            startDate: 'p.start_date',
+            endDate: 'p.end_date',
+        }[pagination.sortField]) !== null && _a !== void 0 ? _a : 'p.name';
+        const queryParams = [...params];
+        const limitPlaceholder = this.param(queryParams, pagination.pageSize);
+        const offsetPlaceholder = this.param(queryParams, pagination.offset);
+        const rows = await this.queryRows(`SELECT p.id,
+              p.code,
+              p.name,
+              p.client_name AS "clientName",
+              MAX(pa.id)::int AS "projectAssignmentId",
+              MAX(pa.role_label) AS "roleLabel",
+              p.status,
+              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
+        WHERE ${whereClause}
+        GROUP BY p.id
+        ORDER BY ${sortColumn} ${pagination.sortOrder.toUpperCase()}, p.id ASC
+        LIMIT ${limitPlaceholder}
+       OFFSET ${offsetPlaceholder}`, queryParams);
+        return this.buildPaginationResult(rows.map((row) => (Object.assign(Object.assign({}, row), { label: [row.code, row.name, row.roleLabel].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 listTasks(userId, paginationParams) {
+        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 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')`,
+        ];
+        if (pagination.search) {
+            const searchPlaceholder = this.param(params, `%${pagination.search}%`);
+            filters.push(`(
+        COALESCE(t.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(t.description, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(p.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(p.code, '') ILIKE ${searchPlaceholder}
+      )`);
+        }
+        if (paginationParams.projectAssignmentId) {
+            filters.push(`pa.id = ${this.param(params, paginationParams.projectAssignmentId)}`);
+        }
+        if (paginationParams.projectId) {
+            filters.push(`pa.project_id = ${this.param(params, paginationParams.projectId)}`);
+        }
+        if (paginationParams.status) {
+            filters.push(`t.status = ${this.param(params, paginationParams.status)}`);
+        }
+        const whereClause = filters.join(' AND ');
+        const totalRow = await this.querySingle(`SELECT COUNT(*)::text AS total
+         FROM operations_task t
+         JOIN operations_project_assignment pa
+           ON pa.id = t.project_assignment_id
+         JOIN operations_project p
+           ON p.id = pa.project_id
+        WHERE ${whereClause}`, params);
+        const sortColumn = (_a = {
+            name: 't.name',
+            projectName: 'p.name',
+            status: 't.status',
+            createdAt: 't.created_at',
+        }[pagination.sortField]) !== null && _a !== void 0 ? _a : 't.name';
+        const queryParams = [...params];
+        const limitPlaceholder = this.param(queryParams, pagination.pageSize);
+        const offsetPlaceholder = this.param(queryParams, pagination.offset);
+        const rows = await this.queryRows(`SELECT t.id,
+              t.name,
+              t.description,
+              t.status,
+              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
+           ON pa.id = t.project_assignment_id
+         JOIN operations_project p
+           ON p.id = pa.project_id
+        WHERE ${whereClause}
+        ORDER BY ${sortColumn} ${pagination.sortOrder.toUpperCase()}, t.id ASC
+        LIMIT ${limitPlaceholder}
+       OFFSET ${offsetPlaceholder}`, queryParams);
+        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, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        const actor = await this.getActorContext(userId);
+        if (!actor.isCollaborator && !actor.isDirector && !actor.isSupervisor) {
+            throw new common_1.ForbiddenException('Operations collaborator access is required.');
+        }
+        this.requireFields(data, ['name']);
+        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 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, $5,
+        $6::operations_task_priority_394ab327eb_enum,
+        $7::operations_task_status_574c143dbe_enum,
+        $8::date, $9::decimal, $10, $11, NOW(), NOW()
+      )
+      RETURNING id`, [
+            projectId,
+            assignmentId,
+            (_f = data.assigneeCollaboratorId) !== null && _f !== void 0 ? _f : null,
+            name,
+            this.normalizeOptionalText(data.description),
+            (_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.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);
+        if (!actor.isCollaborator && !actor.isDirector && !actor.isSupervisor) {
+            throw new common_1.ForbiddenException('Operations collaborator access is required.');
+        }
+        const current = await this.getTaskRecordForActor(this.prisma, actor, taskId);
+        await this.assertProjectAccess(actor, current.projectId);
+        const nextName = data.name !== undefined
+            ? this.normalizeOptionalText(data.name)
+            : current.name;
+        if (!nextName) {
+            throw new common_1.BadRequestException('Field "name" is required.');
+        }
+        await this.prisma.$transaction(async (tx) => {
+            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,
+                });
+                await this.assertProjectAccess(actor, nextAssignment.projectId);
+                nextAssignmentId = nextAssignment.id;
+                nextProjectId = nextAssignment.projectId;
+            }
+            await tx.$executeRawUnsafe(`UPDATE operations_task
+            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 = $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)
+                : ((_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.getProjectBoardTask(taskId);
+    }
+    async removeTask(userId, taskId) {
+        const actor = await this.getActorContext(userId);
+        if (!actor.isCollaborator && !actor.isDirector && !actor.isSupervisor) {
+            throw new common_1.ForbiddenException('Operations collaborator access is required.');
+        }
+        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()),
+                updated_at = NOW()
+          WHERE id = $1
+            AND deleted_at IS NULL`, taskId);
+        });
+        return { success: true };
+    }
+    async listTimesheetEntries(userId, paginationParams) {
+        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: 'workDate',
+            defaultSortOrder: 'desc',
+            allowedSortFields: [
+                'workDate',
+                'createdAt',
+                'durationMinutes',
+                'projectName',
+                'taskName',
+                'status',
+            ],
+        });
+        const params = [actor.collaboratorId];
+        const filters = [
+            'e.deleted_at IS NULL',
+            't.deleted_at IS NULL',
+            `t.collaborator_id = $1`,
+        ];
+        if (pagination.search) {
+            const searchPlaceholder = this.param(params, `%${pagination.search}%`);
+            filters.push(`(
+        COALESCE(p.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(p.code, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(task_record.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(e.activity_label, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(e.description, '') ILIKE ${searchPlaceholder}
+      )`);
+        }
+        if (paginationParams.projectAssignmentId) {
+            filters.push(`e.project_assignment_id = ${this.param(params, paginationParams.projectAssignmentId)}`);
+        }
+        if (paginationParams.projectId) {
+            filters.push(`pa.project_id = ${this.param(params, paginationParams.projectId)}`);
+        }
+        if (paginationParams.taskId) {
+            filters.push(`e.task_id = ${this.param(params, paginationParams.taskId)}`);
+        }
+        if (paginationParams.status) {
+            filters.push(`t.status = ${this.param(params, paginationParams.status, 'operations_timesheet_status_128a8ecd30_enum')}`);
+        }
+        if (paginationParams.fromDate) {
+            filters.push(`e.work_date >= ${this.param(params, paginationParams.fromDate, 'date')}`);
+        }
+        if (paginationParams.toDate) {
+            filters.push(`e.work_date <= ${this.param(params, paginationParams.toDate, 'date')}`);
+        }
+        const whereClause = filters.join(' AND ');
+        const totalRow = await this.querySingle(`SELECT COUNT(*)::text AS total
+         FROM operations_timesheet_entry e
+         JOIN operations_timesheet t
+           ON t.id = e.timesheet_id
+         LEFT JOIN operations_project_assignment pa
+           ON pa.id = e.project_assignment_id
+         LEFT JOIN operations_project p
+           ON p.id = pa.project_id
+         LEFT JOIN operations_task task_record
+           ON task_record.id = e.task_id
+          AND task_record.deleted_at IS NULL
+        WHERE ${whereClause}`, params);
+        const sortColumn = (_a = {
+            workDate: 'e.work_date',
+            createdAt: 'e.created_at',
+            durationMinutes: 'COALESCE(NULLIF(e.duration_minutes, 0), ROUND(COALESCE(e.hours, 0)::numeric * 60))',
+            projectName: 'p.name',
+            taskName: 'COALESCE(task_record.name, e.activity_label)',
+            status: 't.status',
+        }[pagination.sortField]) !== null && _a !== void 0 ? _a : 'e.work_date';
+        const queryParams = [...params];
+        const limitPlaceholder = this.param(queryParams, pagination.pageSize);
+        const offsetPlaceholder = this.param(queryParams, pagination.offset);
+        const rows = await this.queryRows(`SELECT e.id,
+              e.timesheet_id AS "timesheetId",
+              t.collaborator_id AS "collaboratorId",
+              pa.project_id AS "projectId",
+              e.project_assignment_id AS "projectAssignmentId",
+              p.code AS "projectCode",
+              p.name AS "projectName",
+              e.task_id AS "taskId",
+              COALESCE(task_record.name, e.activity_label) AS "taskName",
+              e.activity_label AS "activityLabel",
+              e.work_date AS "workDate",
+              COALESCE(NULLIF(e.duration_minutes, 0), ROUND(COALESCE(e.hours, 0)::numeric * 60))::int AS "durationMinutes",
+              COALESCE(
+                e.hours,
+                ROUND((COALESCE(NULLIF(e.duration_minutes, 0), 0)::numeric / 60), 2)
+              ) AS hours,
+              e.description,
+              t.status,
+              t.week_start_date AS "weekStartDate",
+              t.week_end_date AS "weekEndDate",
+              e.created_at AS "createdAt"
+         FROM operations_timesheet_entry e
+         JOIN operations_timesheet t
+           ON t.id = e.timesheet_id
+         LEFT JOIN operations_project_assignment pa
+           ON pa.id = e.project_assignment_id
+         LEFT JOIN operations_project p
+           ON p.id = pa.project_id
+         LEFT JOIN operations_task task_record
+           ON task_record.id = e.task_id
+          AND task_record.deleted_at IS NULL
+        WHERE ${whereClause}
+        ORDER BY ${sortColumn} ${pagination.sortOrder.toUpperCase()}, e.id DESC
+        LIMIT ${limitPlaceholder}
+       OFFSET ${offsetPlaceholder}`, queryParams);
+        return this.buildPaginationResult(rows.map((row) => (Object.assign(Object.assign({}, row), { label: [row.projectCode, row.projectName, row.taskName]
+                .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 createTimesheetEntry(userId, data) {
+        var _a;
+        const actor = await this.getActorContext(userId);
+        this.ensureCollaborator(actor);
+        this.requireFields(data, ['workDate', 'duration']);
+        if (!actor.collaboratorId) {
+            throw new common_1.BadRequestException('Collaborator context is required.');
+        }
+        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 createdEntryId = await this.prisma.$transaction(async (tx) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            const assignment = await this.resolveOwnedProjectAssignment(tx, actor.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, 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.');
+            }
+            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 timesheetId = await this.getOrCreateTimesheetForWorkDate(tx, actor.collaboratorId, data.workDate);
+            const created = (await tx.$queryRawUnsafe(`INSERT INTO operations_timesheet_entry (
+          timesheet_id,
+          project_assignment_id,
+          task_id,
+          activity_label,
+          work_date,
+          duration_minutes,
+          hours,
+          description,
+          created_at,
+          updated_at
+        ) VALUES (
+          $1,
+          $2,
+          $3,
+          $4,
+          $5::date,
+          $6,
+          $7,
+          $8,
+          NOW(),
+          NOW()
+        )
+        RETURNING id`, timesheetId, 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)));
+            await this.refreshTimesheetTotal(tx, timesheetId);
+            return (_j = (_h = created[0]) === null || _h === void 0 ? void 0 : _h.id) !== null && _j !== void 0 ? _j : 0;
+        });
+        return this.getTimesheetEntryByIdForActor(actor, createdEntryId);
+    }
+    async removeTimesheetEntry(userId, entryId) {
+        const actor = await this.getActorContext(userId);
+        this.ensureCollaborator(actor);
+        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 delete this timesheet entry.');
+        }
+        if (!['draft', 'rejected'].includes(entry.status)) {
+            throw new common_1.BadRequestException('Only draft or rejected timesheet entries can be deleted.');
+        }
+        await this.prisma.$transaction(async (tx) => {
+            await tx.$executeRawUnsafe(`UPDATE operations_timesheet_entry
+            SET deleted_at = NOW(),
+                updated_at = NOW()
+          WHERE id = $1
+            AND deleted_at IS NULL`, entryId);
+            await this.refreshTimesheetTotal(tx, entry.timesheetId);
+        });
+        return { success: true };
+    }
     async getProjectById(userId, projectId) {
         const actor = await this.getActorContext(userId);
         await this.assertProjectAccess(actor, projectId);
@@ -715,10 +1533,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,
@@ -732,33 +1551,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,
@@ -777,18 +1596,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
@@ -801,30 +1621,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);
     }
@@ -2101,13 +2937,22 @@ let OperationsService = OperationsService_1 = class OperationsService {
               pa.project_id AS "projectId",
               p.name AS "projectName",
               pa.role_label AS "roleLabel",
-              e.activity_label AS "activityLabel",
+              e.task_id AS "taskId",
+              task_record.name AS "taskName",
+              COALESCE(task_record.name, e.activity_label) AS "activityLabel",
               e.work_date AS "workDate",
-              e.hours,
+              COALESCE(NULLIF(e.duration_minutes, 0), ROUND(COALESCE(e.hours, 0)::numeric * 60))::int AS "durationMinutes",
+              COALESCE(
+                e.hours,
+                ROUND((COALESCE(NULLIF(e.duration_minutes, 0), 0)::numeric / 60), 2)
+              ) AS hours,
               e.description
          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
+         LEFT JOIN operations_task task_record
+           ON task_record.id = e.task_id
+          AND task_record.deleted_at IS NULL
         WHERE e.deleted_at IS NULL
           AND e.timesheet_id = ANY($1::int[])
         ORDER BY e.work_date ASC, e.id ASC`, [headers.map((item) => item.id)]);
@@ -2192,6 +3037,18 @@ let OperationsService = OperationsService_1 = class OperationsService {
         }
         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;
+        if (!approverId) {
+            throw new common_1.BadRequestException('An approver is required before submitting a timesheet.');
+        }
+        const activeEntries = await this.querySingle(`SELECT EXISTS (
+          SELECT 1
+            FROM operations_timesheet_entry
+           WHERE timesheet_id = $1
+             AND deleted_at IS NULL
+        ) AS exists`, [timesheetId]);
+        if (!(activeEntries === null || activeEntries === void 0 ? void 0 : activeEntries.exists)) {
+            throw new common_1.BadRequestException('Cannot submit a timesheet without active entries.');
+        }
         await this.prisma.$transaction(async (tx) => {
             await tx.$executeRawUnsafe(`UPDATE operations_timesheet
             SET status = 'submitted',
@@ -2606,6 +3463,9 @@ let OperationsService = OperationsService_1 = class OperationsService {
                 submitted_at = COALESCE(submitted_at, NOW()),
                 updated_at = NOW()
           WHERE id = $3`, nextStatus, actor.collaboratorId, approval.targetId);
+                if (nextStatus === 'approved') {
+                    await this.applyApprovedScheduleAdjustmentIfNeeded(tx, approval.targetId);
+                }
             }
             await this.insertApprovalHistory(tx, approvalId, actor.collaboratorId, nextStatus === 'approved' ? 'approved' : 'rejected', (_b = data.note) !== null && _b !== void 0 ? _b : null);
         });
@@ -2734,64 +3594,328 @@ let OperationsService = OperationsService_1 = class OperationsService {
     }
     async assertDepartmentCodeAvailable(client, code, excludeDepartmentId) {
         const existing = (await client.$queryRawUnsafe(`SELECT id
-         FROM operations_department
+         FROM operations_department
+        WHERE UPPER(COALESCE(code, '')) = UPPER($1)
+          AND ($2::int IS NULL OR id <> $2)
+        LIMIT 1`, code, excludeDepartmentId !== null && excludeDepartmentId !== void 0 ? excludeDepartmentId : null));
+        if (existing[0]) {
+            throw new common_1.BadRequestException('A department with this code already exists.');
+        }
+    }
+    async resolveDepartmentReference(client, input) {
+        var _a;
+        if (input.departmentName !== undefined) {
+            const normalizedDepartmentName = this.normalizeOptionalText(input.departmentName);
+            if (!normalizedDepartmentName) {
+                return null;
+            }
+            const existingByName = (await client.$queryRawUnsafe(`SELECT id, name
+           FROM operations_department
+          WHERE deleted_at IS NULL
+            AND LOWER(name) = LOWER($1)
+          ORDER BY id ASC
+          LIMIT 1`, normalizedDepartmentName));
+            if (existingByName[0]) {
+                return existingByName[0];
+            }
+            const slug = await this.generateUniqueDepartmentSlug(client, normalizedDepartmentName);
+            const created = (await client.$queryRawUnsafe(`INSERT INTO operations_department (
+          slug,
+          code,
+          name,
+          description,
+          created_at,
+          updated_at
+        ) VALUES ($1, NULL, $2, NULL, NOW(), NOW())
+        RETURNING id, name`, slug, normalizedDepartmentName));
+            return (_a = created[0]) !== null && _a !== void 0 ? _a : null;
+        }
+        if (typeof input.departmentId === 'number' &&
+            Number.isInteger(input.departmentId) &&
+            input.departmentId > 0) {
+            return this.getDepartmentById(client, input.departmentId);
+        }
+        return null;
+    }
+    async generateUniqueDepartmentSlug(client, label, excludeDepartmentId) {
+        const baseSlug = this.slugifyValue(label) || `department-${Date.now().toString(36)}`;
+        for (let attempt = 0; attempt < 25; attempt += 1) {
+            const candidate = attempt === 0 ? baseSlug : `${baseSlug}-${attempt + 1}`;
+            const existing = (await client.$queryRawUnsafe(`SELECT id
+           FROM operations_department
+          WHERE slug = $1
+            AND ($2::int IS NULL OR id <> $2)
+          LIMIT 1`, candidate, excludeDepartmentId !== null && excludeDepartmentId !== void 0 ? excludeDepartmentId : null));
+            if (!existing.length) {
+                return candidate;
+            }
+        }
+        return `${baseSlug}-${Date.now().toString(36)}`;
+    }
+    async getJobTitleById(client, jobTitleId, includeInactive = false) {
+        var _a;
+        const jobTitles = (await client.$queryRawUnsafe(`SELECT id,
+              slug,
+              code,
+              name,
+              description,
+              created_at AS "createdAt",
+              updated_at AS "updatedAt",
+              deleted_at AS "deletedAt",
+              CASE WHEN deleted_at IS NULL THEN 'active' ELSE 'inactive' END AS status
+         FROM operations_job_title
+        WHERE id = $1
+          AND ($2::boolean OR deleted_at IS NULL)`, jobTitleId, includeInactive));
+        const jobTitle = (_a = jobTitles[0]) !== null && _a !== void 0 ? _a : null;
+        if (!jobTitle) {
+            throw new common_1.NotFoundException('Job title not found.');
+        }
+        return jobTitle;
+    }
+    async assertJobTitleNameAvailable(client, name, excludeJobTitleId) {
+        const existing = (await client.$queryRawUnsafe(`SELECT id
+         FROM operations_job_title
+        WHERE LOWER(name) = LOWER($1)
+          AND ($2::int IS NULL OR id <> $2)
+        LIMIT 1`, name, excludeJobTitleId !== null && excludeJobTitleId !== void 0 ? excludeJobTitleId : null));
+        if (existing[0]) {
+            throw new common_1.BadRequestException('A job title with this name already exists.');
+        }
+    }
+    async assertJobTitleCodeAvailable(client, code, excludeJobTitleId) {
+        const existing = (await client.$queryRawUnsafe(`SELECT id
+         FROM operations_job_title
+        WHERE UPPER(COALESCE(code, '')) = UPPER($1)
+          AND ($2::int IS NULL OR id <> $2)
+        LIMIT 1`, code, excludeJobTitleId !== null && excludeJobTitleId !== void 0 ? excludeJobTitleId : null));
+        if (existing[0]) {
+            throw new common_1.BadRequestException('A job title with this code already exists.');
+        }
+    }
+    async resolveJobTitleReference(client, input) {
+        var _a;
+        if (input.jobTitleName !== undefined) {
+            const normalizedJobTitleName = this.normalizeOptionalText(input.jobTitleName);
+            if (!normalizedJobTitleName) {
+                return null;
+            }
+            const existingByName = (await client.$queryRawUnsafe(`SELECT id, name
+           FROM operations_job_title
+          WHERE deleted_at IS NULL
+            AND LOWER(name) = LOWER($1)
+          ORDER BY id ASC
+          LIMIT 1`, normalizedJobTitleName));
+            if (existingByName[0]) {
+                return existingByName[0];
+            }
+            const slug = await this.generateUniqueJobTitleSlug(client, normalizedJobTitleName);
+            const created = (await client.$queryRawUnsafe(`INSERT INTO operations_job_title (
+          slug,
+          code,
+          name,
+          description,
+          created_at,
+          updated_at
+        ) VALUES ($1, NULL, $2, NULL, NOW(), NOW())
+        RETURNING id, name`, slug, normalizedJobTitleName));
+            return (_a = created[0]) !== null && _a !== void 0 ? _a : null;
+        }
+        if (typeof input.jobTitleId === 'number' &&
+            Number.isInteger(input.jobTitleId) &&
+            input.jobTitleId > 0) {
+            return this.getJobTitleById(client, input.jobTitleId);
+        }
+        return null;
+    }
+    async generateUniqueJobTitleSlug(client, label, excludeJobTitleId) {
+        const baseSlug = this.slugifyValue(label) || `job-title-${Date.now().toString(36)}`;
+        for (let attempt = 0; attempt < 25; attempt += 1) {
+            const candidate = attempt === 0 ? baseSlug : `${baseSlug}-${attempt + 1}`;
+            const existing = (await client.$queryRawUnsafe(`SELECT id
+           FROM operations_job_title
+          WHERE slug = $1
+            AND ($2::int IS NULL OR id <> $2)
+          LIMIT 1`, candidate, excludeJobTitleId !== null && excludeJobTitleId !== void 0 ? excludeJobTitleId : null));
+            if (!existing.length) {
+                return candidate;
+            }
+        }
+        return `${baseSlug}-${Date.now().toString(36)}`;
+    }
+    async getCollaboratorTypeById(client, collaboratorTypeId, includeInactive = false) {
+        var _a;
+        const collaboratorTypes = (await client.$queryRawUnsafe(`SELECT ct.id,
+              ct.slug,
+              ct.name,
+              ct.description,
+              ct.category,
+              ct.is_active AS "isActive",
+              ct.sort_order AS "sortOrder",
+              CASE
+                WHEN ct.deleted_at IS NULL AND ct.is_active THEN 'active'
+                ELSE 'inactive'
+              END AS status,
+              COUNT(DISTINCT c.id)::int AS "collaboratorCount",
+              ct.created_at AS "createdAt",
+              ct.updated_at AS "updatedAt",
+              ct.deleted_at AS "deletedAt"
+         FROM operations_collaborator_type ct
+         LEFT JOIN operations_collaborator c
+           ON c.deleted_at IS NULL
+          AND c.collaborator_type_id = ct.id
+        WHERE ct.id = $1
+          AND ($2::boolean OR ct.deleted_at IS NULL)
+        GROUP BY ct.id
+        LIMIT 1`, collaboratorTypeId, includeInactive));
+        const collaboratorType = (_a = collaboratorTypes[0]) !== null && _a !== void 0 ? _a : null;
+        if (!collaboratorType) {
+            throw new common_1.NotFoundException('Collaborator type not found.');
+        }
+        return collaboratorType;
+    }
+    async assertCollaboratorTypeNameAvailable(client, name, excludeCollaboratorTypeId) {
+        const existing = (await client.$queryRawUnsafe(`SELECT id
+         FROM operations_collaborator_type
+        WHERE LOWER(name) = LOWER($1)
+          AND ($2::int IS NULL OR id <> $2)
+        LIMIT 1`, name, excludeCollaboratorTypeId !== null && excludeCollaboratorTypeId !== void 0 ? excludeCollaboratorTypeId : null));
+        if (existing[0]) {
+            throw new common_1.BadRequestException('A collaborator type with this name already exists.');
+        }
+    }
+    async assertCollaboratorTypeSlugAvailable(client, slug, excludeCollaboratorTypeId) {
+        const existing = (await client.$queryRawUnsafe(`SELECT id
+         FROM operations_collaborator_type
+        WHERE LOWER(slug) = LOWER($1)
+          AND ($2::int IS NULL OR id <> $2)
+        LIMIT 1`, slug, excludeCollaboratorTypeId !== null && excludeCollaboratorTypeId !== void 0 ? excludeCollaboratorTypeId : null));
+        if (existing[0]) {
+            throw new common_1.BadRequestException('A collaborator type with this slug already exists.');
+        }
+    }
+    async buildCollaboratorTypeSlug(client, name, slugInput, excludeCollaboratorTypeId) {
+        var _a;
+        const normalizedSlugInput = this.slugifyValue((_a = this.normalizeOptionalText(slugInput)) !== null && _a !== void 0 ? _a : '');
+        if (normalizedSlugInput) {
+            await this.assertCollaboratorTypeSlugAvailable(client, normalizedSlugInput, excludeCollaboratorTypeId);
+            return normalizedSlugInput;
+        }
+        return this.generateUniqueCollaboratorTypeSlug(client, name, excludeCollaboratorTypeId);
+    }
+    async generateUniqueCollaboratorTypeSlug(client, label, excludeCollaboratorTypeId) {
+        const baseSlug = this.slugifyValue(label) || `collaborator-type-${Date.now().toString(36)}`;
+        for (let attempt = 0; attempt < 25; attempt += 1) {
+            const candidate = attempt === 0 ? baseSlug : `${baseSlug}-${attempt + 1}`;
+            const existing = (await client.$queryRawUnsafe(`SELECT id
+           FROM operations_collaborator_type
+          WHERE slug = $1
+            AND ($2::int IS NULL OR id <> $2)
+          LIMIT 1`, candidate, excludeCollaboratorTypeId !== null && excludeCollaboratorTypeId !== void 0 ? excludeCollaboratorTypeId : null));
+            if (!existing.length) {
+                return candidate;
+            }
+        }
+        return `${baseSlug}-${Date.now().toString(36)}`;
+    }
+    async getProjectRoleById(client, projectRoleId, includeInactive = false) {
+        var _a;
+        const localeId = await this.resolvePreferredLocaleId(client);
+        const projectRoles = (await client.$queryRawUnsafe(`SELECT pr.id,
+              pr.slug,
+              pr.code,
+              COALESCE(prl.name, pr.code, pr.slug) AS name,
+              prl.description,
+              pr.is_active AS "isActive",
+              pr.sort_order AS "sortOrder",
+              pr.created_at AS "createdAt",
+              pr.updated_at AS "updatedAt",
+              pr.deleted_at AS "deletedAt"
+         FROM operations_project_role pr
+         LEFT JOIN LATERAL (
+           SELECT pr_locale.name,
+                  pr_locale.description
+             FROM operations_project_role_locale pr_locale
+            WHERE pr_locale.operations_project_role_id = pr.id
+            ORDER BY CASE
+                       WHEN $3::int IS NOT NULL AND pr_locale.locale_id = $3 THEN 0
+                       ELSE 1
+                     END ASC,
+                     pr_locale.id ASC
+            LIMIT 1
+         ) prl ON TRUE
+        WHERE pr.id = $1
+          AND ($2::boolean OR pr.deleted_at IS NULL)`, projectRoleId, includeInactive, localeId));
+        const projectRole = (_a = projectRoles[0]) !== null && _a !== void 0 ? _a : null;
+        if (!projectRole) {
+            throw new common_1.NotFoundException('Project role not found.');
+        }
+        return projectRole;
+    }
+    async assertProjectRoleNameAvailable(client, name, excludeProjectRoleId) {
+        const existing = (await client.$queryRawUnsafe(`SELECT pr.id
+         FROM operations_project_role pr
+         JOIN operations_project_role_locale prl
+           ON prl.operations_project_role_id = pr.id
+        WHERE LOWER(prl.name) = LOWER($1)
+          AND pr.deleted_at IS NULL
+          AND ($2::int IS NULL OR pr.id <> $2)
+        LIMIT 1`, name, excludeProjectRoleId !== null && excludeProjectRoleId !== void 0 ? excludeProjectRoleId : null));
+        if (existing[0]) {
+            throw new common_1.BadRequestException('A project role with this name already exists.');
+        }
+    }
+    async assertProjectRoleCodeAvailable(client, code, excludeProjectRoleId) {
+        const existing = (await client.$queryRawUnsafe(`SELECT id
+         FROM operations_project_role
         WHERE UPPER(COALESCE(code, '')) = UPPER($1)
           AND ($2::int IS NULL OR id <> $2)
-        LIMIT 1`, code, excludeDepartmentId !== null && excludeDepartmentId !== void 0 ? excludeDepartmentId : null));
+        LIMIT 1`, code, excludeProjectRoleId !== null && excludeProjectRoleId !== void 0 ? excludeProjectRoleId : null));
         if (existing[0]) {
-            throw new common_1.BadRequestException('A department with this code already exists.');
-        }
-    }
-    async resolveDepartmentReference(client, input) {
-        var _a;
-        if (input.departmentName !== undefined) {
-            const normalizedDepartmentName = this.normalizeOptionalText(input.departmentName);
-            if (!normalizedDepartmentName) {
-                return null;
-            }
-            const existingByName = (await client.$queryRawUnsafe(`SELECT id, name
-           FROM operations_department
-          WHERE deleted_at IS NULL
-            AND LOWER(name) = LOWER($1)
-          ORDER BY id ASC
-          LIMIT 1`, normalizedDepartmentName));
-            if (existingByName[0]) {
-                return existingByName[0];
-            }
-            const slug = await this.generateUniqueDepartmentSlug(client, normalizedDepartmentName);
-            const created = (await client.$queryRawUnsafe(`INSERT INTO operations_department (
-          slug,
-          code,
-          name,
-          description,
-          created_at,
-          updated_at
-        ) VALUES ($1, NULL, $2, NULL, NOW(), NOW())
-        RETURNING id, name`, slug, normalizedDepartmentName));
-            return (_a = created[0]) !== null && _a !== void 0 ? _a : null;
+            throw new common_1.BadRequestException('A project role with this code already exists.');
         }
-        if (typeof input.departmentId === 'number' &&
-            Number.isInteger(input.departmentId) &&
-            input.departmentId > 0) {
-            return this.getDepartmentById(client, input.departmentId);
-        }
-        return null;
     }
-    async generateUniqueDepartmentSlug(client, label, excludeDepartmentId) {
-        const baseSlug = this.slugifyValue(label) || `department-${Date.now().toString(36)}`;
+    async generateUniqueProjectRoleSlug(client, label, excludeProjectRoleId) {
+        const baseSlug = this.slugifyValue(label) || `project-role-${Date.now().toString(36)}`;
         for (let attempt = 0; attempt < 25; attempt += 1) {
             const candidate = attempt === 0 ? baseSlug : `${baseSlug}-${attempt + 1}`;
             const existing = (await client.$queryRawUnsafe(`SELECT id
-           FROM operations_department
+           FROM operations_project_role
           WHERE slug = $1
             AND ($2::int IS NULL OR id <> $2)
-          LIMIT 1`, candidate, excludeDepartmentId !== null && excludeDepartmentId !== void 0 ? excludeDepartmentId : null));
+          LIMIT 1`, candidate, excludeProjectRoleId !== null && excludeProjectRoleId !== void 0 ? excludeProjectRoleId : null));
             if (!existing.length) {
                 return candidate;
             }
         }
         return `${baseSlug}-${Date.now().toString(36)}`;
     }
+    async resolveCollaboratorTypeReference(client, input) {
+        var _a, _b;
+        if (typeof input.collaboratorTypeId === 'number' &&
+            Number.isInteger(input.collaboratorTypeId) &&
+            input.collaboratorTypeId > 0) {
+            const collaboratorTypes = (await client.$queryRawUnsafe(`SELECT id, slug, name
+           FROM operations_collaborator_type
+          WHERE id = $1
+            AND deleted_at IS NULL
+          LIMIT 1`, input.collaboratorTypeId));
+            return (_a = collaboratorTypes[0]) !== null && _a !== void 0 ? _a : null;
+        }
+        const normalizedLookup = this.normalizeOptionalText(input.collaboratorTypeSlug);
+        if (!normalizedLookup) {
+            return null;
+        }
+        const collaboratorTypes = (await client.$queryRawUnsafe(`SELECT id, slug, name
+         FROM operations_collaborator_type
+        WHERE deleted_at IS NULL
+          AND (
+            LOWER(slug) = LOWER($1)
+            OR LOWER(name) = LOWER($1)
+          )
+        ORDER BY id ASC
+        LIMIT 1`, normalizedLookup));
+        return (_b = collaboratorTypes[0]) !== null && _b !== void 0 ? _b : null;
+    }
     async getContractTemplateRecord(client, templateId, includeInactive = false) {
         const template = (await client.$queryRawUnsafe(`SELECT t.id,
               t.slug,
@@ -2878,6 +4002,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",
@@ -2886,40 +4012,67 @@ 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",
               m.display_name AS "managerName",
               MAX(CASE WHEN pa.collaborator_id = $2 THEN pa.id END)::int AS "myAssignmentId",
-              MAX(CASE WHEN pa.collaborator_id = $2 THEN pa.role_label END) AS "myRoleLabel",
+              MAX(CASE WHEN pa.collaborator_id = $2 THEN COALESCE(project_role_locale.name, pa.role_label) END) AS "myRoleLabel",
               COUNT(DISTINCT pa.id)::int AS "teamSize"
          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
+         LEFT JOIN operations_project_role project_role
+           ON project_role.id = pa.project_role_id
+          AND project_role.deleted_at IS NULL
+         LEFT JOIN LATERAL (
+           SELECT prl.name
+             FROM operations_project_role_locale prl
+            WHERE prl.operations_project_role_id = project_role.id
+            ORDER BY prl.id ASC
+            LIMIT 1
+         ) 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.role_label AS "roleLabel",
+                  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
+             LEFT JOIN LATERAL (
+               SELECT prl.name
+                 FROM operations_project_role_locale prl
+                WHERE prl.operations_project_role_id = project_role.id
+                ORDER BY prl.id ASC
+                LIMIT 1
+             ) project_role_locale ON TRUE
             WHERE pa.project_id = $1
               AND pa.deleted_at IS NULL
             ORDER BY c.display_name ASC`, [projectId]),
@@ -2931,8 +4084,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,
@@ -2982,11 +4135,14 @@ let OperationsService = OperationsService_1 = class OperationsService {
               person_record.name AS "personName",
               person_record.avatar_id AS "personAvatarId",
               c.code,
-              c.collaborator_type AS "collaboratorType",
+              c.collaborator_type_id AS "collaboratorTypeId",
+              collaborator_type.slug AS "collaboratorTypeSlug",
+              collaborator_type.name AS "collaboratorType",
               COALESCE(NULLIF(c.display_name, ''), person_record.name) AS "displayName",
               c.department_id AS "departmentId",
               COALESCE(NULLIF(department_record.name, ''), NULLIF(c.department, '')) AS "department",
-              c.title,
+              c.job_title_id AS "jobTitleId",
+              COALESCE(NULLIF(job_title_record.name, ''), NULLIF(c.title, '')) AS "title",
               c.level_label AS "levelLabel",
               c.weekly_capacity_hours AS "weeklyCapacityHours",
               c.status,
@@ -2997,13 +4153,20 @@ let OperationsService = OperationsService_1 = class OperationsService {
               s.display_name AS "supervisorName",
               hiring_contract.id AS "contractId",
               hiring_contract.status AS "contractStatus",
+              hiring_contract.budget_amount AS "compensationAmount",
               COUNT(DISTINCT pa.id)::int AS "activeAssignments"
          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
          LEFT JOIN operations_department department_record
            ON department_record.id = c.department_id
           AND department_record.deleted_at IS NULL
+         LEFT JOIN operations_job_title job_title_record
+           ON job_title_record.id = c.job_title_id
+          AND job_title_record.deleted_at IS NULL
          LEFT JOIN operations_collaborator s
            ON s.id = c.supervisor_collaborator_id
          LEFT JOIN operations_project_assignment pa
@@ -3011,7 +4174,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
           AND pa.deleted_at IS NULL
           AND pa.status IN ('planned', 'active')
          LEFT JOIN LATERAL (
-           SELECT oc.id, oc.status
+           SELECT oc.id, oc.status, oc.budget_amount
              FROM operations_contract oc
             WHERE oc.related_collaborator_id = c.id
               AND oc.deleted_at IS NULL
@@ -3021,22 +4184,33 @@ let OperationsService = OperationsService_1 = class OperationsService {
          ) hiring_contract ON TRUE
         WHERE c.id = $1
           AND c.deleted_at IS NULL
-        GROUP BY c.id, person_record.id, department_record.id, s.id, hiring_contract.id, hiring_contract.status`, [collaboratorId]);
+        GROUP BY c.id, person_record.id, collaborator_type.id, department_record.id, job_title_record.id, s.id, hiring_contract.id, hiring_contract.status, hiring_contract.budget_amount`, [collaboratorId]);
         if (!collaborator) {
             throw new common_1.NotFoundException('Collaborator not found.');
         }
-        const [assignedProjects, relatedContracts, weeklySchedule, timesheetSummary, timeOffSummary, scheduleAdjustmentRequests] = await Promise.all([
+        const [assignedProjects, relatedContracts, weeklySchedule, equityParticipation, timesheetSummary, timeOffSummary, scheduleAdjustmentRequests] = await Promise.all([
             this.queryRows(`SELECT p.id,
                   p.code,
                   p.name,
                   p.status,
-                  pa.role_label AS "roleLabel",
+                  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.start_date AS "startDate",
                   pa.end_date AS "endDate"
              FROM operations_project_assignment pa
              JOIN operations_project p ON p.id = pa.project_id
+             LEFT JOIN operations_project_role project_role
+               ON project_role.id = pa.project_role_id
+              AND project_role.deleted_at IS NULL
+             LEFT JOIN LATERAL (
+               SELECT prl.name
+                 FROM operations_project_role_locale prl
+                WHERE prl.operations_project_role_id = project_role.id
+                ORDER BY prl.id ASC
+                LIMIT 1
+             ) project_role_locale ON TRUE
             WHERE pa.collaborator_id = $1
               AND pa.deleted_at IS NULL
               AND p.deleted_at IS NULL
@@ -3058,7 +4232,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",
@@ -3068,6 +4243,17 @@ let OperationsService = OperationsService_1 = class OperationsService {
             WHERE collaborator_id = $1
               AND deleted_at IS NULL
             ORDER BY id ASC`, [collaboratorId]),
+            this.querySingle(`SELECT participation_type AS "participationType",
+                  percentage,
+                  voting_power AS "votingPower",
+                  start_date AS "startDate",
+                  end_date AS "endDate",
+                  notes
+             FROM operations_collaborator_equity_participation
+            WHERE collaborator_id = $1
+              AND deleted_at IS NULL
+            ORDER BY updated_at DESC, id DESC
+            LIMIT 1`, [collaboratorId]),
             this.querySingle(`SELECT COUNT(*)::text AS "totalTimesheets",
                   COUNT(*) FILTER (WHERE status = 'submitted')::text AS "pendingTimesheets",
                   COALESCE(SUM(total_hours), 0)::text AS "totalHours"
@@ -3093,7 +4279,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
         ]);
         return Object.assign(Object.assign({}, collaborator), { assignedProjects,
             relatedContracts,
-            weeklySchedule, timesheetSummary: {
+            weeklySchedule,
+            equityParticipation, timesheetSummary: {
                 totalTimesheets: Number((_a = timesheetSummary === null || timesheetSummary === void 0 ? void 0 : timesheetSummary.totalTimesheets) !== null && _a !== void 0 ? _a : 0),
                 pendingTimesheets: Number((_b = timesheetSummary === null || timesheetSummary === void 0 ? void 0 : timesheetSummary.pendingTimesheets) !== null && _b !== void 0 ? _b : 0),
                 totalHours: Number((_c = timesheetSummary === null || timesheetSummary === void 0 ? void 0 : timesheetSummary.totalHours) !== null && _c !== void 0 ? _c : 0),
@@ -3119,6 +4306,270 @@ let OperationsService = OperationsService_1 = class OperationsService {
             AND status IN ('planned', 'active')
             AND collaborator_id = ANY($1::int[])`, [collaboratorIds])).map((row) => row.projectId);
     }
+    async resolveOwnedProjectAssignment(client, collaboratorId, input) {
+        if (!input.projectId && !input.projectAssignmentId) {
+            throw new common_1.BadRequestException('Either projectId or projectAssignmentId is required.');
+        }
+        const params = [collaboratorId];
+        const filters = [
+            'pa.deleted_at IS NULL',
+            'p.deleted_at IS NULL',
+            `pa.collaborator_id = $1`,
+            `pa.status IN ('planned', 'active')`,
+        ];
+        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.ForbiddenException('The selected project is not assigned to the authenticated collaborator.');
+        }
+        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",
+              COALESCE(t.project_id, pa.project_id) AS "projectId",
+              p.name AS "projectName",
+              p.code AS "projectCode"
+         FROM operations_task t
+         LEFT JOIN operations_project_assignment pa
+           ON pa.id = t.project_assignment_id
+          AND pa.deleted_at IS NULL
+         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
+            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 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;
+        const normalizedWorkDate = this.normalizeDateOnly(workDate);
+        const { weekStartDate, weekEndDate } = this.getWorkWeekRange(normalizedWorkDate);
+        const existing = (await client.$queryRawUnsafe(`SELECT id, status
+         FROM operations_timesheet
+        WHERE collaborator_id = $1
+          AND week_start_date = $2::date
+          AND week_end_date = $3::date
+          AND deleted_at IS NULL
+        ORDER BY id DESC
+        LIMIT 1`, collaboratorId, weekStartDate, weekEndDate));
+        if (existing[0]) {
+            if (!['draft', 'rejected'].includes(existing[0].status)) {
+                throw new common_1.BadRequestException('The timesheet for this week has already been submitted or approved.');
+            }
+            return existing[0].id;
+        }
+        const collaborator = await this.getCollaboratorById(collaboratorId);
+        const created = (await client.$queryRawUnsafe(`INSERT INTO operations_timesheet (
+        collaborator_id,
+        approver_collaborator_id,
+        week_start_date,
+        week_end_date,
+        notes,
+        status,
+        created_at,
+        updated_at
+      ) VALUES (
+        $1,
+        $2,
+        $3::date,
+        $4::date,
+        NULL,
+        'draft',
+        NOW(),
+        NOW()
+      )
+      RETURNING id`, collaboratorId, (_a = collaborator.supervisorId) !== null && _a !== void 0 ? _a : null, weekStartDate, weekEndDate));
+        return (_c = (_b = created[0]) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : 0;
+    }
+    async getTimesheetEntryByIdForActor(actor, entryId) {
+        const filter = this.buildIdFilter(actor.visibleCollaboratorIds, 't.collaborator_id', actor.isDirector);
+        const params = [...filter.params, entryId];
+        const entry = await this.querySingle(`SELECT e.id,
+              e.timesheet_id AS "timesheetId",
+              t.collaborator_id AS "collaboratorId",
+              pa.project_id AS "projectId",
+              e.project_assignment_id AS "projectAssignmentId",
+              p.code AS "projectCode",
+              p.name AS "projectName",
+              e.task_id AS "taskId",
+              COALESCE(task_record.name, e.activity_label) AS "taskName",
+              e.activity_label AS "activityLabel",
+              e.work_date AS "workDate",
+              COALESCE(NULLIF(e.duration_minutes, 0), ROUND(COALESCE(e.hours, 0)::numeric * 60))::int AS "durationMinutes",
+              COALESCE(
+                e.hours,
+                ROUND((COALESCE(NULLIF(e.duration_minutes, 0), 0)::numeric / 60), 2)
+              ) AS hours,
+              e.description,
+              t.status,
+              t.week_start_date AS "weekStartDate",
+              t.week_end_date AS "weekEndDate",
+              e.created_at AS "createdAt"
+         FROM operations_timesheet_entry e
+         JOIN operations_timesheet t
+           ON t.id = e.timesheet_id
+         LEFT JOIN operations_project_assignment pa
+           ON pa.id = e.project_assignment_id
+         LEFT JOIN operations_project p
+           ON p.id = pa.project_id
+         LEFT JOIN operations_task task_record
+           ON task_record.id = e.task_id
+          AND task_record.deleted_at IS NULL
+        WHERE e.deleted_at IS NULL
+          AND ${filter.clause}
+          AND e.id = $${params.length}
+        LIMIT 1`, params);
+        if (!entry) {
+            throw new common_1.NotFoundException('Timesheet entry not found.');
+        }
+        return Object.assign(Object.assign({}, entry), { label: [entry.projectCode, entry.projectName, entry.taskName]
+                .filter(Boolean)
+                .join(' • ') });
+    }
     async getTimesheetById(timesheetId) {
         const timesheet = await this.querySingle(`SELECT id,
               collaborator_id AS "collaboratorId",
@@ -3133,7 +4584,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
         return timesheet;
     }
     async replaceTimesheetEntries(client, timesheetId, entries, collaboratorId) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         await client.$executeRawUnsafe(`UPDATE operations_timesheet_entry
           SET deleted_at = NOW()
         WHERE timesheet_id = $1
@@ -3159,22 +4610,54 @@ let OperationsService = OperationsService_1 = class OperationsService {
             }
         }
         for (const entry of entries) {
+            const durationMinutes = this.resolveEntryDurationMinutes(entry);
+            const hours = Number((durationMinutes / 60).toFixed(2));
+            const resolvedTask = entry.taskId
+                ? await this.getOwnedTaskRecord(client, collaboratorId, entry.taskId)
+                : 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.');
+            }
+            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;
+            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);
+            if (!entry.workDate) {
+                throw new common_1.BadRequestException('Timesheet entry workDate is required.');
+            }
             await client.$executeRawUnsafe(`INSERT INTO operations_timesheet_entry (
           timesheet_id,
           project_assignment_id,
+          task_id,
           activity_label,
           work_date,
+          duration_minutes,
           hours,
           description,
           created_at,
           updated_at
-        ) VALUES ($1, $2, $3, $4::date, $5, $6, NOW(), NOW())`, timesheetId, (_a = entry.projectAssignmentId) !== null && _a !== void 0 ? _a : null, (_b = entry.activityLabel) !== null && _b !== void 0 ? _b : null, entry.workDate, entry.hours, (_c = entry.description) !== null && _c !== void 0 ? _c : null);
+        ) 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));
         }
     }
     async refreshTimesheetTotal(client, timesheetId) {
         await client.$executeRawUnsafe(`UPDATE operations_timesheet
           SET total_hours = (
-                SELECT COALESCE(SUM(hours), 0)
+                SELECT COALESCE(
+                         SUM(
+                           COALESCE(
+                             CASE
+                               WHEN duration_minutes IS NOT NULL AND duration_minutes > 0
+                                 THEN duration_minutes::numeric / 60
+                               ELSE hours
+                             END,
+                             0
+                           )
+                         ),
+                         0
+                       )
                   FROM operations_timesheet_entry
                  WHERE timesheet_id = $1
                    AND deleted_at IS NULL
@@ -3222,6 +4705,30 @@ let OperationsService = OperationsService_1 = class OperationsService {
         }
         await this.insertApprovalHistory(client, approvalId, input.requesterCollaboratorId, 'submitted', null);
     }
+    async applyApprovedScheduleAdjustmentIfNeeded(client, requestId) {
+        const request = (await client.$queryRawUnsafe(`SELECT collaborator_id AS "collaboratorId",
+              request_scope AS "requestScope"
+         FROM operations_schedule_adjustment_request
+        WHERE id = $1
+          AND deleted_at IS NULL
+        LIMIT 1`, requestId));
+        const currentRequest = request[0];
+        if (!currentRequest || currentRequest.requestScope !== 'permanent') {
+            return;
+        }
+        const days = (await client.$queryRawUnsafe(`SELECT weekday,
+              is_working_day AS "isWorkingDay",
+              start_time AS "startTime",
+              end_time AS "endTime",
+              break_minutes AS "breakMinutes"
+         FROM operations_schedule_adjustment_day
+        WHERE schedule_adjustment_request_id = $1
+        ORDER BY id ASC`, requestId));
+        if (!days.length) {
+            return;
+        }
+        await this.replaceCollaboratorScheduleDays(client, currentRequest.collaboratorId, days);
+    }
     async insertApprovalHistory(client, approvalId, actorCollaboratorId, action, note) {
         await client.$executeRawUnsafe(`INSERT INTO operations_approval_history (
         approval_id,
@@ -3238,19 +4745,10 @@ let OperationsService = OperationsService_1 = class OperationsService {
       )`, approvalId, actorCollaboratorId, action, note);
     }
     async assertProjectAccess(actor, projectId) {
-        if (actor.isDirector)
-            return;
-        if (!actor.visibleProjectIds.includes(projectId)) {
-            throw new common_1.ForbiddenException('You do not have access to this project.');
-        }
+        this.accessService.ensureProjectAccess(actor, projectId);
     }
     ensureCollaboratorAccess(actor, collaboratorId) {
-        if (actor.isDirector) {
-            return;
-        }
-        if (!actor.visibleCollaboratorIds.includes(collaboratorId)) {
-            throw new common_1.ForbiddenException('You do not have access to this collaborator.');
-        }
+        this.accessService.ensureCollaboratorAccess(actor, collaboratorId);
     }
     async listSingleTimesheet(actor, timesheetId) {
         const timesheets = await this.listTimesheets(actor.userId);
@@ -3261,19 +4759,13 @@ let OperationsService = OperationsService_1 = class OperationsService {
         return timesheet;
     }
     ensureDirector(actor) {
-        if (!actor.isDirector) {
-            throw new common_1.ForbiddenException('Director access is required.');
-        }
+        this.accessService.ensureDirector(actor);
     }
     ensureSupervisor(actor) {
-        if (!actor.isSupervisor) {
-            throw new common_1.ForbiddenException('Supervisor access is required.');
-        }
+        this.accessService.ensureSupervisor(actor);
     }
     ensureCollaborator(actor) {
-        if (!actor.isCollaborator) {
-            throw new common_1.ForbiddenException('Operations collaborator access is required.');
-        }
+        this.accessService.ensureCollaborator(actor);
     }
     defaultWeeklySchedule() {
         return [
@@ -3352,16 +4844,22 @@ let OperationsService = OperationsService_1 = class OperationsService {
         }
     }
     async replaceProjectAssignments(client, projectId, teamAssignments) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         await client.$executeRawUnsafe(`UPDATE operations_project_assignment
           SET deleted_at = NOW(),
               updated_at = NOW()
         WHERE project_id = $1
           AND deleted_at IS NULL`, projectId);
         for (const assignment of teamAssignments !== null && teamAssignments !== void 0 ? teamAssignments : []) {
+            const projectRole = typeof assignment.projectRoleId === 'number' &&
+                Number.isInteger(assignment.projectRoleId) &&
+                assignment.projectRoleId > 0
+                ? await this.getProjectRoleById(client, assignment.projectRoleId)
+                : null;
             await client.$executeRawUnsafe(`INSERT INTO operations_project_assignment (
           project_id,
           collaborator_id,
+          project_role_id,
           role_label,
           allocation_percent,
           weekly_hours,
@@ -3372,30 +4870,98 @@ let OperationsService = OperationsService_1 = class OperationsService {
           created_at,
           updated_at
         ) VALUES (
-          $1, $2, $3, $4, $5, $6, $7::date, $8::date,
-          $9::operations_project_assignment_status_155b459bbf_enum,
+          $1, $2, $3, $4, $5, $6, $7, $8::date, $9::date,
+          $10::operations_project_assignment_status_155b459bbf_enum,
           NOW(), NOW()
-        )`, projectId, assignment.collaboratorId, (_a = assignment.roleLabel) !== null && _a !== void 0 ? _a : 'Team Member', (_b = assignment.allocationPercent) !== null && _b !== void 0 ? _b : null, (_c = assignment.weeklyHours) !== null && _c !== void 0 ? _c : null, (_d = assignment.isBillable) !== null && _d !== void 0 ? _d : true, (_e = assignment.startDate) !== null && _e !== void 0 ? _e : null, (_f = assignment.endDate) !== null && _f !== void 0 ? _f : null, (_g = assignment.status) !== null && _g !== void 0 ? _g : 'active');
+        )`, projectId, assignment.collaboratorId, (_a = projectRole === null || projectRole === void 0 ? void 0 : projectRole.id) !== null && _a !== void 0 ? _a : null, (_c = (_b = this.normalizeOptionalText(assignment.roleLabel)) !== null && _b !== void 0 ? _b : projectRole === null || projectRole === void 0 ? void 0 : projectRole.name) !== null && _c !== void 0 ? _c : 'Team Member', (_d = assignment.allocationPercent) !== null && _d !== void 0 ? _d : null, (_e = assignment.weeklyHours) !== null && _e !== void 0 ? _e : null, (_f = assignment.isBillable) !== null && _f !== void 0 ? _f : true, (_g = assignment.startDate) !== null && _g !== void 0 ? _g : null, (_h = assignment.endDate) !== null && _h !== void 0 ? _h : null, (_j = assignment.status) !== null && _j !== void 0 ? _j : 'active');
+        }
+    }
+    async replaceCollaboratorEquityParticipation(client, collaboratorId, equityParticipation) {
+        var _a, _b, _c, _d, _e;
+        if (equityParticipation === undefined) {
+            return;
+        }
+        await client.$executeRawUnsafe(`UPDATE operations_collaborator_equity_participation
+          SET deleted_at = COALESCE(deleted_at, NOW()),
+              updated_at = NOW()
+        WHERE collaborator_id = $1
+          AND deleted_at IS NULL`, collaboratorId);
+        if (equityParticipation === null) {
+            return;
+        }
+        const participationType = (_a = equityParticipation.participationType) !== null && _a !== void 0 ? _a : 'other';
+        await client.$executeRawUnsafe(`INSERT INTO operations_collaborator_equity_participation (
+        collaborator_id,
+        participation_type,
+        percentage,
+        voting_power,
+        start_date,
+        end_date,
+        notes,
+        deleted_at,
+        created_at,
+        updated_at
+      ) VALUES (
+        $1,
+        $2::operations_collaborator_equity_participation_pa_98792c1f1e_enum,
+        $3,
+        $4,
+        $5::date,
+        $6::date,
+        $7,
+        NULL,
+        NOW(),
+        NOW()
+      )`, collaboratorId, participationType, (_b = equityParticipation.percentage) !== null && _b !== void 0 ? _b : null, (_c = equityParticipation.votingPower) !== null && _c !== void 0 ? _c : null, (_d = equityParticipation.startDate) !== null && _d !== void 0 ? _d : null, (_e = equityParticipation.endDate) !== null && _e !== void 0 ? _e : null, this.normalizeOptionalText(equityParticipation.notes));
+    }
+    normalizeCollaboratorTypeKey(collaboratorType) {
+        const normalized = String(collaboratorType !== null && collaboratorType !== void 0 ? collaboratorType : '')
+            .trim()
+            .toLowerCase()
+            .normalize('NFD')
+            .replace(/[\u0300-\u036f]/g, '');
+        switch (normalized) {
+            case 'estagiario':
+                return 'intern';
+            case 'outro':
+                return 'other';
+            default:
+                return normalized;
         }
     }
     mapContractCategoryForCollaboratorType(collaboratorType) {
-        switch (collaboratorType) {
+        switch (this.normalizeCollaboratorTypeKey(collaboratorType)) {
             case 'clt':
+            case 'intern':
                 return 'employee';
             case 'pj':
             case 'freelancer':
                 return 'contractor';
+            case 'socio':
+            case 'acionista':
+            case 'parceiro':
+                return 'partner';
+            case 'administrador':
+            case 'diretor':
+            case 'conselheiro':
+                return 'internal';
             default:
                 return 'other';
         }
     }
     mapBillingModelForCollaboratorType(collaboratorType) {
-        return collaboratorType === 'freelancer'
-            ? 'time_and_material'
-            : 'monthly_retainer';
+        switch (this.normalizeCollaboratorTypeKey(collaboratorType)) {
+            case 'freelancer':
+                return 'time_and_material';
+            case 'pj':
+            case 'parceiro':
+                return 'fixed_price';
+            default:
+                return 'monthly_retainer';
+        }
     }
     mapContractTypeForCollaboratorType(collaboratorType) {
-        switch (collaboratorType) {
+        switch (this.normalizeCollaboratorTypeKey(collaboratorType)) {
             case 'clt':
                 return 'clt';
             case 'pj':
@@ -3404,16 +4970,39 @@ let OperationsService = OperationsService_1 = class OperationsService {
                 return 'freelancer_agreement';
             case 'intern':
                 return 'fixed_term';
+            case 'socio':
+            case 'acionista':
+            case 'administrador':
+            case 'diretor':
+            case 'conselheiro':
+            case 'parceiro':
+                return 'service_agreement';
             default:
                 return 'other';
         }
     }
+    buildHiringContractName(displayName, collaboratorType) {
+        switch (this.normalizeCollaboratorTypeKey(collaboratorType)) {
+            case 'clt':
+                return `${displayName} Employment Contract`;
+            case 'intern':
+                return `${displayName} Internship Agreement`;
+            case 'socio':
+            case 'acionista':
+            case 'parceiro':
+                return `${displayName} Partnership Agreement`;
+            case 'administrador':
+            case 'diretor':
+            case 'conselheiro':
+                return `${displayName} Executive Engagement Agreement`;
+            default:
+                return `${displayName} Service Contract`;
+        }
+    }
     async createHiringContractDraft(client, createdByUserId, input) {
         var _a, _b, _c;
         const contractCode = `HIR-${input.collaboratorCode}`;
-        const contractName = input.collaboratorType === 'clt'
-            ? `${input.displayName} Employment Contract`
-            : `${input.displayName} Service Contract`;
+        const contractName = this.buildHiringContractName(input.displayName, input.collaboratorType);
         await client.$executeRawUnsafe(`INSERT INTO operations_contract (
         code,
         name,
@@ -3452,6 +5041,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
@@ -4479,6 +6152,97 @@ let OperationsService = OperationsService_1 = class OperationsService {
                 ? ''
                 : String(value).trim();
     }
+    normalizeDurationMinutes(duration, unit) {
+        const numeric = Number(duration);
+        if (!Number.isFinite(numeric) || numeric <= 0) {
+            throw new common_1.BadRequestException('Duration must be greater than 0.');
+        }
+        const minutes = unit === 'hours' ? numeric * 60 : numeric;
+        const rounded = Math.round(minutes);
+        if (!Number.isFinite(rounded) || rounded <= 0) {
+            throw new common_1.BadRequestException('Duration must be greater than 0.');
+        }
+        return rounded;
+    }
+    resolveEntryDurationMinutes(entry) {
+        var _a;
+        if (entry.durationMinutes !== undefined &&
+            entry.durationMinutes !== null) {
+            return this.normalizeDurationMinutes(entry.durationMinutes, 'minutes');
+        }
+        if (entry.duration !== undefined && entry.duration !== null) {
+            return this.normalizeDurationMinutes(entry.duration, (_a = entry.unit) !== null && _a !== void 0 ? _a : 'minutes');
+        }
+        if (entry.hours !== undefined && entry.hours !== null) {
+            return this.normalizeDurationMinutes(entry.hours, 'hours');
+        }
+        throw new common_1.BadRequestException('Timesheet entry duration is required.');
+    }
+    normalizeDateOnly(value) {
+        const normalized = this.normalizeExtractionString(value);
+        if (!/^\d{4}-\d{2}-\d{2}$/.test(normalized)) {
+            throw new common_1.BadRequestException('Date values must use the YYYY-MM-DD format.');
+        }
+        return normalized;
+    }
+    parseDateOnly(value) {
+        const normalized = this.normalizeDateOnly(value);
+        const parsed = new Date(`${normalized}T00:00:00.000Z`);
+        if (Number.isNaN(parsed.getTime())) {
+            throw new common_1.BadRequestException('Invalid date value provided.');
+        }
+        return parsed;
+    }
+    formatDateOnly(value) {
+        return value.toISOString().slice(0, 10);
+    }
+    getWorkWeekRange(workDate) {
+        const date = this.parseDateOnly(workDate);
+        const day = date.getUTCDay();
+        const diffToMonday = day === 0 ? -6 : 1 - day;
+        const weekStart = new Date(date);
+        weekStart.setUTCDate(weekStart.getUTCDate() + diffToMonday);
+        const weekEnd = new Date(weekStart);
+        weekEnd.setUTCDate(weekStart.getUTCDate() + 6);
+        return {
+            weekStartDate: this.formatDateOnly(weekStart),
+            weekEndDate: this.formatDateOnly(weekEnd),
+        };
+    }
+    normalizePaginationParams(input = {}, options) {
+        var _a, _b, _c, _d, _e, _f, _g;
+        const page = Math.max(Number((_a = input.page) !== null && _a !== void 0 ? _a : 1) || 1, 1);
+        const pageSize = Math.min(Math.max(Number((_b = input.pageSize) !== null && _b !== void 0 ? _b : 10) || 10, 1), 100);
+        const search = (_c = this.normalizeOptionalText(input.search)) !== null && _c !== void 0 ? _c : '';
+        const requestedSortField = this.normalizeOptionalText(input.sortField);
+        const sortField = requestedSortField && options.allowedSortFields.includes(requestedSortField)
+            ? requestedSortField
+            : ((_e = (_d = options.defaultSortField) !== null && _d !== void 0 ? _d : options.allowedSortFields[0]) !== null && _e !== void 0 ? _e : 'id');
+        const sortOrder = String((_g = (_f = input.sortOrder) !== null && _f !== void 0 ? _f : options.defaultSortOrder) !== null && _g !== void 0 ? _g : 'asc')
+            .toLowerCase() === 'desc'
+            ? 'desc'
+            : 'asc';
+        return {
+            page,
+            pageSize,
+            search,
+            sortField,
+            sortOrder,
+            offset: (page - 1) * pageSize,
+        };
+    }
+    buildPaginationResult(data, total, page, pageSize) {
+        const lastPage = Math.max(1, Math.ceil(total / Math.max(pageSize, 1)));
+        return {
+            total,
+            lastPage,
+            page,
+            pageSize,
+            prev: page > 1 ? page - 1 : null,
+            next: page < lastPage ? page + 1 : null,
+            data,
+        };
+    }
     normalizeExtractionBoolean(value) {
         if (typeof value === 'boolean') {
             return value;
@@ -4621,6 +6385,8 @@ exports.OperationsService = OperationsService = OperationsService_1 = __decorate
         core_1.AiService,
         core_1.IntegrationDeveloperApiService,
         core_1.FileService,
-        core_1.SettingService])
+        core_1.SettingService,
+        operations_access_service_1.OperationsAccessService,
+        api_locale_1.LocaleService])
 ], OperationsService);
 //# sourceMappingURL=operations.service.js.map