@platform-modules/civil-aviation-authority 1.0.47 → 1.0.48

package/.env

@@ -1,5 +1,5 @@
 DB_HOST=localhost
-DB_PORT=5432
+DB_PORT=5433
 DB_USER=postgres
-DB_PASS=Fa@123
+DB_PASS=123
 DB_NAME=CAA

package/dist/data-source.js

@@ -26,6 +26,7 @@ const WorkflowTaskNames_1 = require("./models/WorkflowTaskNames");
 const DirectorateModel_1 = require("./models/DirectorateModel");
 const PositionModel_1 = require("./models/PositionModel");
 const serviceBookmarksModel_1 = require("./models/serviceBookmarksModel");
+const contactInfoModel_1 = require("./models/contactInfoModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -55,6 +56,7 @@ exports.AppDataSource = new typeorm_1.DataSource({
         WorkflowTaskNames_1.WorkflowTaskNames,
         DirectorateModel_1.Directorate,
         PositionModel_1.Position,
-        serviceBookmarksModel_1.ServiceBookmarks
+        serviceBookmarksModel_1.ServiceBookmarks,
+        contactInfoModel_1.ContactInfo
     ],
 });

package/dist/index.d.ts

@@ -19,3 +19,4 @@ export * from './models/WorkflowTaskNames';
 export * from './models/DirectorateModel';
 export * from './models/PositionModel';
 export * from './models/serviceBookmarksModel';
+export * from './models/contactInfoModel';

package/dist/index.js

@@ -35,3 +35,4 @@ __exportStar(require("./models/WorkflowTaskNames"), exports);
 __exportStar(require("./models/DirectorateModel"), exports);
 __exportStar(require("./models/PositionModel"), exports);
 __exportStar(require("./models/serviceBookmarksModel"), exports);
+__exportStar(require("./models/contactInfoModel"), exports);

package/dist/models/ITServicesTypesModel.d.ts

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

package/dist/models/ITServicesTypesModel.js

@@ -0,0 +1,29 @@
+"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);

package/dist/models/contactInfoModel.d.ts

@@ -0,0 +1,18 @@
+import { BaseModel } from './BaseModel';
+export declare class ContactInfo extends BaseModel {
+    id: number;
+    category: "FM" | "Embassy";
+    name: string;
+    business_email: string;
+    business_phone: string;
+    extension_number: string;
+    fax_number: string;
+    location: string;
+    street: string;
+    city: string;
+    state: string;
+    zip_code: string;
+    country: string;
+    photo_url: string;
+    department_id: number;
+}

package/dist/models/contactInfoModel.js

@@ -0,0 +1,80 @@
+"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.ContactInfo = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let ContactInfo = class ContactInfo extends BaseModel_1.BaseModel {
+};
+exports.ContactInfo = ContactInfo;
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)(),
+    __metadata("design:type", Number)
+], ContactInfo.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "enum", enum: ["FM", "Embassy"], nullable: false }),
+    __metadata("design:type", String)
+], ContactInfo.prototype, "category", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
+    __metadata("design:type", String)
+], ContactInfo.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
+    __metadata("design:type", String)
+], ContactInfo.prototype, "business_email", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 20, nullable: false }),
+    __metadata("design:type", String)
+], ContactInfo.prototype, "business_phone", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 10, nullable: true }),
+    __metadata("design:type", String)
+], ContactInfo.prototype, "extension_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 20, nullable: true }),
+    __metadata("design:type", String)
+], ContactInfo.prototype, "fax_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", String)
+], ContactInfo.prototype, "location", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", String)
+], ContactInfo.prototype, "street", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: true }),
+    __metadata("design:type", String)
+], ContactInfo.prototype, "city", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: true }),
+    __metadata("design:type", String)
+], ContactInfo.prototype, "state", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 20, nullable: true }),
+    __metadata("design:type", String)
+], ContactInfo.prototype, "zip_code", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: true }),
+    __metadata("design:type", String)
+], ContactInfo.prototype, "country", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 500, nullable: true }),
+    __metadata("design:type", String)
+], ContactInfo.prototype, "photo_url", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Number)
+], ContactInfo.prototype, "department_id", void 0);
+exports.ContactInfo = ContactInfo = __decorate([
+    (0, typeorm_1.Entity)({ name: "contact_info" })
+], ContactInfo);

package/dist/models/user.d.ts

