@platform-modules/civil-aviation-authority 2.3.172 → 2.3.173

package/src/models/PromotionRequestModel.ts

@@ -45,12 +45,12 @@ export class PromotionRequest extends BaseModel {
     @Column({ type: "timestamp", nullable: true })
     assigned_at: Date | null;
 
-    @Column({ type: "varchar", length: 255, nullable: true })
-    workflow_execution_id: string | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    reference_number: string | null;
-
+    @Column({ type: "varchar", length: 255, nullable: true })
+    workflow_execution_id: string | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    reference_number: string | null;
+
     // Promotion Decision specific fields
     @Column({ type: "varchar", length: 255, nullable: false })
     employee_name: string;
@@ -108,11 +108,11 @@ export class PromotionRequest extends BaseModel {
         this.req_user_position_id = req_user_position_id || null;
         this.description = description || 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.reference_number = null;
-        this.employee_name = employee_name || "";
+        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;
+        this.employee_name = employee_name || "";
         this.employee_id = employee_id || "";
         this.current_job_title = current_job_title || "";
         this.proposed_job_title = proposed_job_title || "";

package/src/models/ScholarshipAttendeeModel.ts

@@ -0,0 +1,14 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+@Entity({ name: "scholarship_attendees" })
+export class ScholarshipAttendee extends BaseModel {
+  @Column({ type: "integer", nullable: false })
+  request_id: number;
+
+  @Column({ type: "integer", nullable: false })
+  attendee_id: number;
+
+  @Column({ type: "varchar", length: 320, nullable: false })
+  attendee_email: string;
+}

package/src/models/ScholarshipRequestModel.ts

@@ -44,6 +44,10 @@ export class ScholarshipRequests extends BaseModel {
   @Column({ type: "enum", enum: ScholarshipType, nullable: false })
   type: ScholarshipType;
 
+  /** Planned-flow only: whether amount exceeds threshold; Unplanned rows store null. */
+  @Column({ type: "varchar", length: 10, nullable: true })
+  is_amount_more_than_tenthousand: "Yes" | "No" | null;
+
   @Column({ type: "text", nullable: true })
   reason: string | null;
 
@@ -61,4 +65,28 @@ export class ScholarshipRequests extends BaseModel {
 
   @Column({ type: "varchar", length: 500, nullable: true })
   place: string | null;
+
+  @Column({ type: "boolean", default: false, nullable: false })
+  is_confirm: boolean;
+
+  @Column({ type: "varchar", length: 500, nullable: true })
+  training_entity: string | null;
+
+  @Column({ type: "varchar", length: 10, nullable: true })
+  media_coverage: "Yes" | "No" | null;
+
+  @Column({ type: "date", nullable: true })
+  training_start_date: string | null;
+
+  @Column({ type: "date", nullable: true })
+  training_end_date: string | null;
+
+  @Column({ type: "date", nullable: true })
+  travel_date: string | null;
+
+  @Column({ type: "date", nullable: true })
+  return_date: string | null;
+
+  @Column({ type: "text", nullable: true })
+  comment: string | null;
 }

package/src/models/UserSkillModel.ts

@@ -1,56 +1,56 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-import { SkillCategory } from "./SkillsEnhancementRequestModel";
-
-@Entity({ name: "user_skills" })
-export class UserSkill extends BaseModel {
-    @Column({ type: "integer", nullable: false })
-    user_id: number;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    skill_name: string;
-
-    @Column({ type: "enum", enum: SkillCategory, nullable: true })
-    skill_category: SkillCategory | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    issuing_authority: string | null;
-
-    @Column({ type: "date", nullable: true })
-    completion_date: Date | null;
-
-    @Column({ type: "text", nullable: true })
-    skill_summary: string | null;
-
-    @Column({ type: "integer", nullable: true })
-    source_request_id: number | null;
-
-    @Column({ type: "varchar", length: 50, nullable: true })
-    source_request_type: string | null;
-
-    @Column({ type: "boolean", nullable: false, default: true })
-    is_active: boolean;
-
-    constructor(
-        user_id: number,
-        skill_name: string,
-        skill_category?: SkillCategory | null,
-        issuing_authority?: string | null,
-        completion_date?: Date | null,
-        skill_summary?: string | null,
-        source_request_id?: number | null,
-        source_request_type?: string | null,
-        is_active?: boolean
-    ) {
-        super();
-        this.user_id = user_id;
-        this.skill_name = skill_name;
-        this.skill_category = skill_category || null;
-        this.issuing_authority = issuing_authority || null;
-        this.completion_date = completion_date || null;
-        this.skill_summary = skill_summary || null;
-        this.source_request_id = source_request_id || null;
-        this.source_request_type = source_request_type || null;
-        this.is_active = is_active !== undefined ? is_active : true;
-    }
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+import { SkillCategory } from "./SkillsEnhancementRequestModel";
+
+@Entity({ name: "user_skills" })
+export class UserSkill extends BaseModel {
+    @Column({ type: "integer", nullable: false })
+    user_id: number;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    skill_name: string;
+
+    @Column({ type: "enum", enum: SkillCategory, nullable: true })
+    skill_category: SkillCategory | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    issuing_authority: string | null;
+
+    @Column({ type: "date", nullable: true })
+    completion_date: Date | null;
+
+    @Column({ type: "text", nullable: true })
+    skill_summary: string | null;
+
+    @Column({ type: "integer", nullable: true })
+    source_request_id: number | null;
+
+    @Column({ type: "varchar", length: 50, nullable: true })
+    source_request_type: string | null;
+
+    @Column({ type: "boolean", nullable: false, default: true })
+    is_active: boolean;
+
+    constructor(
+        user_id: number,
+        skill_name: string,
+        skill_category?: SkillCategory | null,
+        issuing_authority?: string | null,
+        completion_date?: Date | null,
+        skill_summary?: string | null,
+        source_request_id?: number | null,
+        source_request_type?: string | null,
+        is_active?: boolean
+    ) {
+        super();
+        this.user_id = user_id;
+        this.skill_name = skill_name;
+        this.skill_category = skill_category || null;
+        this.issuing_authority = issuing_authority || null;
+        this.completion_date = completion_date || null;
+        this.skill_summary = skill_summary || null;
+        this.source_request_id = source_request_id || null;
+        this.source_request_type = source_request_type || null;
+        this.is_active = is_active !== undefined ? is_active : true;
+    }
+}

package/src/models/user.ts

@@ -52,8 +52,8 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     blood_type?: string;
 
-    @Column({  nullable: true })
-    national_id?: string;
+    @Column({ type: 'bigint', nullable: true })
+    national_id?: number;
 
     @Column({ type: 'bigint', nullable: true })
     manpower_id?: number;
@@ -67,8 +67,8 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     department?: number;
 
-    @Column({ nullable: true })
-    category: string; // Mandatory
+    @Column({ type: "enum", enum: ["CAA", "Embassy"], nullable: false, default: "CAA" })
+    category: "CAA" | "Embassy"; // Mandatory
 
     @Column({ nullable: true })
     directorate?: string;
@@ -156,7 +156,7 @@ export class User extends BaseModel {
         nationality?: string,
         email?: string,
         blood_type?: string,
-        national_id?: string,
+        national_id?: number,
         manpower_id?: number,
         mobile?: string,
         office_number?: string,

package/dist/models/ITApprovalSettings.d.ts

@@ -1,7 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare class ITApprovalSettings extends BaseModel {
-    level: number;
-    approval_role_id: number;
-    workflow_id: number;
-    constructor(level: number, approval_role_id: number, workflow_id: number);
-}

package/dist/models/ITApprovalSettings.js

@@ -1,40 +0,0 @@
-"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.ITApprovalSettings = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-let ITApprovalSettings = class ITApprovalSettings extends BaseModel_1.BaseModel {
-    constructor(level, approval_role_id, workflow_id) {
-        super();
-        this.level = level;
-        this.approval_role_id = approval_role_id;
-        this.workflow_id = workflow_id;
-    }
-};
-exports.ITApprovalSettings = ITApprovalSettings;
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], ITApprovalSettings.prototype, "level", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], ITApprovalSettings.prototype, "approval_role_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], ITApprovalSettings.prototype, "workflow_id", void 0);
-exports.ITApprovalSettings = ITApprovalSettings = __decorate([
-    (0, typeorm_1.Entity)({ name: 'it_approval_settings' }),
-    (0, typeorm_1.Unique)(['workflow_id', 'level']),
-    __metadata("design:paramtypes", [Number, Number, Number])
-], ITApprovalSettings);

package/dist/models/ITServicesTypesMuscatModel.d.ts

@@ -1,6 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare class ITServicesTypesMuscat extends BaseModel {
-    name: string;
-    name_in_arabic: string;
-    constructor(name: string, name_in_arabic: string);
-}

package/dist/models/ITServicesTypesSalalahModel.d.ts

@@ -1,6 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare class ITServicesTypesSalalah extends BaseModel {
-    name: string;
-    name_in_arabic: string;
-    constructor(name: string, name_in_arabic: string);
-}

package/dist/models/ITServicesTypesSalalahModel.js

@@ -1,34 +0,0 @@
-"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.ITServicesTypesSalalah = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-let ITServicesTypesSalalah = class ITServicesTypesSalalah extends BaseModel_1.BaseModel {
-    constructor(name, name_in_arabic) {
-        super();
-        this.name = name;
-        this.name_in_arabic = name_in_arabic;
-    }
-};
-exports.ITServicesTypesSalalah = ITServicesTypesSalalah;
-__decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
-    __metadata("design:type", String)
-], ITServicesTypesSalalah.prototype, "name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
-    __metadata("design:type", String)
-], ITServicesTypesSalalah.prototype, "name_in_arabic", void 0);
-exports.ITServicesTypesSalalah = ITServicesTypesSalalah = __decorate([
-    (0, typeorm_1.Entity)({ name: 'it_services_types_salalah' }),
-    __metadata("design:paramtypes", [String, String])
-], ITServicesTypesSalalah);

