@platform-modules/civil-aviation-authority 1.0.32 → 1.0.34

package/dist/data-source.js

@@ -33,5 +33,5 @@ exports.AppDataSource = new typeorm_1.DataSource({
     database: process.env.DB_NAME || 'common_models',
     synchronize: true, // auto-create tables (disable in prod)
     logging: false,
-    entities: [user_1.User, user_sessions_1.userSessions, role_1.Role, ITHelpDeskModel_1.ITHelpDeskRequests, ITServicesTypesSalalahModel_1.ITServicesTypesSalalah, ITServicesTypesMuscatModel_1.ITServicesTypesMuscat, CAAServices_1.CAAServices, CAASubServices_1.CAASubServices, ITApprovalSettings_1.ITApprovalSettings, Workflows_1.Workflows, ItApprovalsModel_1.ItApprovalDetails, ItWorkflowModel_1.ItWorkFlow, WorkflowDefinitions_1.WorkflowDefinitions, WorkflowTask_1.WorkflowTask, DepartmentsModel_1.Departments, SectionModel_1.UserSections, WorkflowHierarchy_1.WorkflowHierarchy, WorkflowTaskNames_1.WorkflowTaskNames, DirectorateModel_1.Directorate, ITApprovalSettings_1.ITApprovalSettings],
+    entities: [user_1.User, user_sessions_1.userSessions, role_1.Role, ITHelpDeskModel_1.ITHelpDeskRequests, ITServicesTypesSalalahModel_1.ITServicesTypesSalalah, ITServicesTypesMuscatModel_1.ITServicesTypesMuscat, CAAServices_1.CAAServices, CAASubServices_1.CAASubServices, ITApprovalSettings_1.ITApprovalSettings, Workflows_1.Workflows, ItApprovalsModel_1.ItApprovalDetails, ItWorkflowModel_1.ItWorkFlow, WorkflowDefinitions_1.WorkflowDefinitions, WorkflowTask_1.WorkflowTask, DepartmentsModel_1.Departments, SectionModel_1.UserSections, WorkflowHierarchy_1.WorkflowHierarchy, WorkflowTaskNames_1.WorkflowTaskNames, DirectorateModel_1.Directorate],
 });

package/dist/models/WorkflowHierarchy.js

@@ -50,7 +50,7 @@ __decorate([
     __metadata("design:type", WorkflowDefinitions_1.WorkflowDefinitions)
 ], WorkflowHierarchy.prototype, "workflow_definition", void 0);
 exports.WorkflowHierarchy = WorkflowHierarchy = __decorate([
-    (0, typeorm_1.Entity)({ name: 'workflow_approval_steps' }),
+    (0, typeorm_1.Entity)({ name: 'workflow_hierarchy' }),
     (0, typeorm_1.Unique)(['workflow_definition_id', 'step_order']),
     __metadata("design:paramtypes", [Number, Number, Number, Number, Boolean])
 ], WorkflowHierarchy);

package/dist/models/WorkflowTask.d.ts

@@ -1,6 +1,6 @@
 import { BaseModel } from './BaseModel';
 export declare class WorkflowTask extends BaseModel {
-    name: string;
     task_id: number;
-    constructor(name: string, task_id: number);
+    name: string;
+    constructor(name: string, task_id?: number);
 }

package/dist/models/WorkflowTask.js

@@ -16,19 +16,19 @@ let WorkflowTask = class WorkflowTask extends BaseModel_1.BaseModel {
     constructor(name, task_id) {
         super();
         this.name = name;
-        this.task_id = task_id;
+        this.task_id = task_id || 0;
     }
 };
 exports.WorkflowTask = WorkflowTask;
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)(),
+    __metadata("design:type", Number)
+], WorkflowTask.prototype, "task_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
     __metadata("design:type", String)
 ], WorkflowTask.prototype, "name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
-    __metadata("design:type", Number)
-], WorkflowTask.prototype, "task_id", void 0);
 exports.WorkflowTask = WorkflowTask = __decorate([
-    (0, typeorm_1.Entity)({ name: 'workflow_task' }),
+    (0, typeorm_1.Entity)({ name: 'workflow_tasks' }),
     __metadata("design:paramtypes", [String, Number])
 ], WorkflowTask);

package/dist/models/WorkflowTaskNames.d.ts

