@platform-modules/foreign-ministry 1.0.86 → 1.0.88

package/dist/data-source.js

@@ -49,6 +49,11 @@ const MessageReadStatusModel_1 = require("./models/MessageReadStatusModel");
 const ShifttimesModel_1 = require("./models/ShifttimesModel");
 const AttendanceModel_1 = require("./models/AttendanceModel");
 const UserShiftModel_1 = require("./models/UserShiftModel");
+const HolidaysModel_1 = require("./models/HolidaysModel");
+const userRolesModel_1 = require("./models/userRolesModel");
+const roleRightsModel_1 = require("./models/roleRightsModel");
+const PortalFeedbackModel_1 = require("./models/PortalFeedbackModel");
+const NotificationModel_1 = require("./models/NotificationModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -56,7 +61,7 @@ exports.AppDataSource = new typeorm_1.DataSource({
     username: process.env.DB_USER || 'postgres',
     password: process.env.DB_PASS || 'postgres',
     database: process.env.DB_NAME || 'common_models',
-    synchronize: false, // auto-create tables (disable in prod)
+    synchronize: true, // auto-create tables (disable in prod)
     logging: false,
     entities: [
         user_1.User,
@@ -102,6 +107,11 @@ exports.AppDataSource = new typeorm_1.DataSource({
         MessageReadStatusModel_1.MessageReadStatus,
         ShifttimesModel_1.ShiftDetails,
         AttendanceModel_1.AttendanceDetails,
-        UserShiftModel_1.UserShift
+        UserShiftModel_1.UserShift,
+        HolidaysModel_1.Holidays,
+        userRolesModel_1.UserRole,
+        roleRightsModel_1.RoleRights,
+        PortalFeedbackModel_1.PortalFeedback,
+        NotificationModel_1.Notification
     ],
 });

package/dist/index.d.ts

@@ -42,16 +42,8 @@ export * from './models/ShifttimesModel';
 export * from './models/AttendanceModel';
 export * from './models/contactInfoModel';
 export * from './models/UserShiftModel';
-export * from './models/FinancialRequestsModel';
-export * from './models/PayslipRequestsModel';
-export * from './models/SalaryCertificateRequestsModel';
-export * from './models/AllowanceRequestsModel';
-export * from './models/ReimbursementRequestsModel';
-export * from './models/BankAccountChangeRequestsModel';
-export * from './models/FinancialChatsModel';
-export * from './models/FinancialApprovalsModel';
-export * from './models/FinancialWorkFlowModel';
-export * from './models/FinancialAttachmentsModel';
-export * from './models/RequestTypeMasterModel';
-export * from './models/FinancialSettingsModel';
-export * from './models/AllowanceTypesModel';
+export * from './models/HolidaysModel';
+export * from './models/userRolesModel';
+export * from './models/roleRightsModel';
+export * from './models/PortalFeedbackModel';
+export * from './models/NotificationModel';

package/dist/index.js

@@ -58,16 +58,8 @@ __exportStar(require("./models/ShifttimesModel"), exports);
 __exportStar(require("./models/AttendanceModel"), exports);
 __exportStar(require("./models/contactInfoModel"), exports);
 __exportStar(require("./models/UserShiftModel"), exports);
-__exportStar(require("./models/FinancialRequestsModel"), exports);
-__exportStar(require("./models/PayslipRequestsModel"), exports);
-__exportStar(require("./models/SalaryCertificateRequestsModel"), exports);
-__exportStar(require("./models/AllowanceRequestsModel"), exports);
-__exportStar(require("./models/ReimbursementRequestsModel"), exports);
-__exportStar(require("./models/BankAccountChangeRequestsModel"), exports);
-__exportStar(require("./models/FinancialChatsModel"), exports);
-__exportStar(require("./models/FinancialApprovalsModel"), exports);
-__exportStar(require("./models/FinancialWorkFlowModel"), exports);
-__exportStar(require("./models/FinancialAttachmentsModel"), exports);
-__exportStar(require("./models/RequestTypeMasterModel"), exports);
-__exportStar(require("./models/FinancialSettingsModel"), exports);
-__exportStar(require("./models/AllowanceTypesModel"), exports);
+__exportStar(require("./models/HolidaysModel"), exports);
+__exportStar(require("./models/userRolesModel"), exports);
+__exportStar(require("./models/roleRightsModel"), exports);
+__exportStar(require("./models/PortalFeedbackModel"), exports);
+__exportStar(require("./models/NotificationModel"), exports);

package/dist/models/FMServices.js

@@ -35,7 +35,7 @@ __decorate([
     __metadata("design:type", String)
 ], FMServices.prototype, "description", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
+    (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], FMServices.prototype, "logo_url", void 0);
 exports.FMServices = FMServices = __decorate([

package/dist/models/FinancialApprovalsModel.d.ts

@@ -14,6 +14,9 @@ export declare class FinancialApprovals extends BaseModel {
     comment: string;
     approval_status: FinancialApprovalStatus;
     action_date: Date;
+    department_id: number;
+    section_id: number;
+    approved_by: number;
     financialRequest?: FinancialRequests;
-    constructor(financial_request_id: number, level: number, approver_role_id: number, approval_status: FinancialApprovalStatus);
+    constructor(financial_request_id: number, level: number, approver_role_id: number, approval_status: FinancialApprovalStatus, department_id: number, section_id: number, approved_by: number);
 }

package/dist/models/FinancialApprovalsModel.js

@@ -21,12 +21,15 @@ var FinancialApprovalStatus;
     FinancialApprovalStatus["SKIPPED"] = "Skipped";
 })(FinancialApprovalStatus || (exports.FinancialApprovalStatus = FinancialApprovalStatus = {}));
 let FinancialApprovals = class FinancialApprovals extends BaseModel_1.BaseModel {
-    constructor(financial_request_id, level, approver_role_id, approval_status) {
+    constructor(financial_request_id, level, approver_role_id, approval_status, department_id, section_id, approved_by) {
         super();
         this.financial_request_id = financial_request_id;
         this.level = level;
         this.approver_role_id = approver_role_id;
         this.approval_status = approval_status;
+        this.department_id = department_id;
+        this.section_id = section_id;
+        this.approved_by = approved_by;
     }
 };
 exports.FinancialApprovals = FinancialApprovals;
@@ -58,6 +61,18 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'timestamp', nullable: true }),
     __metadata("design:type", Date)
 ], FinancialApprovals.prototype, "action_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], FinancialApprovals.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], FinancialApprovals.prototype, "section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], FinancialApprovals.prototype, "approved_by", void 0);
 __decorate([
     (0, typeorm_1.ManyToOne)(() => FinancialRequestsModel_1.FinancialRequests, fr => fr.approvals),
     (0, typeorm_1.JoinColumn)({ name: 'financial_request_id' }),
@@ -65,5 +80,5 @@ __decorate([
 ], FinancialApprovals.prototype, "financialRequest", void 0);
 exports.FinancialApprovals = FinancialApprovals = __decorate([
     (0, typeorm_1.Entity)({ name: 'financial_approvals' }),
-    __metadata("design:paramtypes", [Number, Number, Number, String])
+    __metadata("design:paramtypes", [Number, Number, Number, String, Number, Number, Number])
 ], FinancialApprovals);

package/dist/models/FinancialRequestsModel.d.ts

@@ -35,6 +35,10 @@ export declare class FinancialRequests extends BaseModel {
     remarks: string;
     current_approval_level: number;
     current_approver_id: number;
+    service_id: number;
+    sub_service_id: number;
+    section_id: number;
+    reporting_manager: number;
     payslipRequest?: PayslipRequests;
     salaryCertificateRequest?: SalaryCertificateRequests;
     allowanceRequest?: AllowanceRequests;
@@ -45,5 +49,5 @@ export declare class FinancialRequests extends BaseModel {
     workflows?: FinancialWorkFlow[];
     attachments?: FinancialAttachments[];
     requestType?: RequestTypeMaster;
-    constructor(user_id: number, employee_id: string, employee_name: string, email_address: string, contact_number: string, request_type_id: number);
+    constructor(user_id: number, employee_id: string, employee_name: string, email_address: string, contact_number: string, request_type_id: number, service_id: number, sub_service_id: number, section_id: number, reporting_manager: number);
 }

package/dist/models/FinancialRequestsModel.js

@@ -24,7 +24,7 @@ var FinancialRequestStatus;
     FinancialRequestStatus["CANCELLED"] = "Cancelled";
 })(FinancialRequestStatus || (exports.FinancialRequestStatus = FinancialRequestStatus = {}));
 let FinancialRequests = class FinancialRequests extends BaseModel_1.BaseModel {
-    constructor(user_id, employee_id, employee_name, email_address, contact_number, request_type_id) {
+    constructor(user_id, employee_id, employee_name, email_address, contact_number, request_type_id, service_id, sub_service_id, section_id, reporting_manager) {
         super();
         this.user_id = user_id;
         this.employee_id = employee_id;
@@ -34,6 +34,10 @@ let FinancialRequests = class FinancialRequests extends BaseModel_1.BaseModel {
         this.request_type_id = request_type_id;
         this.request_date = new Date();
         this.request_status = FinancialRequestStatus.PENDING;
+        this.service_id = service_id;
+        this.sub_service_id = sub_service_id;
+        this.section_id = section_id;
+        this.reporting_manager = reporting_manager;
     }
 };
 exports.FinancialRequests = FinancialRequests;
@@ -97,6 +101,22 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
 ], FinancialRequests.prototype, "current_approver_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], FinancialRequests.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], FinancialRequests.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], FinancialRequests.prototype, "section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], FinancialRequests.prototype, "reporting_manager", void 0);
 __decorate([
     (0, typeorm_1.OneToOne)('PayslipRequests', 'financialRequest', { nullable: true }),
     __metadata("design:type", Function)
@@ -140,5 +160,5 @@ __decorate([
 ], FinancialRequests.prototype, "requestType", void 0);
 exports.FinancialRequests = FinancialRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'financial_requests' }),
