@platform-modules/foreign-ministry 1.3.355 → 1.3.358

package/dist/helpers/employee-evaluation-request.utils.d.ts

@@ -34,3 +34,15 @@ export declare function persistEmployeeEvaluationScores(manager: EntityManager,
     averageScore: number;
     employeeCount: number;
 }>;
+/** Sync person_scores/answers on an existing request (draft update or draft promotion). */
+export declare function syncEmployeeEvaluationScores(manager: EntityManager, opts: {
+    requestId: number;
+    formId: number;
+    createdBy: string;
+    employees: NormalizedEmployeeSubmission[];
+    validateAnswers?: boolean;
+}): Promise<{
+    totalScore: number | null;
+    averageScore: number | null;
+    employeeCount: number;
+}>;

package/dist/helpers/employee-evaluation-request.utils.js

@@ -5,6 +5,7 @@ exports.normalizeEmployeeSubmissions = normalizeEmployeeSubmissions;
 exports.normalizeEmployeeDraftSubmissions = normalizeEmployeeDraftSubmissions;
 exports.resolveMaxEmployeesPerRequest = resolveMaxEmployeesPerRequest;
 exports.persistEmployeeEvaluationScores = persistEmployeeEvaluationScores;
+exports.syncEmployeeEvaluationScores = syncEmployeeEvaluationScores;
 const EmployeeEvaluationAnswerModel_1 = require("../models/EmployeeEvaluationAnswerModel");
 const EmployeeEvaluationPersonScoreModel_1 = require("../models/EmployeeEvaluationPersonScoreModel");
 const EmployeeEvaluationRequestModel_1 = require("../models/EmployeeEvaluationRequestModel");
@@ -213,3 +214,87 @@ async function persistEmployeeEvaluationScores(manager, opts) {
     });
     return { totalScore: requestTotal, averageScore, employeeCount };
 }
