@platform-modules/civil-aviation-authority 2.3.333 → 2.3.335

package/dist/data-source.js

@@ -275,6 +275,7 @@ const ComplaintLostPropertyReportRequestModel_1 = require("./models/ComplaintLos
 const ComplaintLostPropertyReportWorkflowModel_1 = require("./models/ComplaintLostPropertyReportWorkflowModel");
 const ContractServiceRequestModel_1 = require("./models/ContractServiceRequestModel");
 const ContractServiceRequestDocumentModel_1 = require("./models/ContractServiceRequestDocumentModel");
+const AnnualPlanSubmissionRestrictionModel_1 = require("./models/AnnualPlanSubmissionRestrictionModel");
 const CountryMasterModel_1 = require("./models/CountryMasterModel");
 const CyberSecurityAuditRequestModel_1 = require("./models/CyberSecurityAuditRequestModel");
 const CyberSecurityRiskManagementRequestModel_1 = require("./models/CyberSecurityRiskManagementRequestModel");
@@ -601,6 +602,7 @@ exports.AppDataSource = new typeorm_1.DataSource({
         ComplaintLostPropertyReportWorkflowModel_1.ComplaintLostPropertyReportWorkflow,
         ContractServiceRequestModel_1.ContractServiceRequest,
         ContractServiceRequestDocumentModel_1.ContractServiceRequestDocument,
+        AnnualPlanSubmissionRestrictionModel_1.AnnualPlanSubmissionRestriction,
         CountryMasterModel_1.CountryMaster,
         CyberSecurityAuditRequestModel_1.CyberSecurityAuditRequest,
         CyberSecurityRiskManagementRequestModel_1.CyberSecurityRiskManagementRequest,

package/dist/helpers/cancellation-bilingual-persist.helper.d.ts

@@ -0,0 +1,37 @@
+import type { EntityManager } from 'typeorm';
+import { CancellationMessageType } from '../models/CancellationChatModel';
+import { CancellationWorkFlowStatus } from '../models/CancellationWorkflowModel';
+export type CancellationWorkflowRowInput = {
+    request_id: number;
+    service_id?: number | null;
+    sub_service_id?: number | null;
+    content: string;
+    content_ar?: string | null;
+    status: CancellationWorkFlowStatus;
+    status_ar?: string | null;
+    user_id?: number | null;
+    role_id?: number | null;
+    department_id?: number | null;
+    section_id?: number | null;
+    step_order?: number | null;
+    created_by?: number | null;
+};
+export type CancellationChatRowInput = {
+    request_id: number;
+    service_id?: number | null;
+    sub_service_id?: number | null;
+    user_id: number;
+    role_id?: number | null;
+    message: string;
+    message_ar?: string | null;
+    messageType?: CancellationMessageType;
+    status?: string | null;
+    status_ar?: string | null;
+    created_by?: number | string | null;
+};
+/** Force-persist Arabic workflow columns (guards against stale TypeORM entity metadata). */
+export declare function patchCancellationWorkflowArabic(manager: EntityManager, workflowId: number, contentAr: string | null, statusAr: string | null): Promise<void>;
+/** Force-persist Arabic chat columns (guards against stale TypeORM entity metadata). */
+export declare function patchCancellationChatArabic(manager: EntityManager, chatId: number, messageAr: string | null, statusAr: string | null): Promise<void>;
+export declare function insertCancellationWorkflowRow(manager: EntityManager, input: CancellationWorkflowRowInput): Promise<number>;
+export declare function insertCancellationChatRow(manager: EntityManager, input: CancellationChatRowInput): Promise<number>;

package/dist/helpers/cancellation-bilingual-persist.helper.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.patchCancellationWorkflowArabic = patchCancellationWorkflowArabic;
+exports.patchCancellationChatArabic = patchCancellationChatArabic;
+exports.insertCancellationWorkflowRow = insertCancellationWorkflowRow;
+exports.insertCancellationChatRow = insertCancellationChatRow;
+const CancellationChatModel_1 = require("../models/CancellationChatModel");
+const CancellationWorkflowModel_1 = require("../models/CancellationWorkflowModel");
+const workflow_chat_i18n_1 = require("../i18n/workflow-chat-i18n");
+function resolveWorkflowRowId(insertResult) {
+    const id = insertResult.raw?.[0]?.id ?? insertResult.identifiers?.[0]?.id;
+    if (!id) {
+        throw new Error('Failed to insert cancellation workflow row');
+    }
+    return id;
+}
+function resolveChatRowId(insertResult) {
+    const id = insertResult.raw?.[0]?.id ?? insertResult.identifiers?.[0]?.id;
+    if (!id) {
+        throw new Error('Failed to insert cancellation chat row');
+    }
+    return id;
+}
+/** Force-persist Arabic workflow columns (guards against stale TypeORM entity metadata). */
+async function patchCancellationWorkflowArabic(manager, workflowId, contentAr, statusAr) {
+    await manager.query(`UPDATE cancellation_workflows
+     SET content_ar = $1,
+         status_ar = $2,
+         updated_at = CURRENT_TIMESTAMP
+     WHERE id = $3`, [contentAr, statusAr, workflowId]);
+}
+/** Force-persist Arabic chat columns (guards against stale TypeORM entity metadata). */
+async function patchCancellationChatArabic(manager, chatId, messageAr, statusAr) {
+    await manager.query(`UPDATE cancellation_chats
+     SET message_ar = $1,
+         status_ar = $2,
+         updated_at = CURRENT_TIMESTAMP
+     WHERE id = $3`, [messageAr, statusAr, chatId]);
+}
+async function insertCancellationWorkflowRow(manager, input) {
+    const contentAr = input.content_ar ?? null;
+    const statusAr = input.status_ar ?? (0, workflow_chat_i18n_1.resolveWorkflowStatusAr)(input.status);
+    const insertResult = await manager
+        .createQueryBuilder()
+        .insert()
+        .into(CancellationWorkflowModel_1.CancellationWorkFlow)
+        .values({
+        ...input,
+        content_ar: contentAr,
+        status_ar: statusAr,
+    })
+        .returning('id')
+        .execute();
+    const id = resolveWorkflowRowId(insertResult);
+    await patchCancellationWorkflowArabic(manager, id, contentAr, statusAr);
+    return id;
+}
+async function insertCancellationChatRow(manager, input) {
+    const messageAr = input.message_ar ?? null;
+    const statusAr = input.status_ar ?? (0, workflow_chat_i18n_1.resolveChatStatusAr)(input.status ?? null);
+    const messageType = input.messageType ?? CancellationChatModel_1.CancellationMessageType.TEXT;
+    const insertResult = await manager
+        .createQueryBuilder()
+        .insert()
+        .into(CancellationChatModel_1.CancellationRequestChat)
+        .values({
+        ...input,
+        message_ar: messageAr,
+        status_ar: statusAr,
+        messageType,
+    })
+        .returning('id')
+        .execute();
+    const id = resolveChatRowId(insertResult);
+    await patchCancellationChatArabic(manager, id, messageAr, statusAr);
+    return id;
+}

package/dist/index.d.ts

@@ -174,9 +174,6 @@ export { StudyLeaveRequestChat } from './models/StudyLeaveChatModel';
 export { StudyLeaveMessageType } from './models/StudyLeaveChatModel';
 export { StudyLeaveChatStatus } from './models/StudyLeaveChatModel';
 export * from './models/AnnualTrainingPlanRequestModel';
-export * from './models/AnnualTrainingPlanItemModel';
-export * from './models/AnnualTrainingPlanDepartmentPlanModel';
-export * from './models/AnnualTrainingPlanDepartmentPlanDecisionModel';
 export * from './models/AnnualTrainingPlanWorkflowModel';
 export * from './models/AnnualTrainingPlanApprovalModel';
 export * from './models/AnnualTrainingPlanChatModel';
@@ -278,6 +275,7 @@ export * from './models/JobTransferRequestModel';
 export { JobTransferRequestStatus } from './models/JobTransferRequestModel';
 export * from './models/NewResourceRequestModel';
 export { NewResourceRequestStatus } from './models/NewResourceRequestModel';
+export * from './models/AnnualPlanSubmissionRestrictionModel';
 export * from './models/CountryMasterModel';
 export * from './models/CAIRatingMasterModel';
 export * from './models/CSRMLikelihoodMasterModel';

package/dist/index.js

@@ -235,9 +235,6 @@ Object.defineProperty(exports, "StudyLeaveMessageType", { enumerable: true, get:
 var StudyLeaveChatModel_3 = require("./models/StudyLeaveChatModel");
 Object.defineProperty(exports, "StudyLeaveChatStatus", { enumerable: true, get: function () { return StudyLeaveChatModel_3.StudyLeaveChatStatus; } });
 __exportStar(require("./models/AnnualTrainingPlanRequestModel"), exports);
-__exportStar(require("./models/AnnualTrainingPlanItemModel"), exports);
-__exportStar(require("./models/AnnualTrainingPlanDepartmentPlanModel"), exports);
-__exportStar(require("./models/AnnualTrainingPlanDepartmentPlanDecisionModel"), exports);
 __exportStar(require("./models/AnnualTrainingPlanWorkflowModel"), exports);
 __exportStar(require("./models/AnnualTrainingPlanApprovalModel"), exports);
 __exportStar(require("./models/AnnualTrainingPlanChatModel"), exports);
@@ -420,6 +417,8 @@ Object.defineProperty(exports, "JobTransferRequestStatus", { enumerable: true, g
 __exportStar(require("./models/NewResourceRequestModel"), exports);
 var NewResourceRequestModel_1 = require("./models/NewResourceRequestModel");
 Object.defineProperty(exports, "NewResourceRequestStatus", { enumerable: true, get: function () { return NewResourceRequestModel_1.NewResourceRequestStatus; } });
+// Annual plan submission restriction master
+__exportStar(require("./models/AnnualPlanSubmissionRestrictionModel"), exports);
 // Country Master
 __exportStar(require("./models/CountryMasterModel"), exports);
 __exportStar(require("./models/CAIRatingMasterModel"), exports);

package/dist/models/AnnualPlanSubmissionRestrictionModel.d.ts

@@ -0,0 +1,9 @@
+import { BaseModel } from './BaseModel';
+export type AnnualPlanSubmissionRestrictionStatus = 'Active' | 'Inactive';
+export declare class AnnualPlanSubmissionRestriction extends BaseModel {
+    user_id: number;
+    department_id: number;
+    section_id: number;
+    status: AnnualPlanSubmissionRestrictionStatus;
+    constructor(userId?: number, departmentId?: number, sectionId?: number);
+}

package/dist/models/AnnualPlanSubmissionRestrictionModel.js

@@ -0,0 +1,47 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AnnualPlanSubmissionRestriction = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let AnnualPlanSubmissionRestriction = class AnnualPlanSubmissionRestriction extends BaseModel_1.BaseModel {
+    constructor(userId, departmentId, sectionId) {
+        super();
+        if (userId != null)
+            this.user_id = userId;
+        if (departmentId != null)
+            this.department_id = departmentId;
+        if (sectionId != null)
+            this.section_id = sectionId;
+        this.status = 'Active';
+    }
+};
+exports.AnnualPlanSubmissionRestriction = AnnualPlanSubmissionRestriction;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], AnnualPlanSubmissionRestriction.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], AnnualPlanSubmissionRestriction.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], AnnualPlanSubmissionRestriction.prototype, "section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 20, default: 'Active' }),
+    __metadata("design:type", String)
+], AnnualPlanSubmissionRestriction.prototype, "status", void 0);
+exports.AnnualPlanSubmissionRestriction = AnnualPlanSubmissionRestriction = __decorate([
+    (0, typeorm_1.Entity)({ name: 'annual_plan_submission_restriction' }),
+    __metadata("design:paramtypes", [Number, Number, Number])
+], AnnualPlanSubmissionRestriction);

package/dist/models/AnnualTrainingPlanRequestModel.d.ts

@@ -10,15 +10,6 @@ export declare enum AnnualTrainingPlanPlace {
     INSIDE = "Inside",
     OUTSIDE = "Outside"
 }
-export declare enum AnnualTrainingPlanImportStatus {
-    VALIDATED = "Validated",
-    IMPORTED = "Imported",
-    FAILED = "Failed"
-}
-export declare enum AnnualTrainingPlanSubmissionSource {
-    EXCEL = "Excel",
-    DIRECT = "Direct"
-}
 export declare class AnnualTrainingPlanRequest extends BaseModel {
     req_user_department_id: number | null;
     req_user_section_id: number | null;
@@ -26,23 +17,23 @@ export declare class AnnualTrainingPlanRequest extends BaseModel {
     service_id: number | null;
     sub_service_id: number | null;
     user_id: number;
+    course_name: string;
+    no_of_participants: number;
+    course_cost: number;
     total_cost: number;
+    proposed_implementation_date: string;
+    description: string;
+    place: AnnualTrainingPlanPlace | null;
+    location: string | null;
+    reason: string;
+    employee_list: any[] | null;
     status: AnnualTrainingPlanRequestStatus;
     reviewer_user_id: number | null;
     assigned_to_user_id: number | null;
     assigned_at: Date | null;
     workflow_execution_id: string | null;
+    job_competency: string | null;
+    name_of_participants: string[] | null;
     directarate: string | null;
-    plan_name: string | null;
-    plan_number: string | null;
-    plan_year: number | null;
-    source_file_url: string | null;
-    source_file_name: string | null;
-    total_departments: number;
-    total_courses: number;
-    total_participants: number;
-    import_status: AnnualTrainingPlanImportStatus | null;
-    submission_source: AnnualTrainingPlanSubmissionSource | null;
-    reference_number: string | null;
-    constructor(user_id: number, status?: AnnualTrainingPlanRequestStatus, service_id?: number | null, sub_service_id?: number | null, req_user_department_id?: number | null, req_user_section_id?: number | null, req_user_position_id?: number | null, reviewer_user_id?: number | null, assigned_to_user_id?: number | null, assigned_at?: Date | null, workflow_execution_id?: string | null, directarate?: string | null);
+    constructor(user_id: number, course_name: string, no_of_participants: number, course_cost: number, total_cost: number, proposed_implementation_date: string, description: string, place: AnnualTrainingPlanPlace | null, reason: string, status?: AnnualTrainingPlanRequestStatus, service_id?: number | null, sub_service_id?: number | null, req_user_department_id?: number | null, req_user_section_id?: number | null, req_user_position_id?: number | null, location?: string | null, employee_list?: any[] | null, reviewer_user_id?: number | null, assigned_to_user_id?: number | null, assigned_at?: Date | null, workflow_execution_id?: string | null, job_competency?: string | null, name_of_participants?: string[] | null, directarate?: string | null);
 }

package/dist/models/AnnualTrainingPlanRequestModel.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AnnualTrainingPlanRequest = exports.AnnualTrainingPlanSubmissionSource = exports.AnnualTrainingPlanImportStatus = exports.AnnualTrainingPlanPlace = exports.AnnualTrainingPlanRequestStatus = void 0;
+exports.AnnualTrainingPlanRequest = exports.AnnualTrainingPlanPlace = exports.AnnualTrainingPlanRequestStatus = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 var AnnualTrainingPlanRequestStatus;
@@ -25,44 +25,33 @@ var AnnualTrainingPlanPlace;
     AnnualTrainingPlanPlace["INSIDE"] = "Inside";
     AnnualTrainingPlanPlace["OUTSIDE"] = "Outside";
 })(AnnualTrainingPlanPlace || (exports.AnnualTrainingPlanPlace = AnnualTrainingPlanPlace = {}));
-var AnnualTrainingPlanImportStatus;
-(function (AnnualTrainingPlanImportStatus) {
-    AnnualTrainingPlanImportStatus["VALIDATED"] = "Validated";
-    AnnualTrainingPlanImportStatus["IMPORTED"] = "Imported";
-    AnnualTrainingPlanImportStatus["FAILED"] = "Failed";
-})(AnnualTrainingPlanImportStatus || (exports.AnnualTrainingPlanImportStatus = AnnualTrainingPlanImportStatus = {}));
-var AnnualTrainingPlanSubmissionSource;
-(function (AnnualTrainingPlanSubmissionSource) {
-    AnnualTrainingPlanSubmissionSource["EXCEL"] = "Excel";
-    AnnualTrainingPlanSubmissionSource["DIRECT"] = "Direct";
-})(AnnualTrainingPlanSubmissionSource || (exports.AnnualTrainingPlanSubmissionSource = AnnualTrainingPlanSubmissionSource = {}));
 let AnnualTrainingPlanRequest = class AnnualTrainingPlanRequest extends BaseModel_1.BaseModel {
-    constructor(user_id, status = AnnualTrainingPlanRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id, directarate) {
+    constructor(user_id, course_name, no_of_participants, course_cost, total_cost, proposed_implementation_date, description, place, reason, status = AnnualTrainingPlanRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, location, employee_list, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id, job_competency, name_of_participants, directarate) {
         super();
         this.user_id = user_id;
-        this.total_cost = 0;
+        this.course_name = course_name;
+        this.no_of_participants = no_of_participants;
+        this.course_cost = course_cost;
+        this.total_cost = total_cost;
+        this.proposed_implementation_date = proposed_implementation_date;
+        this.description = description;
+        this.place = place;
+        this.reason = reason;
         this.status = status;
         this.service_id = service_id || null;
         this.sub_service_id = sub_service_id || null;
         this.req_user_department_id = req_user_department_id || null;
         this.req_user_section_id = req_user_section_id || null;
         this.req_user_position_id = req_user_position_id || null;
+        this.location = location || null;
+        this.employee_list = employee_list || null;
         this.reviewer_user_id = reviewer_user_id || null;
         this.assigned_to_user_id = assigned_to_user_id || null;
         this.assigned_at = assigned_at || null;
         this.workflow_execution_id = workflow_execution_id || null;
+        this.job_competency = job_competency ?? null;
+        this.name_of_participants = name_of_participants ?? null;
         this.directarate = directarate ?? null;
-        this.plan_name = null;
-        this.plan_number = null;
-        this.plan_year = null;
-        this.source_file_url = null;
-        this.source_file_name = null;
-        this.total_departments = 0;
-        this.total_courses = 0;
-        this.total_participants = 0;
-        this.import_status = null;
-        this.submission_source = null;
-        this.reference_number = null;
     }
 };
 exports.AnnualTrainingPlanRequest = AnnualTrainingPlanRequest;
@@ -91,9 +80,49 @@ __decorate([
     __metadata("design:type", Number)
 ], AnnualTrainingPlanRequest.prototype, "user_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "decimal", precision: 14, scale: 2, nullable: false, default: 0 }),
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
+    __metadata("design:type", String)
+], AnnualTrainingPlanRequest.prototype, "course_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTrainingPlanRequest.prototype, "no_of_participants", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 2, nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTrainingPlanRequest.prototype, "course_cost", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 2, nullable: false }),
     __metadata("design:type", Number)
 ], AnnualTrainingPlanRequest.prototype, "total_cost", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 500, nullable: false, default: "" }),