@@ -1,5 +1,7 @@
 import { BaseModel } from './BaseModel';
 export declare class WorkflowTaskNames extends BaseModel {
     name: string;
-    constructor(name: string);
+    task_id: number;
+    description: string;
+    constructor(name: string, task_id: number, description: string);
 }

package/dist/models/WorkflowTaskNames.js

@@ -13,9 +13,11 @@ exports.WorkflowTaskNames = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let WorkflowTaskNames = class WorkflowTaskNames extends BaseModel_1.BaseModel {
-    constructor(name) {
+    constructor(name, task_id, description) {
         super();
         this.name = name;
+        this.task_id = task_id;
+        this.description = description;
     }
 };
 exports.WorkflowTaskNames = WorkflowTaskNames;
@@ -23,7 +25,15 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
     __metadata("design:type", String)
 ], WorkflowTaskNames.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], WorkflowTaskNames.prototype, "task_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 200, nullable: true }),
+    __metadata("design:type", String)
+], WorkflowTaskNames.prototype, "description", void 0);
 exports.WorkflowTaskNames = WorkflowTaskNames = __decorate([
     (0, typeorm_1.Entity)({ name: 'workflow_task_names' }),
-    __metadata("design:paramtypes", [String])
+    __metadata("design:paramtypes", [String, Number, String])
 ], WorkflowTaskNames);

package/package.json

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

package/src/data-source.ts

@@ -30,5 +30,5 @@ export const AppDataSource = new DataSource({
   database: process.env.DB_NAME || 'common_models',
   synchronize: true, // auto-create tables (disable in prod)
   logging: false,
-  entities: [User,userSessions,Role, ITHelpDeskRequests, ITServicesTypesSalalah, ITServicesTypesMuscat, CAAServices, CAASubServices, ITApprovalSettings, Workflows, ItApprovalDetails, ItWorkFlow, WorkflowDefinitions, WorkflowTask, Departments, UserSections, WorkflowHierarchy, WorkflowTaskNames, Directorate, ITApprovalSettings],
+  entities: [User,userSessions,Role, ITHelpDeskRequests, ITServicesTypesSalalah, ITServicesTypesMuscat, CAAServices, CAASubServices, ITApprovalSettings, Workflows, ItApprovalDetails, ItWorkFlow, WorkflowDefinitions, WorkflowTask, Departments, UserSections, WorkflowHierarchy, WorkflowTaskNames, Directorate],
 });

package/src/models/WorkflowHierarchy.ts

@@ -2,7 +2,7 @@ import { Column, Entity, ManyToOne, JoinColumn, Unique } from "typeorm";
 import { BaseModel } from './BaseModel';
 import { WorkflowDefinitions } from './WorkflowDefinitions';
 
-@Entity({ name: 'workflow_approval_steps' })
+@Entity({ name: 'workflow_hierarchy' })
 @Unique(['workflow_definition_id', 'step_order'])
 export class WorkflowHierarchy extends BaseModel {
 

package/src/models/WorkflowTask.ts

@@ -1,21 +1,21 @@
-import { Column, Entity } from "typeorm";
+import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
 import { BaseModel } from './BaseModel';
 
-@Entity({ name: 'workflow_task' })
+@Entity({ name: 'workflow_tasks' })
 export class WorkflowTask extends BaseModel {
 
+    @PrimaryGeneratedColumn()
+    task_id: number;
+
     @Column({ type: 'varchar', length: 100, nullable: false })
     name: string;
 
-    @Column({ type: 'integer', nullable: false })
-    task_id: number;
-
     constructor(
         name: string,
-        task_id: number
+        task_id?: number
     ) {
         super();
         this.name = name;
-        this.task_id = task_id;
+        this.task_id = task_id || 0;
     }
 }

package/src/models/WorkflowTaskNames.ts

@@ -7,10 +7,20 @@ export class WorkflowTaskNames extends BaseModel {
     @Column({ type: 'varchar', length: 100, nullable: false })
     name: string;
 
+    @Column({ type: 'integer', nullable: false })
+    task_id: number;
+     
+    @Column({ type: 'varchar', length: 200, nullable: true })
+    description: string;
+
     constructor(
-        name: string
+        name: string,
+        task_id: number,
+        description: string
     ) {
         super();
         this.name = name;
+        this.task_id = task_id;
+        this.description = description;
     }
 }