@platform-modules/civil-aviation-authority 2.3.78 → 2.3.80

package/dist/data-source.js

@@ -128,6 +128,7 @@ const CashAllowanceLeaveRequestModel_1 = require("./models/CashAllowanceLeaveReq
 const PromotionRequestModel_1 = require("./models/PromotionRequestModel");
 const AnnualIncrementRequestModel_1 = require("./models/AnnualIncrementRequestModel");
 const SkillsEnhancementRequestModel_1 = require("./models/SkillsEnhancementRequestModel");
+const CityMasterModel_1 = require("./models/CityMasterModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -259,6 +260,7 @@ exports.AppDataSource = new typeorm_1.DataSource({
         CashAllowanceLeaveRequestModel_1.CashAllowanceLeaveRequest,
         PromotionRequestModel_1.PromotionRequest,
         AnnualIncrementRequestModel_1.AnnualIncrementRequest,
-        SkillsEnhancementRequestModel_1.SkillsEnhancementRequest
+        SkillsEnhancementRequestModel_1.SkillsEnhancementRequest,
+        CityMasterModel_1.CityMaster
     ],
 });

package/dist/index.d.ts

@@ -188,6 +188,7 @@ export { JobTransferRequestStatus } from './models/JobTransferRequestModel';
 export * from './models/NewResourceRequestModel';
 export { NewResourceRequestStatus } from './models/NewResourceRequestModel';
 export * from './models/CountryMasterModel';
+export * from './models/CityMasterModel';
 export * from './models/LocationModel';
 export * from './models/FinancialGradeModel';
 export * from './models/NationalityMasterModel';

package/dist/index.js

@@ -279,6 +279,8 @@ var NewResourceRequestModel_1 = require("./models/NewResourceRequestModel");
 Object.defineProperty(exports, "NewResourceRequestStatus", { enumerable: true, get: function () { return NewResourceRequestModel_1.NewResourceRequestStatus; } });
 // Country Master
 __exportStar(require("./models/CountryMasterModel"), exports);
+// City Master
+__exportStar(require("./models/CityMasterModel"), exports);
 // Location Master
 __exportStar(require("./models/LocationModel"), exports);
 // Financial Grade Master

package/dist/models/CityMasterModel.d.ts

@@ -0,0 +1,8 @@
+import { BaseModel } from './BaseModel';
+export declare class CityMaster extends BaseModel {
+    country_id: number | null;
+    city_name: string;
+    city_code: string | null;
+    description: string | null;
+    constructor(city_name: string);
+}

package/dist/models/CityMasterModel.js

@@ -0,0 +1,41 @@
+"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.CityMaster = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let CityMaster = class CityMaster extends BaseModel_1.BaseModel {
+    constructor(city_name) {
+        super();
+        this.city_name = city_name;
+    }
+};
+exports.CityMaster = CityMaster;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], CityMaster.prototype, "country_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    __metadata("design:type", String)
+], CityMaster.prototype, "city_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], CityMaster.prototype, "city_code", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], CityMaster.prototype, "description", void 0);
+exports.CityMaster = CityMaster = __decorate([
+    (0, typeorm_1.Entity)({ name: 'city_master' }),
+    __metadata("design:paramtypes", [String])
+], CityMaster);

package/dist/models/DutyMissionRequestModel.d.ts

@@ -61,5 +61,6 @@ export declare class DutyMissionRequests extends BaseModel {
     vehicle_required: VehicleRequired | null;
     remarks: string | null;
     decision_number: string | null;
-    constructor(req_user_department_id: number | null, req_user_section_id: number | null, service_id: number, sub_service_id: number, user_id: number, trip_type: TripType, choose_type: ChooseType, mission_sponsored_by: MissionSponsoredBy, mission_purpose: string, mission_number: string, mission_start_date: Date, mission_end_date: Date, travelling_area_from: string, travelling_area_to: string, from_country: string, to_country: string, travel_place: string, travel_start_date: Date, travel_return_date: Date, status: DutyMissionStatus, request_id?: string | null, mission_id?: string | null, mission_days?: number | null, distance?: string | null, if_sponsored?: string | null, allowance_percentage?: string | null, air_ticket_required?: AirTicketRequired | null, vehicle_required?: VehicleRequired | null, remarks?: string | null, decision_number?: string | null, workflow_execution_id?: string | null);
+    decision_date: Date | null;
+    constructor(req_user_department_id: number | null, req_user_section_id: number | null, service_id: number, sub_service_id: number, user_id: number, trip_type: TripType, choose_type: ChooseType, mission_sponsored_by: MissionSponsoredBy, mission_purpose: string, mission_number: string, mission_start_date: Date, mission_end_date: Date, travelling_area_from: string, travelling_area_to: string, from_country: string, to_country: string, travel_place: string, travel_start_date: Date, travel_return_date: Date, status: DutyMissionStatus, request_id?: string | null, mission_id?: string | null, mission_days?: number | null, distance?: string | null, if_sponsored?: string | null, allowance_percentage?: string | null, air_ticket_required?: AirTicketRequired | null, vehicle_required?: VehicleRequired | null, remarks?: string | null, decision_number?: string | null, decision_date?: Date | null, workflow_execution_id?: string | null);
 }

