@platform-modules/foreign-ministry 1.1.101 → 1.1.103

package/dist/data-source.js

@@ -120,6 +120,7 @@ const UserEducationDetailsModel_1 = require("./models/UserEducationDetailsModel"
 const DiplomaticTitlesMasterModel_1 = require("./models/DiplomaticTitlesMasterModel");
 const CountryMasterModel_1 = require("./models/CountryMasterModel");
 const NationalityMasterModel_1 = require("./models/NationalityMasterModel");
+const OfficeMasterModel_1 = require("./models/OfficeMasterModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -244,6 +245,7 @@ exports.AppDataSource = new typeorm_1.DataSource({
         UserEducationDetailsModel_1.UserEducationDetails,
         DiplomaticTitlesMasterModel_1.DiplomaticTitlesMaster,
         CountryMasterModel_1.CountryMaster,
-        NationalityMasterModel_1.NationalityMaster
+        NationalityMasterModel_1.NationalityMaster,
+        OfficeMasterModel_1.OfficeMaster
     ],
 });

package/dist/index.d.ts

@@ -129,3 +129,4 @@ export { ProfileUpdateRequestStatus } from './models/ProfileUpdateRequestsModel'
 export * from './models/DiplomaticTitlesMasterModel';
 export * from './models/CountryMasterModel';
 export * from './models/NationalityMasterModel';
+export * from './models/OfficeMasterModel';

package/dist/index.js

@@ -160,3 +160,4 @@ Object.defineProperty(exports, "ProfileUpdateRequestStatus", { enumerable: true,
 __exportStar(require("./models/DiplomaticTitlesMasterModel"), exports);
 __exportStar(require("./models/CountryMasterModel"), exports);
 __exportStar(require("./models/NationalityMasterModel"), exports);
+__exportStar(require("./models/OfficeMasterModel"), exports);

package/dist/models/OfficeMasterModel.d.ts

@@ -0,0 +1,12 @@
+import { BaseModel } from './BaseModel';
+export declare class OfficeMaster extends BaseModel {
+    office_name: string;
+    office_name_arabic: string | null;
+    office_code: string | null;
+    description: string | null;
+    location: string | null;
+    address: string | null;
+    is_active: boolean;
+    display_order: number;
+    constructor(office_name: string);
+}

package/dist/models/OfficeMasterModel.js

@@ -0,0 +1,59 @@
+"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.OfficeMaster = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let OfficeMaster = class OfficeMaster extends BaseModel_1.BaseModel {
+    constructor(office_name) {
+        super();
+        this.office_name = office_name;
+        this.is_active = true;
+        this.display_order = 0;
+    }
+};
+exports.OfficeMaster = OfficeMaster;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    __metadata("design:type", String)
+], OfficeMaster.prototype, "office_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], OfficeMaster.prototype, "office_name_arabic", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], OfficeMaster.prototype, "office_code", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], OfficeMaster.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], OfficeMaster.prototype, "location", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], OfficeMaster.prototype, "address", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: true }),
+    __metadata("design:type", Boolean)
+], OfficeMaster.prototype, "is_active", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', default: 0 }),
+    __metadata("design:type", Number)
+], OfficeMaster.prototype, "display_order", void 0);
+exports.OfficeMaster = OfficeMaster = __decorate([
+    (0, typeorm_1.Entity)({ name: 'office_master' }),
+    __metadata("design:paramtypes", [String])
+], OfficeMaster);

package/dist/models/ProfileUpdateRequestsModel.d.ts

