@platform-modules/civil-aviation-authority 2.2.311 → 2.2.312

package/.env

@@ -1,12 +1,5 @@
-# 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_PORT=5433
 DB_USER=postgres
-DB_PASS=stevejobs
+DB_PASS=123
 DB_NAME=CAA

package/dist/data-source.js

@@ -82,10 +82,6 @@ const HrServiceWorkflowModel_1 = require("./models/HrServiceWorkflowModel");
 const HrServiceAttachmentModel_1 = require("./models/HrServiceAttachmentModel");
 const HrServiceChatModel_1 = require("./models/HrServiceChatModel");
 const TrainingRequestModel_1 = require("./models/TrainingRequestModel");
-const TrainingWorkflowModel_1 = require("./models/TrainingWorkflowModel");
-const TrainingApprovalModel_1 = require("./models/TrainingApprovalModel");
-const TrainingChatModel_1 = require("./models/TrainingChatModel");
-const TrainingAttachmentModel_1 = require("./models/TrainingAttachmentModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -171,10 +167,6 @@ exports.AppDataSource = new typeorm_1.DataSource({
         HrServiceWorkflowModel_1.HrServiceWorkFlow,
         HrServiceAttachmentModel_1.HrServiceRequestAttachment,
         HrServiceChatModel_1.HrServiceRequestChat,
-        TrainingRequestModel_1.TrainingRequest,
-        TrainingWorkflowModel_1.TrainingWorkFlow,
-        TrainingApprovalModel_1.TrainingApprovalDetails,
-        TrainingChatModel_1.TrainingRequestChat,
-        TrainingAttachmentModel_1.TrainingRequestAttachment
+        TrainingRequestModel_1.TrainingRequest
     ],
 });

package/dist/index.d.ts

@@ -71,10 +71,6 @@ export * from './models/HrServiceWorkflowModel';
 export * from './models/HrServiceAttachmentModel';
 export * from './models/HrServiceChatModel';
 export * from './models/TrainingRequestModel';
-export * from './models/TrainingWorkflowModel';
-export * from './models/TrainingApprovalModel';
-export * from './models/TrainingChatModel';
-export * from './models/TrainingAttachmentModel';
 export { HrServiceRequestStatus } from './models/HrServiceRequestModel';
 export { HrServiceApprovalStatus } from './models/HrServiceApprovalModel';
 export { HrServiceWorkFlowStatus } from './models/HrServiceWorkflowModel';

package/dist/index.js

@@ -92,10 +92,6 @@ __exportStar(require("./models/HrServiceWorkflowModel"), exports);
 __exportStar(require("./models/HrServiceAttachmentModel"), exports);
 __exportStar(require("./models/HrServiceChatModel"), exports);
 __exportStar(require("./models/TrainingRequestModel"), exports);
-__exportStar(require("./models/TrainingWorkflowModel"), exports);
-__exportStar(require("./models/TrainingApprovalModel"), exports);
-__exportStar(require("./models/TrainingChatModel"), exports);
-__exportStar(require("./models/TrainingAttachmentModel"), exports);
 var HrServiceRequestModel_1 = require("./models/HrServiceRequestModel");
 Object.defineProperty(exports, "HrServiceRequestStatus", { enumerable: true, get: function () { return HrServiceRequestModel_1.HrServiceRequestStatus; } });
 var HrServiceApprovalModel_1 = require("./models/HrServiceApprovalModel");

package/dist/models/HrServiceApprovalModel.js

@@ -94,7 +94,7 @@ __decorate([
     __metadata("design:type", String)
 ], HrServiceApprovalDetails.prototype, "approval_status", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "boolean", default: false, nullable: false }),
+    (0, typeorm_1.Column)({ type: "boolean", default: null, nullable: true }),
     __metadata("design:type", Boolean)
 ], HrServiceApprovalDetails.prototype, "is_manager", void 0);
 __decorate([

package/dist/models/ITApprovalSettings.d.ts

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,40 @@
+"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

@@ -0,0 +1,6 @@
+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/ITServicesTypesMuscatModel.js

@@ -0,0 +1,34 @@
+"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.ITServicesTypesMuscat = 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;
+    }
+};
+exports.ITServicesTypesMuscat = ITServicesTypesMuscat;
+__decorate([
+    (0, typeorm_1.Column)({ nullable: false }),
+    __metadata("design:type", String)
+], ITServicesTypesMuscat.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ 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);

package/dist/models/ITServicesTypesSalalahModel.d.ts

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,34 @@
+"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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,31 @@
+"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;
+//     }
+// }

package/package.json

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

package/src/data-source.ts

