@platform-modules/civil-aviation-authority 2.3.290 → 2.3.292

package/dist/models/FollowUpReportItemModel.js

@@ -0,0 +1,74 @@
+"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.FollowUpReportItem = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+const FollowUpReportRequestModel_1 = require("./FollowUpReportRequestModel");
+let FollowUpReportItem = class FollowUpReportItem extends BaseModel_1.BaseModel {
+};
+exports.FollowUpReportItem = FollowUpReportItem;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], FollowUpReportItem.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "reference_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "letter_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "subject", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: 'enum',
+        enum: FollowUpReportRequestModel_1.FollowUpReportSubjectClassification,
+        enumName: 'maintenance_subject_classification_en',
+        nullable: true,
+    }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "subject_classification", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "general_manager_comment", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "response_date_target", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "action_status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "action_taken", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportItem.prototype, "delay_period", void 0);
+exports.FollowUpReportItem = FollowUpReportItem = __decorate([
+    (0, typeorm_1.Entity)({ name: 'followup_report_items' })
+], FollowUpReportItem);

package/dist/models/FollowUpReportRequestModel.d.ts

@@ -36,6 +36,11 @@ export declare class FollowUpReportRequests extends BaseModel {
     concerned_department: FollowUpReportConcernedDepartment;
     date_from: Date;
     date_to: Date;
+    general_manager_comment: string | null;
+    response_date_target: string | null;
+    action_status: string | null;
+    action_taken: string | null;
+    delay_period: string | null;
     request_submission_date: Date;
     status: FollowUpReportRequestStatus;
     workflow_execution_id: string | null;

package/dist/models/FollowUpReportRequestModel.js

@@ -103,6 +103,26 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'date', nullable: false }),
     __metadata("design:type", Date)
 ], FollowUpReportRequests.prototype, "date_to", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportRequests.prototype, "general_manager_comment", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportRequests.prototype, "response_date_target", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportRequests.prototype, "action_status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportRequests.prototype, "action_taken", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], FollowUpReportRequests.prototype, "delay_period", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'date', nullable: false, default: () => 'CURRENT_DATE' }),
     __metadata("design:type", Date)

package/dist/models/MaintenanceRequestModel.d.ts

@@ -3,7 +3,9 @@ export declare enum AssetMaintenanceCategory {
     BUILDING = "Building",
     EQUIPMENT = "Equipment",
     RESIDENTIAL = "Residential",
-    STATION = "Station"
+    STATION = "Station",
+    PLOT_OF_LAND = "Plot of land",
+    OTHER = "Other"
 }
 export declare enum AssetMaintenanceSubCategory {
     ELECTRICAL = "Electrical",

package/dist/models/MaintenanceRequestModel.js

@@ -18,6 +18,8 @@ var AssetMaintenanceCategory;
     AssetMaintenanceCategory["EQUIPMENT"] = "Equipment";
     AssetMaintenanceCategory["RESIDENTIAL"] = "Residential";
     AssetMaintenanceCategory["STATION"] = "Station";
+    AssetMaintenanceCategory["PLOT_OF_LAND"] = "Plot of land";
+    AssetMaintenanceCategory["OTHER"] = "Other";
 })(AssetMaintenanceCategory || (exports.MaintenanceCategory = exports.AssetMaintenanceCategory = AssetMaintenanceCategory = {}));
 var AssetMaintenanceSubCategory;
 (function (AssetMaintenanceSubCategory) {

package/dist/models/RequestATenderRequestModel.d.ts

@@ -18,6 +18,8 @@ export declare class RequestATenderRequest extends BaseModel {
     scope_of_work: string;
     type_of_request: RequestATenderType;
     date_of_submission: Date;
+    date: Date | null;
+    time: string | null;
     phone: string;
     budget_code: string | null;
     estimated_cost: string;

package/dist/models/RequestATenderRequestModel.js

@@ -69,6 +69,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: "date", nullable: false }),
     __metadata("design:type", Date)
 ], RequestATenderRequest.prototype, "date_of_submission", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "date", nullable: true }),
+    __metadata("design:type", Object)
+], RequestATenderRequest.prototype, "date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 8, nullable: true }),
+    __metadata("design:type", Object)
+], RequestATenderRequest.prototype, "time", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 30, nullable: false }),
     __metadata("design:type", String)

