@hed-hog/operations 0.0.305 → 0.0.309

package/dist/operations.service.js

@@ -102,11 +102,6 @@ const PARTY_ROLE_VALUES = [
     'other',
 ];
 const PARTY_TYPE_VALUES = ['individual', 'company', 'internal_team', 'other'];
-const SIGNATURE_ITEM_STATUS_VALUES = ['pending', 'signed', 'rejected'];
-const FINANCIAL_TERM_TYPE_VALUES = ['value', 'payment', 'revenue', 'fine', 'other'];
-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, accessService, localeService) {
@@ -154,35 +149,82 @@ let OperationsService = OperationsService_1 = class OperationsService {
         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) {
+    async listCollaboratorTypes(userId, filters = {}) {
+        var _a, _b;
         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"
+        const params = [];
+        const where = [];
+        if (filters.active === true || filters.status === 'active') {
+            where.push('(ct.deleted_at IS NULL AND ct.is_active = true)');
+        }
+        else if (filters.status === 'inactive') {
+            where.push('(ct.deleted_at IS NOT NULL OR ct.is_active = false)');
+        }
+        const pagination = this.shouldPaginate(filters)
+            ? this.normalizePaginationParams(filters, {
+                defaultSortField: 'sortOrder',
+                defaultSortOrder: 'asc',
+                allowedSortFields: ['name', 'slug', 'category', 'sortOrder', 'createdAt'],
+            })
+            : null;
+        if (pagination === null || pagination === void 0 ? void 0 : pagination.search) {
+            const searchPlaceholder = this.param(params, `%${pagination.search}%`);
+            where.push(`(
+        COALESCE(ct.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(ct.slug, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(ct.description, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(ct.category, '') ILIKE ${searchPlaceholder}
+      )`);
+        }
+        const whereClause = where.length ? `WHERE ${where.join(' AND ')}` : '';
+        const baseQuery = `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
+      ${whereClause}
+      GROUP BY ct.id`;
+        if (!pagination) {
+            return this.queryRows(`${baseQuery}
+         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`, params);
+        }
+        const totalRow = await this.querySingle(`SELECT COUNT(*)::text AS total
          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)]);
+        ${whereClause}`, params);
+        const sortColumn = (_a = {
+            name: 'ct.name',
+            slug: 'ct.slug',
+            category: 'ct.category',
+            sortOrder: 'ct.sort_order',
+            createdAt: 'ct.created_at',
+        }[pagination.sortField]) !== null && _a !== void 0 ? _a : 'ct.name';
+        const queryParams = [...params];
+        const limitPlaceholder = this.param(queryParams, pagination.pageSize);
+        const offsetPlaceholder = this.param(queryParams, pagination.offset);
+        const rows = await this.queryRows(`${baseQuery}
+       ORDER BY ${sortColumn} ${pagination.sortOrder.toUpperCase()}, ct.id ASC
+       LIMIT ${limitPlaceholder}
+      OFFSET ${offsetPlaceholder}`, queryParams);
+        return this.buildPaginationResult(rows, Number((_b = totalRow === null || totalRow === void 0 ? void 0 : totalRow.total) !== null && _b !== void 0 ? _b : 0), pagination.page, pagination.pageSize);
     }
     async createCollaboratorType(userId, data) {
         const actor = await this.getActorContext(userId);
@@ -196,6 +238,9 @@ let OperationsService = OperationsService_1 = class OperationsService {
             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 nextSortOrder = data.sortOrder !== undefined && Number.isFinite(Number(data.sortOrder))
+                ? Number(data.sortOrder)
+                : await this.getNextCollaboratorTypeSortOrder(tx);
             const created = (await tx.$queryRawUnsafe(`INSERT INTO operations_collaborator_type (
           slug,
           name,
@@ -211,7 +256,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
           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));
+        RETURNING id`, nextSlug, name, this.normalizeOptionalText(data.description), this.normalizeOptionalText(data.category), nextIsActive, nextSortOrder));
             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.');
@@ -261,6 +306,40 @@ let OperationsService = OperationsService_1 = class OperationsService {
             return this.getCollaboratorTypeById(tx, collaboratorTypeId, true);
         });
     }
+    async reorderCollaboratorTypes(userId, ids) {
+        const actor = await this.getActorContext(userId);
+        this.ensureDirector(actor);
+        const normalizedIds = [
+            ...new Set(ids
+                .map((value) => Number(value))
+                .filter((value) => Number.isInteger(value) && value > 0)),
+        ];
+        if (!normalizedIds.length) {
+            throw new common_1.BadRequestException('At least one collaborator type is required.');
+        }
+        return this.prisma.$transaction(async (tx) => {
+            const existingRows = (await tx.$queryRawUnsafe(`SELECT id
+           FROM operations_collaborator_type
+          WHERE id = ANY($1::int[])`, normalizedIds));
+            if (existingRows.length !== normalizedIds.length) {
+                throw new common_1.NotFoundException('One or more collaborator types were not found.');
+            }
+            await tx.$executeRawUnsafe(`UPDATE operations_collaborator_type AS ct
+            SET sort_order = updates.sort_order,
+                updated_at = NOW()
+           FROM (
+             SELECT UNNEST($1::int[]) AS id,
+                    GENERATE_SERIES(1, array_length($1::int[], 1)) AS sort_order
+           ) AS updates
+          WHERE ct.id = updates.id`, normalizedIds);
+            return this.listCollaboratorTypes(userId, {
+                page: 1,
+                pageSize: Math.max(normalizedIds.length, 1),
+                sortField: 'sortOrder',
+                sortOrder: 'asc',
+            });
+        });
+    }
     async listProjectRoles(userId) {
         const actor = await this.getActorContext(userId);
         this.ensureCollaborator(actor);
@@ -409,11 +488,54 @@ let OperationsService = OperationsService_1 = class OperationsService {
             recentTimesheets,
         };
     }
-    async listCollaborators(userId) {
+    async listCollaborators(userId, filters = {}) {
+        var _a, _b;
         const actor = await this.getActorContext(userId);
         this.ensureCollaborator(actor);
         const filter = this.buildIdFilter(actor.visibleCollaboratorIds, 'c.id', actor.isDirector);
-        return this.queryRows(`SELECT c.id,
+        const pagination = this.shouldPaginate(filters)
+            ? this.normalizePaginationParams(filters, {
+                defaultSortField: 'displayName',
+                defaultSortOrder: 'asc',
+                allowedSortFields: ['displayName', 'code', 'joinedAt', 'status'],
+            })
+            : null;
+        const params = [...filter.params];
+        const where = ['c.deleted_at IS NULL', filter.clause];
+        if (filters.status && filters.status !== 'all') {
+            where.push(`c.status::text = ${this.param(params, filters.status)}`);
+        }
+        if (filters.collaboratorTypeId) {
+            where.push(`c.collaborator_type_id = ${this.param(params, Number(filters.collaboratorTypeId))}`);
+        }
+        else if (filters.collaboratorType && filters.collaboratorType !== 'all') {
+            const collaboratorTypePlaceholder = this.param(params, filters.collaboratorType);
+            where.push(`(
+        collaborator_type.slug = ${collaboratorTypePlaceholder}
+        OR collaborator_type.name = ${collaboratorTypePlaceholder}
+      )`);
+        }
+        if (filters.departmentId) {
+            where.push(`c.department_id = ${this.param(params, Number(filters.departmentId))}`);
+        }
+        if (filters.jobTitleId) {
+            where.push(`c.job_title_id = ${this.param(params, Number(filters.jobTitleId))}`);
+        }
+        if (pagination === null || pagination === void 0 ? void 0 : pagination.search) {
+            const searchPlaceholder = this.param(params, `%${pagination.search}%`);
+            where.push(`(
+        COALESCE(c.display_name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(person_record.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(c.code, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(department_record.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(c.department, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(job_title_record.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(c.title, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(s.display_name, '') ILIKE ${searchPlaceholder}
+      )`);
+        }
+        const whereClause = where.join(' AND ');
+        const baseQuery = `SELECT c.id,
               c.user_id AS "userId",
               c.person_id AS "personId",
               c.code,
@@ -466,10 +588,122 @@ let OperationsService = OperationsService_1 = class OperationsService {
                      oc.created_at DESC
             LIMIT 1
          ) hiring_contract ON TRUE
-        WHERE c.deleted_at IS NULL
-          AND ${filter.clause}
+        WHERE ${whereClause}
         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);
+    `;
+        if (!pagination) {
+            return this.queryRows(`${baseQuery}
+         ORDER BY COALESCE(NULLIF(c.display_name, ''), person_record.name) ASC`, params);
+        }
+        const totalRow = await this.querySingle(`SELECT COUNT(*)::text AS total
+         FROM (
+           SELECT c.id
+             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
+            WHERE ${whereClause}
+            GROUP BY c.id, person_record.id, collaborator_type.id, department_record.id, job_title_record.id, s.id
+         ) collaborator_rows`, params);
+        const sortColumn = (_a = {
+            displayName: `COALESCE(NULLIF(c.display_name, ''), person_record.name)`,
+            code: 'c.code',
+            joinedAt: 'c.joined_at',
+            status: 'c.status',
+        }[pagination.sortField]) !== null && _a !== void 0 ? _a : `COALESCE(NULLIF(c.display_name, ''), person_record.name)`;
+        const queryParams = [...params];
+        const limitPlaceholder = this.param(queryParams, pagination.pageSize);
+        const offsetPlaceholder = this.param(queryParams, pagination.offset);
+        const rows = await this.queryRows(`${baseQuery}
+       ORDER BY ${sortColumn} ${pagination.sortOrder.toUpperCase()}, c.id ASC
+       LIMIT ${limitPlaceholder}
+      OFFSET ${offsetPlaceholder}`, queryParams);
+        return this.buildPaginationResult(rows, Number((_b = totalRow === null || totalRow === void 0 ? void 0 : totalRow.total) !== null && _b !== void 0 ? _b : 0), pagination.page, pagination.pageSize);
+    }
+    async getCollaboratorStats(userId, filters = {}) {
+        var _a, _b, _c, _d, _e;
+        const actor = await this.getActorContext(userId);
+        this.ensureCollaborator(actor);
+        const filter = this.buildIdFilter(actor.visibleCollaboratorIds, 'c.id', actor.isDirector);
+        const params = [...filter.params];
+        const where = ['c.deleted_at IS NULL', filter.clause];
+        if (filters.status && filters.status !== 'all') {
+            where.push(`c.status::text = ${this.param(params, filters.status)}`);
+        }
+        if (filters.collaboratorTypeId) {
+            where.push(`c.collaborator_type_id = ${this.param(params, Number(filters.collaboratorTypeId))}`);
+        }
+        else if (filters.collaboratorType && filters.collaboratorType !== 'all') {
+            const collaboratorTypePlaceholder = this.param(params, filters.collaboratorType);
+            where.push(`(
+        collaborator_type.slug = ${collaboratorTypePlaceholder}
+        OR collaborator_type.name = ${collaboratorTypePlaceholder}
+      )`);
+        }
+        if (filters.departmentId) {
+            where.push(`c.department_id = ${this.param(params, Number(filters.departmentId))}`);
+        }
+        if (filters.jobTitleId) {
+            where.push(`c.job_title_id = ${this.param(params, Number(filters.jobTitleId))}`);
+        }
+        const normalizedSearch = String((_a = filters.search) !== null && _a !== void 0 ? _a : '').trim();
+        if (normalizedSearch) {
+            const searchPlaceholder = this.param(params, `%${normalizedSearch}%`);
+            where.push(`(
+        COALESCE(c.display_name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(person_record.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(c.code, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(department_record.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(c.department, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(job_title_record.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(c.title, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(s.display_name, '') ILIKE ${searchPlaceholder}
+      )`);
+        }
+        const result = await this.querySingle(`SELECT COUNT(DISTINCT c.id)::int AS total,
+              COUNT(DISTINCT c.id) FILTER (WHERE c.status = 'active')::int AS active,
+              COUNT(DISTINCT c.id) FILTER (WHERE c.status = 'on_leave')::int AS "onLeave",
+              COUNT(DISTINCT c.id) FILTER (WHERE hiring_contract.id IS NOT NULL)::int AS "withContracts"
+         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 LATERAL (
+           SELECT oc.id
+             FROM operations_contract oc
+            WHERE oc.related_collaborator_id = c.id
+              AND oc.deleted_at IS NULL
+            ORDER BY CASE WHEN oc.origin_type = 'employee_hiring' THEN 0 ELSE 1 END,
+                     oc.created_at DESC
+            LIMIT 1
+         ) hiring_contract ON TRUE
+        WHERE ${where.join(' AND ')}`, params);
+        return {
+            total: Number((_b = result === null || result === void 0 ? void 0 : result.total) !== null && _b !== void 0 ? _b : 0),
+            active: Number((_c = result === null || result === void 0 ? void 0 : result.active) !== null && _c !== void 0 ? _c : 0),
+            onLeave: Number((_d = result === null || result === void 0 ? void 0 : result.onLeave) !== null && _d !== void 0 ? _d : 0),
+            withContracts: Number((_e = result === null || result === void 0 ? void 0 : result.withContracts) !== null && _e !== void 0 ? _e : 0),
+        };
     }
     async getMyCollaborator(userId) {
         const actor = await this.getActorContext(userId);
@@ -596,12 +830,12 @@ let OperationsService = OperationsService_1 = class OperationsService {
                     ''
                   ) AS "timesheetProjectNames",
                   tor.request_type AS "timeOffType",
-                  tor.start_date AS "timeOffStartDate",
-                  tor.end_date AS "timeOffEndDate",
+                  tor.start_date::text AS "timeOffStartDate",
+                  tor.end_date::text AS "timeOffEndDate",
                   tor.reason AS "timeOffReason",
                   sar.request_scope AS "scheduleRequestScope",
-                  sar.effective_start_date AS "scheduleStartDate",
-                  sar.effective_end_date AS "scheduleEndDate",
+                  sar.effective_start_date::text AS "scheduleStartDate",
+                  sar.effective_end_date::text AS "scheduleEndDate",
                   sar.reason AS "scheduleReason"
              FROM operations_approval a
              JOIN operations_collaborator requester
@@ -633,8 +867,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
                   tor.collaborator_id AS "collaboratorId",
                   c.display_name AS "collaboratorName",
                   tor.request_type AS "requestType",
-                  tor.start_date AS "startDate",
-                  tor.end_date AS "endDate",
+                  tor.start_date::text AS "startDate",
+                  tor.end_date::text AS "endDate",
                   tor.total_days AS "totalDays",
                   tor.status,
                   tor.reason,
@@ -655,8 +889,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
                   sar.collaborator_id AS "collaboratorId",
                   c.display_name AS "collaboratorName",
                   sar.request_scope AS "requestScope",
-                  sar.effective_start_date AS "effectiveStartDate",
-                  sar.effective_end_date AS "effectiveEndDate",
+                  sar.effective_start_date::text AS "effectiveStartDate",
+                  sar.effective_end_date::text AS "effectiveEndDate",
                   sar.status,
                   sar.reason,
                   sar.submitted_at AS "submittedAt",
@@ -851,31 +1085,77 @@ let OperationsService = OperationsService_1 = class OperationsService {
         });
         return this.getCollaboratorByIdForUser(userId, collaboratorId);
     }
-    async listDepartments(userId) {
+    async listDepartments(userId, filters = {}) {
+        var _a, _b;
         const actor = await this.getActorContext(userId);
         this.ensureCollaborator(actor);
-        return this.queryRows(`SELECT d.id,
-              d.slug,
-              d.code,
-              d.name,
-              d.description,
-              CASE WHEN d.deleted_at IS NULL THEN 'active' ELSE 'inactive' END AS status,
-              COUNT(DISTINCT c.id)::int AS "collaboratorCount",
-              d.created_at AS "createdAt",
-              d.updated_at AS "updatedAt"
-         FROM operations_department d
-         LEFT JOIN operations_collaborator c
-           ON c.deleted_at IS NULL
-          AND (
-            c.department_id = d.id
-            OR (
-              c.department_id IS NULL
-              AND LOWER(COALESCE(c.department, '')) = LOWER(d.name)
-            )
+        const pagination = this.shouldPaginate(filters)
+            ? this.normalizePaginationParams(filters, {
+                defaultSortField: 'name',
+                defaultSortOrder: 'asc',
+                allowedSortFields: ['name', 'code', 'createdAt', 'updatedAt'],
+            })
+            : null;
+        const params = [];
+        const where = [];
+        if (filters.status === 'active') {
+            where.push('d.deleted_at IS NULL');
+        }
+        else if (filters.status === 'inactive') {
+            where.push('d.deleted_at IS NOT NULL');
+        }
+        if (pagination === null || pagination === void 0 ? void 0 : pagination.search) {
+            const searchPlaceholder = this.param(params, `%${pagination.search}%`);
+            where.push(`(
+        COALESCE(d.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(d.code, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(d.description, '') ILIKE ${searchPlaceholder}
+      )`);
+        }
+        const whereClause = where.length ? `WHERE ${where.join(' AND ')}` : '';
+        const baseQuery = `SELECT d.id,
+            d.slug,
+            d.code,
+            d.name,
+            d.description,
+            CASE WHEN d.deleted_at IS NULL THEN 'active' ELSE 'inactive' END AS status,
+            COUNT(DISTINCT c.id)::int AS "collaboratorCount",
+            d.created_at AS "createdAt",
+            d.updated_at AS "updatedAt"
+       FROM operations_department d
+       LEFT JOIN operations_collaborator c
+         ON c.deleted_at IS NULL
+        AND (
+          c.department_id = d.id
+          OR (
+            c.department_id IS NULL
+            AND LOWER(COALESCE(c.department, '')) = LOWER(d.name)
           )
-        GROUP BY d.id
-        ORDER BY CASE WHEN d.deleted_at IS NULL THEN 0 ELSE 1 END ASC,
-                 d.name ASC`);
+        )
+      ${whereClause}
+      GROUP BY d.id`;
+        if (!pagination) {
+            return this.queryRows(`${baseQuery}
+         ORDER BY CASE WHEN d.deleted_at IS NULL THEN 0 ELSE 1 END ASC,
+                  d.name ASC`, params);
+        }
+        const totalRow = await this.querySingle(`SELECT COUNT(*)::text AS total
+         FROM operations_department d
+        ${whereClause}`, params);
+        const sortColumn = (_a = {
+            name: 'd.name',
+            code: 'd.code',
+            createdAt: 'd.created_at',
+            updatedAt: 'd.updated_at',
+        }[pagination.sortField]) !== null && _a !== void 0 ? _a : 'd.name';
+        const queryParams = [...params];
+        const limitPlaceholder = this.param(queryParams, pagination.pageSize);
+        const offsetPlaceholder = this.param(queryParams, pagination.offset);
+        const rows = await this.queryRows(`${baseQuery}
+       ORDER BY ${sortColumn} ${pagination.sortOrder.toUpperCase()}, d.id ASC
+       LIMIT ${limitPlaceholder}
+      OFFSET ${offsetPlaceholder}`, queryParams);
+        return this.buildPaginationResult(rows, Number((_b = totalRow === null || totalRow === void 0 ? void 0 : totalRow.total) !== null && _b !== void 0 ? _b : 0), pagination.page, pagination.pageSize);
     }
     async listJobTitles(userId) {
         const actor = await this.getActorContext(userId);
@@ -1015,7 +1295,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
             return this.getDepartmentById(tx, departmentId, true);
         });
     }
-    async listProjects(userId) {
+    async listProjects(userId, filters = {}) {
+        var _a, _b;
         const actor = await this.getActorContext(userId);
         const filter = this.buildIdFilter(actor.visibleProjectIds, 'p.id', actor.isDirector);
         const assignmentParams = [];
@@ -1024,7 +1305,30 @@ let OperationsService = OperationsService_1 = class OperationsService {
          MAX(CASE WHEN pa.collaborator_id = ${this.param(assignmentParams, actor.collaboratorId)} THEN pa.role_label END) AS "myRoleLabel",`
             : `NULL::int AS "myAssignmentId",
          NULL::varchar AS "myRoleLabel",`;
-        return this.queryRows(`SELECT p.id,
+        const pagination = this.shouldPaginate(filters)
+            ? this.normalizePaginationParams(filters, {
+                defaultSortField: 'name',
+                defaultSortOrder: 'asc',
+                allowedSortFields: ['name', 'code', 'clientName', 'startDate', 'endDate', 'status'],
+            })
+            : null;
+        const params = [...assignmentParams, ...filter.params];
+        const where = ['p.deleted_at IS NULL', filter.clause];
+        if (filters.status && filters.status !== 'all') {
+            where.push(`p.status::text = ${this.param(params, filters.status)}`);
+        }
+        if (pagination === null || pagination === void 0 ? void 0 : pagination.search) {
+            const searchPlaceholder = this.param(params, `%${pagination.search}%`);
+            where.push(`(
+        COALESCE(p.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(p.code, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(p.client_name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(c.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(m.display_name, '') ILIKE ${searchPlaceholder}
+      )`);
+        }
+        const whereClause = where.join(' AND ');
+        const baseQuery = `SELECT p.id,
               p.contract_id AS "contractId",
               p.manager_collaborator_id AS "managerCollaboratorId",
               p.code,
@@ -1049,28 +1353,49 @@ let OperationsService = OperationsService_1 = class OperationsService {
            ON pa.project_id = p.id
           AND pa.deleted_at IS NULL
           AND pa.status IN ('planned', 'active')
-        WHERE p.deleted_at IS NULL AND ${filter.clause}
-        GROUP BY p.id, c.id, m.id
-        ORDER BY p.name ASC`, [...assignmentParams, ...filter.params]);
+        WHERE ${whereClause}
+        GROUP BY p.id, c.id, m.id`;
+        if (!pagination) {
+            return this.queryRows(`${baseQuery} ORDER BY p.name ASC`, params);
+        }
+        const totalRow = await this.querySingle(`SELECT COUNT(*)::text AS total
+         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
+        WHERE ${whereClause}`, params);
+        const sortColumn = (_a = {
+            name: 'p.name',
+            code: 'p.code',
+            clientName: 'p.client_name',
+            startDate: 'p.start_date',
+            endDate: 'p.end_date',
+            status: 'p.status',
+        }[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(`${baseQuery}
+       ORDER BY ${sortColumn} ${pagination.sortOrder.toUpperCase()}, p.id ASC
+       LIMIT ${limitPlaceholder}
+      OFFSET ${offsetPlaceholder}`, queryParams);
+        return this.buildPaginationResult(rows, Number((_b = totalRow === null || totalRow === void 0 ? void 0 : totalRow.total) !== null && _b !== void 0 ? _b : 0), pagination.page, pagination.pageSize);
     }
     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 filter = this.buildIdFilter(actor.visibleProjectIds, 'p.id', actor.isDirector);
+        const params = [...filter.params];
         const filters = [
             'p.deleted_at IS NULL',
             'pa.deleted_at IS NULL',
-            `pa.collaborator_id = $1`,
             `pa.status IN ('planned', 'active')`,
+            filter.clause,
         ];
         if (pagination.search) {
             const searchPlaceholder = this.param(params, `%${pagination.search}%`);
@@ -1120,21 +1445,25 @@ let OperationsService = OperationsService_1 = class OperationsService {
         var _a, _b;
         const actor = await this.getActorContext(userId);
         this.ensureCollaborator(actor);
-        if (!actor.collaboratorId) {
-            throw new common_1.BadRequestException('Collaborator context is required.');
-        }
         const pagination = this.normalizePaginationParams(paginationParams, {
             defaultSortField: 'name',
             defaultSortOrder: 'asc',
             allowedSortFields: ['name', 'projectName', 'status', 'createdAt'],
         });
-        const params = [actor.collaboratorId];
+        const projectFilter = this.buildIdFilter(actor.visibleProjectIds, 'COALESCE(t.project_id, pa.project_id)', actor.isDirector);
+        const params = [...projectFilter.params];
         const filters = [
             't.deleted_at IS NULL',
-            'pa.deleted_at IS NULL',
             'p.deleted_at IS NULL',
-            `pa.collaborator_id = $1`,
-            `pa.status IN ('planned', 'active')`,
+            projectFilter.clause,
+            `(
+        t.project_id IS NOT NULL
+        OR (
+          pa.id IS NOT NULL
+          AND pa.deleted_at IS NULL
+          AND pa.status IN ('planned', 'active')
+        )
+      )`,
         ];
         if (pagination.search) {
             const searchPlaceholder = this.param(params, `%${pagination.search}%`);
@@ -1149,18 +1478,18 @@ let OperationsService = OperationsService_1 = class OperationsService {
             filters.push(`pa.id = ${this.param(params, paginationParams.projectAssignmentId)}`);
         }
         if (paginationParams.projectId) {
-            filters.push(`pa.project_id = ${this.param(params, paginationParams.projectId)}`);
+            filters.push(`COALESCE(t.project_id, pa.project_id) = ${this.param(params, paginationParams.projectId)}`);
         }
         if (paginationParams.status) {
-            filters.push(`t.status = ${this.param(params, paginationParams.status)}`);
+            filters.push(`t.status::text = ${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
+         LEFT JOIN operations_project_assignment pa
            ON pa.id = t.project_assignment_id
          JOIN operations_project p
-           ON p.id = pa.project_id
+           ON p.id = COALESCE(t.project_id, pa.project_id)
         WHERE ${whereClause}`, params);
         const sortColumn = (_a = {
             name: 't.name',
@@ -1175,16 +1504,16 @@ let OperationsService = OperationsService_1 = class OperationsService {
               t.name,
               t.description,
               t.status,
-              pa.project_id AS "projectId",
+              COALESCE(t.project_id, pa.project_id) AS "projectId",
               pa.id AS "projectAssignmentId",
               p.name AS "projectName",
               p.code AS "projectCode",
               t.created_at AS "createdAt"
          FROM operations_task t
-         JOIN operations_project_assignment pa
+         LEFT JOIN operations_project_assignment pa
            ON pa.id = t.project_assignment_id
          JOIN operations_project p
-           ON p.id = pa.project_id
+           ON p.id = COALESCE(t.project_id, pa.project_id)
         WHERE ${whereClause}
         ORDER BY ${sortColumn} ${pagination.sortOrder.toUpperCase()}, t.id ASC
         LIMIT ${limitPlaceholder}
@@ -1463,8 +1792,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
             const resolvedTask = data.taskId
                 ? await this.getOwnedTaskRecord(tx, actor.collaboratorId, data.taskId)
                 : null;
-            if (resolvedTask && resolvedTask.projectAssignmentId !== assignment.id) {
-                throw new common_1.BadRequestException('The selected task does not belong to the chosen project assignment.');
+            if (resolvedTask && resolvedTask.projectId !== assignment.projectId) {
+                throw new common_1.BadRequestException('The selected task does not belong to the chosen project.');
             }
             const activityLabel = (_e = (_d = (_c = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.name) !== null && _c !== void 0 ? _c : taskLabel) !== null && _d !== void 0 ? _d : assignment.roleLabel) !== null && _e !== void 0 ? _e : assignment.projectName;
             if (!activityLabel) {
@@ -1500,6 +1829,68 @@ let OperationsService = OperationsService_1 = class OperationsService {
         });
         return this.getTimesheetEntryByIdForActor(actor, createdEntryId);
     }
+    async updateTimesheetEntry(userId, entryId, data) {
+        var _a;
+        const actor = await this.getActorContext(userId);
+        this.ensureCollaborator(actor);
+        this.requireFields(data, ['workDate', 'duration']);
+        if (!actor.collaboratorId && !actor.isDirector) {
+            throw new common_1.BadRequestException('Collaborator context is required.');
+        }
+        const entry = await this.getTimesheetEntryByIdForActor(actor, entryId);
+        if (!actor.isDirector && entry.collaboratorId !== actor.collaboratorId) {
+            throw new common_1.ForbiddenException('Only the entry owner can update this timesheet entry.');
+        }
+        if (!['draft', 'rejected'].includes(entry.status)) {
+            throw new common_1.BadRequestException('Only draft or rejected timesheet entries can be edited.');
+        }
+        const collaboratorId = actor.isDirector
+            ? entry.collaboratorId
+            : actor.collaboratorId;
+        const durationMinutes = this.normalizeDurationMinutes(data.duration, data.unit);
+        const taskLabel = (_a = this.normalizeOptionalText(data.taskName)) !== null && _a !== void 0 ? _a : this.normalizeOptionalText(data.activityLabel);
+        const targetWeek = this.getWorkWeekRange(data.workDate);
+        const isSameWeek = entry.weekStartDate === targetWeek.weekStartDate &&
+            entry.weekEndDate === targetWeek.weekEndDate;
+        await this.prisma.$transaction(async (tx) => {
+            var _a, _b, _c, _d, _e, _f, _g;
+            const assignment = await this.resolveOwnedProjectAssignment(tx, collaboratorId, {
+                projectId: (_a = data.projectId) !== null && _a !== void 0 ? _a : null,
+                projectAssignmentId: (_b = data.projectAssignmentId) !== null && _b !== void 0 ? _b : null,
+            });
+            const resolvedTask = data.taskId
+                ? await this.getOwnedTaskRecord(tx, collaboratorId, data.taskId)
+                : null;
+            if (resolvedTask && resolvedTask.projectId !== assignment.projectId) {
+                throw new common_1.BadRequestException('The selected task does not belong to the chosen project.');
+            }
+            const activityLabel = (_e = (_d = (_c = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.name) !== null && _c !== void 0 ? _c : taskLabel) !== null && _d !== void 0 ? _d : assignment.roleLabel) !== null && _e !== void 0 ? _e : assignment.projectName;
+            if (!activityLabel) {
+                throw new common_1.BadRequestException('A task is required for the timesheet entry.');
+            }
+            const targetTimesheetId = isSameWeek
+                ? entry.timesheetId
+                : await this.getOrCreateTimesheetForWorkDate(tx, collaboratorId, data.workDate);
+            await tx.$executeRawUnsafe(`UPDATE operations_timesheet_entry
+            SET timesheet_id = $1,
+                project_assignment_id = $2,
+                task_id = $3,
+                activity_label = $4,
+                work_date = $5::date,
+                duration_minutes = $6,
+                hours = $7,
+                description = $8,
+                updated_at = NOW()
+          WHERE id = $9
+            AND deleted_at IS NULL`, targetTimesheetId, assignment.id, (_g = (_f = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.id) !== null && _f !== void 0 ? _f : data.taskId) !== null && _g !== void 0 ? _g : null, activityLabel, data.workDate, durationMinutes, Number((durationMinutes / 60).toFixed(2)), this.normalizeOptionalText(data.description), entryId);
+            await this.refreshTimesheetTotal(tx, entry.timesheetId);
+            if (targetTimesheetId !== entry.timesheetId) {
+                await this.refreshTimesheetTotal(tx, targetTimesheetId);
+            }
+            await this.cleanupEmptyEditableTimesheet(tx, entry.timesheetId);
+        });
+        return this.getTimesheetEntryByIdForActor(actor, entryId);
+    }
     async removeTimesheetEntry(userId, entryId) {
         const actor = await this.getActorContext(userId);
         this.ensureCollaborator(actor);
@@ -1520,6 +1911,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
           WHERE id = $1
             AND deleted_at IS NULL`, entryId);
             await this.refreshTimesheetTotal(tx, entry.timesheetId);
+            await this.cleanupEmptyEditableTimesheet(tx, entry.timesheetId);
         });
         return { success: true };
     }
@@ -1533,7 +1925,7 @@ 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, _0;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             const created = await tx.$queryRawUnsafe(`INSERT INTO operations_project (
           contract_id,
           manager_collaborator_id,
@@ -1562,28 +1954,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
             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: (_p = data.contractTemplateId) !== null && _p !== void 0 ? _p : null,
-                    projectCode: data.code,
-                    projectName: data.name,
-                    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,
-                  updated_at = NOW()
-            WHERE id = $2`, contractId, projectId);
-            }
             return projectId;
         });
         return this.getProjectById(userId, createdProjectId);
@@ -1608,7 +1978,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
         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, _7;
+            var _a, _b;
             if (updates.length) {
                 params.push(projectId);
                 await tx.$executeRawUnsafe(`UPDATE operations_project
@@ -1622,30 +1992,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
             const nextContractId = data.contractId !== undefined
                 ? data.contractId
                 : ((_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: (_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 &&
+            if (nextContractId &&
                 (data.monthlyHourCap !== undefined || data.billingModel !== undefined)) {
                 const contractUpdates = [];
                 const contractParams = [];
@@ -1664,149 +2011,54 @@ let OperationsService = OperationsService_1 = class OperationsService {
         });
         return this.getProjectById(userId, projectId);
     }
-    async listContractTemplates(userId) {
-        const actor = await this.getActorContext(userId);
-        this.ensureDirector(actor);
-        return this.queryRows(`SELECT t.id,
-              t.slug,
-              t.code,
-              t.name,
-              t.description,
-              t.contract_category AS "contractCategory",
-              t.contract_type AS "contractType",
-              t.billing_model AS "billingModel",
-              t.signature_status AS "signatureStatus",
-              t.is_active AS "isActive",
-              t.status,
-              t.content_html AS "contentHtml",
-              t.created_at AS "createdAt",
-              t.updated_at AS "updatedAt",
-              COUNT(DISTINCT c.id)::int AS "usageCount"
-         FROM operations_contract_template t
-         LEFT JOIN operations_contract c
-           ON c.contract_template_id = t.id
-          AND c.deleted_at IS NULL
-        WHERE t.deleted_at IS NULL
-        GROUP BY t.id
-        ORDER BY CASE
-                   WHEN t.status = 'active' THEN 0
-                   WHEN t.status = 'draft' THEN 1
-                   WHEN t.status = 'inactive' THEN 2
-                   ELSE 3
-                 END,
-                 t.name ASC`);
-    }
-    async getContractTemplateById(userId, templateId) {
-        const actor = await this.getActorContext(userId);
-        this.ensureDirector(actor);
-        return this.getContractTemplateRecord(this.prisma, templateId);
-    }
-    async createContractTemplate(userId, data) {
+    async listContracts(userId, filters = {}) {
+        var _a, _b;
         const actor = await this.getActorContext(userId);
-        this.ensureDirector(actor);
-        const name = this.normalizeOptionalText(data.name);
-        if (!name) {
-            throw new common_1.BadRequestException('Contract template name is required.');
+        const params = [];
+        const accessClause = actor.isDirector
+            ? 'c.deleted_at IS NULL'
+            : `c.deleted_at IS NULL AND (
+          c.related_collaborator_id = ANY(${this.param(params, actor.visibleCollaboratorIds)}::int[])
+          OR EXISTS (
+            SELECT 1
+              FROM operations_project p_access
+             WHERE p_access.contract_id = c.id
+               AND p_access.deleted_at IS NULL
+              AND p_access.id = ANY(${this.param(params, actor.visibleProjectIds)}::int[])
+          )
+        )`;
+        const pagination = this.shouldPaginate(filters)
+            ? this.normalizePaginationParams(filters, {
+                defaultSortField: 'name',
+                defaultSortOrder: 'asc',
+                allowedSortFields: ['name', 'code', 'clientName', 'startDate', 'endDate', 'status'],
+            })
+            : null;
+        const where = [accessClause];
+        if (filters.status && filters.status !== 'all') {
+            where.push(`c.status::text = ${this.param(params, filters.status)}`);
         }
-        return this.prisma.$transaction(async (tx) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-            await this.assertContractTemplateNameAvailable(tx, name);
-            const nextCode = (_b = (_a = this.normalizeOptionalText(data.code)) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : null;
-            if (nextCode) {
-                await this.assertContractTemplateCodeAvailable(tx, nextCode);
-            }
-            const nextStatus = (_c = data.status) !== null && _c !== void 0 ? _c : 'active';
-            const isActive = (_d = data.isActive) !== null && _d !== void 0 ? _d : !['inactive', 'archived'].includes(nextStatus);
-            const created = (await tx.$queryRawUnsafe(`INSERT INTO operations_contract_template (
-          slug,
-          code,
-          name,
-          description,
-          contract_category,
-          contract_type,
-          billing_model,
-          signature_status,
-          is_active,
-          status,
-          content_html,
-          created_at,
-          updated_at
-        ) VALUES (
-          $1, $2, $3, $4,
-          $5, $6, $7, $8, $9, $10, $11,
-          NOW(), NOW()
-        )
-        RETURNING id`, await this.generateUniqueContractTemplateSlug(tx, name), nextCode, name, this.normalizeOptionalText(data.description), (_e = data.contractCategory) !== null && _e !== void 0 ? _e : 'client', (_f = data.contractType) !== null && _f !== void 0 ? _f : 'service_agreement', (_g = data.billingModel) !== null && _g !== void 0 ? _g : 'time_and_material', (_h = data.signatureStatus) !== null && _h !== void 0 ? _h : 'not_started', isActive, nextStatus, this.normalizeOptionalText(data.contentHtml)));
-            const templateId = (_j = created[0]) === null || _j === void 0 ? void 0 : _j.id;
-            if (!templateId) {
-                throw new common_1.BadRequestException('Unable to create the contract template.');
-            }
-            return this.getContractTemplateRecord(tx, templateId, true);
-        });
-    }
-    async updateContractTemplate(userId, templateId, data) {
-        const actor = await this.getActorContext(userId);
-        this.ensureDirector(actor);
-        return this.prisma.$transaction(async (tx) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-            const current = await this.getContractTemplateRecord(tx, templateId, true);
-            const nextName = data.name !== undefined
-                ? this.normalizeOptionalText(data.name)
-                : current.name;
-            if (!nextName) {
-                throw new common_1.BadRequestException('Contract template name is required.');
-            }
-            if (String(nextName).toLowerCase() !== String(current.name).toLowerCase()) {
-                await this.assertContractTemplateNameAvailable(tx, nextName, templateId);
-            }
-            const nextCode = data.code !== undefined
-                ? (_b = (_a = this.normalizeOptionalText(data.code)) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : null
-                : ((_c = current.code) !== null && _c !== void 0 ? _c : null);
-            if (nextCode) {
-                await this.assertContractTemplateCodeAvailable(tx, nextCode, templateId);
-            }
-            const nextStatus = (_e = (_d = data.status) !== null && _d !== void 0 ? _d : current.status) !== null && _e !== void 0 ? _e : 'active';
-            const nextIsActive = (_f = data.isActive) !== null && _f !== void 0 ? _f : !['inactive', 'archived'].includes(nextStatus);
-            const nextSlug = String(nextName).toLowerCase() !== String(current.name).toLowerCase()
-                ? await this.generateUniqueContractTemplateSlug(tx, nextName, templateId)
-                : current.slug;
-            await tx.$executeRawUnsafe(`UPDATE operations_contract_template
-            SET slug = $1,
-                code = $2,
-                name = $3,
-                description = $4,
-                contract_category = $5,
-                contract_type = $6,
-                billing_model = $7,
-                signature_status = $8,
-                is_active = $9,
-                status = $10,
-                content_html = $11,
-                updated_at = NOW()
-          WHERE id = $12`, nextSlug, nextCode, nextName, data.description !== undefined
-                ? this.normalizeOptionalText(data.description)
-                : ((_g = current.description) !== null && _g !== void 0 ? _g : null), (_j = (_h = data.contractCategory) !== null && _h !== void 0 ? _h : current.contractCategory) !== null && _j !== void 0 ? _j : 'client', (_l = (_k = data.contractType) !== null && _k !== void 0 ? _k : current.contractType) !== null && _l !== void 0 ? _l : 'service_agreement', (_o = (_m = data.billingModel) !== null && _m !== void 0 ? _m : current.billingModel) !== null && _o !== void 0 ? _o : 'time_and_material', (_q = (_p = data.signatureStatus) !== null && _p !== void 0 ? _p : current.signatureStatus) !== null && _q !== void 0 ? _q : 'not_started', nextIsActive, nextStatus, data.contentHtml !== undefined
-                ? this.normalizeOptionalText(data.contentHtml)
-                : ((_r = current.contentHtml) !== null && _r !== void 0 ? _r : null), templateId);
-            return this.getContractTemplateRecord(tx, templateId, true);
-        });
-    }
-    async listContracts(userId) {
-        const actor = await this.getActorContext(userId);
-        const params = [];
-        const accessClause = actor.isDirector
-            ? 'c.deleted_at IS NULL'
-            : `c.deleted_at IS NULL AND (
-          c.related_collaborator_id = ANY(${this.param(params, actor.visibleCollaboratorIds)}::int[])
-          OR EXISTS (
-            SELECT 1
-              FROM operations_project p_access
-             WHERE p_access.contract_id = c.id
-               AND p_access.deleted_at IS NULL
-               AND p_access.id = ANY(${this.param(params, actor.visibleProjectIds)}::int[])
-          )
-        )`;
-        return this.queryRows(`SELECT c.id,
+        if (filters.contractCategory && filters.contractCategory !== 'all') {
+            where.push(`c.contract_category = ${this.param(params, filters.contractCategory)}::text::operations_contract_contract_category_70d553ea09_enum`);
+        }
+        if (filters.originType && filters.originType !== 'all') {
+            where.push(`c.origin_type = ${this.param(params, filters.originType)}::text::operations_contract_origin_type_07a7cc2b5d_enum`);
+        }
+        if (filters.isActive === 'true' || filters.isActive === 'false') {
+            where.push(`c.is_active = ${this.param(params, filters.isActive === 'true')}`);
+        }
+        if (pagination === null || pagination === void 0 ? void 0 : pagination.search) {
+            const searchPlaceholder = this.param(params, `%${pagination.search}%`);
+            where.push(`(
+        COALESCE(c.name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(c.code, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(c.client_name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(m.display_name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(linked.display_name, '') ILIKE ${searchPlaceholder}
+      )`);
+        }
+        const whereClause = where.join(' AND ');
+        const baseQuery = `SELECT c.id,
               c.code,
               c.name,
               c.contract_category AS "contractCategory",
@@ -1817,10 +2069,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
               c.billing_model AS "billingModel",
               c.account_manager_collaborator_id AS "accountManagerCollaboratorId",
               c.related_collaborator_id AS "relatedCollaboratorId",
-              c.contract_template_id AS "contractTemplateId",
-              template.name AS "contractTemplateName",
-              template.slug AS "contractTemplateSlug",
-              template.code AS "contractTemplateCode",
               c.origin_type AS "originType",
               c.origin_id AS "originId",
               c.start_date AS "startDate",
@@ -1836,17 +2084,11 @@ let OperationsService = OperationsService_1 = class OperationsService {
               m.display_name AS "accountManagerName",
               linked.display_name AS "relatedCollaboratorName",
               MAX(COALESCE(primary_party.display_name, linked.display_name, c.client_name)) AS "mainRelatedPartyName",
-              MAX(COALESCE(financials.value_amount, 0)) AS "valueAmount",
-              MAX(COALESCE(financials.payment_amount, 0)) AS "paymentAmount",
-              MAX(COALESCE(financials.revenue_amount, 0)) AS "revenueAmount",
-              MAX(COALESCE(financials.fine_amount, 0)) AS "fineAmount",
               MAX(COALESCE(pdf_document.file_name, '')) AS "currentPdfFileName",
               COUNT(DISTINCT p.id)::int AS "projectCount"
          FROM operations_contract c
          LEFT JOIN operations_collaborator m ON m.id = c.account_manager_collaborator_id
          LEFT JOIN operations_collaborator linked ON linked.id = c.related_collaborator_id
-         LEFT JOIN operations_contract_template template
-           ON template.id = c.contract_template_id
          LEFT JOIN LATERAL (
            SELECT cp.display_name
              FROM operations_contract_party cp
@@ -1855,16 +2097,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
             ORDER BY cp.is_primary DESC, cp.id ASC
             LIMIT 1
          ) primary_party ON TRUE
-         LEFT JOIN LATERAL (
-           SELECT
-             SUM(CASE WHEN term_type = 'value' THEN amount ELSE 0 END) AS value_amount,
-             SUM(CASE WHEN term_type = 'payment' THEN amount ELSE 0 END) AS payment_amount,
-             SUM(CASE WHEN term_type = 'revenue' THEN amount ELSE 0 END) AS revenue_amount,
-             SUM(CASE WHEN term_type = 'fine' THEN amount ELSE 0 END) AS fine_amount
-           FROM operations_contract_financial_term ft
-          WHERE ft.contract_id = c.id
-            AND ft.deleted_at IS NULL
-         ) financials ON TRUE
          LEFT JOIN LATERAL (
            SELECT cd.file_name
              FROM operations_contract_document cd
@@ -1878,9 +2110,71 @@ let OperationsService = OperationsService_1 = class OperationsService {
          LEFT JOIN operations_project p
            ON p.contract_id = c.id
           AND p.deleted_at IS NULL
-        WHERE ${accessClause}
-        GROUP BY c.id, m.id, linked.id, template.id
-        ORDER BY COALESCE(c.name, c.code, CONCAT('draft-', c.id)) ASC`, params);
+        WHERE ${whereClause}
+        GROUP BY c.id, m.id, linked.id`;
+        if (!pagination) {
+            return this.queryRows(`${baseQuery}
+         ORDER BY COALESCE(c.name, c.code, CONCAT('draft-', c.id)) ASC`, params);
+        }
+        const totalRow = await this.querySingle(`SELECT COUNT(*)::text AS total
+         FROM operations_contract c
+         LEFT JOIN operations_collaborator m ON m.id = c.account_manager_collaborator_id
+         LEFT JOIN operations_collaborator linked ON linked.id = c.related_collaborator_id
+        WHERE ${whereClause}`, params);
+        const sortColumn = (_a = {
+            name: `COALESCE(c.name, c.code, CONCAT('draft-', c.id))`,
+            code: 'c.code',
+            clientName: 'c.client_name',
+            startDate: 'c.start_date',
+            endDate: 'c.end_date',
+            status: 'c.status',
+        }[pagination.sortField]) !== null && _a !== void 0 ? _a : `COALESCE(c.name, c.code, CONCAT('draft-', c.id))`;
+        const queryParams = [...params];
+        const limitPlaceholder = this.param(queryParams, pagination.pageSize);
+        const offsetPlaceholder = this.param(queryParams, pagination.offset);
+        const rows = await this.queryRows(`${baseQuery}
+       ORDER BY ${sortColumn} ${pagination.sortOrder.toUpperCase()}, c.id ASC
+       LIMIT ${limitPlaceholder}
+      OFFSET ${offsetPlaceholder}`, queryParams);
+        return this.buildPaginationResult(rows, Number((_b = totalRow === null || totalRow === void 0 ? void 0 : totalRow.total) !== null && _b !== void 0 ? _b : 0), pagination.page, pagination.pageSize);
+    }
+    async getContractStats(userId) {
+        var _a, _b, _c, _d;
+        const actor = await this.getActorContext(userId);
+        const params = [];
+        const accessClause = actor.isDirector
+            ? 'c.deleted_at IS NULL'
+            : `c.deleted_at IS NULL AND (
+          c.related_collaborator_id = ANY(${this.param(params, actor.visibleCollaboratorIds)}::int[])
+          OR EXISTS (
+            SELECT 1
+              FROM operations_project p_access
+             WHERE p_access.contract_id = c.id
+               AND p_access.deleted_at IS NULL
+               AND p_access.id = ANY(${this.param(params, actor.visibleProjectIds)}::int[])
+          )
+        )`;
+        const stats = await this.querySingle(`SELECT COUNT(*)::int AS total,
+              COUNT(*) FILTER (WHERE c.is_active = true)::int AS active,
+              COUNT(*) FILTER (WHERE c.is_active = false)::int AS inactive,
+              COUNT(*) FILTER (
+                WHERE EXISTS (
+                  SELECT 1
+                    FROM operations_contract_document cd
+                   WHERE cd.contract_id = c.id
+                     AND cd.deleted_at IS NULL
+                     AND cd.is_current = true
+                     AND cd.document_type IN ('source_upload', 'generated_pdf')
+                )
+              )::int AS "withFile"
+         FROM operations_contract c
+        WHERE ${accessClause}`, params);
+        return {
+            total: Number((_a = stats === null || stats === void 0 ? void 0 : stats.total) !== null && _a !== void 0 ? _a : 0),
+            active: Number((_b = stats === null || stats === void 0 ? void 0 : stats.active) !== null && _b !== void 0 ? _b : 0),
+            inactive: Number((_c = stats === null || stats === void 0 ? void 0 : stats.inactive) !== null && _c !== void 0 ? _c : 0),
+            withFile: Number((_d = stats === null || stats === void 0 ? void 0 : stats.withFile) !== null && _d !== void 0 ? _d : 0),
+        };
     }
     async getContractById(userId, contractId) {
         var _a, _b, _c;
@@ -1896,10 +2190,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
               c.billing_model AS "billingModel",
               c.account_manager_collaborator_id AS "accountManagerCollaboratorId",
               c.related_collaborator_id AS "relatedCollaboratorId",
-              c.contract_template_id AS "contractTemplateId",
-              template.name AS "contractTemplateName",
-              template.slug AS "contractTemplateSlug",
-              template.code AS "contractTemplateCode",
               c.origin_type AS "originType",
               c.origin_id AS "originId",
               c.start_date AS "startDate",
@@ -1918,8 +2208,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
          FROM operations_contract c
          LEFT JOIN operations_collaborator m ON m.id = c.account_manager_collaborator_id
          LEFT JOIN operations_collaborator linked ON linked.id = c.related_collaborator_id
-         LEFT JOIN operations_contract_template template
-           ON template.id = c.contract_template_id
         WHERE c.id = $1
           AND c.deleted_at IS NULL`, [contractId]);
         if (!contract) {
@@ -1946,7 +2234,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
                 throw new common_1.ForbiddenException('You do not have access to this contract.');
             }
         }
-        const [projects, scheduleSummary, parties, signatures, financialTerms, documents, revisions, history] = await Promise.all([
+        const [projects, scheduleSummary, parties, documents, history] = await Promise.all([
             this.queryRows(`SELECT id, code, name, status
              FROM operations_project
             WHERE contract_id = $1
@@ -1975,27 +2263,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
             WHERE contract_id = $1
               AND deleted_at IS NULL
             ORDER BY is_primary DESC, id ASC`, [contractId]),
-            this.queryRows(`SELECT id,
-                  signer_name AS "signerName",
-                  signer_role AS "signerRole",
-                  signer_email AS "signerEmail",
-                  signer_status AS status,
-                  signed_at AS "signedAt"
-             FROM operations_contract_signature
-            WHERE contract_id = $1
-              AND deleted_at IS NULL
-            ORDER BY id ASC`, [contractId]),
-            this.queryRows(`SELECT id,
-                  term_type AS "termType",
-                  label,
-                  amount,
-                  recurrence,
-                  due_day AS "dueDay",
-                  notes
-             FROM operations_contract_financial_term
-            WHERE contract_id = $1
-              AND deleted_at IS NULL
-            ORDER BY id ASC`, [contractId]),
             this.queryRows(`SELECT id,
                   document_type AS "documentType",
                   file_id AS "fileId",
@@ -2011,16 +2278,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
             WHERE contract_id = $1
               AND deleted_at IS NULL
             ORDER BY is_current DESC, id DESC`, [contractId]),
-            this.queryRows(`SELECT id,
-                  revision_type AS "revisionType",
-                  title,
-                  effective_date AS "effectiveDate",
-                  status,
-                  summary
-             FROM operations_contract_revision
-            WHERE contract_id = $1
-              AND deleted_at IS NULL
-            ORDER BY effective_date DESC NULLS LAST, id DESC`, [contractId]),
             this.queryRows(`SELECT id,
                   actor_user_id AS "actorUserId",
                   action,
@@ -2034,17 +2291,14 @@ let OperationsService = OperationsService_1 = class OperationsService {
         return Object.assign(Object.assign({}, contract), { mainRelatedPartyName: (_c = (_b = (_a = parties.find((party) => party.isPrimary)) === null || _a === void 0 ? void 0 : _a.displayName) !== null && _b !== void 0 ? _b : contract.relatedCollaboratorName) !== null && _c !== void 0 ? _c : contract.clientName, projects,
             scheduleSummary,
             parties,
-            signatures,
-            financialTerms,
             documents,
-            revisions,
             history });
     }
     async createContract(userId, data) {
         const actor = await this.getActorContext(userId);
         this.ensureDirector(actor);
         const createdId = 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;
+            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;
             const normalizedCode = (_b = (_a = this.normalizeOptionalText(data.code)) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : (await this.generateContractCode(tx));
             const created = await tx.$queryRawUnsafe(`INSERT INTO operations_contract (
           code,
@@ -2057,7 +2311,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
           billing_model,
           account_manager_collaborator_id,
           related_collaborator_id,
-          contract_template_id,
           origin_type,
           origin_id,
           start_date,
@@ -2083,24 +2336,20 @@ let OperationsService = OperationsService_1 = class OperationsService {
           $8::operations_contract_billing_model_409dc7fea2_enum,
           $9,
           $10,
-          $11,
-          $12::operations_contract_origin_type_07a7cc2b5d_enum,
-          $13,
-          $14::date,
-          $15::date, $16::date, $17::date, $18, $19,
-          $20::operations_contract_status_a0395962df_enum,
-          $21::operations_contract_creation_mode_98ba669209_enum,
+          $11::operations_contract_origin_type_07a7cc2b5d_enum,
+          $12,
+          $13::date,
+          $14::date, $15::date, $16::date, $17, $18,
+          $19::operations_contract_status_a0395962df_enum,
+          $20::operations_contract_creation_mode_98ba669209_enum,
+          $21,
           $22,
           $23,
-          $24,
           NOW(), NOW()
         )
-        RETURNING id`, normalizedCode, this.normalizeOptionalText(data.name), (_c = data.contractCategory) !== null && _c !== void 0 ? _c : 'client', (_d = data.contractType) !== null && _d !== void 0 ? _d : 'service_agreement', this.normalizeOptionalText(data.clientName), (_e = data.signatureStatus) !== null && _e !== void 0 ? _e : 'not_started', (_f = data.isActive) !== null && _f !== void 0 ? _f : true, (_g = data.billingModel) !== null && _g !== void 0 ? _g : 'time_and_material', (_h = data.accountManagerCollaboratorId) !== null && _h !== void 0 ? _h : null, (_j = data.relatedCollaboratorId) !== null && _j !== void 0 ? _j : null, (_k = data.contractTemplateId) !== null && _k !== void 0 ? _k : null, (_l = data.originType) !== null && _l !== void 0 ? _l : 'manual', (_m = data.originId) !== null && _m !== void 0 ? _m : null, this.normalizeOptionalText((_o = data.startDate) !== null && _o !== void 0 ? _o : null), (_p = data.endDate) !== null && _p !== void 0 ? _p : null, (_q = data.signedAt) !== null && _q !== void 0 ? _q : null, (_s = (_r = data.effectiveDate) !== null && _r !== void 0 ? _r : data.startDate) !== null && _s !== void 0 ? _s : null, (_t = data.budgetAmount) !== null && _t !== void 0 ? _t : null, (_u = data.monthlyHourCap) !== null && _u !== void 0 ? _u : null, (_v = data.status) !== null && _v !== void 0 ? _v : 'draft', (_w = data.creationMode) !== null && _w !== void 0 ? _w : 'blank', (_x = data.wizardStep) !== null && _x !== void 0 ? _x : 0, (_y = data.description) !== null && _y !== void 0 ? _y : null, (_z = data.contentHtml) !== null && _z !== void 0 ? _z : null);
-            const contractId = (_0 = created[0]) === null || _0 === void 0 ? void 0 : _0.id;
+        RETURNING id`, normalizedCode, this.normalizeOptionalText(data.name), (_c = data.contractCategory) !== null && _c !== void 0 ? _c : 'client', (_d = data.contractType) !== null && _d !== void 0 ? _d : 'service_agreement', this.normalizeOptionalText(data.clientName), (_e = data.signatureStatus) !== null && _e !== void 0 ? _e : 'not_started', (_f = data.isActive) !== null && _f !== void 0 ? _f : true, (_g = data.billingModel) !== null && _g !== void 0 ? _g : 'time_and_material', (_h = data.accountManagerCollaboratorId) !== null && _h !== void 0 ? _h : null, (_j = data.relatedCollaboratorId) !== null && _j !== void 0 ? _j : null, (_k = data.originType) !== null && _k !== void 0 ? _k : 'manual', (_l = data.originId) !== null && _l !== void 0 ? _l : null, this.normalizeOptionalText((_m = data.startDate) !== null && _m !== void 0 ? _m : null), (_o = data.endDate) !== null && _o !== void 0 ? _o : null, (_p = data.signedAt) !== null && _p !== void 0 ? _p : null, (_r = (_q = data.effectiveDate) !== null && _q !== void 0 ? _q : data.startDate) !== null && _r !== void 0 ? _r : null, (_s = data.budgetAmount) !== null && _s !== void 0 ? _s : null, (_t = data.monthlyHourCap) !== null && _t !== void 0 ? _t : null, (_u = data.status) !== null && _u !== void 0 ? _u : 'draft', (_v = data.creationMode) !== null && _v !== void 0 ? _v : 'blank', (_w = data.wizardStep) !== null && _w !== void 0 ? _w : 0, (_x = data.description) !== null && _x !== void 0 ? _x : null, (_y = data.contentHtml) !== null && _y !== void 0 ? _y : null);
+            const contractId = (_z = created[0]) === null || _z === void 0 ? void 0 : _z.id;
             await this.replaceContractParties(tx, contractId, data.parties);
-            await this.replaceContractSignatures(tx, contractId, data.signatures);
-            await this.replaceContractFinancialTerms(tx, contractId, data.financialTerms);
-            await this.replaceContractRevisions(tx, contractId, data.revisions);
             if (data.replaceUploadedPdfDocument) {
                 await this.replaceContractDocument(tx, contractId, 'source_upload', data.replaceUploadedPdfDocument);
             }
@@ -2111,258 +2360,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
         });
         return this.getContractById(userId, createdId);
     }
-    async createContractDraft(userId, data) {
-        const actor = await this.getActorContext(userId);
-        this.ensureDirector(actor);
-        const creationMode = this.normalizeEnumValue(data.creationMode, CONTRACT_CREATION_MODE_VALUES, 'blank');
-        const selectedTemplate = data.templateId && data.templateId > 0
-            ? await this.getContractTemplateById(userId, data.templateId)
-            : null;
-        const duplicateSource = data.duplicateFromId && data.duplicateFromId > 0
-            ? await this.getContractById(userId, data.duplicateFromId)
-            : null;
-        const storedSourceFile = data.sourceFileId && data.sourceFileId > 0
-            ? await this.prisma.file.findUnique({
-                where: { id: data.sourceFileId },
-                include: { file_mimetype: true },
-            })
-            : null;
-        if (data.sourceFileId && !storedSourceFile) {
-            throw new common_1.NotFoundException('Source contract file not found.');
-        }
-        const createdId = 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, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16;
-            const generatedCode = await this.generateContractCode(tx);
-            const duplicateNameBase = (_b = (_a = this.normalizeOptionalText(duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.name)) !== null && _a !== void 0 ? _a : this.normalizeOptionalText(duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.code)) !== null && _b !== void 0 ? _b : 'Contract';
-            const created = await tx.$queryRawUnsafe(`INSERT INTO operations_contract (
-          code,
-          name,
-          contract_category,
-          contract_type,
-          client_name,
-          signature_status,
-          is_active,
-          billing_model,
-          account_manager_collaborator_id,
-          related_collaborator_id,
-          contract_template_id,
-          origin_type,
-          origin_id,
-          start_date,
-          end_date,
-          signed_at,
-          effective_date,
-          budget_amount,
-          monthly_hour_cap,
-          status,
-          creation_mode,
-          wizard_step,
-          description,
-          content_html,
-          created_by_user_id,
-          updated_by_user_id,
-          created_at,
-          updated_at
-        ) VALUES (
-          $1,
-          $2,
-          $3::operations_contract_contract_category_70d553ea09_enum,
-          $4::operations_contract_contract_type_48331e2ebf_enum,
-          $5,
-          $6::operations_contract_signature_status_2cb7282a7b_enum,
-          $7,
-          $8::operations_contract_billing_model_409dc7fea2_enum,
-          $9,
-          $10,
-          $11,
-          $12::operations_contract_origin_type_07a7cc2b5d_enum,
-          $13,
-          $14::date,
-          $15::date,
-          $16::date,
-          $17::date,
-          $18,
-          $19,
-          $20::operations_contract_status_a0395962df_enum,
-          $21::operations_contract_creation_mode_98ba669209_enum,
-          $22,
-          $23,
-          $24,
-          $25,
-          $25,
-          NOW(),
-          NOW()
-        )
-        RETURNING id`, generatedCode, creationMode === 'duplicate'
-                ? `${duplicateNameBase} Copy`
-                : this.normalizeOptionalText(selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.name), (_d = (_c = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.contractCategory) !== null && _c !== void 0 ? _c : selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.contractCategory) !== null && _d !== void 0 ? _d : 'client', (_f = (_e = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.contractType) !== null && _e !== void 0 ? _e : selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.contractType) !== null && _f !== void 0 ? _f : 'service_agreement', this.normalizeOptionalText(duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.clientName), (_h = (_g = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.signatureStatus) !== null && _g !== void 0 ? _g : selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.signatureStatus) !== null && _h !== void 0 ? _h : 'not_started', (_j = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.isActive) !== null && _j !== void 0 ? _j : true, (_l = (_k = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.billingModel) !== null && _k !== void 0 ? _k : selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.billingModel) !== null && _l !== void 0 ? _l : 'time_and_material', (_m = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.accountManagerCollaboratorId) !== null && _m !== void 0 ? _m : null, (_o = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.relatedCollaboratorId) !== null && _o !== void 0 ? _o : null, (_q = (_p = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.contractTemplateId) !== null && _p !== void 0 ? _p : selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.id) !== null && _q !== void 0 ? _q : null, (_r = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.originType) !== null && _r !== void 0 ? _r : 'manual', (_s = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.originId) !== null && _s !== void 0 ? _s : null, (_t = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.startDate) !== null && _t !== void 0 ? _t : null, (_u = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.endDate) !== null && _u !== void 0 ? _u : null, (_v = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.signedAt) !== null && _v !== void 0 ? _v : null, (_w = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.effectiveDate) !== null && _w !== void 0 ? _w : null, (_x = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.budgetAmount) !== null && _x !== void 0 ? _x : null, (_y = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.monthlyHourCap) !== null && _y !== void 0 ? _y : null, 'draft', creationMode, creationMode === 'upload' ? 0 : creationMode === 'blank' ? 0 : 1, (_0 = (_z = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.description) !== null && _z !== void 0 ? _z : selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.description) !== null && _0 !== void 0 ? _0 : null, (_2 = (_1 = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.contentHtml) !== null && _1 !== void 0 ? _1 : selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.contentHtml) !== null && _2 !== void 0 ? _2 : null, userId);
-            const contractId = (_3 = created[0]) === null || _3 === void 0 ? void 0 : _3.id;
-            if (duplicateSource) {
-                await this.replaceContractParties(tx, contractId, duplicateSource.parties);
-                await this.replaceContractSignatures(tx, contractId, duplicateSource.signatures);
-                await this.replaceContractFinancialTerms(tx, contractId, duplicateSource.financialTerms);
-                await this.replaceContractRevisions(tx, contractId, duplicateSource.revisions);
-                const currentSourceDocument = (_4 = duplicateSource.documents.find((document) => document.isCurrent && document.documentType === 'source_upload')) !== null && _4 !== void 0 ? _4 : null;
-                if (currentSourceDocument) {
-                    await this.replaceContractDocument(tx, contractId, 'source_upload', {
-                        fileId: (_5 = currentSourceDocument.fileId) !== null && _5 !== void 0 ? _5 : null,
-                        fileName: currentSourceDocument.fileName,
-                        mimeType: currentSourceDocument.mimeType,
-                        fileContentBase64: (_6 = currentSourceDocument.fileContentBase64) !== null && _6 !== void 0 ? _6 : null,
-                        notes: (_7 = currentSourceDocument.notes) !== null && _7 !== void 0 ? _7 : null,
-                        extractionStatus: (_8 = currentSourceDocument.extractionStatus) !== null && _8 !== void 0 ? _8 : 'skipped',
-                        extractionSummary: (_9 = currentSourceDocument.extractionSummary) !== null && _9 !== void 0 ? _9 : null,
-                    });
-                }
-            }
-            if (storedSourceFile) {
-                await this.replaceContractDocument(tx, contractId, 'source_upload', {
-                    fileId: storedSourceFile.id,
-                    fileName: (_10 = this.normalizeOptionalText(data.sourceFileName)) !== null && _10 !== void 0 ? _10 : storedSourceFile.filename,
-                    mimeType: (_13 = (_11 = this.normalizeOptionalText(data.sourceMimeType)) !== null && _11 !== void 0 ? _11 : (_12 = storedSourceFile.file_mimetype) === null || _12 === void 0 ? void 0 : _12.name) !== null && _13 !== void 0 ? _13 : 'application/pdf',
-                    notes: 'Source contract document uploaded during draft creation.',
-                    extractionStatus: 'pending',
-                    extractionSummary: null,
-                });
-            }
-            await this.insertContractHistory(tx, contractId, userId, 'draft_created', `Contract draft created with mode ${creationMode}.`, JSON.stringify({
-                creationMode,
-                templateId: (_14 = selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.id) !== null && _14 !== void 0 ? _14 : null,
-                duplicateFromId: (_15 = duplicateSource === null || duplicateSource === void 0 ? void 0 : duplicateSource.id) !== null && _15 !== void 0 ? _15 : null,
-                sourceFileId: (_16 = storedSourceFile === null || storedSourceFile === void 0 ? void 0 : storedSourceFile.id) !== null && _16 !== void 0 ? _16 : null,
-            }));
-            return contractId;
-        });
-        return this.getContractById(userId, createdId);
-    }
-    async extractContractSource(userId, contractId, data) {
-        var _a, _b;
-        const actor = await this.getActorContext(userId);
-        this.ensureDirector(actor);
-        const contract = await this.getContractById(userId, contractId);
-        const sourceDocument = contract.documents.find((document) => document.isCurrent && document.documentType === 'source_upload');
-        if (!sourceDocument) {
-            throw new common_1.BadRequestException('No source document is attached to this contract draft.');
-        }
-        await this.prisma.$executeRawUnsafe(`UPDATE operations_contract_document
-          SET extraction_status = 'processing',
-              updated_at = NOW()
-        WHERE id = $1`, sourceDocument.id);
-        try {
-            const extracted = await this.extractContractDraft(userId, {
-                contractId,
-                provider: (_a = data.provider) !== null && _a !== void 0 ? _a : null,
-                promptMessage: (_b = data.promptMessage) !== null && _b !== void 0 ? _b : null,
-            });
-            await this.prisma.$executeRawUnsafe(`UPDATE operations_contract_document
-            SET extraction_status = 'completed',
-                extraction_summary = $2,
-                updated_at = NOW()
-          WHERE id = $1`, sourceDocument.id, extracted.summary || extracted.description || extracted.name || null);
-            await this.insertContractHistory(this.prisma, contractId, userId, 'source_extracted', 'Source contract document extracted with AI.');
-            return extracted;
-        }
-        catch (error) {
-            await this.prisma.$executeRawUnsafe(`UPDATE operations_contract_document
-            SET extraction_status = 'failed',
-                updated_at = NOW()
-          WHERE id = $1`, sourceDocument.id);
-            throw error;
-        }
-    }
-    async generateContractContent(userId, contractId, data = {}) {
-        const actor = await this.getActorContext(userId);
-        this.ensureDirector(actor);
-        const contract = await this.getContractById(userId, contractId);
-        const contentHtml = await this.generateContractContentHtml(contract, data);
-        await this.prisma.$transaction(async (tx) => {
-            var _a;
-            await tx.$executeRawUnsafe(`UPDATE operations_contract
-            SET content_html = $2,
-                wizard_step = CASE
-                  WHEN COALESCE(wizard_step, 0) < 4 THEN 4
-                  ELSE wizard_step
-                END,
-                updated_by_user_id = $3,
-                updated_at = NOW()
-          WHERE id = $1`, contractId, contentHtml, userId);
-            await this.insertContractHistory(tx, contractId, userId, 'content_generated', 'Contract content generated automatically for editing.', JSON.stringify({
-                provider: (_a = data.provider) !== null && _a !== void 0 ? _a : null,
-                overwrite: Boolean(data.overwrite),
-                hasPrompt: Boolean(this.normalizeOptionalText(data.promptMessage)),
-            }));
-        });
-        return this.getContractById(userId, contractId);
-    }
-    async reviewContractLegally(userId, contractId, data = {}) {
-        const actor = await this.getActorContext(userId);
-        this.ensureDirector(actor);
-        const contract = await this.getContractById(userId, contractId);
-        const review = await this.buildContractLegalReview(contract, data);
-        await this.insertContractHistory(this.prisma, contractId, userId, 'legal_reviewed', 'Advisory legal checklist updated for this contract.', JSON.stringify(review));
-        return review;
-    }
-    async generateContractPdf(userId, contractId) {
-        const actor = await this.getActorContext(userId);
-        this.ensureDirector(actor);
-        const contract = await this.getContractById(userId, contractId);
-        const pdfBuffer = await this.renderContractPdfBuffer(contract);
-        const fileName = this.buildContractPdfFileName(contract);
-        const uploadedFile = await this.fileService.upload('operations/contracts/generated', {
-            fieldname: 'file',
-            originalname: fileName,
-            encoding: '7bit',
-            mimetype: 'application/pdf',
-            size: pdfBuffer.length,
-            destination: '',
-            filename: fileName,
-            path: '',
-            buffer: pdfBuffer,
-        });
-        await this.prisma.$transaction(async (tx) => {
-            await this.replaceContractDocument(tx, contractId, 'generated_pdf', {
-                fileId: uploadedFile.id,
-                fileName,
-                mimeType: 'application/pdf',
-                notes: 'PDF generated from contract rich text content.',
-                extractionStatus: 'skipped',
-                extractionSummary: null,
-            });
-            await this.insertContractHistory(tx, contractId, userId, 'pdf_generated', 'Generated a branded PDF version of the contract.');
-        });
-        return {
-            contractId,
-            fileId: uploadedFile.id,
-            fileName,
-            mimeType: 'application/pdf',
-            documentType: 'generated_pdf',
-            downloadUrl: `/file/open/${uploadedFile.id}`,
-        };
-    }
-    async extractContractDraft(userId, data) {
-        var _a;
-        const actor = await this.getActorContext(userId);
-        this.ensureDirector(actor);
-        const uploadFile = await this.resolveContractExtractionFile(userId, data);
-        const aiResult = await this.aiService.chat({
-            provider: data.provider === 'gemini' ? 'gemini' : 'openai',
-            model: data.provider === 'gemini' ? 'gemini-1.5-flash' : 'gpt-4o-mini',
-            message: this.normalizeExtractionString(data.promptMessage) ||
-                'Analyze the attached contract and extract a structured draft for the contract form.',
-            systemPrompt: this.buildContractExtractionSystemPrompt(),
-        }, uploadFile);
-        const parsed = this.parseAiJsonPayload(String((_a = aiResult === null || aiResult === void 0 ? void 0 : aiResult.content) !== null && _a !== void 0 ? _a : ''));
-        const draft = this.normalizeContractExtractDraft(parsed);
-        const warnings = [...draft.warnings];
-        if (uploadFile.mimetype === 'application/msword' ||
-            uploadFile.mimetype ===
-                'application/vnd.openxmlformats-officedocument.wordprocessingml.document') {
-            warnings.push('Word extraction is best-effort. Review names, dates, and values before saving.');
-        }
-        return Object.assign(Object.assign({}, draft), { warnings: Array.from(new Set(warnings.filter(Boolean))) });
-    }
     async createContractFromProposalIntegration(payload) {
-        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;
         const sourceEntityId = String(payload.proposalId || '').trim();
         if (!sourceEntityId) {
             throw new common_1.BadRequestException('proposalId is required for CRM proposal integration.');
@@ -2386,30 +2385,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
         const billingModel = (_u = proposal.billingModel) !== null && _u !== void 0 ? _u : 'fixed_price';
         const clientName = (_x = (_w = (_v = this.normalizeOptionalText(person.tradeName)) !== null && _v !== void 0 ? _v : this.normalizeOptionalText(person.name)) !== null && _w !== void 0 ? _w : this.normalizeOptionalText(proposal.title)) !== null && _x !== void 0 ? _x : `Proposal ${sourceEntityId}`;
         const contractName = (_y = this.normalizeOptionalText(proposal.title)) !== null && _y !== void 0 ? _y : `Proposal ${sourceEntityId}`;
-        const financialTerms = items
-            .map((item) => {
-            var _a, _b, _c;
-            return ({
-                termType: this.normalizeEnumValue(item.termType, FINANCIAL_TERM_TYPE_VALUES, 'value'),
-                label: (_a = this.normalizeOptionalText(item.name)) !== null && _a !== void 0 ? _a : 'Commercial term',
-                amount: Number((_b = item.amount) !== null && _b !== void 0 ? _b : Number(item.totalAmountCents || 0) / 100),
-                recurrence: this.normalizeEnumValue(item.recurrence, RECURRENCE_VALUES, 'one_time'),
-                dueDay: (_c = item.dueDay) !== null && _c !== void 0 ? _c : null,
-                notes: this.normalizeOptionalText(item.description),
-            });
-        })
-            .filter((term) => Number.isFinite(term.amount) && term.amount > 0);
-        const fallbackAmount = Number((_z = proposal.totalAmount) !== null && _z !== void 0 ? _z : 0);
-        if (financialTerms.length === 0 && Number.isFinite(fallbackAmount) && fallbackAmount > 0) {
-            financialTerms.push({
-                termType: 'revenue',
-                label: contractName,
-                amount: fallbackAmount,
-                recurrence: 'one_time',
-                dueDay: null,
-                notes: this.normalizeOptionalText(proposal.notes),
-            });
-        }
         const primaryPartyRole = ['employee', 'contractor'].includes(contractCategory)
             ? 'employee'
             : ['supplier', 'vendor'].includes(contractCategory)
@@ -2418,7 +2393,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
                     ? 'partner'
                     : 'client';
         return this.prisma.$transaction(async (tx) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             await tx.$queryRawUnsafe(`SELECT pg_advisory_xact_lock(hashtext($1))`, `operations:crm_proposal:${sourceEntityId}`);
             const existingContracts = await tx.$queryRawUnsafe(`SELECT id, code
            FROM operations_contract
@@ -2446,7 +2421,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
           billing_model,
           account_manager_collaborator_id,
           related_collaborator_id,
-          contract_template_id,
           origin_type,
           origin_id,
           start_date,
@@ -2494,8 +2468,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
           NOW(),
           NOW()
         )
-        RETURNING id`, generatedCode, contractName, contractCategory, contractType, clientName, 'not_started', true, billingModel, null, null, null, 'crm_proposal', sourceEntityId, (_b = proposal.validFrom) !== null && _b !== void 0 ? _b : null, (_c = proposal.validUntil) !== null && _c !== void 0 ? _c : null, null, (_d = proposal.validFrom) !== null && _d !== void 0 ? _d : null, fallbackAmount > 0 ? fallbackAmount : null, null, 'draft', 'blank', 1, this.normalizeOptionalText(proposal.notes), this.normalizeOptionalText((_e = payload.revision) === null || _e === void 0 ? void 0 : _e.contentHtml), Number(payload.approvedByUserId) || null);
-            const contractId = (_f = created[0]) === null || _f === void 0 ? void 0 : _f.id;
+        RETURNING id`, generatedCode, contractName, contractCategory, contractType, clientName, 'not_started', true, billingModel, null, null, null, 'crm_proposal', sourceEntityId, (_b = proposal.validFrom) !== null && _b !== void 0 ? _b : null, (_c = proposal.validUntil) !== null && _c !== void 0 ? _c : null, null, (_d = proposal.validFrom) !== null && _d !== void 0 ? _d : null, Number((_e = proposal.totalAmount) !== null && _e !== void 0 ? _e : 0) > 0 ? Number((_f = proposal.totalAmount) !== null && _f !== void 0 ? _f : 0) : null, null, 'draft', 'blank', 1, this.normalizeOptionalText(proposal.notes), this.normalizeOptionalText((_g = payload.revision) === null || _g === void 0 ? void 0 : _g.contentHtml), Number(payload.approvedByUserId) || null);
+            const contractId = (_h = created[0]) === null || _h === void 0 ? void 0 : _h.id;
             if (!contractId) {
                 throw new common_1.BadRequestException('Could not create contract draft from proposal.');
             }
@@ -2510,27 +2484,10 @@ let OperationsService = OperationsService_1 = class OperationsService {
                     isPrimary: true,
                 },
             ]);
-            await this.replaceContractFinancialTerms(tx, contractId, financialTerms.map((term) => ({
-                termType: term.termType,
-                label: term.label,
-                amount: term.amount,
-                recurrence: term.recurrence,
-                dueDay: term.dueDay,
-                notes: term.notes,
-            })));
-            await this.replaceContractRevisions(tx, contractId, [
-                {
-                    revisionType: 'revision',
-                    title: (_h = (_g = payload.revision) === null || _g === void 0 ? void 0 : _g.title) !== null && _h !== void 0 ? _h : contractName,
-                    effectiveDate: (_j = proposal.validFrom) !== null && _j !== void 0 ? _j : null,
-                    status: 'draft',
-                    summary: (_l = this.normalizeOptionalText((_k = payload.revision) === null || _k === void 0 ? void 0 : _k.summary)) !== null && _l !== void 0 ? _l : this.normalizeOptionalText(proposal.notes),
-                },
-            ]);
-            await this.insertContractHistory(tx, contractId, Number(payload.approvedByUserId) || null, 'created', `Draft contract generated from CRM proposal ${(_m = proposal.code) !== null && _m !== void 0 ? _m : sourceEntityId}.`, JSON.stringify({
+            await this.insertContractHistory(tx, contractId, Number(payload.approvedByUserId) || null, 'created', `Draft contract generated from CRM proposal ${(_j = proposal.code) !== null && _j !== void 0 ? _j : sourceEntityId}.`, JSON.stringify({
                 correlationId: payload.correlationId || `proposal:${sourceEntityId}`,
-                proposalId: (_o = payload.proposalId) !== null && _o !== void 0 ? _o : (Number(sourceEntityId) > 0 ? Number(sourceEntityId) : null),
-                proposalRevisionId: (_p = payload.proposalRevisionId) !== null && _p !== void 0 ? _p : null,
+                proposalId: (_k = payload.proposalId) !== null && _k !== void 0 ? _k : (Number(sourceEntityId) > 0 ? Number(sourceEntityId) : null),
+                proposalRevisionId: (_l = payload.proposalRevisionId) !== null && _l !== void 0 ? _l : null,
                 sourceModule: 'contact',
                 sourceEntity: 'proposal',
                 sourceId: sourceEntityId,
@@ -2551,10 +2508,9 @@ let OperationsService = OperationsService_1 = class OperationsService {
                     billingModel,
                     originType: 'crm_proposal',
                     originId: sourceEntityId,
-                    startDate: (_q = proposal.validFrom) !== null && _q !== void 0 ? _q : null,
-                    endDate: (_r = proposal.validUntil) !== null && _r !== void 0 ? _r : null,
+                    startDate: (_m = proposal.validFrom) !== null && _m !== void 0 ? _m : null,
+                    endDate: (_o = proposal.validUntil) !== null && _o !== void 0 ? _o : null,
                     description: this.normalizeOptionalText(proposal.notes),
-                    financialTerms,
                 }, payload, String(payload.locale || '').trim() || 'en', Number(payload.approvedByUserId) || undefined),
                 metadata: {
                     producer: 'operations',
@@ -2575,7 +2531,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
         });
     }
     buildContractCreatedEventPayload(contract, payload, locale = 'en', createdByUserId) {
-        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;
+        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;
         return {
             contractId: contract.id,
             proposalId: (_a = payload.proposalId) !== null && _a !== void 0 ? _a : null,
@@ -2605,19 +2561,18 @@ let OperationsService = OperationsService_1 = class OperationsService {
                 startDate: (_r = contract.startDate) !== null && _r !== void 0 ? _r : null,
                 endDate: (_s = contract.endDate) !== null && _s !== void 0 ? _s : null,
                 description: (_t = contract.description) !== null && _t !== void 0 ? _t : null,
-                financialTerms: (_u = contract.financialTerms) !== null && _u !== void 0 ? _u : [],
             },
-            proposal: (_v = payload.proposal) !== null && _v !== void 0 ? _v : {
-                code: (_w = payload.code) !== null && _w !== void 0 ? _w : null,
-                title: (_x = payload.title) !== null && _x !== void 0 ? _x : null,
-                totalAmount: (_y = payload.total) !== null && _y !== void 0 ? _y : null,
-                notes: (_0 = (_z = payload.commercialTerms) === null || _z === void 0 ? void 0 : _z.notes) !== null && _0 !== void 0 ? _0 : null,
+            proposal: (_u = payload.proposal) !== null && _u !== void 0 ? _u : {
+                code: (_v = payload.code) !== null && _v !== void 0 ? _v : null,
+                title: (_w = payload.title) !== null && _w !== void 0 ? _w : null,
+                totalAmount: (_x = payload.total) !== null && _x !== void 0 ? _x : null,
+                notes: (_z = (_y = payload.commercialTerms) === null || _y === void 0 ? void 0 : _y.notes) !== null && _z !== void 0 ? _z : null,
             },
-            person: (_1 = payload.person) !== null && _1 !== void 0 ? _1 : null,
+            person: (_0 = payload.person) !== null && _0 !== void 0 ? _0 : null,
         };
     }
     async buildContractActivatedEventPayload(contract, locale = 'en', activatedByUserId) {
-        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, _8, _9, _10, _11;
+        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, _8, _9, _10;
         let personId = null;
         let proposalId = null;
         let personRecord = null;
@@ -2678,18 +2633,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
                 }
             }
         }
-        const financialTerms = ((_g = contract.financialTerms) !== null && _g !== void 0 ? _g : []).map((term) => {
-            var _a, _b, _c, _d, _e;
-            return ({
-                label: term.label,
-                termType: (_a = term.termType) !== null && _a !== void 0 ? _a : 'value',
-                amount: Number((_b = term.amount) !== null && _b !== void 0 ? _b : 0),
-                recurrence: (_c = term.recurrence) !== null && _c !== void 0 ? _c : 'one_time',
-                dueDay: (_d = term.dueDay) !== null && _d !== void 0 ? _d : null,
-                notes: (_e = term.notes) !== null && _e !== void 0 ? _e : null,
-            });
-        });
-        const totalAmount = financialTerms.reduce((sum, term) => sum + (Number.isFinite(term.amount) ? term.amount : 0), 0) || Number((_h = contract.budgetAmount) !== null && _h !== void 0 ? _h : 0);
+        const totalAmount = Number((_g = contract.budgetAmount) !== null && _g !== void 0 ? _g : 0);
         return {
             contractId: contract.id,
             proposalId,
@@ -2697,7 +2641,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
             activatedByUserId: activatedByUserId !== null && activatedByUserId !== void 0 ? activatedByUserId : null,
             signedByUserId: activatedByUserId !== null && activatedByUserId !== void 0 ? activatedByUserId : null,
             activatedAt: new Date().toISOString(),
-            signedAt: (_l = (_k = (_j = contract.signedAt) !== null && _j !== void 0 ? _j : contract.effectiveDate) !== null && _k !== void 0 ? _k : contract.startDate) !== null && _l !== void 0 ? _l : null,
+            signedAt: (_k = (_j = (_h = contract.signedAt) !== null && _h !== void 0 ? _h : contract.effectiveDate) !== null && _j !== void 0 ? _j : contract.startDate) !== null && _k !== void 0 ? _k : null,
             locale,
             correlationId: proposalId ? `proposal:${proposalId}` : `contract:${contract.id}`,
             sourceModule: 'operations',
@@ -2707,38 +2651,37 @@ let OperationsService = OperationsService_1 = class OperationsService {
             source_entity: 'contract',
             source_id: String(contract.id),
             contract: {
-                code: (_m = contract.code) !== null && _m !== void 0 ? _m : null,
-                name: (_o = contract.name) !== null && _o !== void 0 ? _o : null,
-                clientName: (_p = contract.clientName) !== null && _p !== void 0 ? _p : null,
-                contractCategory: (_q = contract.contractCategory) !== null && _q !== void 0 ? _q : 'client',
-                contractType: (_r = contract.contractType) !== null && _r !== void 0 ? _r : 'service_agreement',
-                billingModel: (_s = contract.billingModel) !== null && _s !== void 0 ? _s : 'fixed_price',
-                originType: (_t = contract.originType) !== null && _t !== void 0 ? _t : 'manual',
-                originId: (_u = contract.originId) !== null && _u !== void 0 ? _u : null,
-                startDate: (_v = contract.startDate) !== null && _v !== void 0 ? _v : null,
-                endDate: (_w = contract.endDate) !== null && _w !== void 0 ? _w : null,
-                signedAt: (_x = contract.signedAt) !== null && _x !== void 0 ? _x : null,
-                effectiveDate: (_y = contract.effectiveDate) !== null && _y !== void 0 ? _y : null,
-                budgetAmount: (_z = contract.budgetAmount) !== null && _z !== void 0 ? _z : null,
-                description: (_0 = contract.description) !== null && _0 !== void 0 ? _0 : null,
-                financialTerms,
-                parties: (_1 = contract.parties) !== null && _1 !== void 0 ? _1 : [],
+                code: (_l = contract.code) !== null && _l !== void 0 ? _l : null,
+                name: (_m = contract.name) !== null && _m !== void 0 ? _m : null,
+                clientName: (_o = contract.clientName) !== null && _o !== void 0 ? _o : null,
+                contractCategory: (_p = contract.contractCategory) !== null && _p !== void 0 ? _p : 'client',
+                contractType: (_q = contract.contractType) !== null && _q !== void 0 ? _q : 'service_agreement',
+                billingModel: (_r = contract.billingModel) !== null && _r !== void 0 ? _r : 'fixed_price',
+                originType: (_s = contract.originType) !== null && _s !== void 0 ? _s : 'manual',
+                originId: (_t = contract.originId) !== null && _t !== void 0 ? _t : null,
+                startDate: (_u = contract.startDate) !== null && _u !== void 0 ? _u : null,
+                endDate: (_v = contract.endDate) !== null && _v !== void 0 ? _v : null,
+                signedAt: (_w = contract.signedAt) !== null && _w !== void 0 ? _w : null,
+                effectiveDate: (_x = contract.effectiveDate) !== null && _x !== void 0 ? _x : null,
+                budgetAmount: (_y = contract.budgetAmount) !== null && _y !== void 0 ? _y : null,
+                description: (_z = contract.description) !== null && _z !== void 0 ? _z : null,
+                parties: (_0 = contract.parties) !== null && _0 !== void 0 ? _0 : [],
             },
             person: personRecord
                 ? {
-                    id: (_2 = personRecord.id) !== null && _2 !== void 0 ? _2 : null,
-                    name: (_3 = personRecord.name) !== null && _3 !== void 0 ? _3 : null,
-                    tradeName: (_4 = personRecord.trade_name) !== null && _4 !== void 0 ? _4 : null,
-                    email: (_5 = personRecord.email) !== null && _5 !== void 0 ? _5 : null,
-                    phone: (_6 = personRecord.phone) !== null && _6 !== void 0 ? _6 : null,
-                    document: (_7 = personRecord.document) !== null && _7 !== void 0 ? _7 : null,
+                    id: (_1 = personRecord.id) !== null && _1 !== void 0 ? _1 : null,
+                    name: (_2 = personRecord.name) !== null && _2 !== void 0 ? _2 : null,
+                    tradeName: (_3 = personRecord.trade_name) !== null && _3 !== void 0 ? _3 : null,
+                    email: (_4 = personRecord.email) !== null && _4 !== void 0 ? _4 : null,
+                    phone: (_5 = personRecord.phone) !== null && _5 !== void 0 ? _5 : null,
+                    document: (_6 = personRecord.document) !== null && _6 !== void 0 ? _6 : null,
                 }
                 : null,
             receivable: {
                 personId,
-                documentNumber: (_8 = contract.code) !== null && _8 !== void 0 ? _8 : `CONTRACT-${contract.id}`,
+                documentNumber: (_7 = contract.code) !== null && _7 !== void 0 ? _7 : `CONTRACT-${contract.id}`,
                 totalAmount,
-                description: (_11 = (_10 = (_9 = contract.description) !== null && _9 !== void 0 ? _9 : contract.name) !== null && _10 !== void 0 ? _10 : contract.code) !== null && _11 !== void 0 ? _11 : null,
+                description: (_10 = (_9 = (_8 = contract.description) !== null && _8 !== void 0 ? _8 : contract.name) !== null && _9 !== void 0 ? _9 : contract.code) !== null && _10 !== void 0 ? _10 : null,
             },
         };
     }
@@ -2763,7 +2706,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
         this.pushUpdate(updates, params, 'billing_model', data.billingModel, 'operations_contract_billing_model_409dc7fea2_enum');
         this.pushUpdate(updates, params, 'account_manager_collaborator_id', data.accountManagerCollaboratorId);
         this.pushUpdate(updates, params, 'related_collaborator_id', data.relatedCollaboratorId);
-        this.pushUpdate(updates, params, 'contract_template_id', data.contractTemplateId);
         this.pushUpdate(updates, params, 'origin_type', data.originType, 'operations_contract_origin_type_07a7cc2b5d_enum');
         this.pushUpdate(updates, params, 'origin_id', data.originId);
         this.pushUpdate(updates, params, 'start_date', data.startDate, 'date');
@@ -2778,7 +2720,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
         this.pushUpdate(updates, params, 'description', data.description);
         this.pushUpdate(updates, params, 'content_html', data.contentHtml);
         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;
             if (updates.length) {
                 params.push(contractId);
                 await tx.$executeRawUnsafe(`UPDATE operations_contract
@@ -2789,15 +2731,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
             if (data.parties) {
                 await this.replaceContractParties(tx, contractId, data.parties);
             }
-            if (data.signatures) {
-                await this.replaceContractSignatures(tx, contractId, data.signatures);
-            }
-            if (data.financialTerms) {
-                await this.replaceContractFinancialTerms(tx, contractId, data.financialTerms);
-            }
-            if (data.revisions) {
-                await this.replaceContractRevisions(tx, contractId, data.revisions);
-            }
             if (data.replaceUploadedPdfDocument) {
                 await this.replaceContractDocument(tx, contractId, 'source_upload', data.replaceUploadedPdfDocument);
             }
@@ -2819,8 +2752,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
                     effectiveDate: (_m = data.effectiveDate) !== null && _m !== void 0 ? _m : current.effectiveDate,
                     budgetAmount: (_o = data.budgetAmount) !== null && _o !== void 0 ? _o : current.budgetAmount,
                     description: (_p = data.description) !== null && _p !== void 0 ? _p : current.description,
-                    financialTerms: (_q = data.financialTerms) !== null && _q !== void 0 ? _q : current.financialTerms,
-                    parties: (_r = data.parties) !== null && _r !== void 0 ? _r : current.parties,
+                    parties: (_q = data.parties) !== null && _q !== void 0 ? _q : current.parties,
                 }, 'en', userId);
                 if (shouldPublishSigned) {
                     await this.integrationApi.publishEvent({
@@ -2828,15 +2760,15 @@ let OperationsService = OperationsService_1 = class OperationsService {
                         sourceModule: 'operations',
                         aggregateType: 'contract',
                         aggregateId: String(contractId),
-                        payload: Object.assign(Object.assign({}, contractEventPayload), { signedByUserId: userId !== null && userId !== void 0 ? userId : null, signedAt: (_u = (_t = (_s = data.signedAt) !== null && _s !== void 0 ? _s : current.signedAt) !== null && _t !== void 0 ? _t : contractEventPayload.signedAt) !== null && _u !== void 0 ? _u : new Date().toISOString() }),
+                        payload: Object.assign(Object.assign({}, contractEventPayload), { signedByUserId: userId !== null && userId !== void 0 ? userId : null, signedAt: (_t = (_s = (_r = data.signedAt) !== null && _r !== void 0 ? _r : current.signedAt) !== null && _s !== void 0 ? _s : contractEventPayload.signedAt) !== null && _t !== void 0 ? _t : new Date().toISOString() }),
                         metadata: {
                             producer: 'operations',
                             correlationId: contractEventPayload.correlationId || `contract:${contractId}`,
                             sourceModule: 'operations',
                             sourceEntity: 'contract',
                             sourceId: String(contractId),
-                            originType: (_v = data.originType) !== null && _v !== void 0 ? _v : current.originType,
-                            originId: (_w = data.originId) !== null && _w !== void 0 ? _w : current.originId,
+                            originType: (_u = data.originType) !== null && _u !== void 0 ? _u : current.originType,
+                            originId: (_v = data.originId) !== null && _v !== void 0 ? _v : current.originId,
                             lifecycle: 'signed',
                         },
                     }, {
@@ -2856,8 +2788,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
                             sourceModule: 'operations',
                             sourceEntity: 'contract',
                             sourceId: String(contractId),
-                            originType: (_x = data.originType) !== null && _x !== void 0 ? _x : current.originType,
-                            originId: (_y = data.originId) !== null && _y !== void 0 ? _y : current.originId,
+                            originType: (_w = data.originType) !== null && _w !== void 0 ? _w : current.originType,
+                            originId: (_x = data.originId) !== null && _x !== void 0 ? _x : current.originId,
                             lifecycle: 'activated',
                         },
                     }, {
@@ -2881,10 +2813,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
             AND deleted_at IS NULL`, contractId);
             for (const tableName of [
                 'operations_contract_party',
-                'operations_contract_signature',
-                'operations_contract_financial_term',
                 'operations_contract_document',
-                'operations_contract_revision',
             ]) {
                 await tx.$executeRawUnsafe(`UPDATE ${tableName}
               SET deleted_at = NOW(),
@@ -2903,9 +2832,43 @@ let OperationsService = OperationsService_1 = class OperationsService {
         });
         return { success: true };
     }
-    async listTimesheets(userId) {
+    async listTimesheets(userId, filters = {}) {
+        var _a, _b, _c, _d, _e, _f;
         const actor = await this.getActorContext(userId);
         const filter = this.buildIdFilter(actor.visibleCollaboratorIds, 't.collaborator_id', actor.isDirector);
+        const pagination = this.shouldPaginate(filters)
+            ? this.normalizePaginationParams(filters, {
+                defaultSortField: 'weekStartDate',
+                defaultSortOrder: 'desc',
+                allowedSortFields: ['weekStartDate', 'weekEndDate', 'collaboratorName', 'status'],
+            })
+            : null;
+        const params = [...filter.params];
+        const where = ['t.deleted_at IS NULL', filter.clause];
+        if (filters.status && filters.status !== 'all') {
+            where.push(`t.status::text = ${this.param(params, filters.status)}`);
+        }
+        if (pagination === null || pagination === void 0 ? void 0 : pagination.search) {
+            const searchPlaceholder = this.param(params, `%${pagination.search}%`);
+            where.push(`(
+        COALESCE(c.display_name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(a.display_name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(t.notes, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(approval.decision_note, '') ILIKE ${searchPlaceholder}
+      )`);
+        }
+        const whereClause = where.join(' AND ');
+        const sortColumn = (_b = {
+            weekStartDate: 't.week_start_date',
+            weekEndDate: 't.week_end_date',
+            collaboratorName: 'c.display_name',
+            status: 't.status',
+        }[(_a = pagination === null || pagination === void 0 ? void 0 : pagination.sortField) !== null && _a !== void 0 ? _a : 'weekStartDate']) !== null && _b !== void 0 ? _b : 't.week_start_date';
+        const headerParams = [...params];
+        const limitSql = pagination
+            ? `LIMIT ${this.param(headerParams, pagination.pageSize)}
+       OFFSET ${this.param(headerParams, pagination.offset)}`
+            : '';
         const headers = await this.queryRows(`SELECT t.id,
               t.collaborator_id AS "collaboratorId",
               c.display_name AS "collaboratorName",
@@ -2926,11 +2889,26 @@ let OperationsService = OperationsService_1 = class OperationsService {
            ON approval.target_type = 'timesheet'
           AND approval.target_id = t.id
           AND approval.deleted_at IS NULL
-        WHERE t.deleted_at IS NULL AND ${filter.clause}
-        ORDER BY t.week_start_date DESC, t.id DESC`, filter.params);
+        WHERE ${whereClause}
+        ORDER BY ${sortColumn} ${(_d = (_c = pagination === null || pagination === void 0 ? void 0 : pagination.sortOrder) === null || _c === void 0 ? void 0 : _c.toUpperCase()) !== null && _d !== void 0 ? _d : 'DESC'}, t.id DESC
+        ${limitSql}`, headerParams);
         if (!headers.length) {
+            if (pagination) {
+                return this.buildPaginationResult([], 0, pagination.page, pagination.pageSize);
+            }
             return headers;
         }
+        const total = pagination
+            ? Number((_f = (_e = (await this.querySingle(`SELECT COUNT(*)::text AS total
+                 FROM operations_timesheet t
+                 JOIN operations_collaborator c ON c.id = t.collaborator_id
+                 LEFT JOIN operations_collaborator a ON a.id = t.approver_collaborator_id
+                 LEFT JOIN operations_approval approval
+                   ON approval.target_type = 'timesheet'
+                  AND approval.target_id = t.id
+                  AND approval.deleted_at IS NULL
+                WHERE ${whereClause}`, params))) === null || _e === void 0 ? void 0 : _e.total) !== null && _f !== void 0 ? _f : 0)
+            : 0;
         const entries = await this.queryRows(`SELECT e.id,
               e.timesheet_id AS "timesheetId",
               e.project_assignment_id AS "projectAssignmentId",
@@ -2957,10 +2935,14 @@ let OperationsService = OperationsService_1 = class OperationsService {
           AND e.timesheet_id = ANY($1::int[])
         ORDER BY e.work_date ASC, e.id ASC`, [headers.map((item) => item.id)]);
         const grouped = this.groupBy(entries, 'timesheetId');
-        return headers.map((timesheet) => {
+        const data = headers.map((timesheet) => {
             var _a;
             return (Object.assign(Object.assign({}, timesheet), { entries: (_a = grouped[timesheet.id]) !== null && _a !== void 0 ? _a : [] }));
         });
+        if (!pagination) {
+            return data;
+        }
+        return this.buildPaginationResult(data, total, pagination.page, pagination.pageSize);
     }
     async createTimesheet(userId, data) {
         const actor = await this.getActorContext(userId);
@@ -3026,7 +3008,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
         return this.listSingleTimesheet(actor, timesheetId);
     }
     async submitTimesheet(userId, timesheetId) {
-        var _a, _b;
+        var _a, _b, _c;
         const actor = await this.getActorContext(userId);
         const current = await this.getTimesheetById(timesheetId);
         if (!actor.isDirector && current.collaboratorId !== actor.collaboratorId) {
@@ -3036,7 +3018,15 @@ let OperationsService = OperationsService_1 = class OperationsService {
             throw new common_1.BadRequestException('Only draft or rejected timesheets can be submitted.');
         }
         const collaborator = await this.getCollaboratorById(current.collaboratorId);
-        const approverId = (_b = (_a = current.approverCollaboratorId) !== null && _a !== void 0 ? _a : collaborator.supervisorId) !== null && _b !== void 0 ? _b : null;
+        const projectManagerRow = await this.querySingle(`SELECT p.manager_collaborator_id AS "managerCollaboratorId"
+         FROM operations_timesheet_entry e
+         LEFT JOIN operations_project_assignment pa ON pa.id = e.project_assignment_id
+         LEFT JOIN operations_project p ON p.id = pa.project_id
+        WHERE e.timesheet_id = $1
+          AND e.deleted_at IS NULL
+          AND p.manager_collaborator_id IS NOT NULL
+        LIMIT 1`, [timesheetId]);
+        const approverId = (_c = (_b = (_a = projectManagerRow === null || projectManagerRow === void 0 ? void 0 : projectManagerRow.managerCollaboratorId) !== null && _a !== void 0 ? _a : current.approverCollaboratorId) !== null && _b !== void 0 ? _b : collaborator.supervisorId) !== null && _c !== void 0 ? _c : null;
         if (!approverId) {
             throw new common_1.BadRequestException('An approver is required before submitting a timesheet.');
         }
@@ -3065,17 +3055,40 @@ let OperationsService = OperationsService_1 = class OperationsService {
         });
         return this.listSingleTimesheet(actor, timesheetId);
     }
-    async listTimeOffRequests(userId) {
+    async listTimeOffRequests(userId, filters = {}) {
+        var _a, _b;
         const actor = await this.getActorContext(userId);
         const filter = this.buildIdFilter(actor.visibleCollaboratorIds, 'tor.collaborator_id', actor.isDirector);
-        return this.queryRows(`SELECT tor.id,
+        const pagination = this.shouldPaginate(filters)
+            ? this.normalizePaginationParams(filters, {
+                defaultSortField: 'startDate',
+                defaultSortOrder: 'desc',
+                allowedSortFields: ['startDate', 'endDate', 'collaboratorName', 'status'],
+            })
+            : null;
+        const params = [...filter.params];
+        const where = ['tor.deleted_at IS NULL', filter.clause];
+        if (filters.status && filters.status !== 'all') {
+            where.push(`tor.status::text = ${this.param(params, filters.status)}`);
+        }
+        if (pagination === null || pagination === void 0 ? void 0 : pagination.search) {
+            const searchPlaceholder = this.param(params, `%${pagination.search}%`);
+            where.push(`(
+        COALESCE(c.display_name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(a.display_name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(tor.reason, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(tor.request_type::text, '') ILIKE ${searchPlaceholder}
+      )`);
+        }
+        const whereClause = where.join(' AND ');
+        const baseQuery = `SELECT tor.id,
               tor.collaborator_id AS "collaboratorId",
               c.display_name AS "collaboratorName",
               tor.approver_collaborator_id AS "approverCollaboratorId",
               a.display_name AS "approverName",
               tor.request_type AS "requestType",
-              tor.start_date AS "startDate",
-              tor.end_date AS "endDate",
+              tor.start_date::text AS "startDate",
+              tor.end_date::text AS "endDate",
               tor.total_days AS "totalDays",
               tor.status,
               tor.reason,
@@ -3089,8 +3102,30 @@ let OperationsService = OperationsService_1 = class OperationsService {
            ON approval.target_type = 'time_off_request'
           AND approval.target_id = tor.id
           AND approval.deleted_at IS NULL
-        WHERE tor.deleted_at IS NULL AND ${filter.clause}
-        ORDER BY tor.start_date DESC, tor.id DESC`, filter.params);
+        WHERE ${whereClause}`;
+        if (!pagination) {
+            return this.queryRows(`${baseQuery}
+         ORDER BY tor.start_date DESC, tor.id DESC`, params);
+        }
+        const totalRow = await this.querySingle(`SELECT COUNT(*)::text AS total
+         FROM operations_time_off_request tor
+         JOIN operations_collaborator c ON c.id = tor.collaborator_id
+         LEFT JOIN operations_collaborator a ON a.id = tor.approver_collaborator_id
+        WHERE ${whereClause}`, params);
+        const sortColumn = (_a = {
+            startDate: 'tor.start_date',
+            endDate: 'tor.end_date',
+            collaboratorName: 'c.display_name',
+            status: 'tor.status',
+        }[pagination.sortField]) !== null && _a !== void 0 ? _a : 'tor.start_date';
+        const queryParams = [...params];
+        const limitPlaceholder = this.param(queryParams, pagination.pageSize);
+        const offsetPlaceholder = this.param(queryParams, pagination.offset);
+        const rows = await this.queryRows(`${baseQuery}
+       ORDER BY ${sortColumn} ${pagination.sortOrder.toUpperCase()}, tor.id DESC
+       LIMIT ${limitPlaceholder}
+      OFFSET ${offsetPlaceholder}`, queryParams);
+        return this.buildPaginationResult(rows, Number((_b = totalRow === null || totalRow === void 0 ? void 0 : totalRow.total) !== null && _b !== void 0 ? _b : 0), pagination.page, pagination.pageSize);
     }
     async createTimeOffRequest(userId, data) {
         const actor = await this.getActorContext(userId);
@@ -3145,8 +3180,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
               collaborator_id AS "collaboratorId",
               approver_collaborator_id AS "approverCollaboratorId",
               request_type AS "requestType",
-              start_date AS "startDate",
-              end_date AS "endDate",
+              start_date::text AS "startDate",
+              end_date::text AS "endDate",
               total_days AS "totalDays",
               status,
               reason,
@@ -3155,17 +3190,56 @@ let OperationsService = OperationsService_1 = class OperationsService {
          FROM operations_time_off_request
         WHERE id = $1`, [created]);
     }
-    async listScheduleAdjustments(userId) {
+    async listScheduleAdjustments(userId, filters = {}) {
+        var _a, _b, _c, _d, _e, _f;
         const actor = await this.getActorContext(userId);
         const filter = this.buildIdFilter(actor.visibleCollaboratorIds, 'sar.collaborator_id', actor.isDirector);
+        const pagination = this.shouldPaginate(filters)
+            ? this.normalizePaginationParams(filters, {
+                defaultSortField: 'effectiveStartDate',
+                defaultSortOrder: 'desc',
+                allowedSortFields: [
+                    'effectiveStartDate',
+                    'effectiveEndDate',
+                    'collaboratorName',
+                    'status',
+                ],
+            })
+            : null;
+        const params = [...filter.params];
+        const where = ['sar.deleted_at IS NULL', filter.clause];
+        if (filters.status && filters.status !== 'all') {
+            where.push(`sar.status::text = ${this.param(params, filters.status)}`);
+        }
+        if (pagination === null || pagination === void 0 ? void 0 : pagination.search) {
+            const searchPlaceholder = this.param(params, `%${pagination.search}%`);
+            where.push(`(
+        COALESCE(c.display_name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(a.display_name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(sar.reason, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(sar.request_scope::text, '') ILIKE ${searchPlaceholder}
+      )`);
+        }
+        const whereClause = where.join(' AND ');
+        const sortColumn = (_b = {
+            effectiveStartDate: 'sar.effective_start_date',
+            effectiveEndDate: 'sar.effective_end_date',
+            collaboratorName: 'c.display_name',
+            status: 'sar.status',
+        }[(_a = pagination === null || pagination === void 0 ? void 0 : pagination.sortField) !== null && _a !== void 0 ? _a : 'effectiveStartDate']) !== null && _b !== void 0 ? _b : 'sar.effective_start_date';
+        const queryParams = [...params];
+        const limitSql = pagination
+            ? `LIMIT ${this.param(queryParams, pagination.pageSize)}
+       OFFSET ${this.param(queryParams, pagination.offset)}`
+            : '';
         const requests = await this.queryRows(`SELECT sar.id,
               sar.collaborator_id AS "collaboratorId",
               c.display_name AS "collaboratorName",
               sar.approver_collaborator_id AS "approverCollaboratorId",
               a.display_name AS "approverName",
               sar.request_scope AS "requestScope",
-              sar.effective_start_date AS "effectiveStartDate",
-              sar.effective_end_date AS "effectiveEndDate",
+              sar.effective_start_date::text AS "effectiveStartDate",
+              sar.effective_end_date::text AS "effectiveEndDate",
               sar.status,
               sar.reason,
               sar.submitted_at AS "submittedAt",
@@ -3178,11 +3252,22 @@ let OperationsService = OperationsService_1 = class OperationsService {
            ON approval.target_type = 'schedule_adjustment_request'
           AND approval.target_id = sar.id
           AND approval.deleted_at IS NULL
-        WHERE sar.deleted_at IS NULL AND ${filter.clause}
-        ORDER BY sar.effective_start_date DESC, sar.id DESC`, filter.params);
+        WHERE ${whereClause}
+        ORDER BY ${sortColumn} ${(_d = (_c = pagination === null || pagination === void 0 ? void 0 : pagination.sortOrder) === null || _c === void 0 ? void 0 : _c.toUpperCase()) !== null && _d !== void 0 ? _d : 'DESC'}, sar.id DESC
+        ${limitSql}`, queryParams);
         if (!requests.length) {
+            if (pagination) {
+                return this.buildPaginationResult([], 0, pagination.page, pagination.pageSize);
+            }
             return requests;
         }
+        const total = pagination
+            ? Number((_f = (_e = (await this.querySingle(`SELECT COUNT(*)::text AS total
+                 FROM operations_schedule_adjustment_request sar
+                 JOIN operations_collaborator c ON c.id = sar.collaborator_id
+                 LEFT JOIN operations_collaborator a ON a.id = sar.approver_collaborator_id
+                WHERE ${whereClause}`, params))) === null || _e === void 0 ? void 0 : _e.total) !== null && _f !== void 0 ? _f : 0)
+            : 0;
         const days = await this.queryRows(`SELECT schedule_adjustment_request_id AS "requestId",
               weekday,
               is_working_day AS "isWorkingDay",
@@ -3192,7 +3277,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
          FROM operations_schedule_adjustment_day
         WHERE schedule_adjustment_request_id = ANY($1::int[])
         ORDER BY id ASC`, [requests.map((item) => item.id)]);
-        const currentSchedule = await this.queryRows(`SELECT collaborator_id AS "collaboratorId",
+        const currentSchedule = await this.queryRows(`SELECT DISTINCT ON (collaborator_id, weekday)
+              collaborator_id AS "collaboratorId",
               weekday,
               is_working_day AS "isWorkingDay",
               start_time AS "startTime",
@@ -3200,13 +3286,17 @@ let OperationsService = OperationsService_1 = class OperationsService {
               break_minutes AS "breakMinutes"
          FROM operations_collaborator_schedule_day
         WHERE collaborator_id = ANY($1::int[])
-        ORDER BY id ASC`, [this.uniqueNumbers(requests.map((item) => item.collaboratorId))]);
+        ORDER BY collaborator_id, weekday, id DESC`, [this.uniqueNumbers(requests.map((item) => item.collaboratorId))]);
         const grouped = this.groupBy(days, 'requestId');
         const currentScheduleByCollaborator = this.groupBy(currentSchedule, 'collaboratorId');
-        return requests.map((request) => {
+        const data = requests.map((request) => {
             var _a, _b;
             return (Object.assign(Object.assign({}, request), { days: (_a = grouped[request.id]) !== null && _a !== void 0 ? _a : [], currentSchedule: (_b = currentScheduleByCollaborator[request.collaboratorId]) !== null && _b !== void 0 ? _b : [] }));
         });
+        if (!pagination) {
+            return data;
+        }
+        return this.buildPaginationResult(data, total, pagination.page, pagination.pageSize);
     }
     async createScheduleAdjustmentRequest(userId, data) {
         const actor = await this.getActorContext(userId);
@@ -3278,8 +3368,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
               collaborator_id AS "collaboratorId",
               approver_collaborator_id AS "approverCollaboratorId",
               request_scope AS "requestScope",
-              effective_start_date AS "effectiveStartDate",
-              effective_end_date AS "effectiveEndDate",
+              effective_start_date::text AS "effectiveStartDate",
+              effective_end_date::text AS "effectiveEndDate",
               status,
               reason,
               submitted_at AS "submittedAt",
@@ -3287,14 +3377,138 @@ let OperationsService = OperationsService_1 = class OperationsService {
          FROM operations_schedule_adjustment_request
         WHERE id = $1`, [created]);
     }
-    async listApprovals(userId) {
+    async listApprovals(userId, filters = {}) {
+        var _a, _b;
+        const actor = await this.getActorContext(userId);
+        this.ensureSupervisor(actor);
+        const params = [];
+        const clause = actor.isDirector
+            ? 'a.deleted_at IS NULL'
+            : `a.deleted_at IS NULL AND a.approver_collaborator_id = ${this.param(params, actor.collaboratorId)}`;
+        const pagination = this.shouldPaginate(filters)
+            ? this.normalizePaginationParams(filters, {
+                defaultSortField: 'submittedAt',
+                defaultSortOrder: 'desc',
+                allowedSortFields: ['submittedAt', 'decidedAt', 'requesterName', 'status'],
+            })
+            : null;
+        const where = [clause];
+        if (filters.status && filters.status !== 'all') {
+            where.push(`a.status::text = ${this.param(params, filters.status)}`);
+        }
+        if (filters.targetType && filters.targetType !== 'all') {
+            where.push(`a.target_type = ${this.param(params, filters.targetType)}::text::operations_approval_target_type_32d3f04385_enum`);
+        }
+        if (pagination === null || pagination === void 0 ? void 0 : pagination.search) {
+            const searchPlaceholder = this.param(params, `%${pagination.search}%`);
+            where.push(`(
+        COALESCE(requester.display_name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(approver.display_name, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(a.decision_note, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(tor.reason, '') ILIKE ${searchPlaceholder}
+        OR COALESCE(sar.reason, '') ILIKE ${searchPlaceholder}
+      )`);
+        }
+        const whereClause = where.join(' AND ');
+        const baseQuery = `SELECT a.id,
+              a.target_type AS "targetType",
+              a.target_id AS "targetId",
+              a.requester_collaborator_id AS "requesterCollaboratorId",
+              requester.display_name AS "requesterName",
+              a.approver_collaborator_id AS "approverCollaboratorId",
+              approver.display_name AS "approverName",
+              a.status,
+              a.submitted_at AS "submittedAt",
+              a.decided_at AS "decidedAt",
+              a.decision_note AS "decisionNote",
+              t.week_start_date AS "timesheetWeekStartDate",
+              t.week_end_date AS "timesheetWeekEndDate",
+              t.total_hours AS "timesheetTotalHours",
+              COALESCE(
+                STRING_AGG(DISTINCT p.name, ', ') FILTER (WHERE p.name IS NOT NULL),
+                ''
+              ) AS "timesheetProjectNames",
+              tor.request_type AS "timeOffType",
+              tor.start_date::text AS "timeOffStartDate",
+              tor.end_date::text AS "timeOffEndDate",
+              tor.reason AS "timeOffReason",
+              sar.request_scope AS "scheduleRequestScope",
+              sar.effective_start_date::text AS "scheduleStartDate",
+              sar.effective_end_date::text AS "scheduleEndDate",
+              sar.reason AS "scheduleReason"
+         FROM operations_approval a
+         JOIN operations_collaborator requester
+           ON requester.id = a.requester_collaborator_id
+         LEFT JOIN operations_collaborator approver
+           ON approver.id = a.approver_collaborator_id
+         LEFT JOIN operations_timesheet t
+           ON a.target_type = 'timesheet'
+          AND t.id = a.target_id
+         LEFT JOIN operations_timesheet_entry te
+           ON te.timesheet_id = t.id
+          AND te.deleted_at IS NULL
+         LEFT JOIN operations_project_assignment pa
+           ON pa.id = te.project_assignment_id
+         LEFT JOIN operations_project p
+           ON p.id = pa.project_id
+         LEFT JOIN operations_time_off_request tor
+           ON a.target_type = 'time_off_request'
+          AND tor.id = a.target_id
+         LEFT JOIN operations_schedule_adjustment_request sar
+           ON a.target_type = 'schedule_adjustment_request'
+          AND sar.id = a.target_id
+        WHERE ${whereClause}
+        GROUP BY a.id, requester.id, approver.id, t.id, tor.id, sar.id`;
+        if (!pagination) {
+            return this.queryRows(`${baseQuery}
+         ORDER BY a.submitted_at DESC, a.id DESC`, params);
+        }
+        const totalRow = await this.querySingle(`SELECT COUNT(*)::text AS total
+         FROM operations_approval a
+         JOIN operations_collaborator requester
+           ON requester.id = a.requester_collaborator_id
+         LEFT JOIN operations_collaborator approver
+           ON approver.id = a.approver_collaborator_id
+         LEFT JOIN operations_timesheet t
+           ON a.target_type = 'timesheet'
+          AND t.id = a.target_id
+         LEFT JOIN operations_time_off_request tor
+           ON a.target_type = 'time_off_request'
+          AND tor.id = a.target_id
+         LEFT JOIN operations_schedule_adjustment_request sar
+           ON a.target_type = 'schedule_adjustment_request'
+          AND sar.id = a.target_id
+        WHERE ${whereClause}`, params);
+        const sortColumn = (_a = {
+            submittedAt: 'a.submitted_at',
+            decidedAt: 'a.decided_at',
+            requesterName: 'requester.display_name',
+            status: 'a.status',
+        }[pagination.sortField]) !== null && _a !== void 0 ? _a : 'a.submitted_at';
+        const queryParams = [...params];
+        const limitPlaceholder = this.param(queryParams, pagination.pageSize);
+        const offsetPlaceholder = this.param(queryParams, pagination.offset);
+        const rows = await this.queryRows(`${baseQuery}
+       ORDER BY ${sortColumn} ${pagination.sortOrder.toUpperCase()}, a.id DESC
+       LIMIT ${limitPlaceholder}
+      OFFSET ${offsetPlaceholder}`, queryParams);
+        return this.buildPaginationResult(rows, Number((_b = totalRow === null || totalRow === void 0 ? void 0 : totalRow.total) !== null && _b !== void 0 ? _b : 0), pagination.page, pagination.pageSize);
+    }
+    async approve(userId, approvalId, data) {
+        return this.decideApproval(userId, approvalId, 'approve', data);
+    }
+    async reject(userId, approvalId, data) {
+        return this.decideApproval(userId, approvalId, 'reject', data);
+    }
+    async getApprovalDetail(userId, approvalId) {
         const actor = await this.getActorContext(userId);
         this.ensureSupervisor(actor);
         const params = [];
-        const clause = actor.isDirector
+        const actorClause = actor.isDirector
             ? 'a.deleted_at IS NULL'
             : `a.deleted_at IS NULL AND a.approver_collaborator_id = ${this.param(params, actor.collaboratorId)}`;
-        return this.queryRows(`SELECT a.id,
+        const idPlaceholder = this.param(params, approvalId);
+        const row = await this.querySingle(`SELECT a.id,
               a.target_type AS "targetType",
               a.target_id AS "targetId",
               a.requester_collaborator_id AS "requesterCollaboratorId",
@@ -3313,12 +3527,12 @@ let OperationsService = OperationsService_1 = class OperationsService {
                 ''
               ) AS "timesheetProjectNames",
               tor.request_type AS "timeOffType",
-              tor.start_date AS "timeOffStartDate",
-              tor.end_date AS "timeOffEndDate",
+              tor.start_date::text AS "timeOffStartDate",
+              tor.end_date::text AS "timeOffEndDate",
               tor.reason AS "timeOffReason",
               sar.request_scope AS "scheduleRequestScope",
-              sar.effective_start_date AS "scheduleStartDate",
-              sar.effective_end_date AS "scheduleEndDate",
+              sar.effective_start_date::text AS "scheduleStartDate",
+              sar.effective_end_date::text AS "scheduleEndDate",
               sar.reason AS "scheduleReason"
          FROM operations_approval a
          JOIN operations_collaborator requester
@@ -3341,15 +3555,64 @@ let OperationsService = OperationsService_1 = class OperationsService {
          LEFT JOIN operations_schedule_adjustment_request sar
            ON a.target_type = 'schedule_adjustment_request'
           AND sar.id = a.target_id
-        WHERE ${clause}
-        GROUP BY a.id, requester.id, approver.id, t.id, tor.id, sar.id
-        ORDER BY a.submitted_at DESC, a.id DESC`, params);
-    }
-    async approve(userId, approvalId, data) {
-        return this.decideApproval(userId, approvalId, 'approve', data);
-    }
-    async reject(userId, approvalId, data) {
-        return this.decideApproval(userId, approvalId, 'reject', data);
+        WHERE ${actorClause}
+          AND a.id = ${idPlaceholder}
+        GROUP BY a.id, requester.id, approver.id, t.id, tor.id, sar.id`, params);
+        if (!row) {
+            throw new Error('Approval not found or access denied');
+        }
+        if (row.targetType === 'timesheet') {
+            const entries = await this.queryRows(`SELECT e.id,
+                e.timesheet_id AS "timesheetId",
+                e.project_assignment_id AS "projectAssignmentId",
+                pa.project_id AS "projectId",
+                p.name AS "projectName",
+                pa.role_label AS "roleLabel",
+                e.task_id AS "taskId",
+                task_record.name AS "taskName",
+                COALESCE(task_record.name, 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
+           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 = $1
+          ORDER BY e.work_date ASC, e.id ASC`, [row.targetId]);
+            return Object.assign(Object.assign({}, row), { entries });
+        }
+        if (row.targetType === 'schedule_adjustment_request') {
+            const days = await this.queryRows(`SELECT schedule_adjustment_request_id AS "requestId",
+                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`, [row.targetId]);
+            const collaboratorIdParam = [row.requesterCollaboratorId];
+            const currentSchedule = await this.queryRows(`SELECT DISTINCT ON (collaborator_id, weekday)
+                collaborator_id AS "collaboratorId",
+                weekday,
+                is_working_day AS "isWorkingDay",
+                start_time AS "startTime",
+                end_time AS "endTime",
+                break_minutes AS "breakMinutes"
+           FROM operations_collaborator_schedule_day
+          WHERE collaborator_id = $1
+          ORDER BY collaborator_id, weekday, id DESC`, collaboratorIdParam);
+            return Object.assign(Object.assign({}, row), { days, currentSchedule });
+        }
+        return row;
     }
     async publishAccountsPayableReference(userId, data) {
         var _a, _b, _c, _d;
@@ -3524,17 +3787,44 @@ let OperationsService = OperationsService_1 = class OperationsService {
         };
     }
     async getCollaboratorByUserId(userId) {
-        return this.querySingle(`SELECT c.id,
+        return this.querySingle(`WITH linked_collaborator AS (
+         SELECT person_id
+           FROM operations_collaborator
+          WHERE user_id = $1
+            AND deleted_at IS NULL
+          ORDER BY id DESC
+          LIMIT 1
+       )
+       SELECT c.id,
+              c.user_id AS "userId",
+              c.person_id AS "personId",
               COALESCE(NULLIF(c.display_name, ''), person_record.name) AS "displayName",
               s.id AS "supervisorId",
-              s.display_name AS "supervisorName"
+              s.display_name AS "supervisorName",
+              COUNT(pa.id) FILTER (
+                WHERE pa.deleted_at IS NULL
+                  AND pa.status IN ('planned', 'active')
+              )::int AS "activeAssignments"
          FROM operations_collaborator c
          LEFT JOIN person person_record
            ON person_record.id = c.person_id
          LEFT JOIN operations_collaborator s
            ON s.id = c.supervisor_collaborator_id
-        WHERE c.user_id = $1
-          AND c.deleted_at IS NULL`, [userId]);
+         LEFT JOIN operations_project_assignment pa
+           ON pa.collaborator_id = c.id
+        WHERE c.deleted_at IS NULL
+          AND (
+            c.user_id = $1
+            OR (
+              c.person_id IS NOT NULL
+              AND c.person_id = (SELECT person_id FROM linked_collaborator)
+            )
+          )
+        GROUP BY c.id, person_record.id, s.id
+        ORDER BY "activeAssignments" DESC,
+                 CASE WHEN c.user_id = $1 THEN 0 ELSE 1 END,
+                 c.id ASC
+        LIMIT 1`, [userId]);
     }
     async getCollaboratorById(collaboratorId) {
         const collaborator = await this.querySingle(`SELECT c.id,
@@ -3916,73 +4206,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
         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,
-              t.code,
-              t.name,
-              t.description,
-              t.contract_category AS "contractCategory",
-              t.contract_type AS "contractType",
-              t.billing_model AS "billingModel",
-              t.signature_status AS "signatureStatus",
-              t.is_active AS "isActive",
-              t.status,
-              t.content_html AS "contentHtml",
-              COUNT(DISTINCT c.id)::int AS "usageCount",
-              t.created_at AS "createdAt",
-              t.updated_at AS "updatedAt"
-         FROM operations_contract_template t
-         LEFT JOIN operations_contract c
-           ON c.contract_template_id = t.id
-          AND c.deleted_at IS NULL
-        WHERE t.id = $1
-          AND ($2::boolean = true OR t.deleted_at IS NULL)
-        GROUP BY t.id
-        LIMIT 1`, templateId, includeInactive));
-        const record = template[0];
-        if (!record) {
-            throw new common_1.NotFoundException('Contract template not found.');
-        }
-        return record;
-    }
-    async assertContractTemplateNameAvailable(client, name, excludeTemplateId) {
-        const existing = (await client.$queryRawUnsafe(`SELECT id
-         FROM operations_contract_template
-        WHERE LOWER(name) = LOWER($1)
-          AND deleted_at IS NULL
-          AND ($2::int IS NULL OR id <> $2)
-        LIMIT 1`, name, excludeTemplateId !== null && excludeTemplateId !== void 0 ? excludeTemplateId : null));
-        if (existing[0]) {
-            throw new common_1.BadRequestException('A contract template with this name already exists.');
-        }
-    }
-    async assertContractTemplateCodeAvailable(client, code, excludeTemplateId) {
-        const existing = (await client.$queryRawUnsafe(`SELECT id
-         FROM operations_contract_template
-        WHERE UPPER(COALESCE(code, '')) = UPPER($1)
-          AND deleted_at IS NULL
-          AND ($2::int IS NULL OR id <> $2)
-        LIMIT 1`, code, excludeTemplateId !== null && excludeTemplateId !== void 0 ? excludeTemplateId : null));
-        if (existing[0]) {
-            throw new common_1.BadRequestException('A contract template with this code already exists.');
-        }
-    }
-    async generateUniqueContractTemplateSlug(client, label, excludeTemplateId) {
-        const baseSlug = this.slugifyValue(label) || `contract-template-${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_contract_template
-          WHERE slug = $1
-            AND ($2::int IS NULL OR id <> $2)
-          LIMIT 1`, candidate, excludeTemplateId !== null && excludeTemplateId !== void 0 ? excludeTemplateId : null));
-            if (!existing.length) {
-                return candidate;
-            }
-        }
-        return `${baseSlug}-${Date.now().toString(36)}`;
-    }
     slugifyValue(value) {
         return (value !== null && value !== void 0 ? value : '')
             .normalize('NFKD')
@@ -4108,7 +4331,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
             WHERE pa.project_id = $1
               AND pa.deleted_at IS NULL`, [projectId]),
             this.querySingle(`SELECT COUNT(*) FILTER (WHERE status IN ('planned', 'active'))::text AS "activeAssignments",
-                  COUNT(*) FILTER (WHERE is_billable = true AND status IN ('planned', 'active'))::text AS "billableAssignments",
+                  COUNT(*) FILTER (WHERE status = 'completed')::text AS "completedAssignments",
                   COALESCE(AVG(allocation_percent), 0)::text AS "averageAllocation",
                   COALESCE(SUM(weekly_hours), 0)::text AS "totalWeeklyHours"
              FROM operations_project_assignment
@@ -4122,11 +4345,70 @@ let OperationsService = OperationsService_1 = class OperationsService {
                 totalHours: Number((_c = timesheetSummary === null || timesheetSummary === void 0 ? void 0 : timesheetSummary.totalHours) !== null && _c !== void 0 ? _c : 0),
             }, operationalIndicators: {
                 activeAssignments: Number((_d = operationalIndicators === null || operationalIndicators === void 0 ? void 0 : operationalIndicators.activeAssignments) !== null && _d !== void 0 ? _d : 0),
-                billableAssignments: Number((_e = operationalIndicators === null || operationalIndicators === void 0 ? void 0 : operationalIndicators.billableAssignments) !== null && _e !== void 0 ? _e : 0),
+                completedAssignments: Number((_e = operationalIndicators === null || operationalIndicators === void 0 ? void 0 : operationalIndicators.completedAssignments) !== null && _e !== void 0 ? _e : 0),
                 averageAllocation: Number((_f = operationalIndicators === null || operationalIndicators === void 0 ? void 0 : operationalIndicators.averageAllocation) !== null && _f !== void 0 ? _f : 0),
                 totalWeeklyHours: Number((_g = operationalIndicators === null || operationalIndicators === void 0 ? void 0 : operationalIndicators.totalWeeklyHours) !== null && _g !== void 0 ? _g : 0),
             } });
     }
+    async getProjectStats(userId, projectId) {
+        var _a, _b, _c;
+        const [weeklyVelocityRows, allocationRows, quickRadarRow] = await Promise.all([
+            this.prisma.$queryRawUnsafe(`SELECT TO_CHAR(DATE_TRUNC('week', e.work_date), 'DD/MM') AS "weekStart",
+                COALESCE(SUM(e.hours), 0)::text AS "loggedHours"
+           FROM operations_project_assignment pa
+           JOIN operations_timesheet_entry e ON e.project_assignment_id = pa.id AND e.deleted_at IS NULL
+          WHERE pa.project_id = $1
+            AND pa.deleted_at IS NULL
+            AND e.work_date >= NOW() - INTERVAL '7 weeks'
+          GROUP BY DATE_TRUNC('week', e.work_date)
+          ORDER BY DATE_TRUNC('week', e.work_date) ASC
+          LIMIT 7`, projectId),
+            this.prisma.$queryRawUnsafe(`SELECT c.display_name AS "name",
+                COALESCE(pa.allocation_percent, 0)::text AS "allocation"
+           FROM operations_project_assignment pa
+           JOIN operations_collaborator c ON c.id = pa.collaborator_id AND c.deleted_at IS NULL
+          WHERE pa.project_id = $1
+            AND pa.deleted_at IS NULL
+            AND pa.status IN ('planned', 'active')
+          ORDER BY c.display_name ASC
+          LIMIT 6`, projectId),
+            this.prisma.$queryRawUnsafe(`SELECT
+           (SELECT COUNT(*)::text
+              FROM operations_task tk
+             WHERE tk.project_id = $1
+               AND tk.deleted_at IS NULL
+               AND tk.assignee_collaborator_id IS NOT NULL
+               AND tk.status IN ('todo', 'doing', 'review')
+           ) AS "activeAssignments",
+           COUNT(DISTINCT ts.id) FILTER (WHERE ts.status = 'submitted')::text AS "pendingTimesheets",
+           COALESCE(SUM(pa.weekly_hours) FILTER (WHERE pa.status IN ('planned', 'active')), 0)::text AS "totalWeeklyHours"
+         FROM operations_project_assignment pa
+         LEFT JOIN operations_timesheet_entry e ON e.project_assignment_id = pa.id AND e.deleted_at IS NULL
+         LEFT JOIN operations_timesheet ts ON ts.id = e.timesheet_id AND ts.deleted_at IS NULL
+         WHERE pa.project_id = $1 AND pa.deleted_at IS NULL`, projectId).then(rows => Array.isArray(rows) ? rows[0] : rows),
+        ]);
+        const getInitials = (name) => name
+            .split(' ')
+            .map((part) => part[0])
+            .slice(0, 2)
+            .join('')
+            .toUpperCase();
+        return {
+            weeklyVelocity: weeklyVelocityRows.map((row) => ({
+                weekLabel: row.weekStart,
+                loggedHours: Number(row.loggedHours),
+            })),
+            allocationByCollaborator: allocationRows.map((row) => ({
+                name: getInitials(row.name),
+                allocation: Math.round(Number(row.allocation)),
+            })),
+            quickRadar: {
+                activeAssignments: Number((_a = quickRadarRow === null || quickRadarRow === void 0 ? void 0 : quickRadarRow.activeAssignments) !== null && _a !== void 0 ? _a : 0),
+                pendingTimesheets: Number((_b = quickRadarRow === null || quickRadarRow === void 0 ? void 0 : quickRadarRow.pendingTimesheets) !== null && _b !== void 0 ? _b : 0),
+                totalWeeklyHours: Number((_c = quickRadarRow === null || quickRadarRow === void 0 ? void 0 : quickRadarRow.totalWeeklyHours) !== null && _c !== void 0 ? _c : 0),
+            },
+        };
+    }
     async getCollaboratorDetails(collaboratorId) {
         var _a, _b, _c, _d, _e, _f;
         const collaborator = await this.querySingle(`SELECT c.id,
@@ -4268,8 +4550,8 @@ let OperationsService = OperationsService_1 = class OperationsService {
               AND deleted_at IS NULL`, [collaboratorId]),
             this.queryRows(`SELECT id,
                   request_scope AS "requestScope",
-                  effective_start_date AS "effectiveStartDate",
-                  effective_end_date AS "effectiveEndDate",
+                  effective_start_date::text AS "effectiveStartDate",
+                  effective_end_date::text AS "effectiveEndDate",
                   status,
                   reason
              FROM operations_schedule_adjustment_request
@@ -4584,7 +4866,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
         return timesheet;
     }
     async replaceTimesheetEntries(client, timesheetId, entries, collaboratorId) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         await client.$executeRawUnsafe(`UPDATE operations_timesheet_entry
           SET deleted_at = NOW()
         WHERE timesheet_id = $1
@@ -4594,17 +4876,19 @@ let OperationsService = OperationsService_1 = class OperationsService {
         const assignmentIds = entries
             .map((entry) => entry.projectAssignmentId)
             .filter((value) => typeof value === 'number');
+        const assignmentMap = new Map();
         if (assignmentIds.length) {
-            const assignments = (await client.$queryRawUnsafe(`SELECT id, collaborator_id AS "collaboratorId"
+            const assignments = (await client.$queryRawUnsafe(`SELECT id,
+                collaborator_id AS "collaboratorId",
+                project_id AS "projectId"
            FROM operations_project_assignment
           WHERE id = ANY($1::int[])
             AND deleted_at IS NULL`, assignmentIds));
-            const assignmentMap = new Map(assignments.map((assignment) => [
-                assignment.id,
-                assignment.collaboratorId,
-            ]));
+            assignments.forEach((assignment) => {
+                assignmentMap.set(assignment.id, assignment);
+            });
             for (const assignmentId of assignmentIds) {
-                if (assignmentMap.get(assignmentId) !== collaboratorId) {
+                if (((_a = assignmentMap.get(assignmentId)) === null || _a === void 0 ? void 0 : _a.collaboratorId) !== collaboratorId) {
                     throw new common_1.ForbiddenException('Timesheet entries must use assignments owned by the target collaborator.');
                 }
             }
@@ -4615,16 +4899,19 @@ let OperationsService = OperationsService_1 = class OperationsService {
             const resolvedTask = entry.taskId
                 ? await this.getOwnedTaskRecord(client, collaboratorId, entry.taskId)
                 : null;
+            const selectedAssignment = entry.projectAssignmentId
+                ? (_b = assignmentMap.get(entry.projectAssignmentId)) !== null && _b !== void 0 ? _b : null
+                : null;
             if (resolvedTask &&
-                entry.projectAssignmentId &&
-                resolvedTask.projectAssignmentId !== entry.projectAssignmentId) {
-                throw new common_1.BadRequestException('The selected task does not belong to the chosen project assignment.');
+                selectedAssignment &&
+                resolvedTask.projectId !== selectedAssignment.projectId) {
+                throw new common_1.BadRequestException('The selected task does not belong to the chosen project.');
             }
-            const resolvedAssignmentId = (_b = (_a = entry.projectAssignmentId) !== null && _a !== void 0 ? _a : resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.projectAssignmentId) !== null && _b !== void 0 ? _b : null;
+            const resolvedAssignmentId = (_d = (_c = entry.projectAssignmentId) !== null && _c !== void 0 ? _c : resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.projectAssignmentId) !== null && _d !== void 0 ? _d : null;
             if (entry.taskId && !resolvedAssignmentId) {
                 throw new common_1.BadRequestException('The selected task must belong to a project assignment.');
             }
-            const activityLabel = (_d = (_c = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.name) !== null && _c !== void 0 ? _c : this.normalizeOptionalText(entry.taskName)) !== null && _d !== void 0 ? _d : this.normalizeOptionalText(entry.activityLabel);
+            const activityLabel = (_f = (_e = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.name) !== null && _e !== void 0 ? _e : this.normalizeOptionalText(entry.taskName)) !== null && _f !== void 0 ? _f : this.normalizeOptionalText(entry.activityLabel);
             if (!entry.workDate) {
                 throw new common_1.BadRequestException('Timesheet entry workDate is required.');
             }
@@ -4639,7 +4926,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
           description,
           created_at,
           updated_at
-        ) VALUES ($1, $2, $3, $4, $5::date, $6, $7, $8, NOW(), NOW())`, timesheetId, resolvedAssignmentId, (_f = (_e = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.id) !== null && _e !== void 0 ? _e : entry.taskId) !== null && _f !== void 0 ? _f : null, activityLabel !== null && activityLabel !== void 0 ? activityLabel : null, entry.workDate, durationMinutes, hours, this.normalizeOptionalText(entry.description));
+        ) VALUES ($1, $2, $3, $4, $5::date, $6, $7, $8, NOW(), NOW())`, timesheetId, resolvedAssignmentId, (_h = (_g = resolvedTask === null || resolvedTask === void 0 ? void 0 : resolvedTask.id) !== null && _g !== void 0 ? _g : entry.taskId) !== null && _h !== void 0 ? _h : null, activityLabel !== null && activityLabel !== void 0 ? activityLabel : null, entry.workDate, durationMinutes, hours, this.normalizeOptionalText(entry.description));
         }
     }
     async refreshTimesheetTotal(client, timesheetId) {
@@ -4665,6 +4952,29 @@ let OperationsService = OperationsService_1 = class OperationsService {
               updated_at = NOW()
         WHERE id = $1`, timesheetId);
     }
+    async cleanupEmptyEditableTimesheet(client, timesheetId) {
+        var _a;
+        const candidate = (await client.$queryRawUnsafe(`SELECT t.id
+         FROM operations_timesheet t
+        WHERE t.id = $1
+          AND t.deleted_at IS NULL
+          AND t.status IN ('draft', 'rejected')
+          AND NOT EXISTS (
+            SELECT 1
+              FROM operations_timesheet_entry e
+             WHERE e.timesheet_id = t.id
+               AND e.deleted_at IS NULL
+          )
+        LIMIT 1`, timesheetId));
+        if (!((_a = candidate[0]) === null || _a === void 0 ? void 0 : _a.id)) {
+            return;
+        }
+        await client.$executeRawUnsafe(`UPDATE operations_timesheet
+          SET deleted_at = NOW(),
+              updated_at = NOW()
+        WHERE id = $1
+          AND deleted_at IS NULL`, timesheetId);
+    }
     async upsertApproval(client, input) {
         var _a, _b;
         const existing = (await client.$queryRawUnsafe(`SELECT id
@@ -4844,7 +5154,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
         }
     }
     async replaceProjectAssignments(client, projectId, teamAssignments) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         await client.$executeRawUnsafe(`UPDATE operations_project_assignment
           SET deleted_at = NOW(),
               updated_at = NOW()
@@ -4863,17 +5173,16 @@ let OperationsService = OperationsService_1 = class OperationsService {
           role_label,
           allocation_percent,
           weekly_hours,
-          is_billable,
           start_date,
           end_date,
           status,
           created_at,
           updated_at
         ) VALUES (
-          $1, $2, $3, $4, $5, $6, $7, $8::date, $9::date,
-          $10::operations_project_assignment_status_155b459bbf_enum,
+          $1, $2, $3, $4, $5, $6, $7::date, $8::date,
+          $9::operations_project_assignment_status_155b459bbf_enum,
           NOW(), NOW()
-        )`, 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');
+        )`, 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.startDate) !== null && _f !== void 0 ? _f : null, (_g = assignment.endDate) !== null && _g !== void 0 ? _g : null, (_h = assignment.status) !== null && _h !== void 0 ? _h : 'active');
         }
     }
     async replaceCollaboratorEquityParticipation(client, collaboratorId, equityParticipation) {
@@ -5125,106 +5434,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
               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
-            ? (await client.$queryRawUnsafe(`SELECT id,
-                  code,
-                  name,
-                  description,
-                  contract_category AS "contractCategory",
-                  contract_type AS "contractType",
-                  billing_model AS "billingModel",
-                  signature_status AS "signatureStatus",
-                  content_html AS "contentHtml"
-             FROM operations_contract_template
-            WHERE id = $1
-              AND deleted_at IS NULL
-            LIMIT 1`, input.contractTemplateId))
-            : [];
-        const selectedTemplate = (_a = templateRows[0]) !== null && _a !== void 0 ? _a : null;
-        const templateContext = {
-            project_code: input.projectCode,
-            project_name: input.projectName,
-            client_name: input.clientName,
-            start_date: (_b = input.startDate) !== null && _b !== void 0 ? _b : '',
-            end_date: (_c = input.endDate) !== null && _c !== void 0 ? _c : '',
-            budget_amount: input.budgetAmount !== null && input.budgetAmount !== undefined
-                ? String(input.budgetAmount)
-                : '',
-            monthly_hour_cap: input.monthlyHourCap !== null && input.monthlyHourCap !== undefined
-                ? String(input.monthlyHourCap)
-                : '',
-        };
-        const applyTemplateVariables = (value) => {
-            const source = value !== null && value !== void 0 ? value : '';
-            return Object.entries(templateContext).reduce((result, [key, replacement]) => result.split(`{{${key}}}`).join(replacement || ''), source);
-        };
-        const templateCodePrefix = this.normalizeOptionalText(selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.code);
-        const generatedContractCode = ((_e = (_d = this.normalizeOptionalText(input.contractCode)) !== null && _d !== void 0 ? _d : (templateCodePrefix
-            ? `${templateCodePrefix}-${input.projectCode}`
-            : null)) !== null && _e !== void 0 ? _e : `PRJ-${input.projectCode}`).slice(0, 40);
-        const generatedContractName = (_g = (_f = this.normalizeOptionalText(input.contractName)) !== null && _f !== void 0 ? _f : this.normalizeOptionalText(applyTemplateVariables(selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.name))) !== null && _g !== void 0 ? _g : `${input.projectName} Service Agreement`;
-        const generatedDescription = this.normalizeOptionalText(applyTemplateVariables((_h = input.description) !== null && _h !== void 0 ? _h : selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.description));
-        const generatedContentHtml = this.normalizeOptionalText(applyTemplateVariables(selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.contentHtml));
-        const created = await client.$queryRawUnsafe(`INSERT INTO operations_contract (
-        code,
-        name,
-        contract_category,
-        contract_type,
-        client_name,
-        signature_status,
-        is_active,
-        billing_model,
-        account_manager_collaborator_id,
-        related_collaborator_id,
-        contract_template_id,
-        origin_type,
-        origin_id,
-        start_date,
-        end_date,
-        signed_at,
-        effective_date,
-        budget_amount,
-        monthly_hour_cap,
-        status,
-        description,
-        content_html,
-        created_by_user_id,
-        updated_by_user_id,
-        created_at,
-        updated_at
-      ) VALUES (
-        $1,
-        $2,
-        $3::operations_contract_contract_category_70d553ea09_enum,
-        $4::operations_contract_contract_type_48331e2ebf_enum,
-        $5,
-        $6::operations_contract_signature_status_2cb7282a7b_enum,
-        true,
-        $7::operations_contract_billing_model_409dc7fea2_enum,
-        $8,
-        NULL,
-        $9,
-        'client_project',
-        $10,
-        $11::date,
-        $12::date,
-        NULL,
-        $11::date,
-        $13,
-        $14,
-        'draft',
-        $15,
-        $16,
-        $17,
-        $17,
-        NOW(),
-        NOW()
-      )
-      RETURNING id`, generatedContractCode, generatedContractName, (_j = selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.contractCategory) !== null && _j !== void 0 ? _j : 'client', (_k = selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.contractType) !== null && _k !== void 0 ? _k : 'service_agreement', input.clientName, (_l = selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.signatureStatus) !== null && _l !== void 0 ? _l : 'not_started', (_m = selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.billingModel) !== null && _m !== void 0 ? _m : input.billingModel, input.managerCollaboratorId, (_o = selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.id) !== null && _o !== void 0 ? _o : null, input.projectId, (_p = input.startDate) !== null && _p !== void 0 ? _p : new Date().toISOString().slice(0, 10), (_q = input.endDate) !== null && _q !== void 0 ? _q : null, (_r = input.budgetAmount) !== null && _r !== void 0 ? _r : null, (_s = input.monthlyHourCap) !== null && _s !== void 0 ? _s : null, generatedDescription, generatedContentHtml, createdByUserId);
-        return (_t = created[0]) === null || _t === void 0 ? void 0 : _t.id;
-    }
     async replaceContractParties(client, contractId, parties) {
         var _a, _b, _c, _d, _e, _f;
         await client.$executeRawUnsafe(`UPDATE operations_contract_party
@@ -5252,88 +5461,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
         )`, contractId, (_a = party.partyRole) !== null && _a !== void 0 ? _a : 'other', (_b = party.partyType) !== null && _b !== void 0 ? _b : 'company', party.displayName, (_c = party.documentNumber) !== null && _c !== void 0 ? _c : null, (_d = party.email) !== null && _d !== void 0 ? _d : null, (_e = party.phone) !== null && _e !== void 0 ? _e : null, (_f = party.isPrimary) !== null && _f !== void 0 ? _f : false);
         }
     }
-    async replaceContractSignatures(client, contractId, signatures) {
-        var _a, _b, _c, _d;
-        await client.$executeRawUnsafe(`UPDATE operations_contract_signature
-          SET deleted_at = NOW(),
-              updated_at = NOW()
-        WHERE contract_id = $1
-          AND deleted_at IS NULL`, contractId);
-        for (const signature of signatures !== null && signatures !== void 0 ? signatures : []) {
-            await client.$executeRawUnsafe(`INSERT INTO operations_contract_signature (
-          contract_id,
-          signer_name,
-          signer_role,
-          signer_email,
-          signer_status,
-          signed_at,
-          created_at,
-          updated_at
-        ) VALUES (
-          $1, $2, $3, $4,
-          $5::operations_contract_signature_signer_status_1e6fbe2519_enum,
-          $6::timestamp, NOW(), NOW()
-        )`, contractId, signature.signerName, (_a = signature.signerRole) !== null && _a !== void 0 ? _a : null, (_b = signature.signerEmail) !== null && _b !== void 0 ? _b : null, (_c = signature.status) !== null && _c !== void 0 ? _c : 'pending', (_d = signature.signedAt) !== null && _d !== void 0 ? _d : null);
-        }
-    }
-    async replaceContractFinancialTerms(client, contractId, financialTerms) {
-        var _a, _b, _c, _d;
-        await client.$executeRawUnsafe(`UPDATE operations_contract_financial_term
-          SET deleted_at = NOW(),
-              updated_at = NOW()
-        WHERE contract_id = $1
-          AND deleted_at IS NULL`, contractId);
-        for (const term of financialTerms !== null && financialTerms !== void 0 ? financialTerms : []) {
-            await client.$executeRawUnsafe(`INSERT INTO operations_contract_financial_term (
-          contract_id,
-          term_type,
-          label,
-          amount,
-          recurrence,
-          due_day,
-          notes,
-          created_at,
-          updated_at
-        ) VALUES (
-          $1,
-          $2::operations_contract_financial_term_term_type_700635c06a_enum,
-          $3,
-          $4,
-          $5::operations_contract_financial_term_recurrence_ba90bbe3bf_enum,
-          $6,
-          $7,
-          NOW(), NOW()
-        )`, contractId, (_a = term.termType) !== null && _a !== void 0 ? _a : 'value', term.label, term.amount, (_b = term.recurrence) !== null && _b !== void 0 ? _b : 'one_time', (_c = term.dueDay) !== null && _c !== void 0 ? _c : null, (_d = term.notes) !== null && _d !== void 0 ? _d : null);
-        }
-    }
-    async replaceContractRevisions(client, contractId, revisions) {
-        var _a, _b, _c, _d;
-        await client.$executeRawUnsafe(`UPDATE operations_contract_revision
-          SET deleted_at = NOW(),
-              updated_at = NOW()
-        WHERE contract_id = $1
-          AND deleted_at IS NULL`, contractId);
-        for (const revision of revisions !== null && revisions !== void 0 ? revisions : []) {
-            await client.$executeRawUnsafe(`INSERT INTO operations_contract_revision (
-          contract_id,
-          revision_type,
-          title,
-          effective_date,
-          status,
-          summary,
-          created_at,
-          updated_at
-        ) VALUES (
-          $1,
-          $2::operations_contract_revision_revision_type_cf5ba1a538_enum,
-          $3,
-          $4::date,
-          $5::operations_contract_revision_status_f44f35bb66_enum,
-          $6,
-          NOW(), NOW()
-        )`, contractId, (_a = revision.revisionType) !== null && _a !== void 0 ? _a : 'revision', revision.title, (_b = revision.effectiveDate) !== null && _b !== void 0 ? _b : null, (_c = revision.status) !== null && _c !== void 0 ? _c : 'draft', (_d = revision.summary) !== null && _d !== void 0 ? _d : null);
-        }
-    }
     async replaceContractDocument(client, contractId, documentType, document) {
         var _a, _b, _c, _d, _e;
         await client.$executeRawUnsafe(`UPDATE operations_contract_document
@@ -5341,7 +5468,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
               updated_at = NOW()
         WHERE contract_id = $1
           AND deleted_at IS NULL
-          AND document_type = $2`, contractId, documentType);
+          AND document_type::text = $2`, contractId, documentType);
         await client.$executeRawUnsafe(`INSERT INTO operations_contract_document (
         contract_id,
         document_type,
@@ -5356,7 +5483,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
         created_at,
         updated_at
       ) VALUES (
-        $1, $2, $3, $4, $5, $6, true, $7, $8, $9, NOW(), NOW()
+        $1, $2::operations_contract_document_document_type_15ebaff0c9_enum, $3, $4, $5, $6, true, $7::operations_contract_document_extraction_status_6d94c231f3_enum, $8, $9, NOW(), NOW()
       )`, contractId, documentType, (_a = document.fileId) !== null && _a !== void 0 ? _a : null, document.fileName, document.mimeType, (_b = document.fileContentBase64) !== null && _b !== void 0 ? _b : null, (_c = document.extractionStatus) !== null && _c !== void 0 ? _c : 'skipped', (_d = document.extractionSummary) !== null && _d !== void 0 ? _d : null, (_e = document.notes) !== null && _e !== void 0 ? _e : null);
     }
     async resolveContractExtractionFile(userId, data) {
@@ -5441,7 +5568,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
         }
     }
     async buildContractPdfHtml(contract) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const logoUrl = await this.resolveContractPdfLogoUrl();
         const contentHtml = (_c = (_a = this.normalizeOptionalText(contract.contentHtml)) !== null && _a !== void 0 ? _a : (_b = this.normalizeOptionalText(contract.description)) === null || _b === void 0 ? void 0 : _b.split(/\n{2,}/).map((paragraph) => `<p>${this.escapeHtml(paragraph)}</p>`).join('')) !== null && _c !== void 0 ? _c : '<p>No contract body was provided yet.</p>';
         const partiesHtml = ((_d = contract.parties) !== null && _d !== void 0 ? _d : []).length
@@ -5453,17 +5580,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
               </li>`)
                 .join('')
             : '<li><strong>No parties registered yet.</strong><span>Complete this contract later if needed.</span></li>';
-        const financialTermsHtml = ((_e = contract.financialTerms) !== null && _e !== void 0 ? _e : []).length
-            ? contract.financialTerms
-                .map((term) => `
-              <li>
-                <strong>${this.escapeHtml(term.label || 'Term')}</strong>
-                <span>${this.escapeHtml([term.termType, term.amount, term.recurrence]
-                .filter((item) => item !== null && item !== undefined && String(item).trim())
-                .join(' • '))}</span>
-              </li>`)
-                .join('')
-            : '<li><strong>No financial terms registered yet.</strong><span>The draft is intentionally lightweight.</span></li>';
         return `<!DOCTYPE html>
 <html lang="en">
   <head>
@@ -5608,11 +5724,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
       <ul>${partiesHtml}</ul>
     </section>
 
-    <section>
-      <h2>Financial Terms</h2>
-      <ul>${financialTermsHtml}</ul>
-    </section>
-
     <section>
       <h2>Contract Body</h2>
       <div class="content">${contentHtml}</div>
@@ -5853,7 +5964,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
                         effectiveDate: contract.effectiveDate,
                         signatureStatus: contract.signatureStatus,
                         parties: contract.parties,
-                        financialTerms: contract.financialTerms,
                     }, null, 2)}`,
                     `Contract HTML:\n${(_b = this.normalizeOptionalText(contract.contentHtml)) !== null && _b !== void 0 ? _b : ''}`,
                 ].join('\n\n'),
@@ -5893,7 +6003,7 @@ let OperationsService = OperationsService_1 = class OperationsService {
         }
     }
     buildHeuristicContractLegalReview(contract) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         const contentText = ((_a = this.normalizeOptionalText(contract.contentHtml)) !== null && _a !== void 0 ? _a : '')
             .replace(/<[^>]+>/g, ' ')
             .replace(/\s+/g, ' ')
@@ -5931,12 +6041,12 @@ let OperationsService = OperationsService_1 = class OperationsService {
         if (!this.normalizeOptionalText(primaryParty === null || primaryParty === void 0 ? void 0 : primaryParty.documentNumber)) {
             warnings.push('Consider confirming the primary party document number.');
         }
-        if (!((_g = contract.financialTerms) !== null && _g !== void 0 ? _g : []).length && contract.budgetAmount == null) {
-            warnings.push('Commercial conditions are still generic; define prices, recurrence, and penalties.');
-            checklist.push('Attention: validate billing, adjustments, and penalties.');
+        if (contract.budgetAmount == null) {
+            warnings.push('Commercial conditions are still generic; define a budget amount before signature.');
+            checklist.push('Attention: validate billing and penalties.');
         }
         else {
-            checklist.push('OK: there is at least one financial reference to review.');
+            checklist.push('OK: there is a budget reference to review.');
         }
         if (!contentText) {
             missingFields.push('Contract body content');
@@ -6102,34 +6212,6 @@ let OperationsService = OperationsService_1 = class OperationsService {
                 isPrimary: this.normalizeExtractionBoolean(party.isPrimary),
             }))
                 .filter((party) => party.displayName),
-            signatures: this.normalizeObjectList(raw.signatures)
-                .map((signature) => ({
-                signerName: this.normalizeExtractionString(signature.signerName),
-                signerRole: this.normalizeExtractionString(signature.signerRole),
-                signerEmail: this.normalizeExtractionString(signature.signerEmail),
-                status: this.normalizeEnumValue(signature.status, SIGNATURE_ITEM_STATUS_VALUES, 'pending'),
-                signedAt: this.normalizeExtractionDate(signature.signedAt),
-            }))
-                .filter((signature) => signature.signerName),
-            financialTerms: this.normalizeObjectList(raw.financialTerms)
-                .map((term) => ({
-                label: this.normalizeExtractionString(term.label),
-                termType: this.normalizeEnumValue(term.termType, FINANCIAL_TERM_TYPE_VALUES, 'value'),
-                amount: this.normalizeExtractionNumber(term.amount),
-                recurrence: this.normalizeEnumValue(term.recurrence, RECURRENCE_VALUES, 'one_time'),
-                dueDay: this.normalizeExtractionNumber(term.dueDay),
-                notes: this.normalizeExtractionString(term.notes),
-            }))
-                .filter((term) => term.label),
-            revisions: this.normalizeObjectList(raw.revisions)
-                .map((revision) => ({
-                title: this.normalizeExtractionString(revision.title),
-                revisionType: this.normalizeEnumValue(revision.revisionType, REVISION_TYPE_VALUES, 'revision'),
-                effectiveDate: this.normalizeExtractionDate(revision.effectiveDate),
-                status: this.normalizeEnumValue(revision.status, REVISION_STATUS_VALUES, 'draft'),
-                summary: this.normalizeExtractionString(revision.summary),
-            }))
-                .filter((revision) => revision.title),
         };
         if (!draft.name)
             missingFields.push('Contract title');
@@ -6231,6 +6313,15 @@ let OperationsService = OperationsService_1 = class OperationsService {
             offset: (page - 1) * pageSize,
         };
     }
+    shouldPaginate(input) {
+        return [
+            input.page,
+            input.pageSize,
+            input.search,
+            input.sortField,
+            input.sortOrder,
+        ].some((value) => value !== undefined && value !== null && value !== '');
+    }
     buildPaginationResult(data, total, page, pageSize) {
         const lastPage = Math.max(1, Math.ceil(total / Math.max(pageSize, 1)));
         return {
@@ -6375,6 +6466,12 @@ let OperationsService = OperationsService_1 = class OperationsService {
     async execute(sql, params = []) {
         return this.prisma.$executeRawUnsafe(sql, ...params);
     }
+    async getNextCollaboratorTypeSortOrder(client = this.prisma) {
+        var _a, _b;
+        const row = (await client.$queryRawUnsafe(`SELECT COALESCE(MAX(sort_order), 0) + 1 AS "nextSortOrder"
+         FROM operations_collaborator_type`));
+        return Number((_b = (_a = row === null || row === void 0 ? void 0 : row[0]) === null || _a === void 0 ? void 0 : _a.nextSortOrder) !== null && _b !== void 0 ? _b : 1);
+    }
 };
 exports.OperationsService = OperationsService;
 exports.OperationsService = OperationsService = OperationsService_1 = __decorate([