@platform-modules/foreign-ministry 1.1.80 → 1.1.82

package/dist/models/UserPersonalDetailsModel.js

@@ -0,0 +1,185 @@
+"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.UserPersonalDetails = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+/**
+ * User Personal Details - only fields from business requirements
+ * Linked by user_id (not request_id)
+ * When profile update is approved, data from this table updates users table
+ */
+let UserPersonalDetails = class UserPersonalDetails extends BaseModel_1.BaseModel {
+};
+exports.UserPersonalDetails = UserPersonalDetails;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], UserPersonalDetails.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "title", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "first_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "second_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "third_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "fourth_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "family_name_tribe", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "previous_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "religion", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "sect", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "date_of_birth", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "place_of_birth", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "nationality", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "gender", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "marital_status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "number_of_dependents", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "passport_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "passport_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "issue_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "place_of_issue", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "expiry_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "id_card_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "id_card_place_of_issue", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "id_card_expiry_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "permanent_address", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "governorate_wilaya", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "po_box", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "zip_code", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "house_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "railway_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "governorate", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "wilayat", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "locality", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "country", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "phone_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "fax_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "email", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "email_address_personal", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "sheikh_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", Object)
+], UserPersonalDetails.prototype, "photo", void 0);
+exports.UserPersonalDetails = UserPersonalDetails = __decorate([
+    (0, typeorm_1.Entity)({ name: 'user_personal_details' })
+], UserPersonalDetails);

package/dist/models/user.d.ts

@@ -42,5 +42,6 @@ export declare class User extends BaseModel {
     children2_name?: string;
     language_preferences?: string;
     category: "FM" | "Embassy";
-    constructor(employee_id?: number, employee_name?: string, employee_arabic_name?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, marital_status?: string, nationality?: string, email?: string, blood_group?: string, national_id?: number, mobile?: string, office_number?: string, department?: number, section?: number, grade?: number, location?: string, country?: string, is_admin?: boolean, division?: number, reporting_to?: number, address?: string, residential_status?: string, religion?: string, designation?: number, avatar?: string, passport_number?: string, personal_email?: string, extension_number?: number, fax_number?: string, diplomatic_name?: string, civil_employee_id?: number, qualification?: string, father_name?: string, spouse_name?: string, children1_name?: string, children2_name?: string, language_preferences?: string, category?: "FM" | "Embassy");
+    mandc_number: number;
+    constructor(employee_id?: number, employee_name?: string, employee_arabic_name?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, marital_status?: string, nationality?: string, email?: string, blood_group?: string, national_id?: number, mobile?: string, office_number?: string, department?: number, section?: number, grade?: number, location?: string, country?: string, is_admin?: boolean, division?: number, reporting_to?: number, address?: string, residential_status?: string, religion?: string, designation?: number, avatar?: string, passport_number?: string, personal_email?: string, extension_number?: number, fax_number?: string, diplomatic_name?: string, civil_employee_id?: number, qualification?: string, father_name?: string, spouse_name?: string, children1_name?: string, children2_name?: string, language_preferences?: string, category?: "FM" | "Embassy", mandc_number?: number);
 }

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, employee_name, employee_arabic_name, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, marital_status, nationality, email, blood_group, national_id, mobile, office_number, department, section, grade, location, country, is_admin, division, reporting_to, address, residential_status, religion, designation, avatar, passport_number, personal_email, extension_number, fax_number, diplomatic_name, civil_employee_id, qualification, father_name, spouse_name, children1_name, children2_name, language_preferences, category) {
+    constructor(employee_id, employee_name, employee_arabic_name, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, marital_status, nationality, email, blood_group, national_id, mobile, office_number, department, section, grade, location, country, is_admin, division, reporting_to, address, residential_status, religion, designation, avatar, passport_number, personal_email, extension_number, fax_number, diplomatic_name, civil_employee_id, qualification, father_name, spouse_name, children1_name, children2_name, language_preferences, category, mandc_number) {
         super();
         this.employee_id = employee_id;
         this.employee_name = employee_name;
@@ -57,6 +57,7 @@ let User = class User extends BaseModel_1.BaseModel {
         this.children2_name = children2_name;
         this.language_preferences = language_preferences;
         this.category = category || "FM";
+        this.mandc_number = mandc_number || 0;
     }
 };
 exports.User = User;
@@ -228,7 +229,11 @@ __decorate([
     (0, typeorm_1.Column)({ type: "enum", enum: ["FM", "Embassy"], nullable: false, default: "FM" }),
     __metadata("design:type", String)
 ], User.prototype, "category", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "int", nullable: true, default: 0 }),