-    __metadata("design:paramtypes", [Number, String, String, String, String, Number])
+    __metadata("design:paramtypes", [Number, String, String, String, String, Number, Number, Number, Number, Number])
 ], FinancialRequests);

package/dist/models/HolidaysModel.d.ts

@@ -0,0 +1,11 @@
+import { BaseModel } from './BaseModel';
+export declare class Holidays extends BaseModel {
+    title: string;
+    holiday_date: Date;
+    description?: string;
+    region?: string;
+    is_optional: boolean;
+    holiday_type: string;
+    year?: number;
+    constructor(title: string, holiday_date: Date, description?: string, region?: string, is_optional?: boolean, holiday_type?: string, year?: number);
+}

package/dist/models/HolidaysModel.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.Holidays = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let Holidays = class Holidays extends BaseModel_1.BaseModel {
+    constructor(title, holiday_date, description, region, is_optional = false, holiday_type = 'Public', year) {
+        super();
+        this.title = title;
+        this.holiday_date = holiday_date;
+        this.description = description;
+        this.region = region;
+        this.is_optional = is_optional;
+        this.holiday_type = holiday_type;
+        this.year = year;
+    }
+};
+exports.Holidays = Holidays;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 200 }),
+    __metadata("design:type", String)
+], Holidays.prototype, "title", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', name: 'holiday_date' }),
+    __metadata("design:type", Date)
+], Holidays.prototype, "holiday_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], Holidays.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 200, nullable: true }),
+    __metadata("design:type", String)
+], Holidays.prototype, "region", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', name: 'is_optional', default: false }),
+    __metadata("design:type", Boolean)
+], Holidays.prototype, "is_optional", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 30, name: 'holiday_type', default: 'Public' }),
+    __metadata("design:type", String)
+], Holidays.prototype, "holiday_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], Holidays.prototype, "year", void 0);
+exports.Holidays = Holidays = __decorate([
+    (0, typeorm_1.Entity)({ name: 'holidays' }),
+    __metadata("design:paramtypes", [String, Date, String, String, Boolean, String, Number])
+], Holidays);