package/dist/models/DutyMissionRequestModel.js

@@ -49,7 +49,7 @@ var DutyMissionStatus;
     DutyMissionStatus["REJECTED"] = "Rejected";
 })(DutyMissionStatus || (exports.DutyMissionStatus = DutyMissionStatus = {}));
 let DutyMissionRequests = class DutyMissionRequests extends BaseModel_1.BaseModel {
-    constructor(req_user_department_id, req_user_section_id, service_id, sub_service_id, user_id, trip_type, choose_type, mission_sponsored_by, mission_purpose, mission_number, mission_start_date, mission_end_date, travelling_area_from, travelling_area_to, from_country, to_country, travel_place, travel_start_date, travel_return_date, status, request_id, mission_id, mission_days, distance, if_sponsored, allowance_percentage, air_ticket_required, vehicle_required, remarks, decision_number, workflow_execution_id) {
+    constructor(req_user_department_id, req_user_section_id, service_id, sub_service_id, user_id, trip_type, choose_type, mission_sponsored_by, mission_purpose, mission_number, mission_start_date, mission_end_date, travelling_area_from, travelling_area_to, from_country, to_country, travel_place, travel_start_date, travel_return_date, status, request_id, mission_id, mission_days, distance, if_sponsored, allowance_percentage, air_ticket_required, vehicle_required, remarks, decision_number, decision_date, workflow_execution_id) {
         super();
         this.req_user_department_id = req_user_department_id ?? null;
         this.req_user_section_id = req_user_section_id ?? null;
@@ -81,6 +81,7 @@ let DutyMissionRequests = class DutyMissionRequests extends BaseModel_1.BaseMode
         this.vehicle_required = vehicle_required ?? null;
         this.remarks = remarks ?? null;
         this.decision_number = decision_number ?? null;
+        this.decision_date = decision_date ?? null;
         this.workflow_execution_id = workflow_execution_id ?? null;
     }
 };
@@ -234,9 +235,13 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", Object)
 ], DutyMissionRequests.prototype, "decision_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'timestamp', nullable: true }),
+    __metadata("design:type", Object)
+], DutyMissionRequests.prototype, "decision_date", void 0);
 exports.DutyMissionRequests = DutyMissionRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'duty_mission_requests' }),
     __metadata("design:paramtypes", [Object, Object, Number, Number, Number, String, String, String, String, String, Date,
         Date, String, String, String, String, String, Date,
-        Date, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
+        Date, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
 ], DutyMissionRequests);

package/dist/models/FinancialGradeModel.d.ts

@@ -3,11 +3,10 @@ import { BaseModel } from './BaseModel';
  * This model is used to store the Financial Grade master data on the Admin Side
  */
 export declare class FinancialGrade extends BaseModel {
-    arabic_title: string | null;
     financial_grade: number | null;
-    leave_count: number | null;
     daily_allowance: number | null;
     travel_class: string | null;
+    currency: string | null;
     is_active: boolean;
-    constructor(arabic_title?: string | null, financial_grade?: number | null, leave_count?: number | null, daily_allowance?: number | null, travel_class?: string | null, is_active?: boolean);
+    constructor(financial_grade?: number | null, daily_allowance?: number | null, travel_class?: string | null, currency?: string | null, is_active?: boolean);
 }

package/dist/models/FinancialGradeModel.js

@@ -16,29 +16,20 @@ const BaseModel_1 = require("./BaseModel");
  * This model is used to store the Financial Grade master data on the Admin Side
  */
 let FinancialGrade = class FinancialGrade extends BaseModel_1.BaseModel {
-    constructor(arabic_title, financial_grade, leave_count, daily_allowance, travel_class, is_active) {
+    constructor(financial_grade, daily_allowance, travel_class, currency, is_active) {
         super();
-        this.arabic_title = arabic_title || null;
         this.financial_grade = financial_grade || null;
-        this.leave_count = leave_count || null;
         this.daily_allowance = daily_allowance || null;
         this.travel_class = travel_class || null;
+        this.currency = currency || null;
         this.is_active = is_active !== undefined ? is_active : true;
     }
 };
 exports.FinancialGrade = FinancialGrade;
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
-    __metadata("design:type", Object)
-], FinancialGrade.prototype, "arabic_title", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "integer", nullable: true }),
     __metadata("design:type", Object)
 ], FinancialGrade.prototype, "financial_grade", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
-    __metadata("design:type", Object)
-], FinancialGrade.prototype, "leave_count", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 2, nullable: true }),
     __metadata("design:type", Object)
