@platform-modules/foreign-ministry 1.0.76 → 1.0.77

package/dist/models/FinancialApprovalsModel.d.ts

@@ -10,11 +10,8 @@ export declare class FinancialApprovals extends BaseModel {
     level: number;
     approver_user_id: number;
     approver_role_id: number;
-    approver_name: string;
     comment: string;
     approval_status: FinancialApprovalStatus;
     action_date: Date;
-    sla_days: number;
-    is_overdue: boolean;
     constructor(financial_request_id: number, level: number, approver_role_id: number, approval_status: FinancialApprovalStatus);
 }

package/dist/models/FinancialApprovalsModel.js

@@ -26,7 +26,6 @@ let FinancialApprovals = class FinancialApprovals extends BaseModel_1.BaseModel
         this.level = level;
         this.approver_role_id = approver_role_id;
         this.approval_status = approval_status;
-        this.is_overdue = false;
     }
 };
 exports.FinancialApprovals = FinancialApprovals;
@@ -46,10 +45,6 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'int' }),
     __metadata("design:type", Number)
 ], FinancialApprovals.prototype, "approver_role_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
-    __metadata("design:type", String)
-], FinancialApprovals.prototype, "approver_name", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: true }),
     __metadata("design:type", String)
@@ -59,17 +54,9 @@ __decorate([
     __metadata("design:type", String)
 ], FinancialApprovals.prototype, "approval_status", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'datetime', nullable: true }),
+    (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, "sla_days", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
-    __metadata("design:type", Boolean)
-], FinancialApprovals.prototype, "is_overdue", void 0);
 exports.FinancialApprovals = FinancialApprovals = __decorate([
     (0, typeorm_1.Entity)({ name: 'financial_approvals' }),
     __metadata("design:paramtypes", [Number, Number, Number, String])

package/dist/models/FinancialAttachmentsModel.js

@@ -18,6 +18,7 @@ let FinancialAttachments = class FinancialAttachments extends BaseModel_1.BaseMo
         this.financial_request_id = financial_request_id;
         this.file_url = file_url;
         this.file_name = file_name;
+        this.file_type = 'PDF';
     }
 };
 exports.FinancialAttachments = FinancialAttachments;

package/dist/models/FinancialRequestsModel.js

@@ -74,7 +74,7 @@ __decorate([
     __metadata("design:type", Number)
 ], FinancialRequests.prototype, "request_type_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' }),
+    (0, typeorm_1.Column)({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' }),
     __metadata("design:type", Date)
 ], FinancialRequests.prototype, "request_date", void 0);
 __decorate([
@@ -82,7 +82,7 @@ __decorate([
     __metadata("design:type", String)
 ], FinancialRequests.prototype, "request_status", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'datetime', nullable: true }),
+    (0, typeorm_1.Column)({ type: 'timestamp', nullable: true }),
     __metadata("design:type", Date)
 ], FinancialRequests.prototype, "request_close_date", void 0);
 __decorate([

package/dist/models/FinancialWorkFlowModel.js

@@ -24,10 +24,10 @@ let FinancialWorkFlow = class FinancialWorkFlow extends BaseModel_1.BaseModel {
         super();
         this.financial_request_id = financial_request_id;
         this.status = status;
-        this.financial_approval_id = 0;
-        this.activity_date = new Date();
         this.approved_by_user_id = approved_by_user_id;
         this.content = content;
+        this.financial_approval_id = 0;
+        this.activity_date = new Date();
     }
 };
 exports.FinancialWorkFlow = FinancialWorkFlow;
@@ -48,11 +48,11 @@ __decorate([
     __metadata("design:type", Number)
 ], FinancialWorkFlow.prototype, "approved_by_user_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500 }),
     __metadata("design:type", String)
 ], FinancialWorkFlow.prototype, "content", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' }),
+    (0, typeorm_1.Column)({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' }),
     __metadata("design:type", Date)
 ], FinancialWorkFlow.prototype, "activity_date", void 0);
 exports.FinancialWorkFlow = FinancialWorkFlow = __decorate([

package/dist/models/SalaryCertificateRequestsModel.d.ts

@@ -3,5 +3,10 @@ export declare class SalaryCertificateRequests extends BaseModel {
     financial_request_id: number;
     certificate_purpose: string;
     certificate_url: string;
+    addressee_name: string;
+    addressee_details: string;
+    include_salary_details: boolean;
+    include_allowances: boolean;
+    certificate_language: string;
     constructor(financial_request_id: number, certificate_purpose: string, certificate_url: string);
 }

package/dist/models/SalaryCertificateRequestsModel.js

@@ -18,6 +18,9 @@ let SalaryCertificateRequests = class SalaryCertificateRequests extends BaseMode
         this.financial_request_id = financial_request_id;
         this.certificate_purpose = certificate_purpose;
         this.certificate_url = certificate_url;
+        this.include_salary_details = false;
+        this.include_allowances = false;
+        this.certificate_language = 'English';
     }
 };
 exports.SalaryCertificateRequests = SalaryCertificateRequests;
@@ -33,6 +36,26 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
     __metadata("design:type", String)
 ], SalaryCertificateRequests.prototype, "certificate_url", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", String)
+], SalaryCertificateRequests.prototype, "addressee_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], SalaryCertificateRequests.prototype, "addressee_details", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
+    __metadata("design:type", Boolean)
+], SalaryCertificateRequests.prototype, "include_salary_details", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
+    __metadata("design:type", Boolean)
+], SalaryCertificateRequests.prototype, "include_allowances", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", String)
+], SalaryCertificateRequests.prototype, "certificate_language", void 0);
 exports.SalaryCertificateRequests = SalaryCertificateRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'salary_certificate_requests' }),
     __metadata("design:paramtypes", [Number, String, String])