package/dist/models/NotificationModel.d.ts

@@ -0,0 +1,18 @@
+import { BaseModel } from './BaseModel';
+export declare enum NotificationType {
+    REQUEST_RAISED = "request raised",
+    REMINDER = "reminder",
+    IMPORT = "import"
+}
+export declare class Notification extends BaseModel {
+    type: NotificationType;
+    user_id: number;
+    role_id: number;
+    department_id: number;
+    section_id: number;
+    content: any;
+    is_read: boolean;
+    request_id: number;
+    route_path: string;
+    constructor(type: NotificationType, user_id: number, role_id: number, department_id: number, section_id: number, content: any, is_read: boolean, request_id: number, route_path: string);
+}

package/dist/models/NotificationModel.js

@@ -0,0 +1,79 @@
+"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.Notification = exports.NotificationType = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var NotificationType;
+(function (NotificationType) {
+    NotificationType["REQUEST_RAISED"] = "request raised";
+    NotificationType["REMINDER"] = "reminder";
+    NotificationType["IMPORT"] = "import";
+})(NotificationType || (exports.NotificationType = NotificationType = {}));
+let Notification = class Notification extends BaseModel_1.BaseModel {
+    constructor(type, user_id, role_id, department_id, section_id, content, is_read, request_id, route_path) {
+        super();
+        this.type = type;
+        this.user_id = user_id;
+        this.role_id = role_id;
+        this.department_id = department_id;
+        this.section_id = section_id;
+        this.content = content;
+        this.is_read = is_read;
+        this.request_id = request_id;
+        this.route_path = route_path;
+    }
+};
+exports.Notification = Notification;
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: NotificationType,
+        nullable: false,
+    }),
+    __metadata("design:type", String)
+], Notification.prototype, "type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
+    __metadata("design:type", Number)
+], Notification.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Number)
+], Notification.prototype, "role_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Number)
+], Notification.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Number)
+], Notification.prototype, "section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'jsonb', nullable: true }),
+    __metadata("design:type", Object)
+], Notification.prototype, "content", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
+    __metadata("design:type", Boolean)
+], Notification.prototype, "is_read", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Number)
+], Notification.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", String)
+], Notification.prototype, "route_path", void 0);
+exports.Notification = Notification = __decorate([
+    (0, typeorm_1.Entity)({ name: 'notification' }),
+    __metadata("design:paramtypes", [String, Number, Number, Number, Number, Object, Boolean, Number, String])
+], Notification);

