@platform-modules/foreign-ministry 1.3.237 → 1.3.239

package/.env

@@ -1,17 +1,5 @@
-# DB_HOST=localhost
-# DB_PORT=5432
-# DB_USER=postgres
-# DB_PASS=Fa@123
-# DB_NAME=FM
-
-DB_HOST=164.52.222.169
+DB_HOST=localhost
 DB_PORT=5432
-DB_USER=postgres_admin_user
-DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+DB_USER=postgres
+DB_PASS=Fa@123
 DB_NAME=FM
- 
-# DB_HOST=216.48.187.46
-# DB_PORT=5432
-# DB_USER=adminuser
-# DB_PASS=postgres_caa_fm_qa_34567
-# DB_NAME=FM_QA

package/dist/models/EmbassyMasterModel.d.ts

@@ -0,0 +1,16 @@
+import { BaseModel } from './BaseModel';
+export declare class EmbassyMaster extends BaseModel {
+    embassy_name: string;
+    embassy_name_arabic: string | null;
+    country_id: number | null;
+    city: string | null;
+    address: string | null;
+    phone: string | null;
+    fax: string | null;
+    email: string | null;
+    website: string | null;
+    description: string | null;
+    is_active: boolean;
+    display_order: number;
+    constructor(embassy_name: string);
+}

package/dist/models/EmbassyMasterModel.js

@@ -0,0 +1,75 @@
+"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.EmbassyMaster = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let EmbassyMaster = class EmbassyMaster extends BaseModel_1.BaseModel {
+    constructor(embassy_name) {
+        super();
+        this.embassy_name = embassy_name;
+        this.is_active = true;
+        this.display_order = 0;
+    }
+};
+exports.EmbassyMaster = EmbassyMaster;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    __metadata("design:type", String)
+], EmbassyMaster.prototype, "embassy_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "embassy_name_arabic", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "country_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "city", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "address", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "phone", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "fax", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "email", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "website", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], EmbassyMaster.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: true }),
+    __metadata("design:type", Boolean)
+], EmbassyMaster.prototype, "is_active", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', default: 0 }),
+    __metadata("design:type", Number)
+], EmbassyMaster.prototype, "display_order", void 0);
+exports.EmbassyMaster = EmbassyMaster = __decorate([
+    (0, typeorm_1.Entity)({ name: 'embassy_master' }),
+    __metadata("design:paramtypes", [String])
+], EmbassyMaster);

package/dist/models/ProjectMilestonePhasesModel.d.ts

@@ -6,5 +6,7 @@ export declare class ProjectMilestonePhases extends BaseModel {
     display_order: number;
     checklists: string[] | null;
     criteria: string[] | null;
-    constructor(project_id?: number, milestone_id?: number, phase_name?: string, display_order?: number, checklists?: string[] | null, criteria?: string[] | null);
+    start_date: Date | null;
+    end_date: Date | null;
+    constructor(project_id?: number, milestone_id?: number, phase_name?: string, display_order?: number, checklists?: string[] | null, criteria?: string[] | null, start_date?: Date | null, end_date?: Date | null);
 }

package/dist/models/ProjectMilestonePhasesModel.js

@@ -13,7 +13,7 @@ exports.ProjectMilestonePhases = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let ProjectMilestonePhases = class ProjectMilestonePhases extends BaseModel_1.BaseModel {
-    constructor(project_id, milestone_id, phase_name, display_order, checklists, criteria) {
+    constructor(project_id, milestone_id, phase_name, display_order, checklists, criteria, start_date, end_date) {
         super();
         this.project_id = project_id ?? 0;
         this.milestone_id = milestone_id ?? 0;
@@ -21,6 +21,8 @@ let ProjectMilestonePhases = class ProjectMilestonePhases extends BaseModel_1.Ba
         this.display_order = display_order ?? 1;
         this.checklists = checklists ?? null;
         this.criteria = criteria ?? null;
+        this.start_date = start_date ?? null;
+        this.end_date = end_date ?? null;
     }
 };
 exports.ProjectMilestonePhases = ProjectMilestonePhases;
@@ -48,7 +50,15 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'jsonb', nullable: true }),
     __metadata("design:type", Object)
 ], ProjectMilestonePhases.prototype, "criteria", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], ProjectMilestonePhases.prototype, "start_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], ProjectMilestonePhases.prototype, "end_date", void 0);
 exports.ProjectMilestonePhases = ProjectMilestonePhases = __decorate([
     (0, typeorm_1.Entity)({ name: 'project_milestone_phases' }),
-    __metadata("design:paramtypes", [Number, Number, String, Number, Object, Object])
+    __metadata("design:paramtypes", [Number, Number, String, Number, Object, Object, Object, Object])
 ], ProjectMilestonePhases);

