@platform-modules/civil-aviation-authority 2.3.329 → 2.3.330

package/dist/models/TrainingRoomBookingRequestModel.d.ts

@@ -50,5 +50,6 @@ export declare class TrainingRoomBookingRequest extends BaseModel {
     assigned_to_user_id: number | null;
     assigned_at: Date | null;
     workflow_execution_id: string | null;
+    reference_number: string | null;
     constructor(user_id: number, purpose_of_training: string, date_of_event: Date, start_time: string, end_time: string, room_type: TrainingRoomBookingRoomType, number_of_attendees: number, network_support_required?: boolean, meals_required?: boolean, status?: TrainingRoomBookingRequestStatus, 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, name_of_participants?: string[] | null, remarks?: string | null, reviewer_user_id?: number | null, assigned_to_user_id?: number | null, assigned_at?: Date | null, workflow_execution_id?: string | null, booking_provider_entity?: TrainingRoomBookingProviderEntity | null, sector?: TrainingRoomBookingSector | null);
 }

package/dist/models/TrainingRoomBookingRequestModel.js

@@ -69,6 +69,7 @@ let TrainingRoomBookingRequest = class TrainingRoomBookingRequest extends BaseMo
         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.reference_number = null;
     }
 };
 exports.TrainingRoomBookingRequest = TrainingRoomBookingRequest;
@@ -181,6 +182,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
     __metadata("design:type", Object)
 ], TrainingRoomBookingRequest.prototype, "workflow_execution_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 20, nullable: true }),
+    __metadata("design:type", Object)
+], TrainingRoomBookingRequest.prototype, "reference_number", void 0);
 exports.TrainingRoomBookingRequest = TrainingRoomBookingRequest = __decorate([
     (0, typeorm_1.Entity)({ name: "training_room_booking_requests" }),
     __metadata("design:paramtypes", [Number, String, Date, String, String, String, Number, Boolean, Boolean, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])

package/dist/models/TrainingRoomBookingWorkflowModel.d.ts

@@ -3,6 +3,7 @@ export declare enum TrainingRoomBookingWorkFlowStatus {
     COMPLETED = "Completed",
     NOT_YET_STARTED = "Not Yet Started",
     PENDING = "Pending",
+    IN_PROGRESS = "In Progress",
     REJECTED = "Rejected"
 }
 export declare class TrainingRoomBookingWorkFlow extends BaseModel {
@@ -15,6 +16,8 @@ export declare class TrainingRoomBookingWorkFlow extends BaseModel {
     approver_role_id: number | null;
     approver_user_id: number | null;
     approved_by: number | null;
+    department_id: number | null;
+    section_id: number | null;
     status: TrainingRoomBookingWorkFlowStatus;
     status_ar: string | null;
     constructor(request_id: number, content: string, status: TrainingRoomBookingWorkFlowStatus, service_id?: number | null, sub_service_id?: number | null, order?: number, approver_role_id?: number | null, approver_user_id?: number | null, approved_by?: number | null);

package/dist/models/TrainingRoomBookingWorkflowModel.js

@@ -17,6 +17,7 @@ var TrainingRoomBookingWorkFlowStatus;
     TrainingRoomBookingWorkFlowStatus["COMPLETED"] = "Completed";
     TrainingRoomBookingWorkFlowStatus["NOT_YET_STARTED"] = "Not Yet Started";
     TrainingRoomBookingWorkFlowStatus["PENDING"] = "Pending";
+    TrainingRoomBookingWorkFlowStatus["IN_PROGRESS"] = "In Progress";
     TrainingRoomBookingWorkFlowStatus["REJECTED"] = "Rejected";
 })(TrainingRoomBookingWorkFlowStatus || (exports.TrainingRoomBookingWorkFlowStatus = TrainingRoomBookingWorkFlowStatus = {}));
 let TrainingRoomBookingWorkFlow = class TrainingRoomBookingWorkFlow extends BaseModel_1.BaseModel {
@@ -70,6 +71,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: "integer", nullable: true }),
     __metadata("design:type", Object)
 ], TrainingRoomBookingWorkFlow.prototype, "approved_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], TrainingRoomBookingWorkFlow.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], TrainingRoomBookingWorkFlow.prototype, "section_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: "enum",

package/package.json

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

package/sql/add_training_room_booking_records_reference.sql

@@ -0,0 +1,19 @@
+-- Training room booking parallel approvals: workflow log status, log department
+-- columns, and the Records reference number.
+-- Run once per environment. HR and Conductor use synchronize: false.
+
+ALTER TYPE training_room_booking_workflows_status_enum
+  ADD VALUE IF NOT EXISTS 'In Progress';
+
+ALTER TABLE IF EXISTS training_room_booking_workflows
+  ADD COLUMN IF NOT EXISTS department_id INTEGER NULL;
+
+ALTER TABLE IF EXISTS training_room_booking_workflows
+  ADD COLUMN IF NOT EXISTS section_id INTEGER NULL;
+
+ALTER TABLE IF EXISTS training_room_booking_requests
+  ADD COLUMN IF NOT EXISTS reference_number VARCHAR(20) NULL;
+
+CREATE UNIQUE INDEX IF NOT EXISTS uq_training_room_booking_requests_reference_number
+  ON training_room_booking_requests (reference_number)
+  WHERE reference_number IS NOT NULL;

package/src/models/TrainingRoomBookingRequestModel.ts

@@ -120,6 +120,9 @@ export class TrainingRoomBookingRequest extends BaseModel {
   @Column({ type: "varchar", length: 255, nullable: true })
   workflow_execution_id: string | null;
 
+  @Column({ type: "varchar", length: 20, nullable: true })
+  reference_number: string | null;
+
   constructor(
     user_id: number,
     purpose_of_training: string,
@@ -169,6 +172,7 @@ export class TrainingRoomBookingRequest extends BaseModel {
     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.reference_number = null;
   }
 }
 

package/src/models/TrainingRoomBookingWorkflowModel.ts

@@ -5,6 +5,7 @@ export enum TrainingRoomBookingWorkFlowStatus {
     COMPLETED = "Completed",
     NOT_YET_STARTED = "Not Yet Started",
     PENDING = "Pending",
+    IN_PROGRESS = "In Progress",
     REJECTED = "Rejected"
 }
 
@@ -37,6 +38,12 @@ export class TrainingRoomBookingWorkFlow extends BaseModel {
     @Column({ type: "integer", nullable: true })
     approved_by: number | null;
 
+    @Column({ type: "integer", nullable: true })
+    department_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    section_id: number | null;
+
     @Column({
         type: "enum",
         enum: TrainingRoomBookingWorkFlowStatus,