package/dist/models/PortalFeedbackModel.d.ts

@@ -0,0 +1,8 @@
+import { BaseModel } from './BaseModel';
+import { Rating } from './feedbackModel';
+export declare class PortalFeedback extends BaseModel {
+    comment: string;
+    rating: Rating;
+    user_Id: number;
+    constructor(comment: string, rating: Rating, user_Id: number);
+}

package/dist/models/PortalFeedbackModel.js

@@ -0,0 +1,44 @@
+"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.PortalFeedback = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+const feedbackModel_1 = require("./feedbackModel");
+let PortalFeedback = class PortalFeedback extends BaseModel_1.BaseModel {
+    constructor(comment, rating, user_Id) {
+        super();
+        this.comment = comment,
+            this.rating = rating,
+            this.user_Id = user_Id;
+    }
+};
+exports.PortalFeedback = PortalFeedback;
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], PortalFeedback.prototype, "comment", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: feedbackModel_1.Rating,
+        nullable: true,
+    }),
+    __metadata("design:type", Number)
+], PortalFeedback.prototype, "rating", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Number)
+], PortalFeedback.prototype, "user_Id", void 0);
+exports.PortalFeedback = PortalFeedback = __decorate([
+    (0, typeorm_1.Entity)({ name: 'portal_feedback' }),
+    __metadata("design:paramtypes", [String, Number, Number])
+], PortalFeedback);

package/dist/models/role.d.ts

@@ -9,14 +9,8 @@ Role
 Userrole Information will store
 */
 import { BaseModel } from './BaseModel';
-export interface Irole {
-    name: string;
-    id?: number;
-    is_deleted?: boolean;
-    created_by?: number;
-}
 export declare class Role extends BaseModel {
     name: string;
     is_deleted?: boolean;
-    constructor(name: string, is_deleted: boolean, userId: number);
+    constructor(name: string, is_deleted: boolean);
 }

package/dist/models/role.js