package/dist/models/ResignationTerminationApprovalModel.d.ts

@@ -18,5 +18,6 @@ export declare class ResignationTerminationApprovalDetails extends BaseModel {
     approved_by: number | null;
     comment: string;
     approval_status: ResignationTerminationApprovalStatus;
+    is_edit: boolean;
     is_allowed: boolean;
 }

package/dist/models/ResignationTerminationApprovalModel.js

@@ -70,6 +70,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'enum', enum: ResignationTerminationApprovalStatus, default: ResignationTerminationApprovalStatus.PENDING, nullable: false }),
     __metadata("design:type", String)
 ], ResignationTerminationApprovalDetails.prototype, "approval_status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false, nullable: false }),
+    __metadata("design:type", Boolean)
+], ResignationTerminationApprovalDetails.prototype, "is_edit", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'boolean', default: true, nullable: false }),
     __metadata("design:type", Boolean)

package/dist/models/UserDependentsModel.d.ts

@@ -0,0 +1,18 @@
+import { BaseModel } from './BaseModel';
+export declare class UserDependents extends BaseModel {
+    user_id: number;
+    first_name: string | null;
+    last_name: string | null;
+    family_name: string | null;
+    dob: Date | null;
+    age: number | null;
+    relation_type: string | null;
+    passport_available: boolean;
+    passport_number: string | null;
+    passport_type: string | null;
+    passport_issue_date: Date | null;
+    passport_place_of_issue: string | null;
+    passport_expiry_date: Date | null;
+    is_active: boolean;
+    constructor(user_id?: number, first_name?: string, last_name?: string, family_name?: string, dob?: Date, age?: number, relation_type?: string, passport_available?: boolean, passport_number?: string, passport_type?: string, passport_issue_date?: Date, passport_place_of_issue?: string, passport_expiry_date?: Date);
+}

package/dist/models/UserDependentsModel.js

@@ -0,0 +1,94 @@
+"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.UserDependents = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let UserDependents = class UserDependents extends BaseModel_1.BaseModel {
+    constructor(user_id, first_name, last_name, family_name, dob, age, relation_type, passport_available, passport_number, passport_type, passport_issue_date, passport_place_of_issue, passport_expiry_date) {
+        super();
+        this.user_id = user_id || 0;
+        this.first_name = first_name || null;
+        this.last_name = last_name || null;
+        this.family_name = family_name || null;
+        this.dob = dob || null;
+        this.age = age || null;
+        this.relation_type = relation_type || null;
+        this.passport_available = passport_available || false;
+        this.passport_number = passport_number || null;
+        this.passport_type = passport_type || null;
+        this.passport_issue_date = passport_issue_date || null;
+        this.passport_place_of_issue = passport_place_of_issue || null;
+        this.passport_expiry_date = passport_expiry_date || null;
+        this.is_active = true;
+    }
+};
+exports.UserDependents = UserDependents;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], UserDependents.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "first_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "last_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "family_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "dob", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "age", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "relation_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
+    __metadata("design:type", Boolean)
+], UserDependents.prototype, "passport_available", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "passport_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "passport_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "passport_issue_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "passport_place_of_issue", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], UserDependents.prototype, "passport_expiry_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: true }),
+    __metadata("design:type", Boolean)
+], UserDependents.prototype, "is_active", void 0);
+exports.UserDependents = UserDependents = __decorate([
+    (0, typeorm_1.Entity)({ name: 'user_dependents' }),
+    __metadata("design:paramtypes", [Number, String, String, String, Date, Number, String, Boolean, String, String, Date, String, Date])
+], UserDependents);