package/dist/models/Workflows.d.ts

@@ -1,9 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare class Workflows extends BaseModel {
-    name: string;
-    service_id: number;
-    sub_service_id: number;
-    request_for: string;
-    levels: number;
-    constructor(name: string, service_id: number, sub_service_id: number, request_for: string, levels: number);
-}

package/dist/models/Workflows.js

@@ -1,31 +0,0 @@
-"use strict";
-// import { Column, Entity, Unique } from "typeorm";
-// import { BaseModel } from './BaseModel';
-// @Entity({ name: 'workflows' })
-// @Unique(['service_id', 'sub_service_id', 'request_for'])
-// export class Workflows extends BaseModel {
-//     @Column({ type: 'varchar', length: 100, nullable: false })
-//     name: string;
-//     @Column({ type: 'bigint', nullable: false })
-//     service_id: number;
-//     @Column({ type: 'bigint', nullable: false })
-//     sub_service_id: number;
-//     @Column({ type: 'varchar', length: 20, nullable: false })
-//     request_for: string; // 'Self' | 'Behalf of' | 'Internal'
-//     @Column({ type: 'int', nullable: false })
-//     levels: number;
-//     constructor(
-//         name: string,
-//         service_id: number,
-//         sub_service_id: number,
-//         request_for: string,
-//         levels: number,
-//     ) {
-//         super();
-//         this.name = name;
-//         this.service_id = service_id;
-//         this.sub_service_id = sub_service_id;
-//         this.request_for = request_for;
-//         this.levels = levels;
-//     }
-// }