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

package/dist/models/StudyLeaveRequestModel.d.ts

@@ -6,6 +6,16 @@ export declare enum StudyLeaveRequestStatus {
     APPROVED = "Approved",
     REJECTED = "Rejected"
 }
+export declare enum TypeOfStudy {
+    SCHOLARSHIP = "Scholarship",
+    SELF_FUNDED = "Self-funded",
+    OTHER = "Other"
+}
+export declare enum TypeOfLeave {
+    PARTIAL = "Partial",
+    FULL = "Full",
+    OTHER = "Other"
+}
 export declare class StudyLeaveRequest extends BaseModel {
     req_user_department_id: number | null;
     req_user_section_id: number | null;
@@ -31,5 +41,10 @@ export declare class StudyLeaveRequest extends BaseModel {
     qualification_required: string | null;
     have_you_ever_received_authority: boolean | null;
     scholarship: string | null;
+    type_of_study: TypeOfStudy | null;
+    type_of_study_other: string | null;
+    type_of_leave: TypeOfLeave | null;
+    /** Assigned when the request reaches Records approval, e.g. SL00001. */
+    reference_number: string | null;
     constructor(user_id: number, course_name: string, institute_name: string, course_start_date: Date, course_end_date: Date, location: string, description: string, status?: StudyLeaveRequestStatus, 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, duration_of_course?: string | null, reviewer_user_id?: number | null, assigned_to_user_id?: number | null, assigned_at?: Date | null, workflow_execution_id?: string | null, already_submitted_in_ministry_of_education_system?: boolean | null, area_name?: string | null, country_name?: string | null, qualification_required?: string | null, have_you_ever_received_authority?: boolean | null, scholarship?: string | null);
 }

package/dist/models/StudyLeaveRequestModel.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.StudyLeaveRequest = exports.StudyLeaveRequestStatus = void 0;
+exports.StudyLeaveRequest = exports.TypeOfLeave = exports.TypeOfStudy = exports.StudyLeaveRequestStatus = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 var StudyLeaveRequestStatus;
@@ -20,6 +20,18 @@ var StudyLeaveRequestStatus;
     StudyLeaveRequestStatus["APPROVED"] = "Approved";
     StudyLeaveRequestStatus["REJECTED"] = "Rejected";
 })(StudyLeaveRequestStatus || (exports.StudyLeaveRequestStatus = StudyLeaveRequestStatus = {}));
+var TypeOfStudy;
+(function (TypeOfStudy) {
+    TypeOfStudy["SCHOLARSHIP"] = "Scholarship";
+    TypeOfStudy["SELF_FUNDED"] = "Self-funded";
+    TypeOfStudy["OTHER"] = "Other";
+})(TypeOfStudy || (exports.TypeOfStudy = TypeOfStudy = {}));
+var TypeOfLeave;
+(function (TypeOfLeave) {
+    TypeOfLeave["PARTIAL"] = "Partial";
+    TypeOfLeave["FULL"] = "Full";
+    TypeOfLeave["OTHER"] = "Other";
+})(TypeOfLeave || (exports.TypeOfLeave = TypeOfLeave = {}));
 let StudyLeaveRequest = class StudyLeaveRequest extends BaseModel_1.BaseModel {
     constructor(user_id, course_name, institute_name, course_start_date, course_end_date, location, description, status = StudyLeaveRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, duration_of_course, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id, already_submitted_in_ministry_of_education_system, area_name, country_name, qualification_required, have_you_ever_received_authority, scholarship) {
         super();
@@ -47,6 +59,10 @@ let StudyLeaveRequest = class StudyLeaveRequest extends BaseModel_1.BaseModel {
         this.qualification_required = qualification_required ?? null;
         this.have_you_ever_received_authority = have_you_ever_received_authority ?? null;
         this.scholarship = scholarship ?? null;
+        this.type_of_study = null;
+        this.type_of_study_other = null;
+        this.type_of_leave = null;
+        this.reference_number = null;
     }
 };
 exports.StudyLeaveRequest = StudyLeaveRequest;
@@ -151,6 +167,22 @@ __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
     __metadata("design:type", Object)
 ], StudyLeaveRequest.prototype, "scholarship", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], StudyLeaveRequest.prototype, "type_of_study", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], StudyLeaveRequest.prototype, "type_of_study_other", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], StudyLeaveRequest.prototype, "type_of_leave", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 20, nullable: true, unique: true }),