@@ -31,9 +31,5 @@ export declare class User extends BaseModel {
     supervisor_emp_id?: number;
     supervisor_emp_name?: string;
     is_admin?: boolean;
-    passport_number?: string;
-    personal_email?: string;
-    extension_number?: number;
-    diplomatic_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?: number, category?: string, directorate?: string, section?: number, position?: number, arabic_position?: string, grade?: number, location?: string, supervisor_emp_id?: number, supervisor_emp_name?: string, passport_number?: string, personal_email?: string, extension_number?: number, diplomatic_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?: 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

@@ -13,7 +13,7 @@ exports.User = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let User = class User extends BaseModel_1.BaseModel {
-    constructor(employee_id, civil_employee_id, employee_name, employee_arabic_name, person_type, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, qualification, marital_status, nationality, email, blood_type, national_id, manpower_id, mobile, office_number, department, category, directorate, section, position, arabic_position, grade, location, supervisor_emp_id, supervisor_emp_name, passport_number, personal_email, extension_number, diplomatic_name) {
+    constructor(employee_id, civil_employee_id, employee_name, employee_arabic_name, person_type, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, qualification, marital_status, nationality, email, blood_type, national_id, manpower_id, mobile, office_number, department, category, directorate, section, position, arabic_position, grade, location, supervisor_emp_id, supervisor_emp_name) {
         super();
         this.employee_id = employee_id;
         this.civil_employee_id = civil_employee_id;
@@ -45,10 +45,6 @@ let User = class User extends BaseModel_1.BaseModel {
         this.location = location;
         this.supervisor_emp_id = supervisor_emp_id;
         this.supervisor_emp_name = supervisor_emp_name;
-        this.passport_number = passport_number;
-        this.personal_email = personal_email;
-        this.extension_number = extension_number;
-        this.diplomatic_name = diplomatic_name;
     }
 };
 exports.User = User;
@@ -176,23 +172,7 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true, default: false }),
     __metadata("design:type", Boolean)
 ], User.prototype, "is_admin", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
-], User.prototype, "passport_number", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
-], User.prototype, "personal_email", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Number)
-], User.prototype, "extension_number", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
-], User.prototype, "diplomatic_name", 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, Number, String, String, Number, Number, String, Number, String, Number, String, String, 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.47",
+  "version": "1.0.48",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/data-source.ts

@@ -23,6 +23,7 @@ import { WorkflowTaskNames } from './models/WorkflowTaskNames';
 import { Directorate } from './models/DirectorateModel';
 import { Position } from './models/PositionModel';
 import { ServiceBookmarks } from './models/serviceBookmarksModel';
+import { ContactInfo } from './models/contactInfoModel';
 
 
 
@@ -55,6 +56,7 @@ export const AppDataSource = new DataSource({
     WorkflowTaskNames, 
     Directorate, 
     Position,
-    ServiceBookmarks
+    ServiceBookmarks,
+    ContactInfo
   ],
 });

package/src/index.ts

@@ -19,3 +19,4 @@ export * from './models/WorkflowTaskNames';
 export * from './models/DirectorateModel';
 export * from './models/PositionModel';
 export * from './models/serviceBookmarksModel';
+export * from './models/contactInfoModel';

package/src/models/contactInfoModel.ts

@@ -0,0 +1,60 @@
+import { Entity, Column, PrimaryGeneratedColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: "contact_info" })
+export class ContactInfo extends BaseModel {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  // General Information
+  @Column({ type: "enum", enum: ["FM", "Embassy"], nullable: false })
+  category: "FM" | "Embassy"; // Mandatory
+
+  @Column({ type: "varchar", length: 255, nullable: false })
+  name: string; 
+  
+  // Email & Contact Information
+  @Column({ type: "varchar", length: 255, nullable: false })
+  business_email: string; // Mandatory
+
+  @Column({ type: "varchar", length: 20, nullable: false })
+  business_phone: string; // Mandatory
+
+  @Column({ type: "varchar", length: 10, nullable: true })
+  extension_number: string; // Conditional
+
+  @Column({ type: "varchar", length: 20, nullable: true })
+  fax_number: string; // Optional
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  location: string; // Optional
+
+  // @Column({ type: "varchar", length: 255, nullable: true })
+  // website: string; // Optional
+
+  // @Column({ type: "varchar", length: 255, nullable: true })
+  // blog: string; // Optional
+
+  // Business Postal Address Information
+  @Column({ type: "varchar", length: 255, nullable: true })
+  street: string;
+
+  @Column({ type: "varchar", length: 100, nullable: true })
+  city: string;
+
+  @Column({ type: "varchar", length: 100, nullable: true })
+  state: string;
+
+  @Column({ type: "varchar", length: 20, nullable: true })
+  zip_code: string;
+
+  @Column({ type: "varchar", length: 100, nullable: true })
+  country: string;
+
+  // Photo
+  @Column({ type: "varchar", length: 500, nullable: true })
+  photo_url: string;
+
+  @Column({ nullable: true })
+  department_id: number;
+}

package/src/models/user.ts

@@ -97,18 +97,6 @@ export class User extends BaseModel {
     @Column({ nullable: true , default: false})
     is_admin?: boolean;
 
-    @Column({ nullable: true })
-    passport_number?: string;
-
-    @Column({ nullable: true })
-    personal_email?: string;
-
-    @Column({ nullable: true })
-    extension_number?: number;
-
-    @Column({ nullable: true })
-    diplomatic_name?: string;
-
     constructor(     
         employee_id?: number,
         civil_employee_id?: number,
@@ -139,11 +127,7 @@ export class User extends BaseModel {
         grade?: number,
         location?: string,
         supervisor_emp_id?: number,
-        supervisor_emp_name?: string,
-        passport_number?: string,
-        personal_email?: string,
-        extension_number?: number,
-        diplomatic_name?: string
+        supervisor_emp_name?: string
     ) {
         super();     
         this.employee_id = employee_id;
@@ -176,9 +160,5 @@ export class User extends BaseModel {
         this.location = location;
         this.supervisor_emp_id = supervisor_emp_id;
         this.supervisor_emp_name = supervisor_emp_name;
-        this.passport_number = passport_number;
-        this.personal_email = personal_email;
-        this.extension_number = extension_number;
-        this.diplomatic_name = diplomatic_name;
     }
 }