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

package/.env

@@ -1,12 +1,12 @@
-# DB_HOST=164.52.222.169
-# DB_PORT=5432 
-# DB_USER=postgres_admin_user
-# DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
-# DB_NAME=CAA
+DB_HOST=164.52.222.169
+DB_PORT=5432 
+DB_USER=postgres_admin_user
+DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+DB_NAME=CAA
 
 
-DB_HOST=localhost
-DB_PORT=5432 
-DB_USER=postgres
-DB_PASS=stevejobs
-DB_NAME=CAA
+# DB_HOST=localhost
+# DB_PORT=5432 
+# DB_USER=postgres
+# DB_PASS=stevejobs
+# DB_NAME=CAA

package/dist/data-source.js

@@ -120,6 +120,7 @@ const StudyLeaveAttachmentModel_1 = require("./models/StudyLeaveAttachmentModel"
 const ScholarshipRequestModel_1 = require("./models/ScholarshipRequestModel");
 const ScholarshipApprovalModel_1 = require("./models/ScholarshipApprovalModel");
 const ScholarshipAttachmentModel_1 = require("./models/ScholarshipAttachmentModel");
+const ScholarshipAttendeeModel_1 = require("./models/ScholarshipAttendeeModel");
 const ScholarshipChatModel_1 = require("./models/ScholarshipChatModel");
 const ScholarshipWorkflowModel_1 = require("./models/ScholarshipWorkflowModel");
 const CancellationRequestModel_1 = require("./models/CancellationRequestModel");
@@ -286,6 +287,7 @@ exports.AppDataSource = new typeorm_1.DataSource({
         ScholarshipRequestModel_1.ScholarshipRequests,
         ScholarshipApprovalModel_1.ScholarshipApprovalDetails,
         ScholarshipAttachmentModel_1.ScholarshipRequestAttachment,
+        ScholarshipAttendeeModel_1.ScholarshipAttendee,
         ScholarshipChatModel_1.ScholarshipRequestChat,
         ScholarshipWorkflowModel_1.ScholarshipWorkFlow,
         CancellationRequestModel_1.CancellationRequests,

package/dist/index.d.ts

@@ -92,6 +92,7 @@ export * from './models/StudyLeaveAttachmentModel';
 export * from './models/ScholarshipRequestModel';
 export * from './models/ScholarshipApprovalModel';
 export * from './models/ScholarshipAttachmentModel';
+export * from './models/ScholarshipAttendeeModel';
 export * from './models/ScholarshipChatModel';
 export * from './models/ScholarshipWorkflowModel';
 export * from './models/CancellationRequestModel';

package/dist/index.js

@@ -120,6 +120,7 @@ __exportStar(require("./models/StudyLeaveAttachmentModel"), exports);
 __exportStar(require("./models/ScholarshipRequestModel"), exports);
 __exportStar(require("./models/ScholarshipApprovalModel"), exports);
 __exportStar(require("./models/ScholarshipAttachmentModel"), exports);
+__exportStar(require("./models/ScholarshipAttendeeModel"), exports);
 __exportStar(require("./models/ScholarshipChatModel"), exports);
 __exportStar(require("./models/ScholarshipWorkflowModel"), exports);
 __exportStar(require("./models/CancellationRequestModel"), exports);

package/dist/models/ScholarshipAttendeeModel.d.ts

@@ -0,0 +1,6 @@
+import { BaseModel } from "./BaseModel";
+export declare class ScholarshipAttendee extends BaseModel {
+    request_id: number;
+    attendee_id: number;
+    attendee_email: string;
+}

package/dist/models/{ITServicesTypesMuscatModel.js → ScholarshipAttendeeModel.js}

@@ -9,26 +9,24 @@ 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.ITServicesTypesMuscat = void 0;
+exports.ScholarshipAttendee = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
-let ITServicesTypesMuscat = class ITServicesTypesMuscat extends BaseModel_1.BaseModel {
-    constructor(name, name_in_arabic) {
-        super();
-        this.name = name;
-        this.name_in_arabic = name_in_arabic;
-    }
+let ScholarshipAttendee = class ScholarshipAttendee extends BaseModel_1.BaseModel {
 };
-exports.ITServicesTypesMuscat = ITServicesTypesMuscat;
+exports.ScholarshipAttendee = ScholarshipAttendee;
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
-    __metadata("design:type", String)
-], ITServicesTypesMuscat.prototype, "name", void 0);
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], ScholarshipAttendee.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], ScholarshipAttendee.prototype, "attendee_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
+    (0, typeorm_1.Column)({ type: "varchar", length: 320, nullable: false }),
     __metadata("design:type", String)
