@platform-modules/foreign-ministry 1.1.70 → 1.1.71

package/src/data-source.ts

@@ -105,15 +105,20 @@ 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'
+
 export const AppDataSource = new DataSource({
   type: 'postgres',
   host: process.env.DB_HOST || 'localhost',
@@ -220,13 +225,17 @@ 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
   ],
 });

package/src/index.ts

@@ -100,12 +100,28 @@ 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/DiplomaticTitlesMasterModel';
-export * from './models/DiplomaticClubSubscriptionMasterModel';
+export * from './models/StationeryRequestsModel';
+export * from './models/StationeryMaterialMasterModel';
+export * from './models/ProfileUpdateRequestsModel';
+export * from './models/UserPersonalDetailsModel';
+export * from './models/UserEmploymentDetailsModel';
+export * from './models/UserEducationDetailsModel';

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/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;
+    }
+}

package/src/models/LeaveConfigGradesModel.Ts

@@ -0,0 +1,72 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+//This model is used to store the relationship between Leave Configuration and Financial Grades with monthly leave counts
+@Entity({ name: 'leave_config_grades' })
+export class LeaveConfigurationGrades extends BaseModel {
+
+    @Column({ type: 'int', nullable: true })
+    leave_config_id: number;
+
+    @Column({ type: 'int', nullable: false })
+    grade: number;
+
+    @Column({ type: 'int', nullable: true })
+    jan: number;
+
+    @Column({ type: 'int', nullable: true })
+    feb: number;
+
+    @Column({ type: 'int', nullable: true })
+    mar: number;
+
+    @Column({ type: 'int', nullable: true })
+    apr: number;
+
+    @Column({ type: 'int', nullable: true })
+    may: number;
+
+    @Column({ type: 'int', nullable: true })
+    jun: number;
+
+    @Column({ type: 'int', nullable: true })
+    jul: number;
+
+    @Column({ type: 'int', nullable: true })
+    aug: number;
+
+    @Column({ type: 'int', nullable: true })
+    sep: number;
+
+    @Column({ type: 'int', nullable: true })
+    oct: number;
+
+    @Column({ type: 'int', nullable: true })
+    nov: number;
+
+    @Column({ type: 'int', nullable: true })
+    dec: number;
+
+    @Column({ type: 'int', nullable: false, default: 0 })
+    total_count: number;
+
+    constructor(leave_config_id: number, grade: number, jan: number, feb: number, mar: number, apr: number, may: number, jun: number, jul: number, aug: number, sep: number, oct: number, nov: number, dec: number, total_count: number) {
+        super();
+        this.leave_config_id = leave_config_id;
+        this.grade = grade;
+        this.jan = jan;
+        this.feb = feb;
+        this.mar = mar;
+        this.apr = apr;
+        this.may = may;
+        this.jun = jun;
+        this.jul = jul;
+        this.aug = aug;
+        this.sep = sep;
+        this.oct = oct;
+        this.nov = nov;
+        this.dec = dec;
+        this.total_count = total_count;
+    }
+}
+

package/src/models/LeaveConfigModel.ts

@@ -0,0 +1,64 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum enumFrequency {
+    Monthly = 'Monthly',
+    Yearly = 'Yearly',
+}
+
+//This model is used to store the Financial Grade declaration on the Admin Side
+@Entity({ name: 'leave_configuration' })
+export class LeaveConfiguration extends BaseModel {
+
+    @Column({ type: 'varchar', nullable: true })
+    category: string;
+
+    @Column({ type: 'int', nullable: true })
+    MandC_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    leave_type_id: number;
+
+    @Column({ type: 'varchar', nullable: true })
+    frequency: enumFrequency;
+
+    @Column({ type: 'varchar', nullable: true })
+    region: string;
+
+    @Column({ type: 'varchar', nullable: true })
+    country: string;
+
+    @Column({ type: 'varchar', nullable: true })
+    location: string;
+
+    @Column({ nullable: true, default: false })
+    is_carryforward: boolean;
+
+    @Column({ type: 'int', nullable: true, default: 0 })
+    carryforward_limit: number;
+
+    @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, leave_type_id: number, frequency: enumFrequency, region: string, country: string, location: string, is_carryforward: boolean, carryforward_limit: number, from_date: Date, to_date: Date, reason: string) {
+        super();
+        this.category = category;
+        this.MandC_id = MandC_id;
+        this.leave_type_id = leave_type_id;
+        this.frequency = frequency;
+        this.region = region;
+        this.country = country;
+        this.location = location;
+        this.is_carryforward = is_carryforward;
+        this.carryforward_limit = carryforward_limit;
+        this.from_date = from_date;
+        this.to_date = to_date;
+        this.reason = reason;
+    }
+}

