@platform-modules/civil-aviation-authority 1.0.58 → 2.0.0

package/src/models/ServiceTypeModel.ts

@@ -0,0 +1,52 @@
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { CAAServices } from './CAAServices';
+import { CAASubServices } from './CAASubServices';
+
+@Entity({ name: 'service_types' })
+export class ServiceType extends BaseModel {
+
+    @Column({ nullable: false })
+    name: string;
+
+    @Column({ nullable: false })
+    name_in_arabic: string;
+
+    @Column({ nullable: false })
+    service_id: number;
+
+    @ManyToOne(() => CAAServices)
+    @JoinColumn({ name: 'service_id' })
+    service: CAAServices;
+
+    @Column({ nullable: false })
+    sub_service_id: number;
+
+    @ManyToOne(() => CAASubServices)
+    @JoinColumn({ name: 'sub_service_id' })
+    sub_service: CAASubServices;
+
+    @Column({ nullable: true })
+    description: string;
+
+    @Column({ type: 'boolean', default: true })
+    is_active: boolean;
+
+    constructor(
+        name: string,
+        name_in_arabic: string,
+        service_id: number,
+        sub_service_id: number,
+        description?: string,
+        is_active?: boolean
+    ) {
+        super();
+        this.name = name;
+        this.name_in_arabic = name_in_arabic;
+        this.service_id = service_id;
+        this.sub_service_id = sub_service_id;
+        this.description = description || '';
+        this.is_active = is_active !== undefined ? is_active : true;
+    }
+}
+

package/src/models/WorkflowDefinitions.ts

@@ -1,5 +1,7 @@
-import { Column, Entity } from "typeorm";
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
 import { BaseModel } from './BaseModel';
+import { CAAServices } from './CAAServices';
+import { CAASubServices } from './CAASubServices';
 
 @Entity({ name: 'workflow_definitions' })
 export class WorkflowDefinitions extends BaseModel {
@@ -16,8 +18,28 @@ export class WorkflowDefinitions extends BaseModel {
     @Column({ type: 'boolean', default: true })
     is_active: boolean;
 
-    @Column({ type: 'varchar', length: 50, nullable: true })
-    service_type: string;
+    @Column({ 
+        type: 'varchar', 
+        length: 20, 
+        nullable: true,
+        enum: ['internal', 'external', 'none']
+    })
+    service_type: 'internal' | 'external' | 'none';
+
+    @Column({ type: 'bigint', nullable: false })
+    service_id: number;
+
+    @ManyToOne(() => CAAServices)
+    @JoinColumn({ name: 'service_id' })
+    service: CAAServices;
+
+    @Column({ type: 'bigint', nullable: false })
+    sub_service_id: number;
+
+    @ManyToOne(() => CAASubServices)
+    @JoinColumn({ name: 'sub_service_id' })
+    sub_service: CAASubServices;
+
 
     @Column({ 
         type: 'varchar', 
@@ -31,15 +53,19 @@ export class WorkflowDefinitions extends BaseModel {
         description?: string,
         version?: number,
         is_active?: boolean,
-        service_type?: string,
-        status?: 'draft' | 'published' 
+        service_id?: number,
+        sub_service_id?: number,
+        status?: 'draft' | 'published',
+        service_type?: 'internal' | 'external' | 'none'
     ) {
         super();
         this.name = name;
         this.description = description || '';
         this.version = version || 1;
         this.is_active = is_active !== undefined ? is_active : true;
-        this.service_type = service_type || '';
+        this.service_id = service_id || 0;
+        this.sub_service_id = sub_service_id || 0;
         this.status = status || 'draft';
+        this.service_type = service_type || 'none';
     }
 }

package/src/models/WorkflowHierarchy.ts

@@ -16,7 +16,19 @@ export class WorkflowHierarchy extends BaseModel {
     section_id: number;
 
     @Column({ type: 'integer', nullable: true })
-    approval_id: number;
+    approval_role_id: number;
+
+    @Column({ type: 'integer', nullable: true })
+    approval_user_id: number;
+
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    taskname: string | null;
+
+    @Column({ type: 'varchar', length: 50, nullable: true })
+    status: string | null;
+
+    @Column({ type: 'jsonb', nullable: true })
+    task: any | null;
 
     @Column({ type: 'integer', nullable: false })
     step_order: number;
@@ -32,16 +44,24 @@ export class WorkflowHierarchy extends BaseModel {
         workflow_definition_id: number,
         department_id: number,
         section_id: number,
-        approval_id: number,
+        approval_role_id: number,
+        approval_user_id: number,
         step_order: number,
-        is_required?: boolean
+        is_required?: boolean,
+        taskname?: string,
+        status?: string,
+        task?: any
     ) {
         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_role_id = approval_role_id;
+        this.approval_user_id = approval_user_id;
         this.step_order = step_order;
         this.is_required = is_required !== undefined ? is_required : true;
+        this.taskname = taskname || null;
+        this.status = status || null;
+        this.task = task || null;
     }
 }

package/src/models/user.ts

@@ -124,8 +124,6 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     children2_name?: string;
 
-    @Column({ nullable: true })
-    address?: string;
     
     constructor(     
         employee_id?: number,
@@ -166,8 +164,7 @@ export class User extends BaseModel {
         father_name?: string,
         spouse_name?: string,
         children1_name?: string,
-        children2_name?: string,
-        address?: string
+        children2_name?: string
     ) {
         super();     
         this.employee_id = employee_id;
@@ -209,6 +206,5 @@ export class User extends BaseModel {
         this.spouse_name = spouse_name;
         this.children1_name = children1_name;
         this.children2_name = children2_name;
-        this.address = address;
     }
 }

package/dist/models/ITServicesTypesModel.d.ts

@@ -1,5 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare class ITServicesTypes extends BaseModel {
-    name: string;
-    constructor(name: string);
-}

package/dist/models/ITServicesTypesModel.js

@@ -1,29 +0,0 @@
-"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.ITServicesTypes = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-let ITServicesTypes = class ITServicesTypes extends BaseModel_1.BaseModel {
-    constructor(name) {
-        super();
-        this.name = name;
-    }
-};
-exports.ITServicesTypes = ITServicesTypes;
-__decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
-    __metadata("design:type", String)
-], ITServicesTypes.prototype, "name", void 0);
-exports.ITServicesTypes = ITServicesTypes = __decorate([
-    (0, typeorm_1.Entity)({ name: 'IT_Services_Types' }),
-    __metadata("design:paramtypes", [String])
-], ITServicesTypes);