+    __metadata("design:type", Object)
+], StudyLeaveRequest.prototype, "reference_number", void 0);
 exports.StudyLeaveRequest = StudyLeaveRequest = __decorate([
     (0, typeorm_1.Entity)({ name: "study_leave_requests" }),
     __metadata("design:paramtypes", [Number, String, String, Date,

package/dist/models/TrainingRequestModel.d.ts

@@ -46,6 +46,8 @@ export declare class TrainingRequest extends BaseModel {
     assigned_to_user_id: number | null;
     assigned_at: Date | null;
     workflow_execution_id: string | null;
+    /** Assigned when the request reaches Records Department approval, e.g. RT00001. */
+    reference_number: string | null;
     constructor(user_id: number, type_of_training: TypeOfTraining | null, description: string, place: string | null, no_of_attendees: number, media_coverage_required: TrainingMediaCoverageRequired, status?: TrainingRequestStatus, 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, type_of_category?: TypeOfCategory | null, course_name?: string | null, course_id?: string | null, name_of_attendees_selection?: Array<{
         user_id: number;
         name?: string;

package/dist/models/TrainingRequestModel.js

@@ -61,6 +61,7 @@ let TrainingRequest = class TrainingRequest extends BaseModel_1.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;
     }
 };
 exports.TrainingRequest = TrainingRequest;
@@ -170,6 +171,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
     __metadata("design:type", Object)
 ], TrainingRequest.prototype, "workflow_execution_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 20, nullable: true, unique: true }),
+    __metadata("design:type", Object)
+], TrainingRequest.prototype, "reference_number", void 0);
 exports.TrainingRequest = TrainingRequest = __decorate([
     (0, typeorm_1.Entity)({ name: "training_requests" }),
     __metadata("design:paramtypes", [Number, Object, String, Object, Number, String, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])

package/dist/models/TrainingRoomBookingRequestModel.d.ts

@@ -8,11 +8,23 @@ export declare enum TrainingRoomBookingRequestStatus {
 }
 export declare enum TrainingRoomBookingRoomType {
     TRAINING_ROOMS_A = "Training Rooms (A1, A2)",
+    TRAINING_ROOM_A1 = "Training Room A1",
+    TRAINING_ROOM_A2 = "Training Room A2",
     TRAINING_ROOMS_B = "Training Rooms (B1, B2)",
     TRAINING_ROOMS_C = "Training Rooms (C1, C2)",
     TRAINING_ROOMS_D = "Training Rooms (D1, D2)",
-    LECTURE_HALL = "Lecture Hall",
-    LABORATORY = "Laboratory"
+    LECTURE_HALL = "Lecture Hall (Al Masarat)",
+    LABORATORY = "computers Laboratory",
+    LECTURE_HALL_LEGACY = "Lecture Hall",
+    LABORATORY_LEGACY = "Laboratory"
+}
+export declare enum TrainingRoomBookingProviderEntity {
+    INSIDE = "Inside",
+    OUTSIDE = "Outside"
+}
+export declare enum TrainingRoomBookingSector {
+    GOVERNMENT = "Government",
+    PRIVATE = "Private"
 }
 export declare class TrainingRoomBookingRequest extends BaseModel {
     req_user_department_id: number | null;
@@ -26,6 +38,8 @@ export declare class TrainingRoomBookingRequest extends BaseModel {
     start_time: string;
     end_time: string;
     room_type: TrainingRoomBookingRoomType;
+    booking_provider_entity: TrainingRoomBookingProviderEntity | null;
+    sector: TrainingRoomBookingSector | null;
     network_support_required: boolean;
     meals_required: boolean;
     number_of_attendees: number;
@@ -36,5 +50,6 @@ export declare class TrainingRoomBookingRequest extends BaseModel {
     assigned_to_user_id: number | null;
     assigned_at: Date | null;
     workflow_execution_id: 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);
+    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

@@ -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.TrainingRoomBookingRequest = exports.TrainingRoomBookingRoomType = exports.TrainingRoomBookingRequestStatus = void 0;
+exports.TrainingRoomBookingRequest = exports.TrainingRoomBookingSector = exports.TrainingRoomBookingProviderEntity = exports.TrainingRoomBookingRoomType = exports.TrainingRoomBookingRequestStatus = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 var TrainingRoomBookingRequestStatus;
@@ -23,14 +23,28 @@ var TrainingRoomBookingRequestStatus;
 var TrainingRoomBookingRoomType;
 (function (TrainingRoomBookingRoomType) {
     TrainingRoomBookingRoomType["TRAINING_ROOMS_A"] = "Training Rooms (A1, A2)";
+    TrainingRoomBookingRoomType["TRAINING_ROOM_A1"] = "Training Room A1";
+    TrainingRoomBookingRoomType["TRAINING_ROOM_A2"] = "Training Room A2";
     TrainingRoomBookingRoomType["TRAINING_ROOMS_B"] = "Training Rooms (B1, B2)";
     TrainingRoomBookingRoomType["TRAINING_ROOMS_C"] = "Training Rooms (C1, C2)";
     TrainingRoomBookingRoomType["TRAINING_ROOMS_D"] = "Training Rooms (D1, D2)";
-    TrainingRoomBookingRoomType["LECTURE_HALL"] = "Lecture Hall";
-    TrainingRoomBookingRoomType["LABORATORY"] = "Laboratory";
+    TrainingRoomBookingRoomType["LECTURE_HALL"] = "Lecture Hall (Al Masarat)";
+    TrainingRoomBookingRoomType["LABORATORY"] = "computers Laboratory";
+    TrainingRoomBookingRoomType["LECTURE_HALL_LEGACY"] = "Lecture Hall";
+    TrainingRoomBookingRoomType["LABORATORY_LEGACY"] = "Laboratory";
 })(TrainingRoomBookingRoomType || (exports.TrainingRoomBookingRoomType = TrainingRoomBookingRoomType = {}));
+var TrainingRoomBookingProviderEntity;
+(function (TrainingRoomBookingProviderEntity) {
+    TrainingRoomBookingProviderEntity["INSIDE"] = "Inside";
+    TrainingRoomBookingProviderEntity["OUTSIDE"] = "Outside";
+})(TrainingRoomBookingProviderEntity || (exports.TrainingRoomBookingProviderEntity = TrainingRoomBookingProviderEntity = {}));
+var TrainingRoomBookingSector;
+(function (TrainingRoomBookingSector) {
+    TrainingRoomBookingSector["GOVERNMENT"] = "Government";
+    TrainingRoomBookingSector["PRIVATE"] = "Private";
+})(TrainingRoomBookingSector || (exports.TrainingRoomBookingSector = TrainingRoomBookingSector = {}));
 let TrainingRoomBookingRequest = class TrainingRoomBookingRequest extends BaseModel_1.BaseModel {
-    constructor(user_id, purpose_of_training, date_of_event, start_time, end_time, room_type, number_of_attendees, network_support_required = false, meals_required = false, status = TrainingRoomBookingRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, name_of_participants, remarks, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id) {
+    constructor(user_id, purpose_of_training, date_of_event, start_time, end_time, room_type, number_of_attendees, network_support_required = false, meals_required = false, status = TrainingRoomBookingRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, name_of_participants, remarks, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id, booking_provider_entity, sector) {
         super();
         this.user_id = user_id;
         this.purpose_of_training = purpose_of_training;
@@ -38,6 +52,8 @@ let TrainingRoomBookingRequest = class TrainingRoomBookingRequest extends BaseMo
         this.start_time = start_time;
         this.end_time = end_time;
         this.room_type = room_type;
+        this.booking_provider_entity = booking_provider_entity ?? null;
+        this.sector = sector ?? null;
         this.number_of_attendees = number_of_attendees;
         this.network_support_required = network_support_required;
         this.meals_required = meals_required;
@@ -53,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;
@@ -104,6 +121,22 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], TrainingRoomBookingRequest.prototype, "room_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: TrainingRoomBookingProviderEntity,
+        nullable: true
+    }),
+    __metadata("design:type", Object)
+], TrainingRoomBookingRequest.prototype, "booking_provider_entity", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: TrainingRoomBookingSector,
+        nullable: true
+    }),
+    __metadata("design:type", Object)
+], TrainingRoomBookingRequest.prototype, "sector", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "boolean", default: false, nullable: false }),
     __metadata("design:type", Boolean)