-], ITServicesTypesMuscat.prototype, "name_in_arabic", void 0);
-exports.ITServicesTypesMuscat = ITServicesTypesMuscat = __decorate([
-    (0, typeorm_1.Entity)({ name: 'it_services_types_muscat' }),
-    __metadata("design:paramtypes", [String, String])
-], ITServicesTypesMuscat);
+], ScholarshipAttendee.prototype, "attendee_email", void 0);
+exports.ScholarshipAttendee = ScholarshipAttendee = __decorate([
+    (0, typeorm_1.Entity)({ name: "scholarship_attendees" })
+], ScholarshipAttendee);

package/dist/models/ScholarshipRequestModel.d.ts

@@ -21,10 +21,20 @@ export declare class ScholarshipRequests extends BaseModel {
     workflow_execution_id: string | null;
     scholarship_name: string | null;
     type: ScholarshipType;
+    /** Planned-flow only: whether amount exceeds threshold; Unplanned rows store null. */
+    is_amount_more_than_tenthousand: "Yes" | "No" | null;
     reason: string | null;
     description: string | null;
     start_date: string | null;
     end_date: string | null;
     number_of_attendees: number | null;
     place: string | null;
+    is_confirm: boolean;
+    training_entity: string | null;
+    media_coverage: "Yes" | "No" | null;
+    training_start_date: string | null;
+    training_end_date: string | null;
+    travel_date: string | null;
+    return_date: string | null;
+    comment: string | null;
 }

package/dist/models/ScholarshipRequestModel.js

@@ -65,6 +65,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "enum", enum: ScholarshipType, nullable: false }),
     __metadata("design:type", String)
 ], ScholarshipRequests.prototype, "type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 10, nullable: true }),
+    __metadata("design:type", Object)
+], ScholarshipRequests.prototype, "is_amount_more_than_tenthousand", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "text", nullable: true }),
     __metadata("design:type", Object)
@@ -89,6 +93,38 @@ __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 500, nullable: true }),
     __metadata("design:type", Object)
 ], ScholarshipRequests.prototype, "place", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "boolean", default: false, nullable: false }),
+    __metadata("design:type", Boolean)
+], ScholarshipRequests.prototype, "is_confirm", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 500, nullable: true }),
+    __metadata("design:type", Object)
+], ScholarshipRequests.prototype, "training_entity", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 10, nullable: true }),
+    __metadata("design:type", Object)
+], ScholarshipRequests.prototype, "media_coverage", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "date", nullable: true }),
+    __metadata("design:type", Object)
+], ScholarshipRequests.prototype, "training_start_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "date", nullable: true }),
+    __metadata("design:type", Object)
+], ScholarshipRequests.prototype, "training_end_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "date", nullable: true }),
+    __metadata("design:type", Object)
+], ScholarshipRequests.prototype, "travel_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "date", nullable: true }),
+    __metadata("design:type", Object)
+], ScholarshipRequests.prototype, "return_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: true }),
+    __metadata("design:type", Object)
+], ScholarshipRequests.prototype, "comment", void 0);
 exports.ScholarshipRequests = ScholarshipRequests = __decorate([
     (0, typeorm_1.Entity)({ name: "scholarship_requests" })
 ], ScholarshipRequests);

package/dist/models/user.d.ts