+    __metadata("design:type", Number)
+], User.prototype, "mandc_number", void 0);
 exports.User = User = __decorate([
     (0, typeorm_1.Entity)({ name: 'users' }),
-    __metadata("design:paramtypes", [Number, String, String, String, String, String, String, String, String, String, String, String, String, Number, String, String, Number, Number, Number, String, String, Boolean, Number, Number, String, String, String, Number, String, String, String, Number, String, String, Number, String, String, String, String, String, String, String])
+    __metadata("design:paramtypes", [Number, String, String, String, String, String, String, String, String, String, String, String, String, Number, String, String, Number, Number, Number, String, String, Boolean, Number, Number, String, String, String, Number, String, String, String, Number, String, String, Number, String, String, String, String, String, String, String, Number])
 ], User);

package/package.json

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

package/src/data-source.ts

@@ -105,15 +105,26 @@ import { GroupNames } from './models/GroupNamesModel';
 import { Group } from './models/GroupModel';
 import { WorkSchedule } from './models/WorkScheduleModel';
 import { Jobs } from './models/JobsModel';
-import { TelephoneDirectory } from './models/TelephoneDirectoryModel';
-import { DiplomaticRequests } from './models/DiplomaticRequestsModel';
-import { DiplomaticApprovals } from './models/DiplomaticApprovalsModel';
-import { DiplomaticWorkFlow } from './models/DiplomaticWorkFlowModel';
-import { DiplomaticAttachments } from './models/DiplomaticAttachmentsModel';
-import { DiplomaticChats } from './models/DiplomaticChatsModel';
-import { DiplomaticClubCardMembers } from './models/DiplomaticClubCardMembersModel';
-import { DiplomaticTitlesMaster } from './models/DiplomaticTitlesMasterModel';
-import { DiplomaticClubSubscriptionMaster } from './models/DiplomaticClubSubscriptionMasterModel';
+import { TelephoneDirectory } from './models/TelephoneDirectoryModel'
+import { MandCMaster } from './models/M&CMasterModel'
+import { LeaveBalance } from './models/LeaveBalanceModel'
+import { LeaveConfiguration } from './models/LeaveConfigModel'
+import { LeaveConfigurationGrades } from './models/LeaveConfigGradesModel'
+import { LeaveTransaction } from './models/LeaveTransactionModel'
+import { EarlyCheckoutBalance } from './models/EarlyCheckoutBalanceModel'
+import { EarlyCheckoutConfiguration } from './models/EarlyCheckoutConfigModel'
+import { EarlyCheckoutTransaction } from './models/EarlyCheckoutTransactionModel'
+import { StayAfterHoursBalance } from './models/StayAfterHoursBalanceModel'
+import { StayAfterHoursTransaction } from './models/StayAfterHoursTransactionModel'
+import {StationeryRequests} from './models/StationeryRequestsModel'
+import {StationeryMaterialMaster} from './models/StationeryMaterialMasterModel'
+import { ProfileUpdateRequests } from './models/ProfileUpdateRequestsModel'
+import { UserPersonalDetails } from './models/UserPersonalDetailsModel'
+import { UserEmploymentDetails } from './models/UserEmploymentDetailsModel'
+import { UserEducationDetails } from './models/UserEducationDetailsModel'
+import { DiplomaticTitlesMaster } from './models/DiplomaticTitlesMasterModel'
+
+
 export const AppDataSource = new DataSource({
   type: 'postgres',
   host: process.env.DB_HOST || 'localhost',
@@ -220,13 +231,22 @@ export const AppDataSource = new DataSource({
     WorkSchedule,
     Jobs,
     TelephoneDirectory,
-    DiplomaticRequests,
-    DiplomaticApprovals,
-    DiplomaticWorkFlow,
-    DiplomaticAttachments,
-    DiplomaticChats,
-    DiplomaticClubCardMembers,
-    DiplomaticTitlesMaster,
-    DiplomaticClubSubscriptionMaster
+    MandCMaster,
+    LeaveBalance,
+    LeaveConfiguration,
+    LeaveConfigurationGrades,
+    LeaveTransaction,
+    EarlyCheckoutBalance,
+    EarlyCheckoutConfiguration,
+    EarlyCheckoutTransaction,
+    StayAfterHoursBalance,
+    StayAfterHoursTransaction,
+    StationeryRequests,
+    StationeryMaterialMaster,
+    ProfileUpdateRequests,
+    UserPersonalDetails,
+    UserEmploymentDetails,
+    UserEducationDetails,
+    DiplomaticTitlesMaster
   ],
 });

package/src/index.ts

@@ -100,12 +100,30 @@ export * from './models/GroupNamesModel';
 export * from './models/GroupModel';
 export * from './models/WorkScheduleModel';
 export * from './models/JobsModel';
+export * from './models/M&CMasterModel';
+export * from './models/LeaveBalanceModel';
+export * from './models/LeaveConfigModel';
+export { LeaveConfiguration, enumFrequency } from './models/LeaveConfigModel';
+export * from './models/LeaveConfigGradesModel';
+export { LeaveConfigurationGrades } from './models/LeaveConfigGradesModel';
+export * from './models/LeaveTransactionModel';
+export { LeaveTransaction, LeaveTransactionStatus } from './models/LeaveTransactionModel';
+export * from './models/EarlyCheckoutBalanceModel';
+export { EarlyCheckoutBalance } from './models/EarlyCheckoutBalanceModel';
+export * from './models/EarlyCheckoutConfigModel';
+export { EarlyCheckoutConfiguration, EarlyCheckoutFrequency } from './models/EarlyCheckoutConfigModel';
+export * from './models/EarlyCheckoutTransactionModel';
+export { EarlyCheckoutTransaction, EarlyCheckoutTransactionStatus } from './models/EarlyCheckoutTransactionModel';
+export * from './models/StayAfterHoursBalanceModel';
+export { StayAfterHoursBalance } from './models/StayAfterHoursBalanceModel';
+export * from './models/StayAfterHoursTransactionModel';
+export { StayAfterHoursTransaction, StayAfterHoursTransactionStatus } from './models/StayAfterHoursTransactionModel';
 export * from './models/TelephoneDirectoryModel';
-export * from './models/DiplomaticRequestsModel';
-export * from './models/DiplomaticApprovalsModel';
-export * from './models/DiplomaticWorkFlowModel';
-export * from './models/DiplomaticAttachmentsModel';
-export * from './models/DiplomaticChatsModel';
-export * from './models/DiplomaticClubCardMembersModel';
+export * from './models/StationeryRequestsModel';
+export * from './models/StationeryMaterialMasterModel';
+export * from './models/ProfileUpdateRequestsModel';
+export * from './models/UserPersonalDetailsModel';
+export * from './models/UserEmploymentDetailsModel';
+export * from './models/UserEducationDetailsModel';
+export { ProfileUpdateRequestStatus } from './models/ProfileUpdateRequestsModel';
 export * from './models/DiplomaticTitlesMasterModel';
-export * from './models/DiplomaticClubSubscriptionMasterModel';

package/src/models/DiplomaticTitlesMasterModel.ts

@@ -1,37 +1,26 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 
-export enum TitleCategory {
-  EMPLOYEE = "Employee",
-  NON_EMPLOYEE = "Non Employee"
-}
-
 @Entity({ name: 'diplomatic_titles_master' })
 export class DiplomaticTitlesMaster extends BaseModel {
-  @Column({ type: 'varchar', length: 255 })
-  title_name: string;
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  title: string; // Diplomatic title name
 
-  @Column({ type: 'enum', enum: TitleCategory })
-  category: TitleCategory;
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  title_in_arabic: string | null; // Arabic translation
 
   @Column({ type: 'text', nullable: true })
-  description: string | null;
+  description: string | null; // Description of the title
 
   @Column({ type: 'boolean', default: true })
-  is_active: boolean;
+  is_active: boolean; // Whether the title is active
 
   @Column({ type: 'int', default: 0 })
-  display_order: number;
+  display_order: number; // Order for display in dropdowns
 
-  constructor(
-    title_name: string,
-    category: TitleCategory,
-    description?: string | null
-  ) {
+  constructor(title: string) {
     super();
-    this.title_name = title_name;
-    this.category = category;
-    this.description = description || null;
+    this.title = title;
     this.is_active = true;
     this.display_order = 0;
   }

package/src/models/EarlyCheckoutBalanceModel.ts

@@ -0,0 +1,22 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'early_checkout_balance' })
+export class EarlyCheckoutBalance extends BaseModel {
+
+    @Column({ nullable: true })
+    user_id: string;
+
+    @Column({ nullable: true })
+    balance: number;
+
+    @Column({ nullable: true })
+    total_balance: number;
+
+    constructor(user_id: string, balance: number, total_balance: number) {
+        super();     
+        this.user_id = user_id;
+        this.balance = balance;
+        this.total_balance = total_balance;
+    }
+}

package/src/models/EarlyCheckoutConfigModel.ts

@@ -0,0 +1,57 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum EarlyCheckoutFrequency {
+    Monthly = 'Monthly',
+    Yearly = 'Yearly',
+}
+
+//This model is used to store the Early Checkout Configuration on the Admin Side
+@Entity({ name: 'early_checkout_configuration' })
+export class EarlyCheckoutConfiguration extends BaseModel {
+
+    @Column({ type: 'varchar', nullable: true })
+    category: string;
+
+    @Column({ type: 'int', nullable: true })
+    MandC_id: number;
+
+    @Column({ type: 'varchar', nullable: true })
+    frequency: EarlyCheckoutFrequency;
+
+    @Column({ type: 'varchar', nullable: true })
+    region: string;
+
+    @Column({ type: 'varchar', nullable: true })
+    country: string;
+
+    @Column({ type: 'varchar', nullable: true })
+    location: string;
+
+    @Column({ type: 'varchar', nullable: true })
+    no_of_hours: string;
+
+
+    @Column({ type: 'date', nullable: true })
+    from_date: Date;
+
+    @Column({ type: 'date', nullable: true })
+    to_date: Date;
+
+    @Column({ type: 'varchar', nullable: true })
+    reason: string;
+
+    constructor(category: string, MandC_id: number, frequency: EarlyCheckoutFrequency, region: string, country: string, location: string, no_of_hours: string, from_date: Date, to_date: Date, reason: string) {
+        super();
+        this.category = category;
+        this.MandC_id = MandC_id;
+        this.no_of_hours = no_of_hours;
+        this.frequency = frequency;
+        this.region = region;
+        this.country = country;
+        this.location = location;
+        this.from_date = from_date;
+        this.to_date = to_date;
+        this.reason = reason;
+    }
+}

package/src/models/EarlyCheckoutTransactionModel.ts

@@ -0,0 +1,53 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum EarlyCheckoutTransactionStatus {
+    GRANTED = 'GRANTED',
+    TAKEN = 'TAKEN',
+    ADJUSTMENT = 'ADJUSTMENT',
+    CARRY_FORWARD = 'CARRY_FORWARD',
+    ENCASHMENT = 'ENCASHMENT',
+    AVAILED = 'AVAILED',
+    ELAPSED = 'ELAPSED'
+}
+
+//This model is used to store early checkout transactions for users
+@Entity({ name: 'early_checkout_transactions' })
+export class EarlyCheckoutTransaction extends BaseModel {
+
+    @Column({ type: 'int', nullable: false })
+    user_id: number;
+
+    @Column({ type: 'varchar', nullable: true })
+    hours_count: string;
+
+    @Column({ type: 'date', nullable: true })
+    from_date: Date;
+
+    @Column({ type: 'date', nullable: true })
+    to_date: Date;
+
+    @Column({ type: 'int', nullable: true })
+    year: number;
+
+    @Column({ type: 'varchar', nullable: false })
+    status: EarlyCheckoutTransactionStatus;
+
+    constructor(
+        user_id: number,
+        hours_count: string,
+        from_date: Date,
+        to_date: Date,
+        year: number,
+        status: EarlyCheckoutTransactionStatus
+    ) {
+        super();
+        this.user_id = user_id;
+        this.hours_count = hours_count;
+        this.from_date = from_date;
+        this.to_date = to_date;
+        this.year = year;
+        this.status = status;
+    }
+}
+

package/src/models/FinancialApprovalsModel.ts

@@ -45,6 +45,10 @@ export class FinancialApprovals extends BaseModel {
   @Column({ type: 'int', nullable: true })
   delegate_user_id: number | null;
 
+  // is_allowed flag: true if logged-in user is the request creator, false otherwise (for chat permissions)
+  @Column({ type: 'boolean', default: true, nullable: true })
+  is_allowed: boolean | null;
+
   @ManyToOne(() => FinancialRequests, fr => fr.approvals)
   @JoinColumn({ name: 'financial_request_id' })
   financialRequest?: FinancialRequests;

package/src/models/FinancialGradeModel.ts

@@ -4,23 +4,28 @@ import { BaseModel } from './BaseModel';
 @Entity({ name: 'financial_grade' })
 export class FinancialGrade extends BaseModel {
 
-    @Column({ nullable: false })
+    @Column({ type: 'varchar', nullable: false })
     diplomatic_title: string;
 
-    @Column({ nullable: false })
-    financial_grade: string;
+    @Column({ type: 'varchar', nullable: true })
+    arabic_title: string;
 
-    @Column({ type: "int", nullable: false })
-    annual_leave: number;
+    @Column({ type: "integer", nullable: true })
+    financial_grade: number;
+
+    @Column({ type: "integer", nullable: true })
+    leave_count: number;
 
     constructor(
         diplomatic_title: string,
-        financial_grade: string,
-        annual_leave: number
+        arabic_title: string,
+        financial_grade: number,
+        leave_count: number
     ) {
         super();
         this.diplomatic_title = diplomatic_title;
+        this.arabic_title = arabic_title;
         this.financial_grade = financial_grade;
-        this.annual_leave = annual_leave;
+        this.leave_count = leave_count;
     }
 }

package/src/models/GeneralServiceApprovalsModel.ts

@@ -6,7 +6,8 @@ export enum GeneralServiceApprovalStatus {
   APPROVED = "Approved",
   REJECTED = "Rejected",
   SKIPPED = "Skipped",
-  IN_PROGRESS = "In Progress"
+  IN_PROGRESS = "In Progress",
+  ASSIGNED = "Assigned"
 }
 
 @Entity({ name: 'general_service_approvals' })
@@ -60,6 +61,14 @@ export class GeneralServiceApprovals extends BaseModel {
   @Column({ type: 'int', nullable: true })
   delegate_user_id: number | null;  // Group who transferred from
 
+  // Stationery-specific: Action type to indicate what action is needed (for FE button handling)
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  action_type: string | null;  // Values: 'approve' (L1), 'store' (Stores Office), 'finance' (Finance), 'finance_purchase', 'complete'
+
+  // is_allowed flag: true if logged-in user is the request creator, false otherwise (for chat permissions)
+  @Column({ type: 'boolean', nullable: true })
+  is_allowed: boolean | null;
+
   // @Column({ type: 'timestamp', nullable: true })
   // sla_start_time: Date | null;  // SLA tracking start time for this assignment
 

package/src/models/LeaveApprovalsModel.ts

@@ -42,7 +42,10 @@ export class LeaveApprovalDetails extends BaseModel {
   @Column({ type: 'enum', enum: ApprovalStatus,default: ApprovalStatus.PENDING, nullable: false })
   approval_status: ApprovalStatus;
 
-  constructor(leave_request_id: number, approver_user_id: number, approver_role_id: number, comment: string, approval_status: ApprovalStatus, level: number, department_id: number, section_id: number) {
+  @Column({ type: 'boolean', default: true, nullable: false })
+  is_allowed: boolean;
+
+  constructor(leave_request_id: number, approver_user_id: number, approver_role_id: number, comment: string, approval_status: ApprovalStatus, level: number, department_id: number, section_id: number, is_allowed: boolean) {
     super();
     this.leave_request_id = leave_request_id;
     this.approver_user_id = approver_user_id;
@@ -52,5 +55,6 @@ export class LeaveApprovalDetails extends BaseModel {
     this.comment = comment;
     this.approval_status = approval_status;
     this.level = level;
+    this.is_allowed = is_allowed;
   }
 }

package/src/models/LeaveBalanceModel.ts

@@ -0,0 +1,26 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'leave_balance' })
+export class LeaveBalance extends BaseModel {
+
+    @Column({ nullable: true })
+    user_id: string;
+
+    @Column({ nullable: true })
+    leave_type_id: string;
+
+    @Column({ nullable: true })
+    balance: number;
+
+    @Column({ nullable: true })
+    total_balance: number;
+
+    constructor(user_id: string, leave_type_id: string, balance: number, total_balance: number) {
+        super();     
+        this.user_id = user_id;
+        this.leave_type_id = leave_type_id;
+        this.balance = balance;
+        this.total_balance = total_balance;
+    }
+}