+/** Sync person_scores/answers on an existing request (draft update or draft promotion). */
+async function syncEmployeeEvaluationScores(manager, opts) {
+    const { requestId, formId, createdBy, employees, validateAnswers = false } = opts;
+    const payloadUserIds = new Set(employees.map((e) => e.user_id));
+    const existingScores = await manager.find(EmployeeEvaluationPersonScoreModel_1.EmployeeEvaluationPersonScore, {
+        where: { request_id: requestId, is_deleted: false },
+    });
+    for (const ps of existingScores) {
+        if (!payloadUserIds.has(ps.user_id)) {
+            await manager.update(EmployeeEvaluationPersonScoreModel_1.EmployeeEvaluationPersonScore, { id: ps.id }, { is_deleted: true, updated_by: createdBy });
+            await manager.update(EmployeeEvaluationAnswerModel_1.EmployeeEvaluationAnswers, { request_id: requestId, user_id: ps.user_id, is_deleted: false }, { is_deleted: true, updated_by: createdBy });
+        }
+    }
+    for (const emp of employees) {
+        const existingPerson = existingScores.find((p) => p.user_id === emp.user_id);
+        if (existingPerson) {
+            await manager.update(EmployeeEvaluationPersonScoreModel_1.EmployeeEvaluationPersonScore, { id: existingPerson.id }, { is_rca: Boolean(emp.is_rca), updated_by: createdBy });
+            await manager.update(EmployeeEvaluationAnswerModel_1.EmployeeEvaluationAnswers, { request_id: requestId, user_id: emp.user_id, is_deleted: false }, { is_deleted: true, updated_by: createdBy });
+        }
+        else {
+            await manager.save(EmployeeEvaluationPersonScoreModel_1.EmployeeEvaluationPersonScore, manager.create(EmployeeEvaluationPersonScoreModel_1.EmployeeEvaluationPersonScore, {
+                request_id: requestId,
+                user_id: emp.user_id,
+                is_rca: Boolean(emp.is_rca),
+                us_feedback: null,
+                total_score: null,
+                created_by: createdBy,
+                is_deleted: false,
+            }));
+        }
+        if (emp.answers.length > 0) {
+            let personTotal = 0;
+            for (const ans of emp.answers) {
+                const qMeta = await manager.findOne(EvaluationFormQuestionModel_1.EvaluationFormQuestion, {
+                    where: { id: ans.question_id, is_deleted: false },
+                });
+                const questionSectionId = qMeta?.form_section_id;
+                if (validateAnswers) {
+                    if (!qMeta || questionSectionId == null || questionSectionId !== ans.section_id) {
+                        throw new Error(`Invalid question ${ans.question_id} for section ${ans.section_id}`);
+                    }
+                    if (qMeta.max_score != null && ans.score > qMeta.max_score) {
+                        throw new Error(`score ${ans.score} exceeds max_score ${qMeta.max_score} for question ${ans.question_id}`);
+                    }
+                }
+                else if (qMeta &&
+                    qMeta.form_section_id != null &&
+                    qMeta.form_section_id !== ans.section_id) {
+                    throw new Error(`Invalid question ${ans.question_id} for section ${ans.section_id}`);
+                }
+                personTotal += ans.score;
+                await manager.save(EmployeeEvaluationAnswerModel_1.EmployeeEvaluationAnswers, manager.create(EmployeeEvaluationAnswerModel_1.EmployeeEvaluationAnswers, {
+                    request_id: requestId,
+                    user_id: emp.user_id,
+                    form_id: formId,
+                    section_id: ans.section_id,
+                    question_id: ans.question_id,
+                    score: ans.score,
+                    remarks: ans.remarks ?? null,
+                    created_by: createdBy,
+                    is_deleted: false,
+                }));
+            }
+            await manager.update(EmployeeEvaluationPersonScoreModel_1.EmployeeEvaluationPersonScore, { request_id: requestId, user_id: emp.user_id, is_deleted: false }, { total_score: personTotal, updated_by: createdBy });
+        }
+    }
+    const personRows = await manager.find(EmployeeEvaluationPersonScoreModel_1.EmployeeEvaluationPersonScore, {
+        where: { request_id: requestId, is_deleted: false },
+    });
+    const scores = personRows.map((p) => p.total_score ?? 0);
+    const requestTotal = scores.reduce((a, b) => a + b, 0);
+    const average = personRows.length ? requestTotal / personRows.length : 0;
+    await manager.update(EmployeeEvaluationRequestModel_1.EmployeeEvaluationRequests, { id: requestId }, {
+        total_score: personRows.length ? requestTotal : null,
+        average_score: personRows.length ? average : null,
+        employee_count: personRows.length,
+        updated_by: createdBy,
+    });
+    return {
+        totalScore: personRows.length ? requestTotal : null,
+        averageScore: personRows.length ? average : null,
+        employeeCount: personRows.length,
+    };
+}

package/dist/index.d.ts