package/package.json

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

package/src/models/FinancialWorkFlowModel.ts

@@ -33,15 +33,15 @@ export class FinancialWorkFlow extends BaseModel {
   @Column({ type: 'int', nullable: true })
   approved_by_role_id: number;
 
-  @Column({ type: 'int', nullable: true })
-  step_order: number;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  action: string | null;
-
-  @ManyToOne(() => FinancialRequests, fr => fr.workflows)
-  @JoinColumn({ name: 'financial_request_id' })
-  financialRequest?: FinancialRequests;
+  @Column({ type: 'int', nullable: true })
+  step_order: number;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  action: string | null;
+
+  @ManyToOne(() => FinancialRequests, fr => fr.workflows)
+  @JoinColumn({ name: 'financial_request_id' })
+  financialRequest?: FinancialRequests;
 
   constructor(
     financial_request_id: number,
@@ -55,10 +55,10 @@ export class FinancialWorkFlow extends BaseModel {
     this.status = status;
     this.approved_by_user_id = approved_by_user_id;
     this.content = content;
-    this.financial_approval_id = 0;
-    this.activity_date = new Date();
-    this.step_order = step_order;
-    this.action = null;
-  }
-}
+    this.financial_approval_id = 0;
+    this.activity_date = new Date();
+    this.step_order = step_order;
+    this.action = null;
+  }
+}
 

package/src/models/GatePassVisitorsModel.ts

@@ -85,10 +85,10 @@ export class GatePassVisitors extends BaseModel {
   @Column({ type: 'varchar', length: 255, nullable: true })
   visiting_person_in_department: string | null; // زائر في القسم (Visiting Person in Department)
 
-  @Column({ type: 'int', nullable: true, unique: true })
-  serial_number: number | null;
-
-  // QR Code for Gate Pass
+  @Column({ type: 'int', nullable: true, unique: true })
+  serial_number: number | null;
+
+  // QR Code for Gate Pass
   @Column({ type: 'text', nullable: true })
   qr_code_url: string | null; // QR code URL for this visitor (data URL can be 6000+ characters)
 
@@ -134,9 +134,9 @@ export class GatePassVisitors extends BaseModel {
     this.visitor_email_address = visitor_email_address;
     this.visitor_mobile_number = visitor_mobile_number;
     this.visitor_photo_url = visitor_photo_url;
-    this.visitor_photo_file_name = visitor_photo_file_name;
-    this.serial_number = null;
-    this.gate_pass_generated = false;
+    this.visitor_photo_file_name = visitor_photo_file_name;
+    this.serial_number = null;
+    this.gate_pass_generated = false;
     this.email_sent = false;
   }
 }

package/src/models/PollOptionsModel.ts

@@ -1,26 +1,26 @@
-import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from "typeorm";
-import { BaseModel } from "./BaseModel";
-import { Poll } from "./PollsModel";
-import { PollVote } from "./PollVotesModel";
-
-@Entity({ name: "poll_options" })
-export class PollOption extends BaseModel {
-  @Column({ type: "int", nullable: false })
-  poll_id: number;
-
-  @Column({ type: "varchar", length: 500, nullable: false })
-  option_text: string;
-
-  @ManyToOne(() => Poll, (poll) => poll.options, { nullable: false })
-  @JoinColumn({ name: "poll_id" })
-  poll?: Poll;
-
-  @OneToMany(() => PollVote, (vote) => vote.option)
-  votes?: PollVote[];
-
-  constructor() {
-    super();
-    this.poll_id = 0;
-    this.option_text = "";
-  }
-}
+import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from "typeorm";
+import { BaseModel } from "./BaseModel";
+import { Poll } from "./PollsModel";
+import { PollVote } from "./PollVotesModel";
+
+@Entity({ name: "poll_options" })
+export class PollOption extends BaseModel {
+  @Column({ type: "int", nullable: false })
+  poll_id: number;
+
+  @Column({ type: "varchar", length: 500, nullable: false })
+  option_text: string;
+
+  @ManyToOne(() => Poll, (poll) => poll.options, { nullable: false })
+  @JoinColumn({ name: "poll_id" })
+  poll?: Poll;
+
+  @OneToMany(() => PollVote, (vote) => vote.option)
+  votes?: PollVote[];
+
+  constructor() {
+    super();
+    this.poll_id = 0;
+    this.option_text = "";
+  }
+}

