@platform-modules/civil-aviation-authority 1.0.38 → 1.0.40

package/dist/data-source.js

@@ -24,6 +24,7 @@ const SectionModel_1 = require("./models/SectionModel");
 const WorkflowHierarchy_1 = require("./models/WorkflowHierarchy");
 const WorkflowTaskNames_1 = require("./models/WorkflowTaskNames");
 const DirectorateModel_1 = require("./models/DirectorateModel");
+const PositionModel_1 = require("./models/PositionModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -33,5 +34,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],
+    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.Sections, WorkflowHierarchy_1.WorkflowHierarchy, WorkflowTaskNames_1.WorkflowTaskNames, DirectorateModel_1.Directorate, PositionModel_1.Position],
 });

package/dist/index.d.ts

@@ -17,3 +17,4 @@ export * from './models/SectionModel';
 export * from './models/WorkflowHierarchy';
 export * from './models/WorkflowTaskNames';
 export * from './models/DirectorateModel';
+export * from './models/PositionModel';

package/dist/index.js

@@ -33,3 +33,4 @@ __exportStar(require("./models/SectionModel"), exports);
 __exportStar(require("./models/WorkflowHierarchy"), exports);
 __exportStar(require("./models/WorkflowTaskNames"), exports);
 __exportStar(require("./models/DirectorateModel"), exports);
+__exportStar(require("./models/PositionModel"), exports);

package/dist/models/PositionModel.d.ts

@@ -0,0 +1,6 @@
+import { BaseModel } from './BaseModel';
+export declare class Position extends BaseModel {
+    name: string;
+    is_deleted?: boolean;
+    constructor(name: string, is_deleted: boolean);
+}

package/dist/models/PositionModel.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.Position = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let Position = class Position extends BaseModel_1.BaseModel {
+    constructor(name, is_deleted) {
+        super();
+        this.name = name;
+        this.is_deleted = is_deleted;
+    }
+};
+exports.Position = Position;
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], Position.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Boolean)
+], Position.prototype, "is_deleted", void 0);
+exports.Position = Position = __decorate([
+    (0, typeorm_1.Entity)({ name: 'position' }),
+    __metadata("design:paramtypes", [String, Boolean])
+], Position);

package/dist/models/SectionModel.d.ts

@@ -1,5 +1,5 @@
 import { BaseModel } from './BaseModel';
-export declare class UserSections extends BaseModel {
+export declare class Sections extends BaseModel {
     section_name: string;
     section_code: string;
     section_description: string;

package/dist/models/SectionModel.js

@@ -9,10 +9,10 @@ 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.UserSections = void 0;
+exports.Sections = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
-let UserSections = class UserSections extends BaseModel_1.BaseModel {
+let Sections = class Sections extends BaseModel_1.BaseModel {
     constructor(section_name, section_code, section_description, department_id) {
         super();
         this.section_name = section_name;
@@ -21,24 +21,24 @@ let UserSections = class UserSections extends BaseModel_1.BaseModel {
         this.department_id = department_id;
     }
 };
-exports.UserSections = UserSections;
+exports.Sections = Sections;
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 64, nullable: false, unique: true }),
     __metadata("design:type", String)
-], UserSections.prototype, "section_name", void 0);
+], Sections.prototype, "section_name", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 64, nullable: false, unique: true }),
     __metadata("design:type", String)
-], UserSections.prototype, "section_code", void 0);
+], Sections.prototype, "section_code", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: false }),
     __metadata("design:type", String)
-], UserSections.prototype, "section_description", void 0);
+], Sections.prototype, "section_description", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
     __metadata("design:type", Number)
-], UserSections.prototype, "department_id", void 0);
-exports.UserSections = UserSections = __decorate([
-    (0, typeorm_1.Entity)({ name: 'user_sections' }),
+], Sections.prototype, "department_id", void 0);
+exports.Sections = Sections = __decorate([
+    (0, typeorm_1.Entity)({ name: 'sections' }),
     __metadata("design:paramtypes", [String, String, String, Number])
-], UserSections);
+], Sections);

package/dist/models/WorkflowHierarchy.d.ts

