@platform-modules/civil-aviation-authority 2.0.15 → 2.0.16

package/.env

@@ -1,5 +1,11 @@
-DB_HOST=localhost
-DB_PORT=5433
-DB_USER=postgres
-DB_PASS=123
+# DB_HOST=localhost
+# DB_PORT=5433
+# DB_USER=postgres
+# DB_PASS=123
+# 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

package/dist/models/LogisticsApprovalModel.d.ts

@@ -12,8 +12,10 @@ export declare class LogisticsApprovalDetails extends BaseModel {
     approver_role_id: number;
     department_id: number | null;
     section_id: number | null;
+    approver_user_id: number | null;
+    delegate_user_id: number | null;
     approved_by: number | null;
     comment: string;
     approval_status: LogisticsApprovalStatus;
-    constructor(request_id: number, approver_role_id: number, comment: string, approval_status: LogisticsApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approved_by?: number | null, service_id?: number, sub_service_id?: number);
+    constructor(request_id: number, approver_role_id: number, comment: string, approval_status: LogisticsApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approver_user_id?: number | null, delegate_user_id?: number | null, approved_by?: number | null, service_id?: number, sub_service_id?: number);
 }

package/dist/models/LogisticsApprovalModel.js

@@ -19,7 +19,7 @@ var LogisticsApprovalStatus;
     LogisticsApprovalStatus["REJECTED"] = "Rejected";
 })(LogisticsApprovalStatus || (exports.LogisticsApprovalStatus = LogisticsApprovalStatus = {}));
 let LogisticsApprovalDetails = class LogisticsApprovalDetails extends BaseModel_1.BaseModel {
-    constructor(request_id, approver_role_id, comment, approval_status, level, department_id, section_id, approved_by, service_id, sub_service_id) {
+    constructor(request_id, approver_role_id, comment, approval_status, level, department_id, section_id, approver_user_id, delegate_user_id, approved_by, service_id, sub_service_id) {
         super();
         this.request_id = request_id;
         this.service_id = service_id || null;
@@ -30,6 +30,8 @@ let LogisticsApprovalDetails = class LogisticsApprovalDetails extends BaseModel_
         this.level = level;
         this.department_id = department_id || null;
         this.section_id = section_id || null;
+        this.approver_user_id = approver_user_id || null;
+        this.delegate_user_id = delegate_user_id || null;
         this.approved_by = approved_by || null;
     }
 };
@@ -62,6 +64,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
     __metadata("design:type", Object)
 ], LogisticsApprovalDetails.prototype, "section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsApprovalDetails.prototype, "approver_user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsApprovalDetails.prototype, "delegate_user_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
     __metadata("design:type", Object)
@@ -76,5 +86,5 @@ __decorate([
 ], LogisticsApprovalDetails.prototype, "approval_status", void 0);
 exports.LogisticsApprovalDetails = LogisticsApprovalDetails = __decorate([
     (0, typeorm_1.Entity)({ name: 'logistics_approvals' }),
-    __metadata("design:paramtypes", [Number, Number, String, String, Number, Object, Object, Object, Number, Number])
+    __metadata("design:paramtypes", [Number, Number, String, String, Number, Object, Object, Object, Object, Object, Number, Number])
 ], LogisticsApprovalDetails);

package/dist/models/WorkflowHierarchy.d.ts

@@ -11,7 +11,6 @@ export declare class WorkflowHierarchy extends BaseModel {
     task: any | null;
     step_order: number;
     is_required: boolean;
-    task_type: string | null;
     workflow_definition: WorkflowDefinitions;
-    constructor(workflow_definition_id: number, department_id: number, section_id: number, approval_role_id: number, approval_user_id: number, step_order: number, is_required?: boolean, taskname?: string, status?: string, task?: any, task_type?: string);
+    constructor(workflow_definition_id: number, department_id: number, section_id: number, approval_role_id: number, approval_user_id: number, step_order: number, is_required?: boolean, taskname?: string, status?: string, task?: any);
 }

package/dist/models/WorkflowHierarchy.js