@@ -80,10 +80,6 @@ import { HrServiceWorkFlow } from './models/HrServiceWorkflowModel';
 import { HrServiceRequestAttachment } from './models/HrServiceAttachmentModel';
 import { HrServiceRequestChat } from './models/HrServiceChatModel';
 import { TrainingRequest } from './models/TrainingRequestModel';
-import { TrainingWorkFlow } from './models/TrainingWorkflowModel';
-import { TrainingApprovalDetails } from './models/TrainingApprovalModel';
-import { TrainingRequestChat } from './models/TrainingChatModel';
-import { TrainingRequestAttachment } from './models/TrainingAttachmentModel';
 
 export const AppDataSource = new DataSource({
   type: 'postgres',
@@ -170,10 +166,6 @@ export const AppDataSource = new DataSource({
     HrServiceWorkFlow,
     HrServiceRequestAttachment,
     HrServiceRequestChat,
-    TrainingRequest,
-    TrainingWorkFlow,
-    TrainingApprovalDetails,
-    TrainingRequestChat,
-    TrainingRequestAttachment
+    TrainingRequest
   ],
 });

package/src/index.ts

@@ -75,10 +75,6 @@ export * from './models/HrServiceWorkflowModel';
 export * from './models/HrServiceAttachmentModel';
 export * from './models/HrServiceChatModel';
 export * from './models/TrainingRequestModel';
-export * from './models/TrainingWorkflowModel';
-export * from './models/TrainingApprovalModel';
-export * from './models/TrainingChatModel';
-export * from './models/TrainingAttachmentModel';
 export {HrServiceRequestStatus} from './models/HrServiceRequestModel';
 export {HrServiceApprovalStatus} from './models/HrServiceApprovalModel';
 export {HrServiceWorkFlowStatus} from './models/HrServiceWorkflowModel';

package/src/models/HrServiceApprovalModel.ts

@@ -52,7 +52,7 @@ export class HrServiceApprovalDetails extends BaseModel {
     })
     approval_status: HrServiceApprovalStatus;
 
-    @Column({ type: "boolean", default: false, nullable: false })
+    @Column({ type: "boolean", default: null, nullable: true })
     is_manager: boolean;
 
     @Column({ type: "boolean", default: true, nullable: false })

package/src/models/ITRequestChatModel.ts

@@ -1,62 +1,62 @@
-import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
-import { BaseModel } from './BaseModel';
-import { ITHelpDeskRequests } from './ITHelpDeskModel';
-import { User } from './user';
-
-@Entity({ name: 'it_request_chat' })
-export class ITRequestChat extends BaseModel {
-
-    @Column({ type: 'integer', nullable: false })
-    request_id: number;
-
-    @ManyToOne(() => ITHelpDeskRequests)
-    @JoinColumn({ name: 'request_id' })
-    request: ITHelpDeskRequests;
-
-    @Column({ type: 'integer', nullable: true })
-    service_id: number | null;
-
-    @Column({ type: 'integer', nullable: true })
-    sub_service_id: number | null;
-
-    @Column({ type: 'integer', nullable: false })
-    user_id: number;
-
-    @ManyToOne(() => User)
-    @JoinColumn({ name: 'user_id' })
-    user: User;
-
-    @Column({ type: 'integer', nullable: true })
-    role_id: number | null;
-
-    @Column({ type: 'text', nullable: false })
-    message: string;
-
-    @Column({ type: 'text', nullable: true })
-    status: string | null;
-
-    @Column({ type: 'boolean', default: false })
-    is_internal: boolean;
-
-    constructor(
-        request_id: number,
-        user_id: number,
-        message: string,
-        is_internal?: boolean,
-        service_id?: number | null,
-        sub_service_id?: number | null,
-        role_id?: number | null,
-        status?: string | null
-    ) {
-        super();
-        this.request_id = request_id;
-        this.service_id = service_id || null;
-        this.sub_service_id = sub_service_id || null;
-        this.user_id = user_id;
-        this.role_id = role_id || null;
-        this.message = message;
-        this.status = status || null;
-        this.is_internal = is_internal || false;
-    }
-}
-
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { ITHelpDeskRequests } from './ITHelpDeskModel';
+import { User } from './user';
+
+@Entity({ name: 'it_request_chat' })
+export class ITRequestChat extends BaseModel {
+
+    @Column({ type: 'integer', nullable: false })
+    request_id: number;
+
+    @ManyToOne(() => ITHelpDeskRequests)
+    @JoinColumn({ name: 'request_id' })
+    request: ITHelpDeskRequests;
+
+    @Column({ type: 'integer', nullable: true })
+    service_id: number | null;
+
+    @Column({ type: 'integer', nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: 'integer', nullable: false })
+    user_id: number;
+
+    @ManyToOne(() => User)
+    @JoinColumn({ name: 'user_id' })
+    user: User;
+
+    @Column({ type: 'integer', nullable: true })
+    role_id: number | null;
+
+    @Column({ type: 'text', nullable: false })
+    message: string;
+
+    @Column({ type: 'text', nullable: true })
+    status: string | null;
+
+    @Column({ type: 'boolean', default: false })
+    is_internal: boolean;
+
+    constructor(
+        request_id: number,
+        user_id: number,
+        message: string,
+        is_internal?: boolean,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        role_id?: number | null,
+        status?: string | null
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.user_id = user_id;
+        this.role_id = role_id || null;
+        this.message = message;
+        this.status = status || null;
+        this.is_internal = is_internal || false;
+    }
+}
+