@@ -21,7 +21,7 @@ export declare class User extends BaseModel {
     mobile?: string;
     office_number?: string;
     department?: number;
-    category: string;
+    category: "CAA" | "Embassy";
     directorate?: string;
     section?: number;
     position?: number;

package/dist/models/user.js

@@ -147,7 +147,7 @@ __decorate([
     __metadata("design:type", Number)
 ], User.prototype, "department", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
+    (0, typeorm_1.Column)({ type: "enum", enum: ["CAA", "Embassy"], nullable: false, default: "CAA" }),
     __metadata("design:type", String)
 ], User.prototype, "category", void 0);
 __decorate([

package/package.json

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

package/src/data-source.ts

@@ -118,6 +118,7 @@ import { StudyLeaveRequestAttachment } from './models/StudyLeaveAttachmentModel'
 import { ScholarshipRequests } from './models/ScholarshipRequestModel';
 import { ScholarshipApprovalDetails } from './models/ScholarshipApprovalModel';
 import { ScholarshipRequestAttachment } from './models/ScholarshipAttachmentModel';
+import { ScholarshipAttendee } from './models/ScholarshipAttendeeModel';
 import { ScholarshipRequestChat } from './models/ScholarshipChatModel';
 import { ScholarshipWorkFlow } from './models/ScholarshipWorkflowModel';
 import { CancellationRequests } from './models/CancellationRequestModel';
@@ -285,6 +286,7 @@ export const AppDataSource = new DataSource({
     ScholarshipRequests,
     ScholarshipApprovalDetails,
     ScholarshipRequestAttachment,
+    ScholarshipAttendee,
     ScholarshipRequestChat,
     ScholarshipWorkFlow,
     CancellationRequests,

package/src/index.ts

@@ -98,6 +98,7 @@ export * from './models/StudyLeaveAttachmentModel';
 export * from './models/ScholarshipRequestModel';
 export * from './models/ScholarshipApprovalModel';
 export * from './models/ScholarshipAttachmentModel';
+export * from './models/ScholarshipAttendeeModel';
 export * from './models/ScholarshipChatModel';
 export * from './models/ScholarshipWorkflowModel';
 export * from './models/CancellationRequestModel';

package/src/models/AccommodationApprovalModel.ts

@@ -35,14 +35,14 @@ export class AccommodationApproval extends BaseModel {
     @Column({ type: 'int', nullable: true })
     department_id: number;
 
-    @Column({ type: 'int', nullable: true })
-    section_id: number;
-
-    @Column({ type: 'boolean', nullable: false, default: true })
-    is_allowed: boolean;
-
-    @Column({ type: 'int', nullable: false })
-    level: number;
+    @Column({ type: 'int', nullable: true })
+    section_id: number;
+
+    @Column({ type: 'boolean', nullable: false, default: true })
+    is_allowed: boolean;
+
+    @Column({ type: 'int', nullable: false })
+    level: number;
 
     @Column({ 
         type: 'enum', 

package/src/models/AccommodationRequestModel.ts

@@ -134,14 +134,14 @@ export class AccommodationRequest extends BaseModel {
     @Column({ type: 'int', nullable: true })
     assigned_to_user_id: number | null;
 
-    @Column({ type: 'text', nullable: true })
-    approver_comment: string | null;
-
-    @Column({ type: 'varchar', length: 255, nullable: true })
-    accommodation_allocated: string | null;
-
-    @Column({ type: 'int', nullable: true })
-    approved_by: number | null;
+    @Column({ type: 'text', nullable: true })
+    approver_comment: string | null;
+
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    accommodation_allocated: string | null;
+
+    @Column({ type: 'int', nullable: true })
+    approved_by: number | null;
 
     @Column({ type: 'date', nullable: true })
     approved_at: Date | null;

package/src/models/AnnualIncrementRequestEmployeeModel.ts

@@ -1,65 +1,65 @@
-import { Column, Entity, JoinColumn, ManyToOne } from "typeorm";
-import { BaseModel } from "./BaseModel";
-import { AnnualIncrementRequest } from "./AnnualIncrementRequestModel";
-
-@Entity({ name: "annual_increment_request_employees" })
-export class AnnualIncrementRequestEmployee extends BaseModel {
-    @Column({ type: "integer", nullable: false })
-    request_id: number;
-
-    @Column({ type: "integer", nullable: true })
-    service_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    sub_service_id: number | null;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    employee_name: string;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    employee_id: string;
-
-    @Column({ type: "integer", nullable: false })
-    allowance_year: number;
-
-    @Column({ type: "date", nullable: false })
-    effective_date: Date;
-
-    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
-    current_basic_salary: number | null;
-
-    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
-    increment_percentage: number | null;
-
-    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
-    new_basic_salary: number | null;
-
-    @ManyToOne(() => AnnualIncrementRequest, { onDelete: "CASCADE" })
-    @JoinColumn({ name: "request_id", referencedColumnName: "id" })
-    request: AnnualIncrementRequest;
-
-    constructor(
-        request_id: number,
-        employee_name: string,
-        employee_id: string,
-        allowance_year: number,
-        effective_date: Date,
-        service_id?: number | null,
-        sub_service_id?: number | null,
-        current_basic_salary?: number | null,
-        increment_percentage?: number | null,
-        new_basic_salary?: number | null
-    ) {
-        super();
-        this.request_id = request_id;
-        this.service_id = service_id ?? null;
-        this.sub_service_id = sub_service_id ?? null;
-        this.employee_name = employee_name;
-        this.employee_id = employee_id;
-        this.allowance_year = allowance_year;
-        this.effective_date = effective_date;
-        this.current_basic_salary = current_basic_salary ?? null;
-        this.increment_percentage = increment_percentage ?? null;
-        this.new_basic_salary = new_basic_salary ?? null;
-    }
-}
+import { Column, Entity, JoinColumn, ManyToOne } from "typeorm";
+import { BaseModel } from "./BaseModel";
+import { AnnualIncrementRequest } from "./AnnualIncrementRequestModel";
+
+@Entity({ name: "annual_increment_request_employees" })
+export class AnnualIncrementRequestEmployee extends BaseModel {
+    @Column({ type: "integer", nullable: false })
+    request_id: number;
+
+    @Column({ type: "integer", nullable: true })
+    service_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    employee_name: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    employee_id: string;
+
+    @Column({ type: "integer", nullable: false })
+    allowance_year: number;
+
+    @Column({ type: "date", nullable: false })
+    effective_date: Date;
+
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
+    current_basic_salary: number | null;
+
+    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
+    increment_percentage: number | null;
+
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
+    new_basic_salary: number | null;
+
+    @ManyToOne(() => AnnualIncrementRequest, { onDelete: "CASCADE" })
+    @JoinColumn({ name: "request_id", referencedColumnName: "id" })
+    request: AnnualIncrementRequest;
+
+    constructor(
+        request_id: number,
+        employee_name: string,
+        employee_id: string,
+        allowance_year: number,
+        effective_date: Date,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        current_basic_salary?: number | null,
+        increment_percentage?: number | null,
+        new_basic_salary?: number | null
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id ?? null;
+        this.sub_service_id = sub_service_id ?? null;
+        this.employee_name = employee_name;
+        this.employee_id = employee_id;
+        this.allowance_year = allowance_year;
+        this.effective_date = effective_date;
+        this.current_basic_salary = current_basic_salary ?? null;
+        this.increment_percentage = increment_percentage ?? null;
+        this.new_basic_salary = new_basic_salary ?? null;
+    }
+}

package/src/models/AnnualIncrementRequestModel.ts

@@ -45,24 +45,24 @@ export class AnnualIncrementRequest 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;
+
     // Annual Increment specific fields
-    @Column({ type: "varchar", length: 255, nullable: true })
-    employee_name: string | null;
-
-    @Column({ type: "varchar", length: 100, nullable: true })
-    employee_id: string | null;
-
-    @Column({ type: "integer", nullable: true })
-    allowance_year: number | null;
-
-    @Column({ type: "date", nullable: true })
-    effective_date: Date | null;
+    @Column({ type: "varchar", length: 255, nullable: true })
+    employee_name: string | null;
+
+    @Column({ type: "varchar", length: 100, nullable: true })
+    employee_id: string | null;
+
+    @Column({ type: "integer", nullable: true })
+    allowance_year: number | null;
+
+    @Column({ type: "date", nullable: true })
+    effective_date: Date | null;
 
     @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
     current_basic_salary: number | null;
@@ -104,14 +104,14 @@ export class AnnualIncrementRequest 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 || null;
-        this.employee_id = employee_id || null;
-        this.allowance_year = allowance_year || null;
-        this.effective_date = effective_date || 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 || null;
+        this.employee_id = employee_id || null;
+        this.allowance_year = allowance_year || null;
+        this.effective_date = effective_date || null;
         this.current_basic_salary = current_basic_salary || null;
         this.increment_percentage = increment_percentage || null;
         this.new_basic_salary = new_basic_salary || null;

package/src/models/AppealAgainstAdministrativeDecisionRequestModel.ts

@@ -75,29 +75,29 @@ export class AppealAgainstAdministrativeDecisionRequest extends BaseModel {
     @Column({ type: "text", nullable: false })
     decision_subject: string;
 
-    @Column({ type: "text", nullable: false })
-    grievance_details: string;
-
-    @Column({ type: "jsonb", nullable: true })
-    individuals_involved: string[] | null;
-
-    @Column({ type: "jsonb", nullable: true })
-    times: string[] | null;
-
-    @Column({ type: "date", nullable: true })
-    dates: Date | null;
-
-    @Column({ type: "text", nullable: true })
-    location: string | null;
-
-    @Column({ type: "jsonb", nullable: true })
-    requests: string[] | null;
-
-    @Column({ type: "jsonb", nullable: true })
-    events: string[] | null;
-
-    @Column({ type: "varchar", length: 500, nullable: false })
-    grievant_name: string;
+    @Column({ type: "text", nullable: false })
+    grievance_details: string;
+
+    @Column({ type: "jsonb", nullable: true })
+    individuals_involved: string[] | null;
+
+    @Column({ type: "jsonb", nullable: true })
+    times: string[] | null;
+
+    @Column({ type: "date", nullable: true })
+    dates: Date | null;
+
+    @Column({ type: "text", nullable: true })
+    location: string | null;
+
+    @Column({ type: "jsonb", nullable: true })
+    requests: string[] | null;
+
+    @Column({ type: "jsonb", nullable: true })
+    events: string[] | null;
+
+    @Column({ type: "varchar", length: 500, nullable: false })
+    grievant_name: string;
 
     @Column({ type: "varchar", length: 100, nullable: false })
     grievant_employee_number: string;

package/src/models/CAAServices.ts

@@ -8,36 +8,36 @@ export class CAAServices extends BaseModel {
     @Column({ type: 'varchar', length: 64, nullable: false, unique: true })
     code: string;
 
-    @Column({ nullable: false })
-    name: string;
-
-    @Column({ type: "text", nullable: true })
-    arabic_name: string | null;
-
-    @Column({ nullable: false })
-    description: string;
-
-    @Column({ type: "text", nullable: true })
-    arabic_description: string | null;
-
-    @Column({ nullable: true })
-    logo_url: string;
-
-
-    constructor(     
-        name: string,
-        description: string,
-        arabic_name?: string | null,
-        arabic_description?: string | null,
-        code?: string,
-        logo_url?: string
-    ) {
-        super();     
-        this.name = name;
-        this.description = description;
-        this.arabic_name = arabic_name || null;
-        this.arabic_description = arabic_description || null;
-        this.code = code || '';
-        this.logo_url = logo_url || '';
-    }
-}
+    @Column({ nullable: false })
+    name: string;
+
+    @Column({ type: "text", nullable: true })
+    arabic_name: string | null;
+
+    @Column({ nullable: false })
+    description: string;
+
+    @Column({ type: "text", nullable: true })
+    arabic_description: string | null;
+
+    @Column({ nullable: true })
+    logo_url: string;
+
+
+    constructor(     
+        name: string,
+        description: string,
+        arabic_name?: string | null,
+        arabic_description?: string | null,
+        code?: string,
+        logo_url?: string
+    ) {
+        super();     
+        this.name = name;
+        this.description = description;
+        this.arabic_name = arabic_name || null;
+        this.arabic_description = arabic_description || null;
+        this.code = code || '';
+        this.logo_url = logo_url || '';
+    }
+}