@@ -149,7 +182,11 @@ __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])
+    __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])
 ], TrainingRoomBookingRequest);

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.327",
+  "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/sql/update_training_room_booking_options.sql

@@ -0,0 +1,43 @@
+-- Training room booking room choices and booking-provider details.
+-- Run once per environment. HR and Conductor use synchronize: false.
+
+ALTER TYPE training_room_booking_requests_room_type_enum
+  ADD VALUE IF NOT EXISTS 'Training Room A1';
+ALTER TYPE training_room_booking_requests_room_type_enum
+  ADD VALUE IF NOT EXISTS 'Training Room A2';
+ALTER TYPE training_room_booking_requests_room_type_enum
+  ADD VALUE IF NOT EXISTS 'Lecture Hall (Al Masarat)';
+ALTER TYPE training_room_booking_requests_room_type_enum
+  ADD VALUE IF NOT EXISTS 'computers Laboratory';
+
+DO $$
+BEGIN
+  IF NOT EXISTS (
+    SELECT 1 FROM pg_type
+    WHERE typname = 'training_room_booking_requests_booking_provider_entity_enum'
+  ) THEN
+    CREATE TYPE training_room_booking_requests_booking_provider_entity_enum
+      AS ENUM ('Inside', 'Outside');
+  END IF;
+END
+$$;
+
+DO $$
+BEGIN
+  IF NOT EXISTS (
+    SELECT 1 FROM pg_type
+    WHERE typname = 'training_room_booking_requests_sector_enum'
+  ) THEN
+    CREATE TYPE training_room_booking_requests_sector_enum
+      AS ENUM ('Government', 'Private');
+  END IF;
+END
+$$;
+
+ALTER TABLE IF EXISTS training_room_booking_requests
+  ADD COLUMN IF NOT EXISTS booking_provider_entity
+    training_room_booking_requests_booking_provider_entity_enum NULL;
+
+ALTER TABLE IF EXISTS training_room_booking_requests
+  ADD COLUMN IF NOT EXISTS sector
+    training_room_booking_requests_sector_enum NULL;

