@platform-modules/foreign-ministry 1.3.130 → 1.3.131

package/dist/models/GatePassVisitorsModel.d.ts

@@ -1,4 +1,5 @@
 import { BaseModel } from './BaseModel';
+import { GatePassType } from "./GatePassRequestsModel";
 /**
  * Gate Pass Visitors Table
  * Stores visitor information for each gate pass request
@@ -17,6 +18,18 @@ export declare class GatePassVisitors extends BaseModel {
     visitor_mobile_number: string | null;
     visitor_photo_url: string | null;
     visitor_photo_file_name: string | null;
+    date: Date | null;
+    department_id: number | null;
+    office_number: string | null;
+    visiting_department: string | null;
+    person_to_be_interviewed: string | null;
+    vehicle_type_and_color: string | null;
+    plate_number_and_code: string | null;
+    purpose_of_entry: string | null;
+    from_date: Date | null;
+    to_date: Date | null;
+    gate_pass_type: GatePassType | null;
+    visiting_person_in_department: string | null;
     qr_code_url: string | null;
     qr_code_data: string | null;
     gate_pass_generated: boolean;

package/dist/models/GatePassVisitorsModel.js

@@ -85,6 +85,54 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
     __metadata("design:type", Object)
 ], GatePassVisitors.prototype, "visitor_photo_file_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], GatePassVisitors.prototype, "date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], GatePassVisitors.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], GatePassVisitors.prototype, "office_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], GatePassVisitors.prototype, "visiting_department", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], GatePassVisitors.prototype, "person_to_be_interviewed", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], GatePassVisitors.prototype, "vehicle_type_and_color", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], GatePassVisitors.prototype, "plate_number_and_code", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], GatePassVisitors.prototype, "purpose_of_entry", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], GatePassVisitors.prototype, "from_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], GatePassVisitors.prototype, "to_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], GatePassVisitors.prototype, "gate_pass_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], GatePassVisitors.prototype, "visiting_person_in_department", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: true }),
     __metadata("design:type", Object)

package/dist/models/ServicesNotificationConfigsModel.d.ts

@@ -8,7 +8,8 @@ export declare class ServicesNotificationConfigs extends BaseModel {
     section_id: number | null;
     service_id: number;
     sub_service_id: number | null;
+    role_id: number;
     trigger: ServicesNotificationTriggerType;
     is_active: boolean;
-    constructor(department_id: number, section_id: number | null | undefined, service_id: number, sub_service_id?: number | null, trigger?: ServicesNotificationTriggerType, is_active?: boolean);
+    constructor(department_id: number, section_id: number | null | undefined, service_id: number, sub_service_id: number | null | undefined, role_id: number, trigger?: ServicesNotificationTriggerType, is_active?: boolean);
 }

package/dist/models/ServicesNotificationConfigsModel.js

@@ -18,12 +18,13 @@ var ServicesNotificationTriggerType;
     ServicesNotificationTriggerType["EVERY_APPROVAL"] = "every_approval";
 })(ServicesNotificationTriggerType || (exports.ServicesNotificationTriggerType = ServicesNotificationTriggerType = {}));
 let ServicesNotificationConfigs = class ServicesNotificationConfigs extends BaseModel_1.BaseModel {
-    constructor(department_id, section_id = null, service_id, sub_service_id = null, trigger = ServicesNotificationTriggerType.FINAL_APPROVAL, is_active = true) {
+    constructor(department_id, section_id = null, service_id, sub_service_id = null, role_id, trigger = ServicesNotificationTriggerType.FINAL_APPROVAL, is_active = true) {
         super();
         this.department_id = department_id;
         this.section_id = section_id;
         this.service_id = service_id;
         this.sub_service_id = sub_service_id;
+        this.role_id = role_id;
         this.trigger = trigger;
         this.is_active = is_active;
     }
@@ -45,6 +46,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "integer", nullable: true }),
     __metadata("design:type", Object)
 ], ServicesNotificationConfigs.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], ServicesNotificationConfigs.prototype, "role_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: "enum",
@@ -60,5 +65,5 @@ __decorate([
 ], ServicesNotificationConfigs.prototype, "is_active", void 0);
 exports.ServicesNotificationConfigs = ServicesNotificationConfigs = __decorate([
     (0, typeorm_1.Entity)({ name: "services_notification_configs" }),
-    __metadata("design:paramtypes", [Number, Object, Number, Object, String, Boolean])
+    __metadata("design:paramtypes", [Number, Object, Number, Object, Number, String, Boolean])
 ], ServicesNotificationConfigs);

package/package.json

@@ -1,24 +1,24 @@
-{
- "name": "@platform-modules/foreign-ministry",
-  "version": "1.3.130",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "build": "tsc",
-    "dev": "ts-node src/scripts.ts"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "dependencies": {
-    "moment-timezone": "^0.6.0",
-    "pg": "^8.16.0",
-    "typeorm": "^0.3.17"
-  },
-  "devDependencies": {
-    "@types/moment-timezone": "^0.5.30",
-    "dotenv": "^16.5.0",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.2.0"
-  }
-}
+{
+ "name": "@platform-modules/foreign-ministry",
+  "version": "1.3.131",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "build": "tsc",
+    "dev": "ts-node src/scripts.ts"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "moment-timezone": "^0.6.0",
+    "pg": "^8.16.0",
+    "typeorm": "^0.3.17"
+  },
+  "devDependencies": {
+    "@types/moment-timezone": "^0.5.30",
+    "dotenv": "^16.5.0",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.2.0"
+  }
+}

package/src/models/GatePassVisitorsModel.ts

@@ -1,5 +1,6 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
+import { GatePassType } from "./GatePassRequestsModel";
 
 /**
  * Gate Pass Visitors Table
@@ -46,6 +47,44 @@ export class GatePassVisitors extends BaseModel {
   @Column({ type: 'varchar', length: 255, nullable: true })
   visitor_photo_file_name: string | null;
 
+  // Visit Details Fields (per-visitor; optional, fallback to request-level)
+  @Column({ type: 'date', nullable: true })
+  date: Date | null; // التاريخ (Date)
+
+  @Column({ type: 'int', nullable: true })
+  department_id: number | null; // الدائرة (Department)
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  office_number: string | null; // رقم المكتب (Office Number)
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  visiting_department: string | null; // قسم الزيارة (Visiting Department)
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  person_to_be_interviewed: string | null; // الشخص المطلوب مقابلته (Person to be Interviewed)
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  vehicle_type_and_color: string | null; // نوع المركبة ولونها (Vehicle Type and Color)
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  plate_number_and_code: string | null; // رقم اللوحة والرمز (Plate Number and Code)
+
+  @Column({ type: 'text', nullable: true })
+  purpose_of_entry: string | null; // الغرض من الدخول (Purpose of Entry)
+
+  @Column({ type: 'date', nullable: true })
+  from_date: Date | null; // من (From)
+
+  @Column({ type: 'date', nullable: true })
+  to_date: Date | null; // الى (To)
+
+  // Store as varchar to avoid DB enum coupling (values: "Short-term" / "Long-term")
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  gate_pass_type: GatePassType | null; // نوع ممر البوابة (Gate Pass Type)
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  visiting_person_in_department: string | null; // زائر في القسم (Visiting Person in Department)
+
   // QR Code for Gate Pass
   @Column({ type: 'text', nullable: true })
   qr_code_url: string | null; // QR code URL for this visitor (data URL can be 6000+ characters)

package/src/models/MoodleUsersModel.ts

@@ -1,25 +1,25 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-@Entity({ name: "moodle_users" })
-export class MoodleUsers extends BaseModel {
-  @Column({ type: "integer", nullable: false })
-  user_id: number; // Foreign key to users table
-
-  @Column({ type: "integer", nullable: false })
-  moodle_user_id: number; // Moodle user ID from Moodle system
-
-  @Column({ type: "varchar", length: 255, nullable: false })
-  moodle_password: string; // Password for Moodle account
-
-  constructor(
-    user_id: number,
-    moodle_user_id: number,
-    moodle_password: string
-  ) {
-    super();
-    this.user_id = user_id;
-    this.moodle_user_id = moodle_user_id;
-    this.moodle_password = moodle_password;
-  }
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+@Entity({ name: "moodle_users" })
+export class MoodleUsers extends BaseModel {
+  @Column({ type: "integer", nullable: false })
+  user_id: number; // Foreign key to users table
+
+  @Column({ type: "integer", nullable: false })
+  moodle_user_id: number; // Moodle user ID from Moodle system
+
+  @Column({ type: "varchar", length: 255, nullable: false })
+  moodle_password: string; // Password for Moodle account
+
+  constructor(
+    user_id: number,
+    moodle_user_id: number,
+    moodle_password: string
+  ) {
+    super();
+    this.user_id = user_id;
+    this.moodle_user_id = moodle_user_id;
+    this.moodle_password = moodle_password;
+  }
+}

package/src/models/ServicesNotificationConfigsModel.ts

@@ -20,6 +20,9 @@ export class ServicesNotificationConfigs extends BaseModel {
   @Column({ type: "integer", nullable: true })
   sub_service_id: number | null;
 
+  @Column({ type: "integer", nullable: false })
+  role_id: number;
+
   @Column({ 
     type: "enum", 
     enum: ServicesNotificationTriggerType, 
@@ -36,6 +39,7 @@ export class ServicesNotificationConfigs extends BaseModel {
     section_id: number | null = null,
     service_id: number,
     sub_service_id: number | null = null,
+    role_id: number,
     trigger: ServicesNotificationTriggerType = ServicesNotificationTriggerType.FINAL_APPROVAL,
     is_active: boolean = true
   ) {
@@ -44,6 +48,7 @@ export class ServicesNotificationConfigs extends BaseModel {
     this.section_id = section_id;
     this.service_id = service_id;
     this.sub_service_id = sub_service_id;
+    this.role_id = role_id;
     this.trigger = trigger;
     this.is_active = is_active;
   }