@@ -19,7 +19,7 @@ export declare class ProfileUpdateRequests extends BaseModel {
     is_diplomatic: boolean | null;
     assigned_to_department: string | null;
     comments: string | null;
-    title: string | null;
+    diplomatic_title_id: number | null;
     first_name: string | null;
     second_name: string | null;
     third_name: string | null;
@@ -30,7 +30,7 @@ export declare class ProfileUpdateRequests extends BaseModel {
     sect: string | null;
     date_of_birth: Date | null;
     place_of_birth: string | null;
-    nationality: string | null;
+    nationality_id: number | null;
     gender: string | null;
     marital_status: string | null;
     number_of_dependents: number | null;
@@ -51,7 +51,7 @@ export declare class ProfileUpdateRequests extends BaseModel {
     governorate: string | null;
     wilayat: string | null;
     locality: string | null;
-    country: string | null;
+    country_id: number | null;
     phone_number: string | null;
     fax_number: string | null;
     email: string | null;
@@ -68,7 +68,7 @@ export declare class ProfileUpdateRequests extends BaseModel {
     nature_of_work: string | null;
     retirement_date: Date | null;
     proposed_position: string | null;
-    proposed_financial_grade: string | null;
+    proposed_financial_grade_id: number | null;
     secondment_start_date: Date | null;
     secondment_end_date: Date | null;
     disability_type: string | null;
@@ -80,7 +80,7 @@ export declare class ProfileUpdateRequests extends BaseModel {
     entity_transferred_to: string | null;
     date_of_transfer_to: Date | null;
     job_description: string | null;
-    country_appointment: string | null;
+    country_appointment_id: number | null;
     date_of_appointment: Date | null;
     appointment_grade: string | null;
     type_of_appointment: string | null;

package/dist/models/ProfileUpdateRequestsModel.js

@@ -69,9 +69,9 @@ __decorate([
     __metadata("design:type", Object)
 ], ProfileUpdateRequests.prototype, "comments", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Object)
-], ProfileUpdateRequests.prototype, "title", void 0);
+], ProfileUpdateRequests.prototype, "diplomatic_title_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
     __metadata("design:type", Object)
@@ -113,9 +113,9 @@ __decorate([
     __metadata("design:type", Object)
 ], ProfileUpdateRequests.prototype, "place_of_birth", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Object)
-], ProfileUpdateRequests.prototype, "nationality", void 0);
+], ProfileUpdateRequests.prototype, "nationality_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
     __metadata("design:type", Object)
@@ -197,9 +197,9 @@ __decorate([
     __metadata("design:type", Object)
 ], ProfileUpdateRequests.prototype, "locality", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Object)
-], ProfileUpdateRequests.prototype, "country", void 0);
+], ProfileUpdateRequests.prototype, "country_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
     __metadata("design:type", Object)
@@ -265,9 +265,9 @@ __decorate([
     __metadata("design:type", Object)
 ], ProfileUpdateRequests.prototype, "proposed_position", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Object)
-], ProfileUpdateRequests.prototype, "proposed_financial_grade", void 0);
+], ProfileUpdateRequests.prototype, "proposed_financial_grade_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'date', nullable: true }),
     __metadata("design:type", Object)
@@ -313,9 +313,9 @@ __decorate([
     __metadata("design:type", Object)
 ], ProfileUpdateRequests.prototype, "job_description", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Object)
-], ProfileUpdateRequests.prototype, "country_appointment", void 0);
+], ProfileUpdateRequests.prototype, "country_appointment_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'date', nullable: true }),
     __metadata("design:type", Object)

package/dist/models/StationeryRequestsModel.d.ts

@@ -14,9 +14,8 @@ export declare class StationeryRequests extends BaseModel {
     sub_service_id: number | null;
     user_id: number;
     date_of_request_preparation: Date;
-    office: string;
-    material_type: string;
-    material_name: string;
+    office_id: number;
+    material_id: number;
     quantity_required: number;
     comments: string | null;
     status: StationeryRequestStatus;

package/dist/models/StationeryRequestsModel.js

@@ -49,17 +49,13 @@ __decorate([
     __metadata("design:type", Date)
 ], StationeryRequests.prototype, "date_of_request_preparation", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
-    __metadata("design:type", String)
-], StationeryRequests.prototype, "office", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
-    __metadata("design:type", String)
-], StationeryRequests.prototype, "material_type", void 0);
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], StationeryRequests.prototype, "office_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
-    __metadata("design:type", String)
-], StationeryRequests.prototype, "material_name", void 0);
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], StationeryRequests.prototype, "material_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: false }),
     __metadata("design:type", Number)

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/foreign-ministry",
-  "version": "1.1.101",
+  "version": "1.1.103",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/data-source.ts

@@ -125,6 +125,7 @@ import { UserEducationDetails } from './models/UserEducationDetailsModel'
 import { DiplomaticTitlesMaster } from './models/DiplomaticTitlesMasterModel'
 import { CountryMaster } from './models/CountryMasterModel'
 import { NationalityMaster } from './models/NationalityMasterModel'