package/src/models/TrainingRoomBookingRequestModel.ts

@@ -11,11 +11,25 @@ export enum TrainingRoomBookingRequestStatus {
 
 export enum TrainingRoomBookingRoomType {
   TRAINING_ROOMS_A = "Training Rooms (A1, A2)",
+  TRAINING_ROOM_A1 = "Training Room A1",
+  TRAINING_ROOM_A2 = "Training Room A2",
   TRAINING_ROOMS_B = "Training Rooms (B1, B2)",
   TRAINING_ROOMS_C = "Training Rooms (C1, C2)",
   TRAINING_ROOMS_D = "Training Rooms (D1, D2)",
-  LECTURE_HALL = "Lecture Hall",
-  LABORATORY = "Laboratory"
+  LECTURE_HALL = "Lecture Hall (Al Masarat)",
+  LABORATORY = "computers Laboratory",
+  LECTURE_HALL_LEGACY = "Lecture Hall",
+  LABORATORY_LEGACY = "Laboratory"
+}
+
+export enum TrainingRoomBookingProviderEntity {
+  INSIDE = "Inside",
+  OUTSIDE = "Outside"
+}
+
+export enum TrainingRoomBookingSector {
+  GOVERNMENT = "Government",
+  PRIVATE = "Private"
 }
 
 @Entity({ name: "training_room_booking_requests" })
@@ -57,6 +71,20 @@ export class TrainingRoomBookingRequest extends BaseModel {
   })
   room_type: TrainingRoomBookingRoomType;
 
+  @Column({
+    type: "enum",
+    enum: TrainingRoomBookingProviderEntity,
+    nullable: true
+  })
+  booking_provider_entity: TrainingRoomBookingProviderEntity | null;
+
+  @Column({
+    type: "enum",
+    enum: TrainingRoomBookingSector,
+    nullable: true
+  })
+  sector: TrainingRoomBookingSector | null;
+
   @Column({ type: "boolean", default: false, nullable: false })
   network_support_required: boolean;
 
@@ -92,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,
@@ -113,7 +144,9 @@ export class TrainingRoomBookingRequest extends BaseModel {
     reviewer_user_id?: number | null,
     assigned_to_user_id?: number | null,
     assigned_at?: Date | null,
-    workflow_execution_id?: string | null
+    workflow_execution_id?: string | null,
+    booking_provider_entity?: TrainingRoomBookingProviderEntity | null,
+    sector?: TrainingRoomBookingSector | null
   ) {
     super();
     this.user_id = user_id;
@@ -122,6 +155,8 @@ export class TrainingRoomBookingRequest extends BaseModel {
     this.start_time = start_time;
     this.end_time = end_time;
     this.room_type = room_type;
+    this.booking_provider_entity = booking_provider_entity ?? null;
+    this.sector = sector ?? null;
     this.number_of_attendees = number_of_attendees;
     this.network_support_required = network_support_required;
     this.meals_required = meals_required;
@@ -137,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,