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

package/dist/index.d.ts

@@ -174,6 +174,9 @@ 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';

package/dist/index.js

@@ -235,6 +235,9 @@ 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);

package/dist/models/AnnualTrainingPlanDepartmentPlanDecisionModel.d.ts

@@ -0,0 +1,10 @@
+import { BaseModel } from "./BaseModel";
+import { AnnualTrainingPlanDepartmentPlan, AnnualTrainingPlanDepartmentPlanStatus } from "./AnnualTrainingPlanDepartmentPlanModel";
+export declare class AnnualTrainingPlanDepartmentPlanDecision extends BaseModel {
+    department_plan_id: number;
+    approval_level: number;
+    status: AnnualTrainingPlanDepartmentPlanStatus;
+    comment: string | null;
+    decided_by: number | null;
+    department_plan: AnnualTrainingPlanDepartmentPlan;
+}

package/dist/models/AnnualTrainingPlanDepartmentPlanDecisionModel.js

@@ -0,0 +1,51 @@
+"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.AnnualTrainingPlanDepartmentPlanDecision = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+const AnnualTrainingPlanDepartmentPlanModel_1 = require("./AnnualTrainingPlanDepartmentPlanModel");
+let AnnualTrainingPlanDepartmentPlanDecision = class AnnualTrainingPlanDepartmentPlanDecision extends BaseModel_1.BaseModel {
+};
+exports.AnnualTrainingPlanDepartmentPlanDecision = AnnualTrainingPlanDepartmentPlanDecision;
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTrainingPlanDepartmentPlanDecision.prototype, "department_plan_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTrainingPlanDepartmentPlanDecision.prototype, "approval_level", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: AnnualTrainingPlanDepartmentPlanModel_1.AnnualTrainingPlanDepartmentPlanStatus,
+        nullable: false
+    }),
+    __metadata("design:type", String)
+], AnnualTrainingPlanDepartmentPlanDecision.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTrainingPlanDepartmentPlanDecision.prototype, "comment", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTrainingPlanDepartmentPlanDecision.prototype, "decided_by", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => AnnualTrainingPlanDepartmentPlanModel_1.AnnualTrainingPlanDepartmentPlan, { onDelete: "CASCADE" }),
+    (0, typeorm_1.JoinColumn)({ name: "department_plan_id" }),
+    __metadata("design:type", AnnualTrainingPlanDepartmentPlanModel_1.AnnualTrainingPlanDepartmentPlan)
+], AnnualTrainingPlanDepartmentPlanDecision.prototype, "department_plan", void 0);
+exports.AnnualTrainingPlanDepartmentPlanDecision = AnnualTrainingPlanDepartmentPlanDecision = __decorate([
+    (0, typeorm_1.Entity)({ name: "annual_training_plan_department_plan_decisions" }),
+    (0, typeorm_1.Index)(["department_plan_id", "approval_level"])
+], AnnualTrainingPlanDepartmentPlanDecision);

package/dist/models/AnnualTrainingPlanDepartmentPlanModel.d.ts

@@ -0,0 +1,13 @@
+import { BaseModel } from "./BaseModel";
+import { AnnualTrainingPlanRequest } from "./AnnualTrainingPlanRequestModel";
+export declare enum AnnualTrainingPlanDepartmentPlanStatus {
+    PENDING = "Pending",
+    APPROVED = "Approved",
+    REJECTED = "Rejected"
+}
+export declare class AnnualTrainingPlanDepartmentPlan extends BaseModel {
+    request_id: number;
+    department_id: number;
+    status: AnnualTrainingPlanDepartmentPlanStatus;
+    request: AnnualTrainingPlanRequest;
+}

package/dist/models/AnnualTrainingPlanDepartmentPlanModel.js