package/src/models/PollVotesModel.ts

@@ -1,37 +1,37 @@
-import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
-import { BaseModel } from "./BaseModel";
-import { Poll } from "./PollsModel";
-import { PollOption } from "./PollOptionsModel";
-import { User } from "./user";
-
-@Entity({ name: "poll_votes" })
-@Index("uq_poll_option_user", ["poll_id", "option_id", "user_id"], { unique: true })
-export class PollVote extends BaseModel {
-  @Column({ type: "int", nullable: false })
-  poll_id: number;
-
-  @Column({ type: "int", nullable: false })
-  option_id: number;
-
-  @Column({ type: "int", nullable: false })
-  user_id: number;
-
-  @ManyToOne(() => Poll, (poll) => poll.votes, { nullable: false })
-  @JoinColumn({ name: "poll_id" })
-  poll?: Poll;
-
-  @ManyToOne(() => PollOption, (option) => option.votes, { nullable: false })
-  @JoinColumn({ name: "option_id" })
-  option?: PollOption;
-
-  @ManyToOne(() => User, { nullable: false })
-  @JoinColumn({ name: "user_id" })
-  user?: User;
-
-  constructor() {
-    super();
-    this.poll_id = 0;
-    this.option_id = 0;
-    this.user_id = 0;
-  }
-}
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import { BaseModel } from "./BaseModel";
+import { Poll } from "./PollsModel";
+import { PollOption } from "./PollOptionsModel";
+import { User } from "./user";
+
+@Entity({ name: "poll_votes" })
+@Index("uq_poll_option_user", ["poll_id", "option_id", "user_id"], { unique: true })
+export class PollVote extends BaseModel {
+  @Column({ type: "int", nullable: false })
+  poll_id: number;
+
+  @Column({ type: "int", nullable: false })
+  option_id: number;
+
+  @Column({ type: "int", nullable: false })
+  user_id: number;
+
+  @ManyToOne(() => Poll, (poll) => poll.votes, { nullable: false })
+  @JoinColumn({ name: "poll_id" })
+  poll?: Poll;
+
+  @ManyToOne(() => PollOption, (option) => option.votes, { nullable: false })
+  @JoinColumn({ name: "option_id" })
+  option?: PollOption;
+
+  @ManyToOne(() => User, { nullable: false })
+  @JoinColumn({ name: "user_id" })
+  user?: User;
+
+  constructor() {
+    super();
+    this.poll_id = 0;
+    this.option_id = 0;
+    this.user_id = 0;
+  }
+}

package/src/models/PollsModel.ts

