@platform-modules/civil-aviation-authority 2.2.300 → 2.2.302

package/dist/models/ServiceTypeModel.d.ts

@@ -5,7 +5,7 @@ import { Departments } from './DepartmentsModel';
 import { Sections } from './SectionModel';
 export declare class ServiceType extends BaseModel {
     name: string;
-    name_in_arabic: string;
+    name_in_arabic: string | null;
     service_id: number;
     service: CAAServices;
     sub_service_id: number;
@@ -16,5 +16,5 @@ export declare class ServiceType extends BaseModel {
     section: Sections;
     description: string;
     is_active: boolean;
-    constructor(name: string, name_in_arabic: string, service_id: number, sub_service_id: number, description?: string, is_active?: boolean, department_id?: number | null, section_id?: number | null);
+    constructor(name: string, name_in_arabic: string | null, service_id: number, sub_service_id: number, description?: string, is_active?: boolean, department_id?: number | null, section_id?: number | null);
 }

package/dist/models/ServiceTypeModel.js

@@ -20,7 +20,7 @@ let ServiceType = class ServiceType extends BaseModel_1.BaseModel {
     constructor(name, name_in_arabic, service_id, sub_service_id, description, is_active, department_id, section_id) {
         super();
         this.name = name;
-        this.name_in_arabic = name_in_arabic;
+        this.name_in_arabic = name_in_arabic || '';
         this.service_id = service_id;
         this.sub_service_id = sub_service_id;
         this.description = description || '';
@@ -31,15 +31,15 @@ let ServiceType = class ServiceType extends BaseModel_1.BaseModel {
 };
 exports.ServiceType = ServiceType;
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
+    (0, typeorm_1.Column)({ type: 'varchar', nullable: false }),
     __metadata("design:type", String)
 ], ServiceType.prototype, "name", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
-    __metadata("design:type", String)
+    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
+    __metadata("design:type", Object)
 ], ServiceType.prototype, "name_in_arabic", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
     __metadata("design:type", Number)
 ], ServiceType.prototype, "service_id", void 0);
 __decorate([
@@ -48,7 +48,7 @@ __decorate([
     __metadata("design:type", CAAServices_1.CAAServices)
 ], ServiceType.prototype, "service", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
     __metadata("design:type", Number)
 ], ServiceType.prototype, "sub_service_id", void 0);
 __decorate([
@@ -75,7 +75,7 @@ __decorate([
     __metadata("design:type", SectionModel_1.Sections)
 ], ServiceType.prototype, "section", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
     __metadata("design:type", String)
 ], ServiceType.prototype, "description", void 0);
 __decorate([
@@ -84,5 +84,5 @@ __decorate([
 ], ServiceType.prototype, "is_active", void 0);
 exports.ServiceType = ServiceType = __decorate([
     (0, typeorm_1.Entity)({ name: 'service_types' }),
-    __metadata("design:paramtypes", [String, String, Number, Number, String, Boolean, Object, Object])
+    __metadata("design:paramtypes", [String, Object, Number, Number, String, Boolean, Object, Object])
 ], ServiceType);

package/dist/models/VpnApprovalModel.d.ts

@@ -17,5 +17,6 @@ export declare class VpnApprovalDetails extends BaseModel {
     comment: string;
     approval_status: VpnApprovalStatus;
     is_manager: boolean;
+    is_allowed: boolean;
     constructor(request_id: number, approver_user_id: number | null, approver_role_id: number | null, comment: string, approval_status: VpnApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approved_by?: number | null, is_manager?: boolean);
 }

package/dist/models/VpnApprovalModel.js

@@ -81,6 +81,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "boolean", default: false, nullable: false }),
     __metadata("design:type", Boolean)
 ], VpnApprovalDetails.prototype, "is_manager", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "boolean", default: true, nullable: false }),
+    __metadata("design:type", Boolean)
+], VpnApprovalDetails.prototype, "is_allowed", void 0);
 exports.VpnApprovalDetails = VpnApprovalDetails = __decorate([
     (0, typeorm_1.Entity)({ name: "vpn_approvals" }),
     __metadata("design:paramtypes", [Number, Object, Object, String, String, Number, Object, Object, Object, Boolean])

package/package.json

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

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;
+  }
 }