@@ -23,7 +23,7 @@ exports.Role = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let Role = class Role extends BaseModel_1.BaseModel {
-    constructor(name, is_deleted, userId) {
+    constructor(name, is_deleted) {
         super();
         this.name = name;
         this.is_deleted = is_deleted;
@@ -40,5 +40,5 @@ __decorate([
 ], Role.prototype, "is_deleted", void 0);
 exports.Role = Role = __decorate([
     (0, typeorm_1.Entity)({ name: 'role' }),
-    __metadata("design:paramtypes", [String, Boolean, Number])
+    __metadata("design:paramtypes", [String, Boolean])
 ], Role);

package/dist/models/roleRightsModel.d.ts

@@ -0,0 +1,16 @@
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model
+Role
+@usage
+Userrole Information will store
+*/
+import { BaseModel } from './BaseModel';
+export declare class RoleRights extends BaseModel {
+    user_role_id: number;
+    service_id: number;
+    constructor(user_role_id: number, service_id: number);
+}

package/dist/models/roleRightsModel.js

@@ -0,0 +1,44 @@
+"use strict";
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model
+Role
+@usage
+Userrole Information will store
+*/
+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.RoleRights = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let RoleRights = class RoleRights extends BaseModel_1.BaseModel {
+    constructor(user_role_id, service_id) {
+        super();
+        this.user_role_id = user_role_id;
+        this.service_id = service_id;
+    }
+};
+exports.RoleRights = RoleRights;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Number)
+], RoleRights.prototype, "user_role_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
+    __metadata("design:type", Number)
+], RoleRights.prototype, "service_id", void 0);
+exports.RoleRights = RoleRights = __decorate([
+    (0, typeorm_1.Entity)({ name: 'role_rights' }),
+    __metadata("design:paramtypes", [Number, Number])
+], RoleRights);

package/dist/models/user.d.ts

@@ -34,5 +34,9 @@ export declare class User extends BaseModel {
     diplomatic_name?: string;
     civil_employee_id?: number;
     qualification?: string;
-    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, 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, diplomatic_name?: string, civil_employee_id?: number, qualification?: string);
+    father_name?: string;
+    spouse_name?: string;
+    children1_name?: string;
+    children2_name?: string;
+    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, 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, diplomatic_name?: string, civil_employee_id?: number, qualification?: string, father_name?: string, spouse_name?: string, children1_name?: string, children2_name?: string);
 }

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, department, section, grade, location, country, is_admin, division, reporting_to, address, residential_status, religion, designation, avatar, passport_number, personal_email, extension_number, diplomatic_name, civil_employee_id, qualification) {
+    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, department, section, grade, location, country, is_admin, division, reporting_to, address, residential_status, religion, designation, avatar, passport_number, personal_email, extension_number, diplomatic_name, civil_employee_id, qualification, father_name, spouse_name, children1_name, children2_name) {
         super();
         this.employee_id = employee_id;
         this.employee_name = employee_name;
@@ -49,6 +49,10 @@ let User = class User extends BaseModel_1.BaseModel {
         this.diplomatic_name = diplomatic_name;
         this.civil_employee_id = civil_employee_id;
         this.qualification = qualification;
+        this.father_name = father_name;
+        this.spouse_name = spouse_name;
+        this.children1_name = children1_name;
+        this.children2_name = children2_name;
     }
 };
 exports.User = User;
@@ -188,7 +192,23 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], User.prototype, "qualification", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "father_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "spouse_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "children1_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "children2_name", 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, Number, Number, Number, String, String, Boolean, Number, Number, String, String, String, Number, String, String, String, Number, String, Number, String])
+    __metadata("design:paramtypes", [Number, String, String, String, String, String, String, String, String, String, String, String, String, Number, String, Number, Number, Number, String, String, Boolean, Number, Number, String, String, String, Number, String, String, String, Number, String, Number, String, String, String, String, String])
 ], User);

package/dist/models/userRolesModel.d.ts

@@ -0,0 +1,19 @@
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model
+Role
+@usage
+Userrole Information will store
+*/
+import { BaseModel } from './BaseModel';
+export declare class UserRole extends BaseModel {
+    role_id: number;
+    user_id: number;
+    department_id: number;
+    section_id: number;
+    is_active: boolean;
+    constructor(role_id: number, user_id: number, department_id: number, section_id: number, is_active?: boolean);
+}

package/dist/models/userRolesModel.js