@@ -3,10 +3,9 @@ import { WorkflowDefinitions } from './WorkflowDefinitions';
 export declare class WorkflowHierarchy extends BaseModel {
     workflow_definition_id: number;
     department_id: number;
-    section_id: number;
-    approval_id: number;
+    approval_level_id: number;
     step_order: number;
     is_required: boolean;
     workflow_definition: WorkflowDefinitions;
-    constructor(workflow_definition_id: number, department_id: number, section_id: number, approval_id: number, step_order: number, is_required?: boolean);
+    constructor(workflow_definition_id: number, department_id: number, approval_level_id: number, step_order: number, is_required?: boolean);
 }

package/dist/models/WorkflowHierarchy.js

@@ -14,12 +14,11 @@ 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_id, step_order, is_required) {
+    constructor(workflow_definition_id, department_id, approval_level_id, step_order, is_required) {
         super();
         this.workflow_definition_id = workflow_definition_id;
         this.department_id = department_id;
-        this.section_id = section_id;
-        this.approval_id = approval_id;
+        this.approval_level_id = approval_level_id;
         this.step_order = step_order;
         this.is_required = is_required !== undefined ? is_required : true;
     }
@@ -36,11 +35,7 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
-], WorkflowHierarchy.prototype, "section_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
-    __metadata("design:type", Number)
-], WorkflowHierarchy.prototype, "approval_id", void 0);
+], WorkflowHierarchy.prototype, "approval_level_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
@@ -57,5 +52,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, Boolean])
+    __metadata("design:paramtypes", [Number, Number, Number, Number, Boolean])
 ], WorkflowHierarchy);

package/dist/models/user.d.ts

@@ -20,15 +20,16 @@ export declare class User extends BaseModel {
     manpower_id?: number;
     mobile?: string;
     office_number?: string;
-    department?: string;
+    department?: number;
     category?: string;
     directorate?: string;
-    section?: string;
-    position?: string;
+    section?: number;
+    position?: number;
     arabic_position?: string;
     grade?: number;
     location?: string;
     supervisor_emp_id?: number;
     supervisor_emp_name?: string;
-    constructor(employee_id?: number, civil_employee_id?: number, employee_name?: string, employee_arabic_name?: string, person_type?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, qualification?: string, marital_status?: string, nationality?: string, email?: string, blood_type?: string, national_id?: number, manpower_id?: number, mobile?: string, office_number?: string, department?: string, category?: string, directorate?: string, section?: string, position?: string, arabic_position?: string, grade?: number, location?: string, supervisor_emp_id?: number, supervisor_emp_name?: string);
+    is_admin?: boolean;
+    constructor(employee_id?: number, civil_employee_id?: number, employee_name?: string, employee_arabic_name?: string, person_type?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, qualification?: string, marital_status?: string, nationality?: string, email?: string, blood_type?: string, national_id?: number, manpower_id?: number, mobile?: string, office_number?: string, department?: number, category?: string, directorate?: string, section?: number, position?: number, arabic_position?: string, grade?: number, location?: string, supervisor_emp_id?: number, supervisor_emp_name?: string);
 }

package/dist/models/user.js

@@ -130,7 +130,7 @@ __decorate([
 ], User.prototype, "office_number", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
+    __metadata("design:type", Number)
 ], User.prototype, "department", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
@@ -142,11 +142,11 @@ __decorate([
 ], User.prototype, "directorate", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
+    __metadata("design:type", Number)
 ], User.prototype, "section", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
+    __metadata("design:type", Number)
 ], User.prototype, "position", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
@@ -168,7 +168,11 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], User.prototype, "supervisor_emp_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true, default: false }),
+    __metadata("design:type", Boolean)
+], User.prototype, "is_admin", void 0);
 exports.User = User = __decorate([
     (0, typeorm_1.Entity)({ name: 'users' }),
-    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, String, String, String, String, String, String, String, String, String, Number, Number, String, String, String, String, String, String, String, String, Number, String, Number, String])
+    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, String, String, String, String, String, String, String, String, String, Number, Number, String, String, Number, String, String, Number, Number, String, Number, String, Number, String])
 ], User);

package/package.json

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

package/src/data-source.ts

@@ -17,10 +17,14 @@ import { ItWorkFlow } from './models/ItWorkflowModel';
 import { WorkflowDefinitions } from './models/WorkflowDefinitions';
 import { WorkflowTask } from './models/WorkflowTask';
 import { Departments } from './models/DepartmentsModel';