@@ -411,7 +411,7 @@ export type { FmServicesNotificationConfigRecipient, CollectFmServicesNotificati
 export * from './models/MoodleUsersModel';
 export { EvaluationEligibilitySetting, EvaluationEligibilitySettingEmployee, } from './models/EvaluationEligibilitySettingModel';
 export { isEvaluationEligibilityWindowOpen, isCalendarMonthInEligibilityRange, mmDdWindowsOverlap, mmDdSortKey, parseMonthDay, parseEligibilityDateRange, parseEvaluationEndDay, parseMonthRange, } from './helpers/evaluation-eligibility.utils';
-export { DEFAULT_MAX_EMPLOYEES_PER_REQUEST, normalizeEmployeeSubmissions, normalizeEmployeeDraftSubmissions, resolveMaxEmployeesPerRequest, persistEmployeeEvaluationScores, } from './helpers/employee-evaluation-request.utils';
+export { DEFAULT_MAX_EMPLOYEES_PER_REQUEST, normalizeEmployeeSubmissions, normalizeEmployeeDraftSubmissions, resolveMaxEmployeesPerRequest, persistEmployeeEvaluationScores, syncEmployeeEvaluationScores, } from './helpers/employee-evaluation-request.utils';
 export type { EmployeeEvaluationSubmitAnswer, EmployeeEvaluationSubmitEmployee, NormalizedEmployeeSubmission, } from './helpers/employee-evaluation-request.utils';
 export { EmployeeEvaluationRequests, EmployeeEvaluationRequestStatus, EmployeeEvaluationRoutingBucket, } from './models/EmployeeEvaluationRequestModel';
 export { EmployeeEvaluation, EmployeeEvaluationUsFeedback } from './models/EmployeeEvaluationModel';

package/dist/index.js

@@ -15,9 +15,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectFmServicesNotificationConfigRecipients = exports.ServicesNotificationTriggerType = exports.AppointmentWorkFlowStatus = exports.AppointmentMessageType = exports.AppointmentAttendeeStatus = exports.AppointmentApprovalStatus = exports.AppointmentAttendees = exports.AppointmentWorkFlow = exports.AppointmentRequestChat = exports.AppointmentRequestAttachment = exports.AppointmentApprovalDetails = exports.AppointmentRequestStatus = exports.AppointmentRequests = exports.TravelClass = exports.MissionTravelWorkFlowStatus = exports.MissionTravelApprovalStatus = exports.AllowanceRatio = exports.DecisionType = exports.MissionType = exports.MissionTravelStatus = exports.GatePassMessageType = exports.GatePassWorkFlowStatus = exports.GatePassApprovalStatus = exports.GatePassType = exports.GatePassRequestStatus = exports.SecurityDeptMessageType = exports.SecurityDeptAccessType = exports.SecurityDeptRequestStatus = exports.RetiredCardMessageType = exports.RetiredCardWorkFlowStatus = exports.RetiredCardApprovalStatus = exports.RetiredCardAccessType = exports.RetiredCardRequestStatus = exports.TitleCategory = exports.ProfileUpdateRequestStatus = exports.StayAfterHoursTransactionStatus = exports.StayAfterHoursTransaction = exports.StayAfterHoursBalance = exports.EarlyCheckoutTransactionStatus = exports.EarlyCheckoutTransaction = exports.EarlyCheckoutFrequency = exports.EarlyCheckoutConfiguration = exports.EarlyCheckoutBalance = exports.LeaveTransactionStatus = exports.LeaveTransaction = exports.LeaveConfigurationGrades = exports.enumFrequency = exports.LeaveConfiguration = exports.ParcelDepartmentCategory = exports.RegisterCandidateExperienceActivity = void 0;
-exports.InitiatorEmployeeNominationApprovalDetails = exports.InitiatorInitiativeType = exports.InitiatorEmployeeNominationRequestStatus = exports.InitiatorEmployeeNominationRequests = exports.IpeGrievanceRequestAttachment = exports.IpeGrievanceMessageType = exports.IpeGrievanceRequestChat = exports.IpeGrievanceWorkFlowStatus = exports.IpeGrievanceWorkFlow = exports.IpeGrievanceApprovalStatus = exports.IpeGrievanceApprovalDetails = exports.IpeGrievancePeriodRating = exports.IpeGrievanceExemptionReason = exports.IpeGrievancePeriodType = exports.IpeGrievanceFinalEvaluationResult = exports.IpeGrievanceRequestStatus = exports.IpeGrievanceRequests = exports.EmployeeEvaluationRequestAttachment = exports.EmployeeEvaluationMessageType = exports.EmployeeEvaluationRequestChat = exports.EmployeeEvaluationWorkFlowStatus = exports.EmployeeEvaluationWorkFlow = exports.EmployeeEvaluationApprovalStatus = exports.EmployeeEvaluationApprovalDetails = exports.EmployeeEvaluationPersonScore = exports.EmployeeEvaluationAnswers = exports.EmployeeEvaluationUsFeedback = exports.EmployeeEvaluation = exports.EmployeeEvaluationRoutingBucket = exports.EmployeeEvaluationRequestStatus = exports.EmployeeEvaluationRequests = exports.persistEmployeeEvaluationScores = exports.resolveMaxEmployeesPerRequest = exports.normalizeEmployeeDraftSubmissions = exports.normalizeEmployeeSubmissions = exports.DEFAULT_MAX_EMPLOYEES_PER_REQUEST = exports.parseMonthRange = exports.parseEvaluationEndDay = exports.parseEligibilityDateRange = exports.parseMonthDay = exports.mmDdSortKey = exports.mmDdWindowsOverlap = exports.isCalendarMonthInEligibilityRange = exports.isEvaluationEligibilityWindowOpen = exports.EvaluationEligibilitySettingEmployee = exports.EvaluationEligibilitySetting = exports.isPortalAdminFromRequest = exports.userHasPortalAdminRole = exports.parsePortalUserIdFromRequest = exports.sendFmServicesNotificationConfigNotifications = void 0;
-exports.EvaluationFormSection = exports.EvaluationFormType = exports.EvaluationForm = exports.EmbassyEvaluationRequestAttachment = exports.EmbassyEvaluationMessageType = exports.EmbassyEvaluationRequestChat = exports.EmbassyEvaluationWorkFlowStatus = exports.EmbassyEvaluationWorkFlow = exports.EmbassyEvaluationApprovalStatus = exports.EmbassyEvaluationApprovalDetails = exports.EmbassyEvaluationRequestStatus = exports.EmbassyEvaluationRequests = exports.EmbassyEvaluationResponse = exports.EmbassyEvaluationAssignmentStatus = exports.EmbassyEvaluationAssignment = exports.EmbassyEvaluationCycleStatus = exports.EmbassyEvaluationCycle = exports.EmployeeOfMonthSupportNominationRequestAttachment = exports.EmployeeOfMonthSupportNominationMessageType = exports.EmployeeOfMonthSupportNominationRequestChat = exports.EmployeeOfMonthSupportNominationWorkFlowStatus = exports.EmployeeOfMonthSupportNominationWorkFlow = exports.EmployeeOfMonthSupportNominationApprovalStatus = exports.EmployeeOfMonthSupportNominationApprovalDetails = exports.EmployeeOfMonthSupportNominationRequestStatus = exports.EmployeeOfMonthSupportNominationRequests = exports.EmployeeOfMonthNominationRequestAttachment = exports.EmployeeOfMonthNominationMessageType = exports.EmployeeOfMonthNominationRequestChat = exports.EmployeeOfMonthNominationWorkFlowStatus = exports.EmployeeOfMonthNominationWorkFlow = exports.EmployeeOfMonthNominationApprovalStatus = exports.EmployeeOfMonthNominationApprovalDetails = exports.EmployeeOfMonthNominationRequestStatus = exports.EmployeeOfMonthNominationRequests = exports.InnovativeEmployeeNominationRequestAttachment = exports.InnovativeEmployeeNominationMessageType = exports.InnovativeEmployeeNominationRequestChat = exports.InnovativeEmployeeNominationWorkFlowStatus = exports.InnovativeEmployeeNominationWorkFlow = exports.InnovativeEmployeeNominationApprovalStatus = exports.InnovativeEmployeeNominationApprovalDetails = exports.InnovativeEmployeeNominationRequestStatus = exports.InnovativeEmployeeNominationRequests = exports.InitiatorEmployeeNominationRequestAttachment = exports.InitiatorEmployeeNominationMessageType = exports.InitiatorEmployeeNominationRequestChat = exports.InitiatorEmployeeNominationWorkFlowStatus = exports.InitiatorEmployeeNominationWorkFlow = exports.InitiatorEmployeeNominationApprovalStatus = void 0;
-exports.EvaluationFormQuestionType = exports.EvaluationFormQuestion = void 0;
+exports.InitiatorInitiativeType = exports.InitiatorEmployeeNominationRequestStatus = exports.InitiatorEmployeeNominationRequests = exports.IpeGrievanceRequestAttachment = exports.IpeGrievanceMessageType = exports.IpeGrievanceRequestChat = exports.IpeGrievanceWorkFlowStatus = exports.IpeGrievanceWorkFlow = exports.IpeGrievanceApprovalStatus = exports.IpeGrievanceApprovalDetails = exports.IpeGrievancePeriodRating = exports.IpeGrievanceExemptionReason = exports.IpeGrievancePeriodType = exports.IpeGrievanceFinalEvaluationResult = exports.IpeGrievanceRequestStatus = exports.IpeGrievanceRequests = exports.EmployeeEvaluationRequestAttachment = exports.EmployeeEvaluationMessageType = exports.EmployeeEvaluationRequestChat = exports.EmployeeEvaluationWorkFlowStatus = exports.EmployeeEvaluationWorkFlow = exports.EmployeeEvaluationApprovalStatus = exports.EmployeeEvaluationApprovalDetails = exports.EmployeeEvaluationPersonScore = exports.EmployeeEvaluationAnswers = exports.EmployeeEvaluationUsFeedback = exports.EmployeeEvaluation = exports.EmployeeEvaluationRoutingBucket = exports.EmployeeEvaluationRequestStatus = exports.EmployeeEvaluationRequests = exports.syncEmployeeEvaluationScores = exports.persistEmployeeEvaluationScores = exports.resolveMaxEmployeesPerRequest = exports.normalizeEmployeeDraftSubmissions = exports.normalizeEmployeeSubmissions = exports.DEFAULT_MAX_EMPLOYEES_PER_REQUEST = exports.parseMonthRange = exports.parseEvaluationEndDay = exports.parseEligibilityDateRange = exports.parseMonthDay = exports.mmDdSortKey = exports.mmDdWindowsOverlap = exports.isCalendarMonthInEligibilityRange = exports.isEvaluationEligibilityWindowOpen = exports.EvaluationEligibilitySettingEmployee = exports.EvaluationEligibilitySetting = exports.isPortalAdminFromRequest = exports.userHasPortalAdminRole = exports.parsePortalUserIdFromRequest = exports.sendFmServicesNotificationConfigNotifications = void 0;
+exports.EvaluationFormType = exports.EvaluationForm = exports.EmbassyEvaluationRequestAttachment = exports.EmbassyEvaluationMessageType = exports.EmbassyEvaluationRequestChat = exports.EmbassyEvaluationWorkFlowStatus = exports.EmbassyEvaluationWorkFlow = exports.EmbassyEvaluationApprovalStatus = exports.EmbassyEvaluationApprovalDetails = exports.EmbassyEvaluationRequestStatus = exports.EmbassyEvaluationRequests = exports.EmbassyEvaluationResponse = exports.EmbassyEvaluationAssignmentStatus = exports.EmbassyEvaluationAssignment = exports.EmbassyEvaluationCycleStatus = exports.EmbassyEvaluationCycle = exports.EmployeeOfMonthSupportNominationRequestAttachment = exports.EmployeeOfMonthSupportNominationMessageType = exports.EmployeeOfMonthSupportNominationRequestChat = exports.EmployeeOfMonthSupportNominationWorkFlowStatus = exports.EmployeeOfMonthSupportNominationWorkFlow = exports.EmployeeOfMonthSupportNominationApprovalStatus = exports.EmployeeOfMonthSupportNominationApprovalDetails = exports.EmployeeOfMonthSupportNominationRequestStatus = exports.EmployeeOfMonthSupportNominationRequests = exports.EmployeeOfMonthNominationRequestAttachment = exports.EmployeeOfMonthNominationMessageType = exports.EmployeeOfMonthNominationRequestChat = exports.EmployeeOfMonthNominationWorkFlowStatus = exports.EmployeeOfMonthNominationWorkFlow = exports.EmployeeOfMonthNominationApprovalStatus = exports.EmployeeOfMonthNominationApprovalDetails = exports.EmployeeOfMonthNominationRequestStatus = exports.EmployeeOfMonthNominationRequests = exports.InnovativeEmployeeNominationRequestAttachment = exports.InnovativeEmployeeNominationMessageType = exports.InnovativeEmployeeNominationRequestChat = exports.InnovativeEmployeeNominationWorkFlowStatus = exports.InnovativeEmployeeNominationWorkFlow = exports.InnovativeEmployeeNominationApprovalStatus = exports.InnovativeEmployeeNominationApprovalDetails = exports.InnovativeEmployeeNominationRequestStatus = exports.InnovativeEmployeeNominationRequests = exports.InitiatorEmployeeNominationRequestAttachment = exports.InitiatorEmployeeNominationMessageType = exports.InitiatorEmployeeNominationRequestChat = exports.InitiatorEmployeeNominationWorkFlowStatus = exports.InitiatorEmployeeNominationWorkFlow = exports.InitiatorEmployeeNominationApprovalStatus = exports.InitiatorEmployeeNominationApprovalDetails = void 0;
+exports.EvaluationFormQuestionType = exports.EvaluationFormQuestion = exports.EvaluationFormSection = void 0;
 __exportStar(require("./models/user"), exports);
 __exportStar(require("./models/role"), exports);
 __exportStar(require("./models/user-sessions"), exports);
@@ -520,6 +520,7 @@ Object.defineProperty(exports, "normalizeEmployeeSubmissions", { enumerable: tru
 Object.defineProperty(exports, "normalizeEmployeeDraftSubmissions", { enumerable: true, get: function () { return employee_evaluation_request_utils_1.normalizeEmployeeDraftSubmissions; } });
 Object.defineProperty(exports, "resolveMaxEmployeesPerRequest", { enumerable: true, get: function () { return employee_evaluation_request_utils_1.resolveMaxEmployeesPerRequest; } });
 Object.defineProperty(exports, "persistEmployeeEvaluationScores", { enumerable: true, get: function () { return employee_evaluation_request_utils_1.persistEmployeeEvaluationScores; } });
+Object.defineProperty(exports, "syncEmployeeEvaluationScores", { enumerable: true, get: function () { return employee_evaluation_request_utils_1.syncEmployeeEvaluationScores; } });
 var EmployeeEvaluationRequestModel_1 = require("./models/EmployeeEvaluationRequestModel");
 Object.defineProperty(exports, "EmployeeEvaluationRequests", { enumerable: true, get: function () { return EmployeeEvaluationRequestModel_1.EmployeeEvaluationRequests; } });
 Object.defineProperty(exports, "EmployeeEvaluationRequestStatus", { enumerable: true, get: function () { return EmployeeEvaluationRequestModel_1.EmployeeEvaluationRequestStatus; } });

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/foreign-ministry",
- "version": "1.3.355",
+ "version": "1.3.358",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "exports": {
@@ -22,7 +22,7 @@
   "access": "public"
  },
  "dependencies": {
-  "@platform-modules/foreign-ministry": "^1.3.338",
+  "@platform-modules/foreign-ministry": "^1.3.355",
   "moment-timezone": "^0.6.0",
   "pg": "^8.16.0",
   "typeorm": "^0.3.17"

package/sql/sla_reports_admin_procedures.sql

@@ -57,7 +57,7 @@ DECLARE
   v_dyn_keys          TEXT[];
   v_dyn_labels        TEXT[];
   v_common_labels     TEXT[] := ARRAY[
-    'SLA Request ID', 'Request ID', 'User', 'Status', 'Created At',
+    'Request ID', 'User', 'Status', 'Created At',
     'Created By', 'Department', 'Section'
   ];
   v_headers_labels    TEXT[];
@@ -167,7 +167,6 @@ BEGIN
       USING p_statuses, p_service_ids, p_sub_service_ids, p_from_date, p_to_date, p_search_text
     LOOP
       v_cells := ARRAY[
-        COALESCE(v_row.sla_request_id::TEXT, ''),
         COALESCE(v_row.request_id::TEXT, ''),
         COALESCE(v_row.user_name, ''),
         COALESCE(v_row.status, ''),

package/sql/sla_reports_approvals_workbook.sql

@@ -180,12 +180,12 @@ DECLARE
   v_dyn_keys          TEXT[];
   v_dyn_labels        TEXT[];
   v_common_req_labels TEXT[] := ARRAY[
-    'SLA Request ID', 'Request ID', 'User', 'Status', 'Created At',
+    'Request ID', 'User', 'Status', 'Created At',
     'Created By', 'Department', 'Section'
   ];
   v_approval_headers  TEXT[] := ARRAY[
     'Request ID', 'Service ID', 'Service Name', 'Sub Service ID', 'Sub Service Name',
-    'SLA Approval ID', 'Source Approval ID', 'Level', 'Approval Status', 'Request Status',
+    'Level', 'Approval Status', 'Request Status',
     'Approval Role ID', 'Approval Role Name', 'Approval Department ID', 'Approval Department Name',
     'Approval Section ID', 'Approval Section Name',
     'Approver User ID', 'Approver User Name', 'Delegate User ID', 'Delegate User Name',
@@ -292,7 +292,6 @@ BEGIN
       USING p_request_statuses, p_service_ids, p_sub_service_ids, p_from_date, p_to_date, p_search_text
     LOOP
       v_cells := ARRAY[
-        COALESCE(v_row.sla_request_id::TEXT, ''),
         COALESCE(v_row.request_id::TEXT, ''),
         COALESCE(v_row.user_name, ''),
         COALESCE(v_row.status, ''),
@@ -394,8 +393,6 @@ BEGIN
         COALESCE(v_approval.service_name, ''),
         COALESCE(v_approval.sub_service_id::TEXT, ''),
         COALESCE(v_approval.sub_service_name, ''),
-        COALESCE(v_approval.sla_approval_id::TEXT, ''),
-        COALESCE(v_approval.source_approval_id::TEXT, ''),
         COALESCE(v_approval.level::TEXT, ''),
         COALESCE(v_approval.approval_status, ''),
         COALESCE(v_approval.request_status, ''),

package/sql/sla_reports_procedures.sql

@@ -574,7 +574,7 @@ DECLARE
   v_sheet_label       TEXT;
   v_headers_labels    TEXT[] := ARRAY[
     'Request ID', 'Service ID', 'Service Name', 'Sub Service ID', 'Sub Service Name',
-    'SLA Approval ID', 'Source Approval ID', 'Level', 'Approval Status', 'Request Status',
+    'Level', 'Approval Status', 'Request Status',
     'Approval Role ID', 'Approval Role Name', 'Approval Department ID', 'Approval Department Name',
     'Approval Section ID', 'Approval Section Name',
     'Approver User ID', 'Approver User Name', 'Delegate User ID', 'Delegate User Name',
@@ -661,8 +661,6 @@ BEGIN
         COALESCE(v_approval.service_name, ''),
         COALESCE(v_approval.sub_service_id::TEXT, ''),
         COALESCE(v_approval.sub_service_name, ''),
-        COALESCE(v_approval.sla_approval_id::TEXT, ''),
-        COALESCE(v_approval.source_approval_id::TEXT, ''),
         COALESCE(v_approval.level::TEXT, ''),
         COALESCE(v_approval.approval_status, ''),
         COALESCE(v_approval.request_status, ''),
@@ -733,7 +731,7 @@ DECLARE
   v_dyn_keys          TEXT[];
   v_dyn_labels        TEXT[];
   v_common_labels     TEXT[] := ARRAY[
-    'SLA Request ID', 'Request ID', 'User', 'Status', 'Created At',
+    'Request ID', 'User', 'Status', 'Created At',
     'Created By', 'Department', 'Section'
   ];
   v_headers_labels    TEXT[];
@@ -839,7 +837,6 @@ BEGIN
       USING p_statuses, p_service_ids, p_sub_service_ids, p_from_date, p_to_date, p_search_text
     LOOP
       v_cells := ARRAY[
-        COALESCE(v_row.sla_request_id::TEXT, ''),
         COALESCE(v_row.request_id::TEXT, ''),
         COALESCE(v_row.user_name, ''),
         COALESCE(v_row.status, ''),

package/src/helpers/employee-evaluation-request.utils.ts

@@ -256,3 +256,130 @@ export async function persistEmployeeEvaluationScores(
 
   return { totalScore: requestTotal, averageScore, employeeCount };
 }
+
+/** Sync person_scores/answers on an existing request (draft update or draft promotion). */
+export async function syncEmployeeEvaluationScores(
+  manager: EntityManager,
+  opts: {
+    requestId: number;
+    formId: number;
+    createdBy: string;
+    employees: NormalizedEmployeeSubmission[];
+    validateAnswers?: boolean;
+  }
+): Promise<{ totalScore: number | null; averageScore: number | null; employeeCount: number }> {
+  const { requestId, formId, createdBy, employees, validateAnswers = false } = opts;
+  const payloadUserIds = new Set(employees.map((e) => e.user_id));
+
+  const existingScores = await manager.find(EmployeeEvaluationPersonScore, {
+    where: { request_id: requestId, is_deleted: false },
+  });
+  for (const ps of existingScores) {
+    if (!payloadUserIds.has(ps.user_id)) {
+      await manager.update(
+        EmployeeEvaluationPersonScore,
+        { id: ps.id },
+        { is_deleted: true, updated_by: createdBy }
+      );
+      await manager.update(
+        EmployeeEvaluationAnswers,
+        { request_id: requestId, user_id: ps.user_id, is_deleted: false },
+        { is_deleted: true, updated_by: createdBy }
+      );
+    }
+  }
+
+  for (const emp of employees) {
+    const existingPerson = existingScores.find((p) => p.user_id === emp.user_id);
+    if (existingPerson) {
+      await manager.update(
+        EmployeeEvaluationPersonScore,
+        { id: existingPerson.id },
+        { is_rca: Boolean(emp.is_rca), updated_by: createdBy }
+      );
+      await manager.update(
+        EmployeeEvaluationAnswers,
+        { request_id: requestId, user_id: emp.user_id, is_deleted: false },
+        { is_deleted: true, updated_by: createdBy }
+      );
+    } else {
+      await manager.save(
+        EmployeeEvaluationPersonScore,
+        manager.create(EmployeeEvaluationPersonScore, {
+          request_id: requestId,
+          user_id: emp.user_id,
+          is_rca: Boolean(emp.is_rca),
+          us_feedback: null,
+          total_score: null,
+          created_by: createdBy,
+          is_deleted: false,
+        })
+      );
+    }
+
+    if (emp.answers.length > 0) {
+      let personTotal = 0;
+      for (const ans of emp.answers) {
+        const qMeta = await manager.findOne(EvaluationFormQuestion, {
+          where: { id: ans.question_id, is_deleted: false },
+        });
+        const questionSectionId = qMeta?.form_section_id;
+        if (validateAnswers) {
+          if (!qMeta || questionSectionId == null || questionSectionId !== ans.section_id) {
+            throw new Error(`Invalid question ${ans.question_id} for section ${ans.section_id}`);
+          }
+          if (qMeta.max_score != null && ans.score > qMeta.max_score) {
+            throw new Error(
+              `score ${ans.score} exceeds max_score ${qMeta.max_score} for question ${ans.question_id}`
+            );
+          }
+        } else if (
+          qMeta &&
+          qMeta.form_section_id != null &&
+          qMeta.form_section_id !== ans.section_id
+        ) {
+          throw new Error(`Invalid question ${ans.question_id} for section ${ans.section_id}`);
+        }
+        personTotal += ans.score;
+        await manager.save(
+          EmployeeEvaluationAnswers,
+          manager.create(EmployeeEvaluationAnswers, {
+            request_id: requestId,
+            user_id: emp.user_id,
+            form_id: formId,
+            section_id: ans.section_id,
+            question_id: ans.question_id,
+            score: ans.score,
+            remarks: ans.remarks ?? null,
+            created_by: createdBy,
+            is_deleted: false,
+          })
+        );
+      }
+      await manager.update(
+        EmployeeEvaluationPersonScore,
+        { request_id: requestId, user_id: emp.user_id, is_deleted: false },
+        { total_score: personTotal, updated_by: createdBy }
+      );
+    }
+  }
+
+  const personRows = await manager.find(EmployeeEvaluationPersonScore, {
+    where: { request_id: requestId, is_deleted: false },
+  });
+  const scores = personRows.map((p) => p.total_score ?? 0);
+  const requestTotal = scores.reduce((a, b) => a + b, 0);
+  const average = personRows.length ? requestTotal / personRows.length : 0;
+  await manager.update(EmployeeEvaluationRequests, { id: requestId }, {
+    total_score: personRows.length ? requestTotal : null,
+    average_score: personRows.length ? average : null,
+    employee_count: personRows.length,
+    updated_by: createdBy,
+  });
+
+  return {
+    totalScore: personRows.length ? requestTotal : null,
+    averageScore: personRows.length ? average : null,
+    employeeCount: personRows.length,
+  };
+}

package/src/index.ts

@@ -463,6 +463,7 @@ export {
   normalizeEmployeeDraftSubmissions,
   resolveMaxEmployeesPerRequest,
   persistEmployeeEvaluationScores,
+  syncEmployeeEvaluationScores,
 } from './helpers/employee-evaluation-request.utils';
 export type {
   EmployeeEvaluationSubmitAnswer,