@@ -14,7 +14,7 @@ const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 const WorkflowDefinitions_1 = require("./WorkflowDefinitions");
 let WorkflowHierarchy = class WorkflowHierarchy extends BaseModel_1.BaseModel {
-    constructor(workflow_definition_id, department_id, section_id, approval_role_id, approval_user_id, step_order, is_required, taskname, status, task, task_type) {
+    constructor(workflow_definition_id, department_id, section_id, approval_role_id, approval_user_id, step_order, is_required, taskname, status, task) {
         super();
         this.workflow_definition_id = workflow_definition_id;
         this.department_id = department_id;
@@ -26,7 +26,6 @@ let WorkflowHierarchy = class WorkflowHierarchy extends BaseModel_1.BaseModel {
         this.taskname = taskname || null;
         this.status = status || null;
         this.task = task || null;
-        this.task_type = task_type || null;
     }
 };
 exports.WorkflowHierarchy = WorkflowHierarchy;
@@ -70,10 +69,6 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'boolean', default: true }),
     __metadata("design:type", Boolean)
 ], WorkflowHierarchy.prototype, "is_required", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
-    __metadata("design:type", Object)
-], WorkflowHierarchy.prototype, "task_type", void 0);
 __decorate([
     (0, typeorm_1.ManyToOne)(() => WorkflowDefinitions_1.WorkflowDefinitions, { onDelete: 'CASCADE' }),
     (0, typeorm_1.JoinColumn)({ name: 'workflow_definition_id' }),
@@ -82,5 +77,5 @@ __decorate([
 exports.WorkflowHierarchy = WorkflowHierarchy = __decorate([
     (0, typeorm_1.Entity)({ name: 'workflow_hierarchy' }),
     (0, typeorm_1.Unique)(['workflow_definition_id', 'step_order']),
-    __metadata("design:paramtypes", [Number, Number, Number, Number, Number, Number, Boolean, String, String, Object, String])
+    __metadata("design:paramtypes", [Number, Number, Number, Number, Number, Number, Boolean, String, String, Object])
 ], WorkflowHierarchy);

package/package.json

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

package/src/models/LogisticsApprovalModel.ts

@@ -31,6 +31,12 @@ export class LogisticsApprovalDetails extends BaseModel {
   @Column({ type: 'integer', nullable: true })
   section_id: number | null;
 
+  @Column({ type: 'integer', nullable: true })
+  approver_user_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  delegate_user_id: number | null;
+
   @Column({ type: 'integer', nullable: true })
   approved_by: number | null;
 
@@ -48,6 +54,8 @@ export class LogisticsApprovalDetails extends BaseModel {
       level: number,
       department_id?: number | null,
       section_id?: number | null,
+      approver_user_id?: number | null,
+      delegate_user_id?: number | null,
       approved_by?: number | null,
       service_id?: number,
       sub_service_id?: number
@@ -62,6 +70,8 @@ export class LogisticsApprovalDetails extends BaseModel {
     this.level = level;
     this.department_id = department_id || null;
     this.section_id = section_id || null;
+    this.approver_user_id = approver_user_id || null;
+    this.delegate_user_id = delegate_user_id || null;
     this.approved_by = approved_by || null;
   }
 }

package/src/models/WorkflowHierarchy.ts

@@ -36,9 +36,6 @@ export class WorkflowHierarchy extends BaseModel {
     @Column({ type: 'boolean', default: true })
     is_required: boolean;
 
-    @Column({ type: 'varchar',length: 255, nullable:true })
-    task_type: string | null;
-
     @ManyToOne(() => WorkflowDefinitions, { onDelete: 'CASCADE' })
     @JoinColumn({ name: 'workflow_definition_id' })
     workflow_definition: WorkflowDefinitions;
@@ -53,8 +50,7 @@ export class WorkflowHierarchy extends BaseModel {
         is_required?: boolean,
         taskname?: string,
         status?: string,
-        task?: any,
-        task_type?:string
+        task?: any
     ) {
         super();
         this.workflow_definition_id = workflow_definition_id;
@@ -67,6 +63,5 @@ export class WorkflowHierarchy extends BaseModel {
         this.taskname = taskname || null;
         this.status = status || null;
         this.task = task || null;
-        this.task_type = task_type || null;
     }
 }