package/dist/models/ResidentialUnitRentalRequestModel.d.ts

@@ -19,7 +19,7 @@ export declare class ResidentialUnitRentalRequest extends BaseModel {
         three_room?: boolean;
     };
     extension_number: string;
-    preferred_start_date: Date;
+    preferred_start_date: Date | null;
     family_size: number;
     phone_number: string;
     location_of_unit: string;

package/dist/models/ResidentialUnitRentalRequestModel.js

@@ -54,8 +54,8 @@ __decorate([
     __metadata("design:type", String)
 ], ResidentialUnitRentalRequest.prototype, "extension_number", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
-    __metadata("design:type", Date)
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
 ], ResidentialUnitRentalRequest.prototype, "preferred_start_date", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: false }),

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
-  "version": "2.3.290",
+  "version": "2.3.292",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
   "scripts": {

package/sql/add_all_workflow_chat_arabic_columns.sql

@@ -1 +1 @@
--- Auto-generated: Arabic columns for all CAA workflow/chat tables
+-- Auto-generated: Arabic columns for all CAA workflow/chat tables

package/sql/caa_api_payload_changes_2026_07.sql

@@ -0,0 +1,32 @@
+-- CAA API payload changes (Jul 2026)
+-- Run after deploying updated shared_models and services.
+
+-- 1. Maintenance: add category enum values
+ALTER TYPE asset_maintenance_category_en ADD VALUE IF NOT EXISTS 'Plot of land';
+ALTER TYPE asset_maintenance_category_en ADD VALUE IF NOT EXISTS 'Other';
+
+-- 2. Residential unit rental: preferred_start_date optional
+ALTER TABLE residential_unit_rental_requests
+  ALTER COLUMN preferred_start_date DROP NOT NULL;
+
+-- 3. Appeal against administrative decision: optional / removed payload fields
+ALTER TABLE appeal_against_administrative_decision_requests
+  ALTER COLUMN description DROP NOT NULL,
+  ALTER COLUMN grievance_details DROP NOT NULL,
+  ALTER COLUMN decision_date DROP NOT NULL,
+  ALTER COLUMN grievant_name DROP NOT NULL;
+
+-- 4. Cyber security audit: date and time fields
+ALTER TABLE cyber_security_audit_requests
+  ADD COLUMN IF NOT EXISTS date DATE,
+  ADD COLUMN IF NOT EXISTS time VARCHAR(8);
+
+-- 5. Request a tender: date and time fields
+ALTER TABLE request_a_tender_requests
+  ADD COLUMN IF NOT EXISTS date DATE,
+  ADD COLUMN IF NOT EXISTS time VARCHAR(8);
+
+-- 6. Cyber security risk management risks: treatment and action fields
+ALTER TABLE cyber_security_risk_management_risks
+  ADD COLUMN IF NOT EXISTS treatment TEXT,
+  ADD COLUMN IF NOT EXISTS action TEXT;

package/src/data-source.ts

@@ -234,6 +234,7 @@ import { MaintenanceExternalStationsAttachment } from './models/MaintenanceExter
 import { MaintenanceExternalStationsChat } from './models/MaintenanceExternalStationsChatModel';
 import { MaintenanceExternalStationsWorkFlow } from './models/MaintenanceExternalStationsWorkflowModel';
 import { FollowUpReportRequests } from './models/FollowUpReportRequestModel';
+import { FollowUpReportItem } from './models/FollowUpReportItemModel';
 import { FollowUpReportApprovalDetails } from './models/FollowUpReportApprovalModel';
 import { FollowUpReportAttachment } from './models/FollowUpReportAttachmentModel';
 import { FollowUpReportChat } from './models/FollowUpReportChatModel';
@@ -557,6 +558,7 @@ export const AppDataSource = new DataSource({
     MaintenanceExternalStationsChat,
     MaintenanceExternalStationsWorkFlow,
     FollowUpReportRequests,
+    FollowUpReportItem,
     FollowUpReportApprovalDetails,
     FollowUpReportAttachment,
     FollowUpReportChat,

package/src/i18n/workflow-chat-i18n.json

@@ -18,7 +18,7 @@
     },
     "request_approval_pending": {
       "en": "Request Approval Pending",
-      "ar": "في انتظار الموافقة على الطلب"
+      "ar": "الموافقة على الطلب قيد الانتظار"
     },
     "request_approval_in_progress_from": {
       "en": "Request Approval In Progress from {{name}}",
@@ -26,7 +26,7 @@
     },
     "request_approval_pending_from": {
       "en": "Request Approval Pending from {{name}}",
-      "ar": "في انتظار موافقة {{name}}"
+      "ar": "الموافقة على الطلب قيد الانتظار من {{name}}"
     },
     "request_approved_by": {
       "en": "Request Approved by {{name}}{{comment}}",
@@ -46,11 +46,11 @@
     },
     "request_returned_for_modification_by": {
       "en": "Request Returned for Modification by {{name}}{{comment}}",
-      "ar": "تم إرجاع الطلب للتعديل من قبل {{name}}{{comment}}"
+      "ar": "تمت إعادة الطلب للتعديل من قبل {{name}}{{comment}}"
     },
     "request_returned_for_modification": {
       "en": "Request Returned for Modification{{comment}}",
-      "ar": "تم إرجاع الطلب للتعديل{{comment}}"
+      "ar": "تمت إعادة الطلب للتعديل{{comment}}"
     },
     "request_closed_by": {
       "en": "Request Closed by: {{name}}{{comment}}",
@@ -62,47 +62,47 @@
     },
     "it_helpdesk_wf_hos_assigned": {
       "en": "{{approverRoleName}} assigned the request to {{assignedRoleName}}{{comment}}",
-      "ar": "قام {{approverRoleName}} بتعيين الطلب إلى {{assignedRoleName}}{{comment}}"
+      "ar": "تم تعيين الطلب إلى {{assignedRoleName}} من قبل {{approverRoleName}}{{comment}}"
     },
     "it_helpdesk_wf_technician_assigned": {
       "en": "IT technician {{level}} assigned by {{approverRoleName}}{{comment}}",
-      "ar": "تم تعيين فني IT {{level}} بواسطة {{approverRoleName}}{{comment}}"
+      "ar": "تم تعيين فني تقنية المعلومات {{level}} من قبل {{approverRoleName}}{{comment}}"
     },
     "it_helpdesk_wf_reassigned_technician": {
       "en": "{{approverRoleName}} reassigned request to Technician{{comment}}{{modifiers}}",
-      "ar": "أعاد {{approverRoleName}} تعيين الطلب إلى الفني{{comment}}{{modifiers}}"
+      "ar": "{{approverRoleName}} تمت إعادة تعيين الطلب إلى الفني{{comment}}{{modifiers}}"
     },
     "it_helpdesk_wf_reassigned_l3": {
       "en": "{{approverRoleName}} reassigned request to L3{{comment}}{{modifiers}}",
-      "ar": "أعاد {{approverRoleName}} تعيين الطلب إلى L3{{comment}}{{modifiers}}"
+      "ar": "{{approverRoleName}} تمت إعادة تعيين الطلب إلى المستوى الثالث (L3){{comment}}{{modifiers}}"
     },
     "it_helpdesk_wf_reassigned_generic": {
       "en": "{{approverRoleName}} {{level}} reassigned{{comment}}{{modifiers}}",
-      "ar": "أعاد {{approverRoleName}} {{level}} التعيين{{comment}}{{modifiers}}"
+      "ar": "{{approverRoleName}} {{level}} إعادة التعيين{{comment}}{{modifiers}}"
     },
     "it_helpdesk_wf_closed_request": {
       "en": "{{approverRoleName}} closed request{{comment}}",
-      "ar": "أغلق {{approverRoleName}} الطلب{{comment}}"
+      "ar": "تم إغلاق الطلب من قبل {{approverRoleName}}{{comment}}"
     },
     "it_helpdesk_wf_closed_request_cap": {
       "en": "{{approverRoleName}} Closed request{{comment}}",
-      "ar": "أغلق {{approverRoleName}} الطلب{{comment}}"
+      "ar": "تم إغلاق الطلب من قبل {{approverRoleName}}{{comment}}"
     },
     "it_helpdesk_wf_l3_approved_by": {
       "en": "{{roleName}} approved the request by {{userName}}{{comment}}",
-      "ar": "وافق {{roleName}} على الطلب من قبل {{userName}}{{comment}}"
+      "ar": "{{roleName}} تمت الموافقة على الطلب من قبل {{userName}}{{comment}}"
     },
     "it_helpdesk_wf_l3_rejected_by": {
       "en": "{{roleName}} rejected the request by {{userName}}{{comment}}",
-      "ar": "رفض {{roleName}} على الطلب من قبل {{userName}}{{comment}}"
+      "ar": "{{roleName}} تم رفض الطلب من قبل {{userName}}{{comment}}"
     },
     "it_helpdesk_wf_level_approved": {
       "en": "Level {{level}} approved by {{approverRoleName}}{{comment}}",
-      "ar": "تمت الموافقة على المستوى {{level}} من قبل {{approverRoleName}}{{comment}}"
+      "ar": "تمت الموافقة من قبل {{approverRoleName}} للمستوى {{level}}{{comment}}"
     },
     "it_helpdesk_wf_rejected": {
       "en": "{{approverRoleName}} rejected the request{{comment}}",
-      "ar": "رفض {{approverRoleName}} الطلب{{comment}}"
+      "ar": "{{approverRoleName}} تم رفض الطلب{{comment}}"
     },
     "it_helpdesk_wf_status_by_role": {
       "en": "Request {{status}} by {{approverRoleName}}{{comment}}",
@@ -110,29 +110,29 @@
     },
     "it_helpdesk_wf_l3_step_rejected": {
       "en": "{{roleName}} rejected the request{{comment}}",
-      "ar": "رفض {{roleName}} الطلب{{comment}}"
+      "ar": "{{roleName}} تم رفض الطلب{{comment}}"
     },
     "it_helpdesk_wf_technician_completed": {
       "en": "Technician action completed - request closed by {{roleName}}{{comment}}",
-      "ar": "اكتمل إجراء الفني - تم إغلاق الطلب بواسطة {{roleName}}{{comment}}"
+      "ar": "تم استكمال إجراء الفني - تم إغلاق الطلب من قبل {{roleName}}{{comment}}"
     },
     "it_helpdesk_wf_routing_rejected": {
       "en": "Workflow routing completed - request rejected at L3{{comment}}",
-      "ar": "اكتمل توجيه سير العمل - تم رفض الطلب في L3{{comment}}"
+      "ar": "تم استكمال مسار سير العمل - تم رفض الطلب في المستوى الثالث (L3){{comment}}"
     },
     "it_helpdesk_wf_routing_resolved": {
       "en": "Workflow routing completed - request resolved at L3",
-      "ar": "اكتمل توجيه سير العمل - تم حل الطلب في L3"
+      "ar": "تم استكمال مسار سير العمل - تم حل الطلب في المستوى الثالث (L3)"
     }
   },
   "chatTemplates": {
     "request_submitted_by": {
       "en": "Request Submitted by {{userName}} ({{employeeId}})",
-      "ar": "تم تقديم الطلب بواسطة {{userName}} ({{employeeId}})"
+      "ar": "تم تقديم الطلب من قبل {{userName}} ({{employeeId}})"
     },
     "cancellation_submitted_by": {
       "en": "Cancellation request submitted by {{userName}} ({{employeeId}})",
-      "ar": "تم تقديم طلب الإلغاء بواسطة {{userName}} ({{employeeId}})"
+      "ar": "تم تقديم طلب الإلغاء من قبل {{userName}} ({{employeeId}})"
     },
     "cancellation_submitted": {
       "en": "Cancellation request submitted",
@@ -142,6 +142,10 @@
       "en": "Request Received",
       "ar": "تم استلام الطلب"
     },
+    "request_assigned_by_role": {
+      "en": "Request assigned by {{roleName}}{{comment}}",
+      "ar": "تم تعيين الطلب من قبل {{roleName}}{{comment}}"
+    },
     "request_approved_by_role": {
       "en": "Request Approved by: {{roleName}}{{comment}}",
       "ar": "تمت الموافقة على الطلب من قبل: {{roleName}}{{comment}}"
@@ -152,7 +156,7 @@
     },
     "request_returned_for_modification_by_role": {
       "en": "Request Returned for Modification by: {{roleName}}{{comment}}",
-      "ar": "تم إرجاع الطلب للتعديل من قبل: {{roleName}}{{comment}}"
+      "ar": "تمت إعادة الطلب للتعديل من قبل: {{roleName}}{{comment}}"
     },
     "request_approved": {
       "en": "Request Approved{{comment}}",
@@ -164,7 +168,7 @@
     },
     "request_returned_for_modification": {
       "en": "Request Returned for Modification{{comment}}",
-      "ar": "تم إرجاع الطلب للتعديل{{comment}}"
+      "ar": "تمت إعادة الطلب للتعديل{{comment}}"
     },
     "request_closed_by_role": {
       "en": "Request Closed by: {{roleName}}{{comment}}",
@@ -172,11 +176,11 @@
     },
     "request_for_change_by_role": {
       "en": "Request For Change by: {{roleName}}{{comment}}",
-      "ar": "طلب تعديل من قبل: {{roleName}}{{comment}}"
+      "ar": "طلب تغيير من قبل: {{roleName}}{{comment}}"
     },
     "request_for_change_requested_by_role": {
       "en": "Request For Change requested by: {{roleName}}{{comment}}",
-      "ar": "تم طلب التعديل من قبل: {{roleName}}{{comment}}"
+      "ar": "تم طلب التغيير من قبل: {{roleName}}{{comment}}"
     },
     "attachment_uploaded": {
       "en": "Attachment uploaded: {{fileName}}",
@@ -188,11 +192,11 @@
     },
     "task_status_in_progress_by_role": {
       "en": "Task status updated to \"In Progress\" by: {{roleName}}",
-      "ar": "تم تحديث حالة المهمة إلى \"قيد التنفيذ\" بواسطة: {{roleName}}"
+      "ar": "تم تحديث حالة المهمة إلى \"قيد التنفيذ\" من قبل: {{roleName}}"
     },
     "task_completed_by_role": {
       "en": "Task Completed by: {{roleName}}{{comment}}",
-      "ar": "تم إكمال المهمة بواسطة: {{roleName}}{{comment}}"
+      "ar": "اكتملت المهمة من قبل: {{roleName}}{{comment}}"
     },
     "task_status_updated": {
       "en": "Task status updated to {{status}}",
@@ -204,23 +208,23 @@
     },
     "it_helpdesk_technician_assigned": {
       "en": "IT technician {{level}} assigned to {{assignedRoleName}}: {{assignedUserName}}{{comment}}",
-      "ar": "تم تعيين فني IT {{level}} إلى {{assignedRoleName}}: {{assignedUserName}}{{comment}}"
+      "ar": "تم تعيين فني تقنية المعلومات {{level}} إلى {{assignedRoleName}}: {{assignedUserName}}{{comment}}"
     },
     "it_helpdesk_reassigned_to_role": {
       "en": "{{approverRoleName}} reassigned request to {{reassignedRoleName}}{{comment}}",
-      "ar": "أعاد {{approverRoleName}} تعيين الطلب إلى {{reassignedRoleName}}{{comment}}"
+      "ar": "{{approverRoleName}} تمت إعادة تعيين الطلب إلى {{reassignedRoleName}}{{comment}}"
     },
     "it_helpdesk_reassigned_to_l3": {
       "en": "{{approverRoleName}} reassigned request to L3{{comment}}",
-      "ar": "أعاد {{approverRoleName}} تعيين الطلب إلى L3{{comment}}"
+      "ar": "{{approverRoleName}} تمت إعادة تعيين الطلب إلى المستوى الثالث (L3){{comment}}"
     },
     "it_helpdesk_reassigned_generic": {
       "en": "{{approverRoleName}} {{level}} reassigned the request{{comment}}",
-      "ar": "أعاد {{approverRoleName}} {{level}} تعيين الطلب{{comment}}"
+      "ar": "{{approverRoleName}} {{level}} تمت إعادة تعيين الطلب{{comment}}"
     },
     "request_submitted_with_ref": {
       "en": "{{requestLabel}} #{{requestId}} has been submitted by {{userName}} ({{employeeId}})",
-      "ar": "تم تقديم {{requestLabel}} رقم {{requestId}} بواسطة {{userName}} ({{employeeId}})"
+      "ar": "تم تقديم {{requestLabel}} رقم {{requestId}} من قبل {{userName}} ({{employeeId}})"
     },
     "security_access_approval_step": {
       "en": "{{productLabel}} request #{{requestId}} was {{statusWord}} (approval step {{approvalLevel}}).{{comment}}",
@@ -228,7 +232,7 @@
     },
     "logistics_actual_return_updated": {
       "en": "{{roleName}} updated the Vehicle Actual Return Date, Time, and Reason. Actual Return Date: {{date}}, Actual Return Time: {{time}}, Reason: {{reason}}",
-      "ar": "قام {{roleName}} بتحديث تاريخ ووقت وسبب الإرجاع الفعلي للمركبة. تاريخ الإرجاع الفعلي: {{date}}، وقت الإرجاع الفعلي: {{time}}، السبب: {{reason}}"
+      "ar": "قام {{roleName}} بتحديث تاريخ الإرجاع الفعلي للمركبة والوقت والسبب. تاريخ الإرجاع الفعلي: {{date}}، وقت الإرجاع الفعلي: {{time}}، السبب: {{reason}}"
     }
   },
   "notificationTemplates": {
@@ -238,11 +242,11 @@
     },
     "it_helpdesk_notif_request_closed": {
       "en": "IT request #{{requestId}} has been closed",
-      "ar": "تم إغلاق طلب IT رقم {{requestId}}"
+      "ar": "تم إغلاق طلب تقنية المعلومات رقم {{requestId}}"
     },
     "it_helpdesk_notif_request_rejected": {
       "en": "IT request #{{requestId}} has been rejected",
-      "ar": "تم رفض طلب IT رقم {{requestId}}"
+      "ar": "تم رفض طلب تقنية المعلومات رقم {{requestId}}"
     }
   },
   "workflowStatusLabels": {
@@ -253,15 +257,15 @@
   "chatStatusLabels": {
     "Submitted": "تم التقديم",
     "Received": "تم الاستلام",
-    "Approved": "موافق عليه",
-    "Rejected": "مرفوض",
+    "Approved": "تم الموافقة",
+    "Rejected": "تم الرفض",
     "Pending": "قيد الانتظار",
-    "Returned for Modification": "أُعيد للتعديل",
-    "Request For Change": "طلب تعديل",
+    "Returned for Modification": "تمت إعادته للتعديل",
+    "Request For Change": "طلب تغيير",
     "Closed": "مغلق",
     "Completed": "مكتمل",
-    "Assigned": "معيّن",
-    "Reassigned": "أعيد التعيين",
+    "Assigned": "تم التعيين",
+    "Reassigned": "تمت إعادة التعيين",
     "In Progress": "قيد التنفيذ",
     "Attachment uploaded": "تم رفع المرفق"
   }

package/src/i18n/workflow-chat-message.builder.ts

@@ -399,6 +399,19 @@ export function toChatPersistFields(
   };
 }
 