@@ -1,49 +1,49 @@
-import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from "typeorm";
-import { BaseModel } from "./BaseModel";
-import { ConversationsV2 } from "./ConversationsV2Model";
-import { PollOption } from "./PollOptionsModel";
-import { PollVote } from "./PollVotesModel";
-
-@Entity({ name: "poll" })
-export class Poll extends BaseModel {
-  @Column({ type: "int", nullable: false })
-  group_id: number;
-
-  @Column({ type: "int", nullable: true })
-  meeting_id?: number | null;
-
-  @Column({ type: "int", nullable: false })
-  conversation_id: number;
-
-  @Column({ type: "varchar", length: 255, nullable: false })
-  title: string;
-
-  @Column({ type: "text", nullable: false })
-  question: string;
-
-  @Column({ type: "timestamptz", nullable: true })
-  expires_at?: Date | null;
-
-  @Column({ type: "boolean", default: false })
-  allow_multiple: boolean;
-
-  @ManyToOne(() => ConversationsV2, { nullable: false })
-  @JoinColumn({ name: "conversation_id" })
-  conversation?: ConversationsV2;
-
-  @OneToMany(() => PollOption, (option) => option.poll)
-  options?: PollOption[];
-
-  @OneToMany(() => PollVote, (vote) => vote.poll)
-  votes?: PollVote[];
-
-  constructor() {
-    super();
-    this.group_id = 0;
-    this.meeting_id = null;
-    this.conversation_id = 0;
-    this.title = "";
-    this.question = "";
-    this.allow_multiple = false;
-  }
-}
+import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from "typeorm";
+import { BaseModel } from "./BaseModel";
+import { ConversationsV2 } from "./ConversationsV2Model";
+import { PollOption } from "./PollOptionsModel";
+import { PollVote } from "./PollVotesModel";
+
+@Entity({ name: "poll" })
+export class Poll extends BaseModel {
+  @Column({ type: "int", nullable: false })
+  group_id: number;
+
+  @Column({ type: "int", nullable: true })
+  meeting_id?: number | null;
+
+  @Column({ type: "int", nullable: false })
+  conversation_id: number;
+
+  @Column({ type: "varchar", length: 255, nullable: false })
+  title: string;
+
+  @Column({ type: "text", nullable: false })
+  question: string;
+
+  @Column({ type: "timestamptz", nullable: true })
+  expires_at?: Date | null;
+
+  @Column({ type: "boolean", default: false })
+  allow_multiple: boolean;
+
+  @ManyToOne(() => ConversationsV2, { nullable: false })
+  @JoinColumn({ name: "conversation_id" })
+  conversation?: ConversationsV2;
+
+  @OneToMany(() => PollOption, (option) => option.poll)
+  options?: PollOption[];
+
+  @OneToMany(() => PollVote, (vote) => vote.poll)
+  votes?: PollVote[];
+
+  constructor() {
+    super();
+    this.group_id = 0;
+    this.meeting_id = null;
+    this.conversation_id = 0;
+    this.title = "";
+    this.question = "";
+    this.allow_multiple = false;
+  }
+}

package/src/models/ProjectMilestonePhasesModel.ts

@@ -21,13 +21,21 @@ export class ProjectMilestonePhases extends BaseModel {
   @Column({ type: 'jsonb', nullable: true })
   criteria: string[] | null;
 
+  @Column({ type: 'date', nullable: true })
+  start_date: Date | null;
+
+  @Column({ type: 'date', nullable: true })
+  end_date: Date | null;
+
   constructor(
     project_id?: number,
     milestone_id?: number,
     phase_name?: string,
     display_order?: number,
     checklists?: string[] | null,
-    criteria?: string[] | null
+    criteria?: string[] | null,
+    start_date?: Date | null,
+    end_date?: Date | null
   ) {
     super();
     this.project_id = project_id ?? 0;
@@ -36,5 +44,7 @@ export class ProjectMilestonePhases extends BaseModel {
     this.display_order = display_order ?? 1;
     this.checklists = checklists ?? null;
     this.criteria = criteria ?? null;
+    this.start_date = start_date ?? null;
+    this.end_date = end_date ?? null;
   }
 }

package/src/models/ResignationTerminationApprovalModel.ts

@@ -43,9 +43,12 @@ export class ResignationTerminationApprovalDetails extends BaseModel {
   @Column({ type: 'varchar', length: 500, nullable: true, default: '' })
   comment: string;
 
-  @Column({ type: 'enum', enum: ResignationTerminationApprovalStatus, default: ResignationTerminationApprovalStatus.PENDING, nullable: false })
-  approval_status: ResignationTerminationApprovalStatus;
-
-  @Column({ type: 'boolean', default: true, nullable: false })
-  is_allowed: boolean;
-}
+  @Column({ type: 'enum', enum: ResignationTerminationApprovalStatus, default: ResignationTerminationApprovalStatus.PENDING, nullable: false })
+  approval_status: ResignationTerminationApprovalStatus;
+
+  @Column({ type: 'boolean', default: false, nullable: false })
+  is_edit: boolean;
+
+  @Column({ type: 'boolean', default: true, nullable: false })
+  is_allowed: boolean;
+}