@@ -0,0 +1,50 @@
+"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.AnnualTrainingPlanDepartmentPlan = exports.AnnualTrainingPlanDepartmentPlanStatus = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+const AnnualTrainingPlanRequestModel_1 = require("./AnnualTrainingPlanRequestModel");
+var AnnualTrainingPlanDepartmentPlanStatus;
+(function (AnnualTrainingPlanDepartmentPlanStatus) {
+    AnnualTrainingPlanDepartmentPlanStatus["PENDING"] = "Pending";
+    AnnualTrainingPlanDepartmentPlanStatus["APPROVED"] = "Approved";
+    AnnualTrainingPlanDepartmentPlanStatus["REJECTED"] = "Rejected";
+})(AnnualTrainingPlanDepartmentPlanStatus || (exports.AnnualTrainingPlanDepartmentPlanStatus = AnnualTrainingPlanDepartmentPlanStatus = {}));
+let AnnualTrainingPlanDepartmentPlan = class AnnualTrainingPlanDepartmentPlan extends BaseModel_1.BaseModel {
+};
+exports.AnnualTrainingPlanDepartmentPlan = AnnualTrainingPlanDepartmentPlan;
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTrainingPlanDepartmentPlan.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTrainingPlanDepartmentPlan.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: AnnualTrainingPlanDepartmentPlanStatus,
+        default: AnnualTrainingPlanDepartmentPlanStatus.PENDING,
+        nullable: false
+    }),
+    __metadata("design:type", String)
+], AnnualTrainingPlanDepartmentPlan.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => AnnualTrainingPlanRequestModel_1.AnnualTrainingPlanRequest, { onDelete: "CASCADE" }),
+    (0, typeorm_1.JoinColumn)({ name: "request_id" }),
+    __metadata("design:type", AnnualTrainingPlanRequestModel_1.AnnualTrainingPlanRequest)
+], AnnualTrainingPlanDepartmentPlan.prototype, "request", void 0);
+exports.AnnualTrainingPlanDepartmentPlan = AnnualTrainingPlanDepartmentPlan = __decorate([
+    (0, typeorm_1.Entity)({ name: "annual_training_plan_department_plans" }),
+    (0, typeorm_1.Index)(["request_id"])
+], AnnualTrainingPlanDepartmentPlan);

package/dist/models/AnnualTrainingPlanItemModel.d.ts

@@ -0,0 +1,22 @@
+import { BaseModel } from "./BaseModel";
+import { AnnualTrainingPlanPlace, AnnualTrainingPlanRequest } from "./AnnualTrainingPlanRequestModel";
+export declare class AnnualTrainingPlanItem extends BaseModel {
+    request_id: number;
+    department_plan_id: number | null;
+    row_number: number;
+    department_id: number;
+    section_id: number | null;
+    course_name: string;
+    no_of_participants: number;
+    course_cost: number;
+    total_cost: number;
+    proposed_implementation_date: string;
+    description: string;
+    reason: string;
+    job_competency: string | null;
+    place: AnnualTrainingPlanPlace | null;
+    location: string | null;
+    name_of_participants: string[] | null;
+    employee_list: any[] | null;
+    request: AnnualTrainingPlanRequest;
+}

package/dist/models/AnnualTrainingPlanItemModel.js

@@ -0,0 +1,101 @@
+"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.AnnualTrainingPlanItem = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+const AnnualTrainingPlanRequestModel_1 = require("./AnnualTrainingPlanRequestModel");
+let AnnualTrainingPlanItem = class AnnualTrainingPlanItem extends BaseModel_1.BaseModel {
+};
+exports.AnnualTrainingPlanItem = AnnualTrainingPlanItem;
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTrainingPlanItem.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTrainingPlanItem.prototype, "department_plan_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTrainingPlanItem.prototype, "row_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTrainingPlanItem.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTrainingPlanItem.prototype, "section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
+    __metadata("design:type", String)
+], AnnualTrainingPlanItem.prototype, "course_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTrainingPlanItem.prototype, "no_of_participants", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 2, nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTrainingPlanItem.prototype, "course_cost", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "decimal", precision: 14, scale: 2, nullable: false }),
+    __metadata("design:type", Number)
+], AnnualTrainingPlanItem.prototype, "total_cost", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 500, nullable: false }),
+    __metadata("design:type", String)
+], AnnualTrainingPlanItem.prototype, "proposed_implementation_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: false }),
+    __metadata("design:type", String)
+], AnnualTrainingPlanItem.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: false }),
+    __metadata("design:type", String)
+], AnnualTrainingPlanItem.prototype, "reason", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTrainingPlanItem.prototype, "job_competency", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: AnnualTrainingPlanRequestModel_1.AnnualTrainingPlanPlace,
+        nullable: true
+    }),
+    __metadata("design:type", Object)
+], AnnualTrainingPlanItem.prototype, "place", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTrainingPlanItem.prototype, "location", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "jsonb", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTrainingPlanItem.prototype, "name_of_participants", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "jsonb", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualTrainingPlanItem.prototype, "employee_list", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => AnnualTrainingPlanRequestModel_1.AnnualTrainingPlanRequest, { onDelete: "CASCADE" }),
+    (0, typeorm_1.JoinColumn)({ name: "request_id" }),
+    __metadata("design:type", AnnualTrainingPlanRequestModel_1.AnnualTrainingPlanRequest)
+], AnnualTrainingPlanItem.prototype, "request", void 0);
+exports.AnnualTrainingPlanItem = AnnualTrainingPlanItem = __decorate([
+    (0, typeorm_1.Entity)({ name: "annual_training_plan_items" }),
+    (0, typeorm_1.Unique)(["request_id", "row_number"]),
+    (0, typeorm_1.Index)(["request_id"]),
+    (0, typeorm_1.Index)(["department_id"])
+], AnnualTrainingPlanItem);