@@ -47,11 +38,15 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
     __metadata("design:type", Object)
 ], FinancialGrade.prototype, "travel_class", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 10, nullable: true }),
+    __metadata("design:type", Object)
+], FinancialGrade.prototype, "currency", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'boolean', default: true }),
     __metadata("design:type", Boolean)
 ], FinancialGrade.prototype, "is_active", void 0);
 exports.FinancialGrade = FinancialGrade = __decorate([
     (0, typeorm_1.Entity)({ name: 'financial_grade' }),
-    __metadata("design:paramtypes", [Object, Object, Object, Object, Object, Boolean])
+    __metadata("design:paramtypes", [Object, Object, Object, Object, Boolean])
 ], FinancialGrade);

package/package.json

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

package/src/data-source.ts

@@ -126,6 +126,7 @@ import { CashAllowanceLeaveRequest } from './models/CashAllowanceLeaveRequestMod
 import { PromotionRequest } from './models/PromotionRequestModel';
 import { AnnualIncrementRequest } from './models/AnnualIncrementRequestModel';
 import { SkillsEnhancementRequest } from './models/SkillsEnhancementRequestModel';
+import { CityMaster } from './models/CityMasterModel';
 
 export const AppDataSource = new DataSource({
   type: 'postgres',
@@ -258,6 +259,7 @@ export const AppDataSource = new DataSource({
     CashAllowanceLeaveRequest,
     PromotionRequest,
     AnnualIncrementRequest,
-    SkillsEnhancementRequest
+    SkillsEnhancementRequest,
+    CityMaster
   ],
 });

package/src/index.ts

@@ -202,6 +202,9 @@ export {NewResourceRequestStatus} from './models/NewResourceRequestModel';
 // Country Master
 export * from './models/CountryMasterModel';
 
+// City Master
+export * from './models/CityMasterModel';
+
 // Location Master
 export * from './models/LocationModel';
 

package/src/models/CityMasterModel.ts

@@ -0,0 +1,22 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'city_master' })
+export class CityMaster extends BaseModel {
+  @Column({ type: 'int', nullable: true })
+  country_id: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  city_name: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  city_code: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  description: string | null;
+
+  constructor(city_name: string) {
+    super();
+    this.city_name = city_name;
+  }
+}

package/src/models/DutyMissionRequestModel.ts

@@ -160,6 +160,9 @@ export class DutyMissionRequests extends BaseModel {
   @Column({ type: 'varchar', length: 100, nullable: true })
   decision_number: string | null;
 
+  @Column({ type: 'timestamp', nullable: true })
+  decision_date: Date | null;
+
   constructor(
     req_user_department_id: number | null,
     req_user_section_id: number | null,
@@ -191,6 +194,7 @@ export class DutyMissionRequests extends BaseModel {
     vehicle_required?: VehicleRequired | null,
     remarks?: string | null,
     decision_number?: string | null,
+    decision_date?: Date | null,
     workflow_execution_id?: string | null,
   ) {
     super();
@@ -224,6 +228,7 @@ export class DutyMissionRequests extends BaseModel {
     this.vehicle_required = vehicle_required ?? null;
     this.remarks = remarks ?? null;
     this.decision_number = decision_number ?? null;
+    this.decision_date = decision_date ?? null;
     this.workflow_execution_id = workflow_execution_id ?? null;
   }
 }

package/src/models/FinancialGradeModel.ts

@@ -7,38 +7,33 @@ import { BaseModel } from './BaseModel';
 @Entity({ name: 'financial_grade' })
 export class FinancialGrade extends BaseModel {
 
-    @Column({ type: 'varchar', nullable: true })
-    arabic_title: string | null;
-
     @Column({ type: "integer", nullable: true })
     financial_grade: number | null;
 
-    @Column({ type: "integer", nullable: true })
-    leave_count: number | null;
-
     @Column({ type: "decimal", precision: 10, scale: 2, nullable: true })
     daily_allowance: number | null;
 
     @Column({ type: 'varchar', nullable: true })
     travel_class: string | null;
 
+    @Column({ type: 'varchar', length: 10, nullable: true})
+    currency: string | null;
+
     @Column({ type: 'boolean', default: true })
     is_active: boolean;
 
     constructor(
-        arabic_title?: string | null,
         financial_grade?: number | null,
-        leave_count?: number | null,
         daily_allowance?: number | null,
         travel_class?: string | null,
+        currency?: string | null,
         is_active?: boolean
     ) {
         super();
-        this.arabic_title = arabic_title || null;
         this.financial_grade = financial_grade || null;
-        this.leave_count = leave_count || null;
         this.daily_allowance = daily_allowance || null;
         this.travel_class = travel_class || null;
+        this.currency = currency || null;
         this.is_active = is_active !== undefined ? is_active : true;
     }
 }