+    __metadata("design:type", String)
+], AnnualTrainingPlanRequest.prototype, "proposed_implementation_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: false }),
+    __metadata("design:type", String)
+], AnnualTrainingPlanRequest.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: AnnualTrainingPlanPlace,
+        nullable: true
+    }),
+    __metadata("design:type", Object)
+], AnnualTrainingPlanRequest.prototype, "place", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTrainingPlanRequest.prototype, "location", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: false }),
+    __metadata("design:type", String)
+], AnnualTrainingPlanRequest.prototype, "reason", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "jsonb", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTrainingPlanRequest.prototype, "employee_list", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: "enum",
@@ -122,60 +151,16 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
     __metadata("design:type", Object)
-], AnnualTrainingPlanRequest.prototype, "directarate", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
-    __metadata("design:type", Object)
-], AnnualTrainingPlanRequest.prototype, "plan_name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 30, nullable: true, unique: true }),
-    __metadata("design:type", Object)
-], AnnualTrainingPlanRequest.prototype, "plan_number", void 0);
+], AnnualTrainingPlanRequest.prototype, "job_competency", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    (0, typeorm_1.Column)({ type: "jsonb", nullable: true }),
     __metadata("design:type", Object)
-], AnnualTrainingPlanRequest.prototype, "plan_year", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 1000, nullable: true }),
-    __metadata("design:type", Object)
-], AnnualTrainingPlanRequest.prototype, "source_file_url", void 0);
+], AnnualTrainingPlanRequest.prototype, "name_of_participants", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
     __metadata("design:type", Object)
