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

package/.env

@@ -2,4 +2,10 @@ DB_HOST=localhost
 DB_PORT=5433
 DB_USER=postgres
 DB_PASS=123
-DB_NAME=CAA
+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

@@ -1,6 +1,7 @@
 import { BaseModel } from './BaseModel';
 export declare enum LogisticsApprovalStatus {
     PENDING = "Pending",
+    IN_PROGRESS = "In Progress",
     APPROVED = "Approved",
     REJECTED = "Rejected"
 }
@@ -12,8 +13,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

@@ -15,11 +15,12 @@ const BaseModel_1 = require("./BaseModel");
 var LogisticsApprovalStatus;
 (function (LogisticsApprovalStatus) {
     LogisticsApprovalStatus["PENDING"] = "Pending";
+    LogisticsApprovalStatus["IN_PROGRESS"] = "In Progress";
     LogisticsApprovalStatus["APPROVED"] = "Approved";
     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 +31,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 +65,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 +87,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/package.json

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

package/src/models/LogisticsApprovalModel.ts

@@ -4,6 +4,7 @@ import { BaseModel } from './BaseModel';
 
 export enum LogisticsApprovalStatus {
   PENDING = "Pending",
+  IN_PROGRESS = "In Progress",
   APPROVED = "Approved",
   REJECTED = "Rejected"
 }
@@ -31,6 +32,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 +55,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 +71,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;
   }
 }