@@ -0,0 +1,59 @@
+"use strict";
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model
+Role
+@usage
+Userrole Information will store
+*/
+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.UserRole = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let UserRole = class UserRole extends BaseModel_1.BaseModel {
+    constructor(role_id, user_id, department_id, section_id, is_active = false) {
+        super();
+        this.role_id = role_id;
+        this.user_id = user_id;
+        this.department_id = department_id;
+        this.section_id = section_id;
+        this.is_active = is_active;
+    }
+};
+exports.UserRole = UserRole;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
+    __metadata("design:type", Number)
+], UserRole.prototype, "role_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
+    __metadata("design:type", Number)
+], UserRole.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Number)
+], UserRole.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Number)
+], UserRole.prototype, "section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
+    __metadata("design:type", Boolean)
+], UserRole.prototype, "is_active", void 0);
+exports.UserRole = UserRole = __decorate([
+    (0, typeorm_1.Entity)({ name: 'user_role' }),
+    __metadata("design:paramtypes", [Number, Number, Number, Number, Boolean])
+], UserRole);

package/package.json

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

package/src/data-source.ts

@@ -50,6 +50,11 @@ import { MessageReadStatus } from './models/MessageReadStatusModel';
 import { ShiftDetails } from './models/ShifttimesModel';
 import { AttendanceDetails } from './models/AttendanceModel';
 import { UserShift } from './models/UserShiftModel';
