@platform-modules/foreign-ministry 1.1.61 → 1.1.63

package/dist/models/FinancialApprovalsModel.d.ts

@@ -19,6 +19,7 @@ export declare class FinancialApprovals extends BaseModel {
     section_id: number | null;
     approved_by: number | null;
     delegate_user_id: number | null;
+    is_allowed: boolean | null;
     financialRequest?: FinancialRequests;
     constructor(financial_request_id: number, level: number, approver_role_id: number, approval_status: FinancialApprovalStatus, department_id: number | null, section_id: number | null, approved_by: number | null, delegate_user_id: number | null);
 }

package/dist/models/FinancialApprovalsModel.js

@@ -79,6 +79,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Object)
 ], FinancialApprovals.prototype, "delegate_user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', nullable: true }),
+    __metadata("design:type", Object)
+], FinancialApprovals.prototype, "is_allowed", void 0);
 __decorate([
     (0, typeorm_1.ManyToOne)(() => FinancialRequestsModel_1.FinancialRequests, fr => fr.approvals),
     (0, typeorm_1.JoinColumn)({ name: 'financial_request_id' }),

package/dist/models/GeneralServiceApprovalsModel.d.ts

@@ -4,7 +4,8 @@ export declare enum GeneralServiceApprovalStatus {
     APPROVED = "Approved",
     REJECTED = "Rejected",
     SKIPPED = "Skipped",
-    IN_PROGRESS = "In Progress"
+    IN_PROGRESS = "In Progress",
+    ASSIGNED = "Assigned"
 }
 export declare class GeneralServiceApprovals extends BaseModel {
     request_id: number;
@@ -23,5 +24,7 @@ export declare class GeneralServiceApprovals extends BaseModel {
     transfer_from_user_id: number | null;
     transfer_to_user_id: number | null;
     delegate_user_id: number | null;
+    action_type: string | null;
+    is_allowed: boolean | null;
     constructor(request_id: number, level: number, approver_role_id: number, approval_status: GeneralServiceApprovalStatus, department_id: number | null, section_id: number | null, approved_by: number | null, service_id?: number | null, sub_service_id?: number | null);
 }

package/dist/models/GeneralServiceApprovalsModel.js

@@ -19,6 +19,7 @@ var GeneralServiceApprovalStatus;
     GeneralServiceApprovalStatus["REJECTED"] = "Rejected";
     GeneralServiceApprovalStatus["SKIPPED"] = "Skipped";
     GeneralServiceApprovalStatus["IN_PROGRESS"] = "In Progress";
+    GeneralServiceApprovalStatus["ASSIGNED"] = "Assigned";
 })(GeneralServiceApprovalStatus || (exports.GeneralServiceApprovalStatus = GeneralServiceApprovalStatus = {}));
 let GeneralServiceApprovals = class GeneralServiceApprovals extends BaseModel_1.BaseModel {
     // @Column({ type: 'timestamp', nullable: true })
@@ -107,6 +108,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Object)
 ], GeneralServiceApprovals.prototype, "delegate_user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], GeneralServiceApprovals.prototype, "action_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', nullable: true }),
+    __metadata("design:type", Object)
+], GeneralServiceApprovals.prototype, "is_allowed", void 0);
 exports.GeneralServiceApprovals = GeneralServiceApprovals = __decorate([
     (0, typeorm_1.Entity)({ name: 'general_service_approvals' }),
     __metadata("design:paramtypes", [Number, Number, Number, String, Object, Object, Object, Object, Object])

package/dist/models/StationeryRequestsModel.d.ts

@@ -4,7 +4,8 @@ export declare enum StationeryRequestStatus {
     ASSIGNED = "Assigned",
     IN_PROGRESS = "In Progress",
     APPROVED = "Approved",
-    REJECTED = "Rejected"
+    REJECTED = "Rejected",
+    COMPLETED = "Completed"
 }
 export declare class StationeryRequests extends BaseModel {
     req_user_department_id: number | null;
@@ -20,4 +21,7 @@ export declare class StationeryRequests extends BaseModel {
     comments: string | null;
     status: StationeryRequestStatus;
     workflow_execution_id: string | null;
+    stock_available: boolean | null;
+    po_number: string | null;
+    stock_available_date: Date | null;
 }

package/dist/models/StationeryRequestsModel.js

@@ -19,6 +19,7 @@ var StationeryRequestStatus;
     StationeryRequestStatus["IN_PROGRESS"] = "In Progress";
     StationeryRequestStatus["APPROVED"] = "Approved";
     StationeryRequestStatus["REJECTED"] = "Rejected";
+    StationeryRequestStatus["COMPLETED"] = "Completed";
 })(StationeryRequestStatus || (exports.StationeryRequestStatus = StationeryRequestStatus = {}));
 let StationeryRequests = class StationeryRequests extends BaseModel_1.BaseModel {
 };
@@ -75,6 +76,18 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
     __metadata("design:type", Object)
 ], StationeryRequests.prototype, "workflow_execution_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false, nullable: true }),
+    __metadata("design:type", Object)
+], StationeryRequests.prototype, "stock_available", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], StationeryRequests.prototype, "po_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], StationeryRequests.prototype, "stock_available_date", void 0);
 exports.StationeryRequests = StationeryRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'stationery_requests' })
 ], StationeryRequests);

package/package.json

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

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', nullable: true })
+  is_allowed: boolean | null;
+
   @ManyToOne(() => FinancialRequests, fr => fr.approvals)
   @JoinColumn({ name: 'financial_request_id' })
   financialRequest?: FinancialRequests;

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/StationeryRequestsModel.ts

@@ -6,9 +6,11 @@ export enum StationeryRequestStatus {
   ASSIGNED = "Assigned",
   IN_PROGRESS = "In Progress",
   APPROVED = "Approved",
-  REJECTED = "Rejected"
+  REJECTED = "Rejected",
+  COMPLETED = "Completed"
 }
 
+
 @Entity({ name: 'stationery_requests' })
 export class StationeryRequests extends BaseModel {
   @Column({ type: 'int', nullable: true })
@@ -49,5 +51,15 @@ export class StationeryRequests extends BaseModel {
 
   @Column({ type: 'varchar', nullable: true })
   workflow_execution_id: string | null;
+
+  // Business logic fields
+  @Column({ type: 'boolean', default: false, nullable: true })
+  stock_available: boolean | null; // Whether stock is available in Stores Office
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  po_number: string | null; // Purchase Order number from Finance
+
+  @Column({ type: 'date', nullable: true })
+  stock_available_date: Date | null; // When stock becomes available
 }