package/package.json

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

package/src/models/FinancialApprovalsModel.ts

@@ -22,24 +22,15 @@ export class FinancialApprovals extends BaseModel {
   @Column({ type: 'int' })
   approver_role_id: number;
 
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  approver_name: string;
-
   @Column({ type: 'text', nullable: true })
   comment: string;
 
   @Column({ type: 'enum', enum: FinancialApprovalStatus, default: FinancialApprovalStatus.PENDING })
   approval_status: FinancialApprovalStatus;
 
-  @Column({ type: 'datetime', nullable: true })
+  @Column({ type: 'timestamp', nullable: true })
   action_date: Date;
 
-  @Column({ type: 'int', nullable: true })
-  sla_days: number;
-
-  @Column({ type: 'boolean', default: false })
-  is_overdue: boolean;
-
   constructor(
     financial_request_id: number,
     level: number,
@@ -51,7 +42,6 @@ export class FinancialApprovals extends BaseModel {
     this.level = level;
     this.approver_role_id = approver_role_id;
     this.approval_status = approval_status;
-    this.is_overdue = false;
   }
 }
 

package/src/models/FinancialAttachmentsModel.ts

@@ -15,16 +15,16 @@ export class FinancialAttachments extends BaseModel {
   @Column({ type: 'varchar', length: 50, nullable: true })
   file_type: string; // PDF, JPG, PNG, etc.
 
-
   constructor(
     financial_request_id: number,
     file_url: string,
-    file_name: string,
+    file_name: string
   ) {
     super();
     this.financial_request_id = financial_request_id;
     this.file_url = file_url;
     this.file_name = file_name;
+    this.file_type = 'PDF';
   }
 }
 

package/src/models/FinancialChatsModel.ts

@@ -12,7 +12,6 @@ export class FinancialChats extends BaseModel {
   @Column({ type: 'int' })
   sender_user_id: number;
 
-
   constructor(financial_request_id: number, content: string, sender_user_id: number) {
     super();
     this.financial_request_id = financial_request_id;

package/src/models/FinancialRequestsModel.ts

@@ -41,13 +41,13 @@ export class FinancialRequests extends BaseModel {
   @Column({ type: 'int' })
   request_type_id: number;
 
-  @Column({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
+  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
   request_date: Date;
 
   @Column({ type: 'enum', enum: FinancialRequestStatus, default: FinancialRequestStatus.PENDING })
   request_status: FinancialRequestStatus;
 
-  @Column({ type: 'datetime', nullable: true })
+  @Column({ type: 'timestamp', nullable: true })
   request_close_date: Date;
 
   @Column({ type: 'text', nullable: true })

package/src/models/FinancialWorkFlowModel.ts

@@ -16,32 +16,31 @@ export class FinancialWorkFlow extends BaseModel {
   @Column({ type: 'int', nullable: true, default: 0 })
   financial_approval_id: number;
 
-
   @Column({ type: 'enum', enum: FinancialWorkFlowStatus, default: FinancialWorkFlowStatus.NOT_YET_STARTED })
   status: FinancialWorkFlowStatus;
 
   @Column({ type: 'int', nullable: true })
   approved_by_user_id: number;
 
-  @Column({ type: 'int', nullable: true })
+  @Column({ type: 'varchar', length: 500 })
   content: string;
 
-  @Column({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
+  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
   activity_date: Date;
 
   constructor(
     financial_request_id: number,
     status: FinancialWorkFlowStatus,
     approved_by_user_id: number,
-    content: string 
+    content: string
   ) {
     super();
     this.financial_request_id = financial_request_id;
     this.status = status;
-    this.financial_approval_id = 0;
-    this.activity_date = new Date();
     this.approved_by_user_id = approved_by_user_id;
     this.content = content;
+    this.financial_approval_id = 0;
+    this.activity_date = new Date();
   }
 }
 

package/src/models/PayslipRequestsModel.ts

@@ -12,12 +12,9 @@ export class PayslipRequests extends BaseModel {
   @Column({ type: 'int', nullable: true })
   payslip_year: number;
 
-
-
   @Column({ type: 'varchar', length: 500, nullable: true })
   payslip_url: string;
 
-
   constructor(financial_request_id: number, payslip_month: string, payslip_year: number, payslip_url: string) {
     super();
     this.financial_request_id = financial_request_id;

package/src/models/SalaryCertificateRequestsModel.ts

@@ -12,13 +12,29 @@ export class SalaryCertificateRequests extends BaseModel {
   @Column({ type: 'varchar', length: 500, nullable: true })
   certificate_url: string;
 
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  addressee_name: string;
 
+  @Column({ type: 'text', nullable: true })
+  addressee_details: string;
+
+  @Column({ type: 'boolean', default: false })
+  include_salary_details: boolean;
+
+  @Column({ type: 'boolean', default: false })
+  include_allowances: boolean;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  certificate_language: string; // English, Arabic
 
   constructor(financial_request_id: number, certificate_purpose: string, certificate_url: string) {
     super();
     this.financial_request_id = financial_request_id;
     this.certificate_purpose = certificate_purpose;
     this.certificate_url = certificate_url;
+    this.include_salary_details = false;
+    this.include_allowances = false;
+    this.certificate_language = 'English';
   }
 }