+/** User-typed chat — never auto-translate; message_ar stays null. */
+export function buildUserEnteredChatPersistFields(
+  message: string,
+  status: string,
+): { message: string; message_ar: null; status: string; status_ar: string | null } {
+  return {
+    message,
+    message_ar: null,
+    status,
+    status_ar: resolveChatStatusAr(status),
+  };
+}
+
 export function buildApprovalWorkflowContent(params: {
   status: 'Approved' | 'Rejected' | 'Returned for Modification' | 'Pending' | string;
   roleName?: string | null;
@@ -1122,6 +1135,58 @@ function resolveArabicChatRoleName(
   return resolveBilingualName(parsedEnglishRole, actors?.roleArabicName);
 }
 
+function escapeRegexLiteral(value: string): string {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+/** Match a templated EN message and extract placeholder values (full-structure match). */
+function matchTemplateMessage(
+  templateEn: string,
+  message: string,
+): Record<string, string> | null {
+  if (!/\{\{\w+\}\}/.test(templateEn)) return null;
+
+  const placeholders: string[] = [];
+  let regexBody = '';
+  let cursor = 0;
+  const tokenRe = /\{\{(\w+)\}\}/g;
+  let tokenMatch: RegExpExecArray | null;
+
+  while ((tokenMatch = tokenRe.exec(templateEn)) !== null) {
+    regexBody += escapeRegexLiteral(templateEn.slice(cursor, tokenMatch.index));
+    const key = tokenMatch[1];
+    placeholders.push(key);
+    regexBody += key === 'comment' ? '(.*)' : '(.+?)';
+    cursor = tokenMatch.index + tokenMatch[0].length;
+  }
+  regexBody += escapeRegexLiteral(templateEn.slice(cursor));
+
+  const match = message.match(new RegExp(`^${regexBody}$`, 's'));
+  if (!match) return null;
+
+  const params: Record<string, string> = {};
+  placeholders.forEach((key, index) => {
+    params[key] = match[index + 1] ?? '';
+  });
+  return params;
+}
+
+function buildArabicChatTemplateParams(
+  params: Record<string, string>,
+  actors?: BilingualActorNames,
+): Record<string, string> {
+  const arParams: Record<string, string> = { ...params };
+  if (params.roleName !== undefined) {
+    arParams.roleName = resolveArabicChatRoleName(actors, params.roleName.trim());
+  }
+  if (params.userName !== undefined) {
+    arParams.userName = actors?.userName?.trim()
+      ? resolveBilingualName(actors.userName, actors.userArabicName)
+      : resolveBilingualName(params.userName.trim(), actors?.userArabicName);
+  }
+  return arParams;
+}
+
 export function resolveWorkflowContentAr(
   content: string | null | undefined,
   actors?: BilingualActorNames,
@@ -1182,38 +1247,24 @@ export function resolveChatMessageAr(
     if (tpl.en === normalized) return tpl.ar;
   }
 
-  for (const tplKey of ['request_submitted_by', 'cancellation_submitted_by'] as const) {
-    const submittedTpl = CHAT_TEMPLATES[tplKey];
-    if (!submittedTpl) continue;
-    const prefix = submittedTpl.en.split('{{userName}}')[0];
-    if (!normalized.startsWith(prefix)) continue;
-    const afterPrefix = normalized.slice(prefix.length);
-    const parenMatch = afterPrefix.match(/^(.+?) \((.+)\)$/);
-    if (parenMatch) {
-      const userEn = parenMatch[1].trim();
-      const employeeId = parenMatch[2].trim();
-      const userAr = actors?.userName?.trim()
-        ? resolveBilingualName(actors.userName, actors.userArabicName)
-        : resolveBilingualName(userEn, actors?.userArabicName);
-      return interpolate(submittedTpl.ar, { userName: userAr, employeeId });
-    }
-  }
-
   for (const tpl of Object.values(CHAT_TEMPLATES)) {
-    if (!tpl.en.includes('{{roleName}}')) continue;
-    const prefix = tpl.en.split('{{roleName}}')[0];
-    if (!normalized.startsWith(prefix)) continue;
-    const rest = normalized.slice(prefix.length);
-    const commentIdx = rest.lastIndexOf(' - ');
-    const roleNameEn = commentIdx >= 0 ? rest.slice(0, commentIdx) : rest;
-    const commentSuffix = commentIdx >= 0 ? rest.slice(commentIdx) : '';
-    const roleNameAr = resolveArabicChatRoleName(actors, roleNameEn.trim());
-    return interpolate(tpl.ar, { roleName: roleNameAr, comment: commentSuffix });
+    if (!/\{\{\w+\}\}/.test(tpl.en)) continue;
+    const params = matchTemplateMessage(tpl.en, normalized);
+    if (!params) continue;
+    return interpolate(tpl.ar, buildArabicChatTemplateParams(params, actors));
   }
 
   return null;
 }
 
+/** True when message matches a known system chat template (safe to resolve message_ar). */
+export function isSystemGeneratedChatMessage(
+  message: string | null | undefined,
+  actors?: BilingualActorNames,
+): boolean {
+  return resolveChatMessageAr(message, actors) != null;
+}
+
 /** Generic workflow log enricher — use in all module repositories. */
 export function enrichWorkflowLog(log: Record<string, unknown>): Record<string, unknown> {
   const status = log.status != null ? String(log.status) : null;

package/src/index.ts

@@ -425,6 +425,7 @@ export * from './models/MaintenanceAttachmentModel';
 export * from './models/MaintenanceChatModel';
 export * from './models/MaintenanceWorkflowModel';
 export * from './models/FollowUpReportRequestModel';
+export * from './models/FollowUpReportItemModel';
 export * from './models/FollowUpReportApprovalModel';
 export * from './models/FollowUpReportAttachmentModel';
 export * from './models/FollowUpReportChatModel';