package/src/models/TelephoneDirectoryModel.ts

@@ -42,18 +42,18 @@ export class TelephoneDirectory extends BaseModel {
   @Column({ type: "varchar", length: 20, nullable: true })
   fax_number: string; // Fax Number
 
-  @Column({ type: "varchar", length: 255, nullable: true })
-  location: string; // Optional
-
-  // External user specific optional fields
-  @Column({ type: "varchar", length: 255, nullable: true })
-  external_department: string;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  external_position: string;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  external_diplomatic_title: string;
+  @Column({ type: "varchar", length: 255, nullable: true })
+  location: string; // Optional
+
+  // External user specific optional fields
+  @Column({ type: "varchar", length: 255, nullable: true })
+  external_department: string;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  external_position: string;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  external_diplomatic_title: string;
 
   // Department Information
   @Column({ nullable: true })
@@ -88,7 +88,7 @@ export class TelephoneDirectory extends BaseModel {
   @Column({ type: "int", nullable: true })
   sub_service_id: number;
 
-  constructor(select_type?: "personal" | "department" | "organization", category?: "FM" | "Embassy" | "M&C" | "external", name?: string, position?: string, diplomatic_title?: string, embassy_id?: number | null, contextual_search?: string | null, email?: string, contact_number?: string, extension_number?: string, fax_number?: string, location?: string, external_department?: string, external_position?: string, external_diplomatic_title?: string, department_id?: number, employee_id?: number, street?: string, city?: string, state?: string, zip_code?: string, country?: string, photo_url?: string, service_id?: number, sub_service_id?: number) {
+  constructor(select_type?: "personal" | "department" | "organization", category?: "FM" | "Embassy" | "M&C" | "external", name?: string, position?: string, diplomatic_title?: string, embassy_id?: number | null, contextual_search?: string | null, email?: string, contact_number?: string, extension_number?: string, fax_number?: string, location?: string, external_department?: string, external_position?: string, external_diplomatic_title?: string, department_id?: number, employee_id?: number, street?: string, city?: string, state?: string, zip_code?: string, country?: string, photo_url?: string, service_id?: number, sub_service_id?: number) {
     super();
     this.select_type = select_type || "personal";
     this.category = category || "FM";
@@ -99,13 +99,13 @@ export class TelephoneDirectory extends BaseModel {
     this.contextual_search = contextual_search || null;
     this.email = email || "";
     this.contact_number = contact_number || "";
-    this.extension_number = extension_number || "";
-    this.fax_number = fax_number || "";
-    this.location = location || "";
-    this.external_department = external_department || "";
-    this.external_position = external_position || "";
-    this.external_diplomatic_title = external_diplomatic_title || "";
-    this.department_id = department_id || 0;
+    this.extension_number = extension_number || "";
+    this.fax_number = fax_number || "";
+    this.location = location || "";
+    this.external_department = external_department || "";
+    this.external_position = external_position || "";
+    this.external_diplomatic_title = external_diplomatic_title || "";
+    this.department_id = department_id || 0;
     this.employee_id = employee_id || 0;
     this.street = street || "";
     this.city = city || "";

package/sql/add_departments_is_geographical_dept.sql

@@ -1,3 +0,0 @@
--- Run against the FM database before deploying the updated Departments entity.
-ALTER TABLE departments
-  ADD COLUMN IF NOT EXISTS is_geographical_dept boolean NOT NULL DEFAULT false;