+import { Holidays } from './models/HolidaysModel';
+import { UserRole } from './models/userRolesModel';
+import { RoleRights } from './models/roleRightsModel';
+import { PortalFeedback } from './models/PortalFeedbackModel';
+import { Notification } from './models/NotificationModel';
 
 
 export const AppDataSource = new DataSource({
@@ -59,7 +64,7 @@ export const AppDataSource = new DataSource({
   username: process.env.DB_USER || 'postgres',
   password: process.env.DB_PASS || 'postgres',
   database: process.env.DB_NAME || 'common_models',
-  synchronize: false, // auto-create tables (disable in prod)
+  synchronize: true, // auto-create tables (disable in prod)
   logging: false,
   entities: [
     User,
@@ -105,6 +110,11 @@ export const AppDataSource = new DataSource({
     MessageReadStatus,
     ShiftDetails,
     AttendanceDetails,
-    UserShift
+    UserShift,
+    Holidays,
+    UserRole,
+    RoleRights,
+    PortalFeedback,
+    Notification
   ],
 });

package/src/index.ts

@@ -42,16 +42,8 @@ export * from './models/ShifttimesModel';
 export * from './models/AttendanceModel';
 export * from './models/contactInfoModel';
 export * from './models/UserShiftModel';
-export * from './models/FinancialRequestsModel';
-export * from './models/PayslipRequestsModel';
-export * from './models/SalaryCertificateRequestsModel';
-export * from './models/AllowanceRequestsModel';
-export * from './models/ReimbursementRequestsModel';
-export * from './models/BankAccountChangeRequestsModel';
-export * from './models/FinancialChatsModel';
-export * from './models/FinancialApprovalsModel';
-export * from './models/FinancialWorkFlowModel';
-export * from './models/FinancialAttachmentsModel';
-export * from './models/RequestTypeMasterModel';
-export * from './models/FinancialSettingsModel';
-export * from './models/AllowanceTypesModel';
+export * from './models/HolidaysModel';
+export * from './models/userRolesModel';
+export * from './models/roleRightsModel';
+export * from './models/PortalFeedbackModel';
+export * from './models/NotificationModel';

package/src/models/FMServices.ts

@@ -14,7 +14,7 @@ export class FMServices extends BaseModel {
     @Column({ nullable: false })
     description: string;
 
-    @Column({ nullable: false })
+    @Column({ nullable: true })
     logo_url: string;
 
     constructor(     

package/src/models/FinancialApprovalsModel.ts

@@ -32,6 +32,15 @@ export class FinancialApprovals extends BaseModel {
   @Column({ type: 'timestamp', nullable: true })
   action_date: Date;
 
+  @Column({ type: 'int', nullable: true })
+  department_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  section_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  approved_by: number;
+
   @ManyToOne(() => FinancialRequests, fr => fr.approvals)
   @JoinColumn({ name: 'financial_request_id' })
   financialRequest?: FinancialRequests;
@@ -40,13 +49,19 @@ export class FinancialApprovals extends BaseModel {
     financial_request_id: number,
     level: number,
     approver_role_id: number,
-    approval_status: FinancialApprovalStatus
+    approval_status: FinancialApprovalStatus,
+    department_id: number,
+    section_id: number,
+    approved_by: number
   ) {
     super();
     this.financial_request_id = financial_request_id;
     this.level = level;
     this.approver_role_id = approver_role_id;
     this.approval_status = approval_status;
+    this.department_id = department_id;
+    this.section_id = section_id;
+    this.approved_by = approved_by;
   }
 }
 

package/src/models/FinancialRequestsModel.ts

@@ -71,6 +71,18 @@ export class FinancialRequests extends BaseModel {
   @Column({ type: 'int', nullable: true })
   current_approver_id: number;
 
+  @Column({ type: 'int', nullable: true })
+  service_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  sub_service_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  section_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  reporting_manager: number;
+
   @OneToOne('PayslipRequests', 'financialRequest', { nullable: true })
   payslipRequest?: PayslipRequests;
 
@@ -108,7 +120,11 @@ export class FinancialRequests extends BaseModel {
     employee_name: string,
     email_address: string,
     contact_number: string,
-    request_type_id: number
+    request_type_id: number,
+    service_id: number,
+    sub_service_id: number,
+    section_id: number,
+    reporting_manager: number
   ) {
     super();
     this.user_id = user_id;
@@ -119,6 +135,10 @@ export class FinancialRequests extends BaseModel {
     this.request_type_id = request_type_id;
     this.request_date = new Date();
     this.request_status = FinancialRequestStatus.PENDING;
+    this.service_id = service_id;
+    this.sub_service_id = sub_service_id;
+    this.section_id = section_id;
+    this.reporting_manager = reporting_manager;
   }
 }
 

package/src/models/HolidaysModel.ts

@@ -0,0 +1,46 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'holidays' })
+export class Holidays extends BaseModel {
+
+  @Column({ type: 'varchar', length: 200 })
+  title: string;
+
+  @Column({ type: 'date', name: 'holiday_date' })
+  holiday_date: Date;
+
+  @Column({ type: 'text', nullable: true })
+  description?: string;
+
+  @Column({ type: 'varchar', length: 200, nullable: true })
+  region?: string;
+
+  @Column({ type: 'boolean', name: 'is_optional', default: false })
+  is_optional: boolean;
+
+  @Column({ type: 'varchar', length: 30, name: 'holiday_type', default: 'Public' })
+  holiday_type: string;
+
+  @Column({ type: 'int', nullable: true })
+  year?: number;
+
+  constructor(
+    title: string,
+    holiday_date: Date,
+    description?: string,
+    region?: string,
+    is_optional: boolean = false,
+    holiday_type: string = 'Public',
+    year?: number
+  ) {
+    super();
+    this.title = title;
+    this.holiday_date = holiday_date;
+    this.description = description;
+    this.region = region;
+    this.is_optional = is_optional;
+    this.holiday_type = holiday_type;
+    this.year = year;
+  }
+}

package/src/models/NotificationModel.ts

@@ -0,0 +1,68 @@
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum NotificationType {
+    REQUEST_RAISED = 'request raised',
+    REMINDER = 'reminder',
+    IMPORT = 'import',
+}
+
+@Entity({ name: 'notification' })
+export class Notification extends BaseModel {
+
+    @Column({
+        type: "enum",
+        enum: NotificationType,
+        nullable: false,
+    })
+    type: NotificationType;
+
+    @Column({ type: 'bigint', nullable: false })
+    user_id: number;
+
+    @Column({ type: 'bigint', nullable: true })
+    role_id: number;
+
+    @Column({ type: 'bigint', nullable: true })
+    department_id: number;
+
+    @Column({ type: 'bigint', nullable: true })
+    section_id: number;
+
+    @Column({ type: 'jsonb', nullable: true })
+    content: any;
+
+    @Column({ type: 'boolean', default: false })
+    is_read: boolean;
+
+    @Column({ type: 'bigint', nullable: true })
+    request_id: number;
+
+    @Column({ type: 'varchar', length: 500, nullable: true })
+    route_path: string;
+
+    constructor(
+        type: NotificationType,
+        user_id: number,
+        role_id: number,
+        department_id: number,
+        section_id: number,
+        content: any,
+        is_read: boolean,
+        request_id: number,
+        route_path: string
+    ) {
+        super();
+        this.type = type;
+        this.user_id = user_id;
+        this.role_id = role_id;
+        this.department_id = department_id;
+        this.section_id = section_id;
+        this.content = content;
+        this.is_read = is_read;
+        this.request_id = request_id;
+        this.route_path = route_path;
+    }
+}
+

package/src/models/PortalFeedbackModel.ts

@@ -0,0 +1,33 @@
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { Rating } from './feedbackModel';
+
+@Entity({ name: 'portal_feedback' })
+export class PortalFeedback extends BaseModel {
+
+    @Column({ nullable: true })
+    comment: string;
+
+    @Column({
+        type: "enum",
+        enum: Rating,
+        nullable: true,
+    })
+    rating: Rating;
+
+    @Column({ nullable: true })
+    user_Id: number;
+
+    constructor(
+        comment: string,
+        rating: Rating,
+        user_Id: number,
+    ) {
+        super();
+        this.comment = comment,
+        this.rating = rating,
+        this.user_Id = user_Id
+    }
+}
+

package/src/models/role.ts

@@ -12,12 +12,6 @@ Userrole Information will store
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 
-export interface Irole {
-    name: string;   
-    id?: number;
-    is_deleted?: boolean;
-    created_by?: number;
-}
 @Entity({ name: 'role' })
 export class Role extends BaseModel {
 
@@ -28,7 +22,7 @@ export class Role extends BaseModel {
     is_deleted?: boolean;  
 
 
-    constructor(name: string,is_deleted:boolean,userId: number) {
+    constructor(name: string, is_deleted:boolean) {
         super();
         this.name = name
         this.is_deleted = is_deleted

package/src/models/roleRightsModel.ts

@@ -0,0 +1,31 @@
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model 
+Role
+@usage
+Userrole Information will store 
+*/
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+
+@Entity({ name: 'role_rights' })
+export class RoleRights extends BaseModel {
+
+    @Column({ type: 'bigint', nullable: true })
+    user_role_id: number;
+
+    @Column({ type: 'bigint', nullable: false })
+    service_id: number;
+
+
+    constructor(user_role_id: number, service_id: number) {
+        super();
+        this.user_role_id = user_role_id
+        this.service_id = service_id
+    }
+}

package/src/models/user.ts

@@ -106,6 +106,19 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     qualification?: string;
 
+    
+    @Column({ nullable: true })
+    father_name?: string;
+
+    @Column({ nullable: true })
+    spouse_name?: string;
+    
+    @Column({ nullable: true })
+    children1_name?: string;
+ 
+    @Column({ nullable: true })
+    children2_name?: string;
+
     constructor(     
         employee_id?: number,
         employee_name?: string,
@@ -141,6 +154,10 @@ export class User extends BaseModel {
         diplomatic_name?: string,
         civil_employee_id?: number,
         qualification?: string,
+        father_name?: string,
+        spouse_name?: string,
+        children1_name?: string,
+        children2_name?: string,
     ) {
         super();     
         this.employee_id = employee_id;
@@ -177,5 +194,9 @@ export class User extends BaseModel {
         this.diplomatic_name = diplomatic_name;
         this.civil_employee_id = civil_employee_id;
         this.qualification = qualification;
+        this.father_name = father_name;
+        this.spouse_name = spouse_name;
+        this.children1_name = children1_name;
+        this.children2_name = children2_name;
     }
 }

package/src/models/userRolesModel.ts

@@ -0,0 +1,42 @@
+/** *
+@author
+Amnet Digital
+@date
+2024-05-20
+@Model 
+Role
+@usage
+Userrole Information will store 
+*/
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+
+@Entity({ name: 'user_role' })
+export class UserRole extends BaseModel {
+
+    @Column({ type: 'bigint', nullable: false })
+    role_id: number;
+
+    @Column({ type: 'bigint', nullable: false })
+    user_id: number;
+
+    @Column({ type: 'bigint', nullable: true })
+    department_id: number;
+
+    @Column({ type: 'bigint', nullable: true })
+    section_id: number;
+
+    @Column({ type: 'boolean', default: false })
+    is_active: boolean;
+
+    constructor(role_id: number, user_id: number, department_id: number, section_id: number, is_active: boolean = false) {
+        super();
+        this.role_id = role_id
+        this.user_id = user_id
+        this.department_id = department_id
+        this.section_id = section_id
+        this.is_active = is_active
+    }
+}