package/src/models/LeaveTransactionModel.ts

@@ -0,0 +1,58 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum LeaveTransactionStatus {
+    GRANTED = 'GRANTED',
+    TAKEN = 'TAKEN',
+    ADJUSTMENT = 'ADJUSTMENT',
+    CARRY_FORWARD = 'CARRY_FORWARD',
+    ENCASHMENT = 'ENCASHMENT',
+    AVAILED = 'AVAILED',
+    ELAPSED = 'ELAPSED'
+}
+
+//This model is used to store leave transactions for users
+@Entity({ name: 'leave_transactions' })
+export class LeaveTransaction extends BaseModel {
+
+    @Column({ type: 'int', nullable: false })
+    user_id: number;
+
+    @Column({ type: 'int', nullable: false })
+    leave_type_id: number;
+
+    @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
+    leave_count: number;
+
+    @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: LeaveTransactionStatus;
+
+    constructor(
+        user_id: number,
+        leave_type_id: number,
+        leave_count: number,
+        from_date: Date,
+        to_date: Date,
+        year: number,
+        status: LeaveTransactionStatus
+    ) {
+        super();
+        this.user_id = user_id;
+        this.leave_type_id = leave_type_id;
+        this.leave_count = leave_count;
+        this.from_date = from_date;
+        this.to_date = to_date;
+        this.year = year;
+        this.status = status;
+    }
+}
+

package/src/models/LeaveTypesModel.ts

@@ -1,31 +1,47 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 
+export enum genderType {
+    Male = 'Male',
+    Female = 'Female',
+    All = 'All',
+}
+
 @Entity({ name: 'leave_types' })
 export class LeaveTypes extends BaseModel {
 
-    @Column({ nullable: true })
+    @Column({type: 'varchar', nullable: true })
     name: string;
 
-    @Column({ nullable: true })
+    @Column({type: 'varchar', nullable: true })
     name_in_arabic: string;
 
-    @Column({ nullable: true, default: false })  
-    omani_only?: boolean = false; 
+    @Column({ nullable: true, default: false })
+    omani_only?: boolean = false;
 
-    @Column({ nullable: true, default: false })  
-    non_omani_muslim?: boolean = false; 
+    @Column({ nullable: true, default: false })
+    non_omani_muslim?: boolean = false;
 
-    @Column({ nullable: true, default: false })  
-    non_omani_non_muslim?: boolean = false; 
+    @Column({ nullable: true, default: false })
+    non_omani_non_muslim?: boolean = false;
 
+    @Column({ nullable: true, default: genderType.All })
+    gender: genderType = genderType.All;
 
-    constructor(     
+    constructor(
         name: string,
         name_in_arabic: string,
+        omani_only: boolean,
+        non_omani_muslim: boolean,
+        non_omani_non_muslim: boolean,
+        gender: genderType
     ) {
-        super();     
+        super();
         this.name = name
-        this.name_in_arabic = name_in_arabic    
+        this.name_in_arabic = name_in_arabic
+        this.omani_only = omani_only
+        this.non_omani_muslim = non_omani_muslim
+        this.non_omani_non_muslim = non_omani_non_muslim
+        this.gender = gender
     }
 }

package/src/models/M&CMasterModel.ts

@@ -0,0 +1,37 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'M&C_names' })
+export class MandCMaster extends BaseModel {
+
+    @Column({type: 'varchar', nullable: true })
+    name: string;
+
+    @Column({type: 'varchar', nullable: true })
+    name_in_arabic: string;
+
+    @Column({type: 'varchar', nullable: true })  
+    region:string; 
+
+    @Column({type: 'varchar', nullable: true })  
+    country:string; 
+
+    @Column({type: 'varchar', nullable: true })  
+    location:string; 
+
+
+    constructor(     
+        name: string,
+        name_in_arabic: string,
+        region: string,
+        country: string,
+        location: string
+    ) {
+        super();     
+        this.name = name
+        this.name_in_arabic = name_in_arabic    
+        this.region = region
+        this.country = country
+        this.location = location
+    }
+}