-], AnnualTrainingPlanRequest.prototype, "source_file_name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: false, default: 0 }),
-    __metadata("design:type", Number)
-], AnnualTrainingPlanRequest.prototype, "total_departments", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: false, default: 0 }),
-    __metadata("design:type", Number)
-], AnnualTrainingPlanRequest.prototype, "total_courses", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: false, default: 0 }),
-    __metadata("design:type", Number)
-], AnnualTrainingPlanRequest.prototype, "total_participants", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        type: "enum",
-        enum: AnnualTrainingPlanImportStatus,
-        nullable: true
-    }),
-    __metadata("design:type", Object)
-], AnnualTrainingPlanRequest.prototype, "import_status", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        type: "enum",
-        enum: AnnualTrainingPlanSubmissionSource,
-        nullable: true
-    }),
-    __metadata("design:type", Object)
-], AnnualTrainingPlanRequest.prototype, "submission_source", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 20, nullable: true, unique: true }),
-    __metadata("design:type", Object)
-], AnnualTrainingPlanRequest.prototype, "reference_number", void 0);
+], AnnualTrainingPlanRequest.prototype, "directarate", void 0);
 exports.AnnualTrainingPlanRequest = AnnualTrainingPlanRequest = __decorate([
     (0, typeorm_1.Entity)({ name: "annual_training_plan_requests" }),
-    __metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
+    __metadata("design:paramtypes", [Number, String, Number, Number, Number, String, String, Object, String, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
 ], AnnualTrainingPlanRequest);

package/dist/models/CyberSecurityRiskManagementRiskModel.d.ts

@@ -33,4 +33,8 @@ export declare class CyberSecurityRiskManagementRisk extends BaseModel {
     confidentiality: number | null;
     integrity: number | null;
     availability: number | null;
+    new_control: string | null;
+    actual_end_date: Date | null;
+    notes: string | null;
+    justification_for_delay: string | null;
 }

package/dist/models/CyberSecurityRiskManagementRiskModel.js

@@ -118,6 +118,22 @@ __decorate([
     (0, typeorm_1.Column)({ type: "integer", nullable: true }),
     __metadata("design:type", Object)
 ], CyberSecurityRiskManagementRisk.prototype, "availability", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: true }),
+    __metadata("design:type", Object)
+], CyberSecurityRiskManagementRisk.prototype, "new_control", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "date", nullable: true }),
+    __metadata("design:type", Object)
+], CyberSecurityRiskManagementRisk.prototype, "actual_end_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: true }),
+    __metadata("design:type", Object)
+], CyberSecurityRiskManagementRisk.prototype, "notes", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: true }),
+    __metadata("design:type", Object)
+], CyberSecurityRiskManagementRisk.prototype, "justification_for_delay", void 0);
 exports.CyberSecurityRiskManagementRisk = CyberSecurityRiskManagementRisk = __decorate([
     (0, typeorm_1.Entity)({ name: "cyber_security_risk_management_risks" })
 ], CyberSecurityRiskManagementRisk);