-import { UserSections } from './models/SectionModel';
+import { Sections } from './models/SectionModel';
 import { WorkflowHierarchy } from './models/WorkflowHierarchy';
 import { WorkflowTaskNames } from './models/WorkflowTaskNames';
 import { Directorate } from './models/DirectorateModel';
+import { Position } from './models/PositionModel';
+
+
+
 export const AppDataSource = new DataSource({
   type: 'postgres',
   host: process.env.DB_HOST || 'localhost',
@@ -30,5 +34,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],
+  entities: [User,userSessions,Role, ITHelpDeskRequests, ITServicesTypesSalalah, ITServicesTypesMuscat, CAAServices, CAASubServices, ITApprovalSettings, Workflows, ItApprovalDetails, ItWorkFlow, WorkflowDefinitions, WorkflowTask, Departments, Sections, WorkflowHierarchy, WorkflowTaskNames, Directorate, Position],
 });

package/src/index.ts

@@ -17,4 +17,4 @@ export * from './models/SectionModel';
 export * from './models/WorkflowHierarchy';
 export * from './models/WorkflowTaskNames';
 export * from './models/DirectorateModel';
-
+export * from './models/PositionModel';

package/src/models/PositionModel.ts

@@ -0,0 +1,19 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'position' })
+export class Position extends BaseModel {
+
+    @Column({ nullable: true })
+    name: string;
+
+    @Column({ nullable: true })   
+    is_deleted?: boolean;  
+
+
+    constructor(name: string,is_deleted:boolean) {
+        super();
+        this.name = name
+        this.is_deleted = is_deleted
+    }
+}

package/src/models/SectionModel.ts

@@ -1,8 +1,8 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 
-@Entity({ name: 'user_sections' })
-export class UserSections extends BaseModel {
+@Entity({ name: 'sections' })
+export class Sections extends BaseModel {
 
     @Column({ type: 'varchar', length: 64, nullable: false, unique: true })
     section_name: string;

package/src/models/WorkflowHierarchy.ts

@@ -13,10 +13,7 @@ export class WorkflowHierarchy extends BaseModel {
     department_id: number;
 
     @Column({ type: 'integer', nullable: false })
-    section_id: number;
-
-    @Column({ type: 'integer', nullable: false })
-    approval_id: number;
+    approval_level_id: number;
 
     @Column({ type: 'integer', nullable: false })
     step_order: number;
@@ -31,16 +28,14 @@ export class WorkflowHierarchy extends BaseModel {
     constructor(
         workflow_definition_id: number,
         department_id: number,
-        section_id: number,
-        approval_id: number,
+        approval_level_id: number,
         step_order: number,
         is_required?: boolean
     ) {
         super();
         this.workflow_definition_id = workflow_definition_id;
         this.department_id = department_id;
-        this.section_id = section_id;
-        this.approval_id = approval_id;
+        this.approval_level_id = approval_level_id;
         this.step_order = step_order;
         this.is_required = is_required !== undefined ? is_required : true;
     }

package/src/models/user.ts

@@ -65,7 +65,7 @@ export class User extends BaseModel {
     office_number?: string;
 
     @Column({ nullable: true })
-    department?: string;
+    department?: number;
 
     @Column({ nullable: true })
     category?: string;
@@ -74,10 +74,10 @@ export class User extends BaseModel {
     directorate?: string;
 
     @Column({ nullable: true })
-    section?: string;
+    section?: number;
 
     @Column({ nullable: true })
-    position?: string;
+    position?: number;
 
     @Column({ nullable: true })
     arabic_position?: string;
@@ -94,6 +94,9 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     supervisor_emp_name?: string;
 
+    @Column({ nullable: true , default: false})
+    is_admin?: boolean;
+
     constructor(     
         employee_id?: number,
         civil_employee_id?: number,
@@ -115,11 +118,11 @@ export class User extends BaseModel {
         manpower_id?: number,
         mobile?: string,
         office_number?: string,
-        department?: string,
+        department?: number,
         category?: string,
         directorate?: string,
-        section?: string,
-        position?: string,
+        section?: number,
+        position?: number,
         arabic_position?: string,
         grade?: number,
         location?: string,