package/src/models/ItApprovalsModel.ts

@@ -1,85 +1,85 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-
-export enum ApprovalStatus {
-  PENDING = "Pending",
-  APPROVED = "Approved",
-  REJECTED = "Rejected",
-  ASSIGNED = "Assigned",
-  REASSIGNED = "Reassigned"
-
-}
-
-@Entity({ name: 'it_approvals' })
-export class ItApprovalDetails 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: 'integer', nullable: false })
-  level: number;
-
-  @Column({ type: 'integer', nullable: true })
-  approver_user_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  delegation_user_id: number | null;
-
-  @Column({ type: 'integer', nullable: false })
-  approver_role_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  department_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  section_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  approved_by: number | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  comment: string;
-
-  @Column({ type: 'enum', enum: ApprovalStatus,default: ApprovalStatus.PENDING, nullable: false })
-  approval_status: ApprovalStatus;
-
-  @Column({ type: 'boolean', default: true, nullable: false })
-  is_allowed: boolean;
-
-    constructor(
-      request_id: number, 
-      approver_user_id: number | null, 
-      approver_role_id: number | null, 
-      comment: string, 
-      approval_status: ApprovalStatus, 
-      level: number,
-      department_id?: number | null,
-      section_id?: number | null,
-      approved_by?: number | null,
-      service_id?: number | null,
-      sub_service_id?: number | null,
-      delegation_user_id?: number | null,
-      is_allowed?: boolean
-    ) {
-    super();
-    this.request_id = request_id;
-    this.approver_user_id = approver_user_id;
-    this.approver_role_id = approver_role_id;
-    this.comment = comment;
-    this.approval_status = approval_status;
-    this.level = level;
-    this.department_id = department_id || null;
-    this.section_id = section_id || null;
-    this.approved_by = approved_by || null;
-    this.service_id = service_id ?? null;
-    this.sub_service_id = sub_service_id ?? null;
-    this.delegation_user_id = delegation_user_id || null;
-    this.is_allowed = is_allowed ?? true;
-  }
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+
+export enum ApprovalStatus {
+  PENDING = "Pending",
+  APPROVED = "Approved",
+  REJECTED = "Rejected",
+  ASSIGNED = "Assigned",
+  REASSIGNED = "Reassigned"
+
+}
+
+@Entity({ name: 'it_approvals' })
+export class ItApprovalDetails 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: 'integer', nullable: false })
+  level: number;
+
+  @Column({ type: 'integer', nullable: true })
+  approver_user_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  delegation_user_id: number | null;
+
+  @Column({ type: 'integer', nullable: false })
+  approver_role_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  department_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  section_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  approved_by: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  comment: string;
+
+  @Column({ type: 'enum', enum: ApprovalStatus,default: ApprovalStatus.PENDING, nullable: false })
+  approval_status: ApprovalStatus;
+
+  @Column({ type: 'boolean', default: true, nullable: false })
+  is_allowed: boolean;
+
+    constructor(
+      request_id: number, 
+      approver_user_id: number | null, 
+      approver_role_id: number | null, 
+      comment: string, 
+      approval_status: ApprovalStatus, 
+      level: number,
+      department_id?: number | null,
+      section_id?: number | null,
+      approved_by?: number | null,
+      service_id?: number | null,
+      sub_service_id?: number | null,
+      delegation_user_id?: number | null,
+      is_allowed?: boolean
+    ) {
+    super();
+    this.request_id = request_id;
+    this.approver_user_id = approver_user_id;
+    this.approver_role_id = approver_role_id;
+    this.comment = comment;
+    this.approval_status = approval_status;
+    this.level = level;
+    this.department_id = department_id || null;
+    this.section_id = section_id || null;
+    this.approved_by = approved_by || null;
+    this.service_id = service_id ?? null;
+    this.sub_service_id = sub_service_id ?? null;
+    this.delegation_user_id = delegation_user_id || null;
+    this.is_allowed = is_allowed ?? true;
+  }
 }