package/dist/models/SlaApprovalsViewModel.js

@@ -11,60 +11,60 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SlaApprovalsView = void 0;
 const typeorm_1 = require("typeorm");
-const VW_SLA_APPROVALS_SQL = `
-SELECT
-    sa.id AS sla_approval_id,
-    sa.source_approval_id,
-    sa.request_id,
-    sa.service_id AS service_id,
-    sa.sub_service_id AS sub_service_id,
-    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
-    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
-    sa.approver_role_id AS approval_role_id,
-    TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
-    sa.department_id AS approval_department_id,
-    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
-    sa.section_id AS approval_section_id,
-    TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
-    sa.approval_status::TEXT AS approval_status,
-    sr.status::TEXT AS request_status,
-    sa.level AS level,
-    sa.approver_user_id AS approver_user_id,
-    TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
-    sa.delegate_user_id AS delegate_user_id,
-    TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
-    sa.approved_by AS approved_by,
-    TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
-    sa.comment::TEXT AS comment,
-    sa.created_at AS created_at,
-    sa.updated_at AS updated_at
-FROM sla_approval sa
-INNER JOIN sla_requests sr
-    ON sr.id = (
-        SELECT MIN(sr2.id)
-        FROM sla_requests sr2
-        WHERE sr2.request_id = sa.request_id
-          AND COALESCE(sr2.is_deleted, false) = false
-          AND (sa.service_id IS NULL OR sr2.service_id = sa.service_id)
-          AND (sa.sub_service_id IS NULL OR sr2.sub_service_id = sa.sub_service_id)
-    )
-LEFT JOIN caa_services svc
-    ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
-LEFT JOIN caa_sub_services subsvc
-    ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
-LEFT JOIN departments adpt
-    ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
-LEFT JOIN sections asec
-    ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
-LEFT JOIN role ar
-    ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
-LEFT JOIN users au
-    ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
-LEFT JOIN users du
-    ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
-LEFT JOIN users ab
-    ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
-WHERE COALESCE(sa.is_deleted, false) = false
+const VW_SLA_APPROVALS_SQL = `
+SELECT
+    sa.id AS sla_approval_id,
+    sa.source_approval_id,
+    sa.request_id,
+    sa.service_id AS service_id,
+    sa.sub_service_id AS sub_service_id,
+    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
+    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
+    sa.approver_role_id AS approval_role_id,
+    TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
+    sa.department_id AS approval_department_id,
+    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
+    sa.section_id AS approval_section_id,
+    TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
+    sa.approval_status::TEXT AS approval_status,
+    sr.status::TEXT AS request_status,
+    sa.level AS level,
+    sa.approver_user_id AS approver_user_id,
+    TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
+    sa.delegate_user_id AS delegate_user_id,
+    TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
+    sa.approved_by AS approved_by,
+    TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
+    sa.comment::TEXT AS comment,
+    sa.created_at AS created_at,
+    sa.updated_at AS updated_at
+FROM sla_approval sa
+INNER JOIN sla_requests sr
+    ON sr.id = (
+        SELECT MIN(sr2.id)
+        FROM sla_requests sr2
+        WHERE sr2.request_id = sa.request_id
+          AND COALESCE(sr2.is_deleted, false) = false
+          AND (sa.service_id IS NULL OR sr2.service_id = sa.service_id)
+          AND (sa.sub_service_id IS NULL OR sr2.sub_service_id = sa.sub_service_id)
+    )
+LEFT JOIN caa_services svc
+    ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
+LEFT JOIN caa_sub_services subsvc
+    ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
+LEFT JOIN departments adpt
+    ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
+LEFT JOIN sections asec
+    ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
+LEFT JOIN role ar
+    ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
+LEFT JOIN users au
+    ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
+LEFT JOIN users du
+    ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
+LEFT JOIN users ab
+    ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
+WHERE COALESCE(sa.is_deleted, false) = false
 `;
 /**
  * Read-only view for SLA approvals listings (TypeORM).

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
-  "version": "2.3.333",
+  "version": "2.3.335",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
   "scripts": {