+import { OfficeMaster } from './models/OfficeMasterModel'
 
 
 export const AppDataSource = new DataSource({
@@ -251,6 +252,7 @@ export const AppDataSource = new DataSource({
     UserEducationDetails,
     DiplomaticTitlesMaster,
     CountryMaster,
-    NationalityMaster
+    NationalityMaster,
+    OfficeMaster
   ],
 });

package/src/index.ts

@@ -129,3 +129,4 @@ export { ProfileUpdateRequestStatus } from './models/ProfileUpdateRequestsModel'
 export * from './models/DiplomaticTitlesMasterModel';
 export * from './models/CountryMasterModel';
 export * from './models/NationalityMasterModel';
+export * from './models/OfficeMasterModel';

package/src/models/OfficeMasterModel.ts

@@ -0,0 +1,37 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'office_master' })
+export class OfficeMaster extends BaseModel {
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  office_name: string; // Office name
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  office_name_arabic: string | null; // Arabic translation
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  office_code: string | null; // Optional office code for identification
+
+  @Column({ type: 'text', nullable: true })
+  description: string | null; // Description of the office
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  location: string | null; // Office location
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  address: string | null; // Office address
+
+  @Column({ type: 'boolean', default: true })
+  is_active: boolean; // Whether the office is active
+
+  @Column({ type: 'int', default: 0 })
+  display_order: number; // Order for display in dropdowns
+
+  constructor(office_name: string) {
+    super();
+    this.office_name = office_name;
+    this.is_active = true;
+    this.display_order = 0;
+  }
+}
+

package/src/models/ProfileUpdateRequestsModel.ts

@@ -48,8 +48,8 @@ export class ProfileUpdateRequests extends BaseModel {
 
   // ========== PERSONAL DETAILS FIELDS (all nullable) ==========
   // Name fields
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  title: string | null;
+  @Column({ type: 'int', nullable: true })
+  diplomatic_title_id: number | null; // Reference to diplomatic_titles_master table
 
   @Column({ type: 'varchar', length: 255, nullable: true })
   first_name: string | null;
@@ -82,8 +82,8 @@ export class ProfileUpdateRequests extends BaseModel {
   @Column({ type: 'varchar', length: 255, nullable: true })
   place_of_birth: string | null;
 
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  nationality: string | null;
+  @Column({ type: 'int', nullable: true })
+  nationality_id: number | null; // Reference to nationality_master table
 
   @Column({ type: 'varchar', length: 50, nullable: true })
   gender: string | null;
@@ -148,8 +148,8 @@ export class ProfileUpdateRequests extends BaseModel {
   @Column({ type: 'varchar', length: 255, nullable: true })
   locality: string | null;
 
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  country: string | null;
+  @Column({ type: 'int', nullable: true })
+  country_id: number | null; // Reference to country_master table
 
   // Contact Information
   @Column({ type: 'varchar', length: 50, nullable: true })
@@ -203,8 +203,8 @@ export class ProfileUpdateRequests extends BaseModel {
   @Column({ type: 'varchar', length: 255, nullable: true })
   proposed_position: string | null;
 
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  proposed_financial_grade: string | null;
+  @Column({ type: 'int', nullable: true })
+  proposed_financial_grade_id: number | null; // Reference to financial_grade table
 
   @Column({ type: 'date', nullable: true })
   secondment_start_date: Date | null;
@@ -241,8 +241,8 @@ export class ProfileUpdateRequests extends BaseModel {
   job_description: string | null;
 
   // Appointment Information
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  country_appointment: string | null;
+  @Column({ type: 'int', nullable: true })
+  country_appointment_id: number | null; // Reference to country_master table
 
   @Column({ type: 'date', nullable: true })
   date_of_appointment: Date | null;

package/src/models/StationeryRequestsModel.ts

@@ -31,14 +31,11 @@ export class StationeryRequests extends BaseModel {
   @Column({ type: 'date', nullable: false })
   date_of_request_preparation: Date;
 
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  office: string;
-
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  material_type: string;
+  @Column({ type: 'int', nullable: false })
+  office_id: number; // Reference to office_master table
 
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  material_name: string;
+  @Column({ type: 'int', nullable: false })
+  material_id: number; // Reference to stationery_material_master table
 
   @Column({ type: 'int', nullable: false })
   quantity_required: number;