package/dist/models/AnnualTrainingPlanRequestModel.d.ts

@@ -10,6 +10,15 @@ 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;
@@ -17,23 +26,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;
-    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);
+    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);
 }

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.AnnualTrainingPlanPlace = exports.AnnualTrainingPlanRequestStatus = void 0;
+exports.AnnualTrainingPlanRequest = exports.AnnualTrainingPlanSubmissionSource = exports.AnnualTrainingPlanImportStatus = exports.AnnualTrainingPlanPlace = exports.AnnualTrainingPlanRequestStatus = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 var AnnualTrainingPlanRequestStatus;
@@ -25,33 +25,44 @@ 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, 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) {
+    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) {
         super();
         this.user_id = user_id;
-        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.total_cost = 0;
         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;
@@ -80,49 +91,9 @@ __decorate([
     __metadata("design:type", Number)
 ], AnnualTrainingPlanRequest.prototype, "user_id", void 0);
 __decorate([
-    (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 }),
+    (0, typeorm_1.Column)({ type: "decimal", precision: 14, scale: 2, nullable: false, default: 0 }),
     __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",
@@ -151,16 +122,60 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
     __metadata("design:type", Object)
-], AnnualTrainingPlanRequest.prototype, "job_competency", void 0);
+], 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);
 __decorate([
-    (0, typeorm_1.Column)({ type: "jsonb", nullable: true }),
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
     __metadata("design:type", Object)
-], AnnualTrainingPlanRequest.prototype, "name_of_participants", void 0);
+], 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);
 __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
     __metadata("design:type", Object)
-], AnnualTrainingPlanRequest.prototype, "directarate", void 0);
+], 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);
 exports.AnnualTrainingPlanRequest = AnnualTrainingPlanRequest = __decorate([
     (0, typeorm_1.Entity)({ name: "annual_training_plan_requests" }),
-    __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])
+    __metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
 ], AnnualTrainingPlanRequest);

package/dist/models/CyberSecurityRiskManagementRiskModel.d.ts

@@ -23,6 +23,9 @@ export declare class CyberSecurityRiskManagementRisk extends BaseModel {
     likelihood: number;
     business_impact: number;
     risk_value: number;
+    new_likelihood: number | null;
+    new_business_impact: number | null;
+    new_risk_value: number | null;
     existing_controls: string;
     start_date: Date;
     end_date: Date;

package/dist/models/CyberSecurityRiskManagementRiskModel.js

@@ -78,6 +78,18 @@ __decorate([
     (0, typeorm_1.Column)({ type: "decimal", precision: 18, scale: 4, nullable: false }),
     __metadata("design:type", Number)
 ], CyberSecurityRiskManagementRisk.prototype, "risk_value", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], CyberSecurityRiskManagementRisk.prototype, "new_likelihood", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], CyberSecurityRiskManagementRisk.prototype, "new_business_impact", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "decimal", precision: 18, scale: 4, nullable: true }),
+    __metadata("design:type", Object)
+], CyberSecurityRiskManagementRisk.prototype, "new_risk_value", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "text", nullable: false }),
     __metadata("design:type", String)

package/package.json

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

package/sql/add_csrm_risk_tracking_fields.sql

@@ -1,5 +1,8 @@
--- Cyber security risk management risks: tracking / closure fields
+-- Cyber security risk management risks: tracking / closure / residual risk fields
 ALTER TABLE cyber_security_risk_management_risks
+  ADD COLUMN IF NOT EXISTS new_likelihood INTEGER,
+  ADD COLUMN IF NOT EXISTS new_business_impact INTEGER,
+  ADD COLUMN IF NOT EXISTS new_risk_value NUMERIC(18, 4),
   ADD COLUMN IF NOT EXISTS new_control TEXT,
   ADD COLUMN IF NOT EXISTS actual_end_date DATE,
   ADD COLUMN IF NOT EXISTS notes TEXT,

package/src/models/CyberSecurityRiskManagementRiskModel.ts

@@ -53,6 +53,15 @@ export class CyberSecurityRiskManagementRisk extends BaseModel {
     @Column({ type: "decimal", precision: 18, scale: 4, nullable: false })
     risk_value: number;
 
+    @Column({ type: "integer", nullable: true })
+    new_likelihood: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    new_business_impact: number | null;
+
+    @Column({ type: "decimal", precision: 18, scale: 4, nullable: true })
+    new_risk_value: number | null;
+
     @Column({ type: "text", nullable: false })
     existing_controls: string;