@platform-modules/foreign-ministry 1.3.114 → 1.3.116

package/dist/models/questionTagsModel.js

@@ -0,0 +1,34 @@
+"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.QuestionTags = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let QuestionTags = class QuestionTags extends BaseModel_1.BaseModel {
+    constructor(name, question_Id) {
+        super();
+        this.name = name,
+            this.question_Id = question_Id;
+    }
+};
+exports.QuestionTags = QuestionTags;
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], QuestionTags.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Number)
+], QuestionTags.prototype, "question_Id", void 0);
+exports.QuestionTags = QuestionTags = __decorate([
+    (0, typeorm_1.Entity)({ name: 'question_tags' }),
+    __metadata("design:paramtypes", [String, Number])
+], QuestionTags);

package/fix-lms-external-course-enum-conflict.sql

@@ -0,0 +1,11 @@
+-- Fix: "type lms_external_course_participation_candidate_approval_status_enu already exists"
+-- Run this once when schema sync fails due to leftover enum types from a previous failed sync.
+-- TypeORM renames the old enum to *_old before creating the new one; if a prior run failed,
+-- *_old can already exist and the next sync fails with "already exists".
+
+-- Drop leftover _old enum types if they exist (not used by any column after a partial sync)
+DROP TYPE IF EXISTS "lms_external_course_participation_candidate_approval_status_enu_old" CASCADE;
+DROP TYPE IF EXISTS "lms_external_course_participation_candidate_approval_status_enum_old" CASCADE;
+
+-- Then re-run your application or schema sync. The entity uses enumName
+-- 'lms_external_course_participation_candidate_approval_status_enum'.

package/package.json

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

package/src/data-source.ts

@@ -118,6 +118,8 @@ import { LMSCourseExternalLecturerApprovalDetails } from './models/LMSCourseExte
 import { LMSCourseExternalLecturerRequestAttachment } from './models/LMSCourseExternalLecturerAttachmentModel';
 import { LMSCourseExternalLecturerRequestChat } from './models/LMSCourseExternalLecturerChatModel';
 import { LMSCourseExternalLecturerWorkFlow } from './models/LMSCourseExternalLecturerWorkflowModel';
+import { LMSCourseExternalLecturerCost } from './models/LMSCourseExternalLecturerCostModel';
+import { LMSCourseExternalLecturerLecturer } from './models/LMSCourseExternalLecturerLecturerModel';
 import { LMSExternalEntityTrainedRequests } from './models/LMSExternalEntityTrainedRequestModel';
 import { LMSExternalEntityTrainedApprovalDetails } from './models/LMSExternalEntityTrainedApprovalModel';
 import { LMSExternalEntityTrainedRequestAttachment } from './models/LMSExternalEntityTrainedAttachmentModel';
@@ -174,7 +176,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,
@@ -285,6 +287,8 @@ export const AppDataSource = new DataSource({
     LMSCourseExternalLecturerRequestAttachment,
     LMSCourseExternalLecturerRequestChat,
     LMSCourseExternalLecturerWorkFlow,
+    LMSCourseExternalLecturerCost,
+    LMSCourseExternalLecturerLecturer,
     LMSExternalEntityTrainedRequests,
     LMSExternalEntityTrainedApprovalDetails,
     LMSExternalEntityTrainedRequestAttachment,

package/src/index.ts

@@ -115,6 +115,8 @@ export * from './models/LMSCourseExternalLecturerApprovalModel';
 export * from './models/LMSCourseExternalLecturerAttachmentModel';
 export * from './models/LMSCourseExternalLecturerChatModel';
 export * from './models/LMSCourseExternalLecturerWorkflowModel';
+export * from './models/LMSCourseExternalLecturerCostModel';
+export * from './models/LMSCourseExternalLecturerLecturerModel';
 export * from './models/LMSExternalEntityTrainedRequestModel';
 export * from './models/LMSExternalEntityTrainedApprovalModel';
 export * from './models/LMSExternalEntityTrainedAttachmentModel';

package/src/models/DocumentTranslationRequestModel.ts

@@ -1,54 +1,54 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum DocumentTranslationStatus {
-  SUBMITTED = "Submitted",
-  PENDING = "Pending",
-  ASSIGNED = "Assigned",
-  IN_PROGRESS = "In Progress",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
-export enum DocumentClassificationType {
-  NORMAL = "Normal",
-  CONFIDENTIAL = "Confidential"
-}
-
-@Entity({ name: 'document_translation_requests' })
-export class DocumentTranslationRequests extends BaseModel {
-
-  // Common columns
-  @Column({ type: 'int', nullable: true })
-  req_user_department_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  req_user_section_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  service_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  sub_service_id: number | null;
-
-  @Column({ type: 'int', nullable: false })
-  user_id: number;
-
-  // Document Translation specific columns
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  document_type: string;
-
-  @Column({ type: 'varchar', length: 500, nullable: false })
-  document_name: string;
-
-  @Column({ type: 'enum', enum: DocumentClassificationType, nullable: false })
-  document_classification: DocumentClassificationType;
-
-  @Column({ type: 'enum', enum: DocumentTranslationStatus, default: DocumentTranslationStatus.PENDING, nullable: false })
-  status: DocumentTranslationStatus;
-
-  @Column({ type: 'varchar', nullable: true })
-  workflow_execution_id: string | null;
-  
-}
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum DocumentTranslationStatus {
+  SUBMITTED = "Submitted",
+  PENDING = "Pending",
+  ASSIGNED = "Assigned",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+export enum DocumentClassificationType {
+  NORMAL = "Normal",
+  CONFIDENTIAL = "Confidential"
+}
+
+@Entity({ name: 'document_translation_requests' })
+export class DocumentTranslationRequests extends BaseModel {
+
+  // Common columns
+  @Column({ type: 'int', nullable: true })
+  req_user_department_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  req_user_section_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  service_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: 'int', nullable: false })
+  user_id: number;
+
+  // Document Translation specific columns
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  document_type: string;
+
+  @Column({ type: 'varchar', length: 500, nullable: false })
+  document_name: string;
+
+  @Column({ type: 'enum', enum: DocumentClassificationType, nullable: false })
+  document_classification: DocumentClassificationType;
+
+  @Column({ type: 'enum', enum: DocumentTranslationStatus, default: DocumentTranslationStatus.PENDING, nullable: false })
+  status: DocumentTranslationStatus;
+
+  @Column({ type: 'varchar', nullable: true })
+  workflow_execution_id: string | null;
+  
+}
+

package/src/models/LMSCourseExternalLecturerCostModel.ts

@@ -0,0 +1,36 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'lms_course_external_lecturer_costs' })
+export class LMSCourseExternalLecturerCost extends BaseModel {
+
+  @Column({ type: 'integer', nullable: false })
+  request_id: number;
+
+  @Column({ type: 'integer', nullable: true })
+  service_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true, default: 0 })
+  material_price: number | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true, default: 0 })
+  transportation: number | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true, default: 0 })
+  accommodation: number | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true, default: 0 })
+  allowances: number | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true, default: 0 })
+  food: number | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true, default: 0 })
+  present: number | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true, default: 0 })
+  total_cost: number | null;
+}

package/src/models/LMSCourseExternalLecturerLecturerModel.ts

@@ -0,0 +1,42 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'lms_course_external_lecturer_lecturers' })
+export class LMSCourseExternalLecturerLecturer extends BaseModel {
+
+  @Column({ type: 'integer', nullable: false })
+  request_id: number;
+
+  @Column({ type: 'integer', nullable: true })
+  service_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  full_name: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: false })
+  passport_or_id: string;
+
+  @Column({ type: 'integer', nullable: false })
+  age: number;
+
+  @Column({ type: 'text', nullable: false })
+  qualifications: string;
+
+  @Column({ type: 'text', nullable: false })
+  experience: string;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  cv_file_url: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  cv_file_name: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  cv_file_type: string | null;
+
+  @Column({ type: 'bigint', nullable: true })
+  cv_file_size: number | null;
+}

package/src/models/LMSCourseExternalLecturerRequestModel.ts

@@ -27,78 +27,36 @@ export class LMSCourseExternalLecturerRequests extends BaseModel {
   @Column({ type: 'int', nullable: false })
   user_id: number;
 
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  course_name: string;
 
-  // New columns
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  course_name: string | null;
+  @Column({ type: 'varchar', length: 100, nullable: false })
+  course_level: string;
 
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  course_level: string | null;
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  institution: string;
 
-  @Column({ type: 'varchar', nullable: true })
-  material_price: string | null;
-
-  @Column({ type: 'varchar', nullable: true })
-  transportation: string | null;
-
-  @Column({ type: 'varchar', nullable: true })
-  accommodation: string | null;
-
-  @Column({ type: 'varchar', nullable: true })
-  allowances: string | null;
-
-  @Column({ type: 'varchar', nullable: true })
-  food: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  present: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  currency_type: string | null;
+  @Column({ type: 'text', nullable: false })
+  reason_of_course: string;
 
-  @Column({ type: 'text', nullable: true })
-  reason_of_course: string | null;
-
-  @Column({ type: 'int', nullable: true })
-  estimated_number_of_participants: number | null;
-
-  @Column({ type: 'date', nullable: true })
-  date_from: Date | null;
-
-  @Column({ type: 'date', nullable: true })
-  date_to: Date | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  time_from: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  time_to: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  lecturer_full_name: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  passport: string | null;
-
-  @Column({ type: 'int', nullable: true })
-  age: number | null;
+  @Column({ type: 'int', nullable: false })
+  estimated_number_of_participants: number;
 
-  @Column({ type: 'text', nullable: true })
-  qualifications: string | null;
+  @Column({ type: 'date', nullable: false })
+  date_from: Date;
 
-  @Column({ type: 'text', nullable: true })
-  experience: string | null;
+  @Column({ type: 'date', nullable: false })
+  date_to: Date;
 
-  @Column({ type: 'varchar', length: 500, nullable: true })
-  cv_attachment: string | null;
+  @Column({ type: 'time', nullable: false })
+  time_from: string;
 
-  @Column({ type: 'varchar', length: 500, nullable: true })
-  course_material: string | null;
+  @Column({ type: 'time', nullable: false })
+  time_to: string;
 
   @Column({ type: 'enum', enum: LMSCourseExternalLecturerStatus, default: LMSCourseExternalLecturerStatus.PENDING, nullable: false })
   status: LMSCourseExternalLecturerStatus;
 
   @Column({ type: 'varchar', nullable: true })
   workflow_execution_id: string | null;
-  
 }

package/src/models/LMSExternalCourseParticipationCandidateModel.ts

@@ -1,6 +1,13 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 
+export enum LMSExternalCourseParticipationCandidateApprovalStatus {
+  PENDING = "Pending",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
 @Entity({ name: 'lms_external_course_participation_candidates' })
 export class LMSExternalCourseParticipationCandidate extends BaseModel {
   @Column({ type: 'integer', nullable: false })
@@ -14,4 +21,34 @@ export class LMSExternalCourseParticipationCandidate extends BaseModel {
 
   @Column({ type: 'varchar', length: 500, nullable: true })
   candidate_profile_url: string | null;
+
+  @Column({ type: 'integer', nullable: true })
+  service_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  approver_role_id: number;
+
+  @Column({ type: 'integer', nullable: true })
+  department_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  section_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  approver_user_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  delegate_user_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  approved_by: number | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true, default: '' })
+  comment: string;
+
+  @Column({ type: 'enum', enum: LMSExternalCourseParticipationCandidateApprovalStatus, enumName: 'lms_external_course_participation_candidate_approval_status_enum', default: LMSExternalCourseParticipationCandidateApprovalStatus.PENDING, nullable: false })
+  approval_status: LMSExternalCourseParticipationCandidateApprovalStatus;
 }

package/src/models/LeaveConfigModel.ts

@@ -1,72 +1,72 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum enumFrequency {
-    Monthly = 'Monthly',
-    Yearly = 'Yearly',
-}
-
-//This model is used to store the Financial Grade declaration on the Admin Side
-@Entity({ name: 'leave_configuration' })
-export class LeaveConfiguration extends BaseModel {
-
-    @Column({ type: 'varchar', nullable: true })
-    category: string;
-
-    @Column({ type: 'int', nullable: true })
-    MandC_id: number;
-
-    @Column({ type: 'int', nullable: true })
-    leave_type_id: number;
-
-    @Column({ type: 'varchar', nullable: true })
-    frequency: enumFrequency;
-
-    @Column({ type: 'varchar', nullable: true })
-    region: string;
-
-    @Column({ type: 'varchar', nullable: true })
-    country: string;
-
-    @Column({ type: 'varchar', nullable: true })
-    location: string;
-
-    @Column({ nullable: true, default: false })
-    is_carryforward: boolean;
-
-    @Column({ type: 'int', nullable: true, default: 0 })
-    carryforward_limit: number;
-
-    @Column({ type: 'date', nullable: true })
-    from_date: Date;
-
-    @Column({ type: 'date', nullable: true })
-    to_date: Date;
-
-    @Column({ type: 'varchar', nullable: true })
-    reason: string;
-
-    @Column({ type: 'int', nullable: true })
-    emergency_balance_days: number | null;
-
-    @Column({ type: 'date', nullable: true })
-    last_credited: Date | null;
-
-    constructor(category: string, MandC_id: number, leave_type_id: number, frequency: enumFrequency, region: string, country: string, location: string, is_carryforward: boolean, carryforward_limit: number, from_date: Date, to_date: Date, reason: string, emergency_balance_days?: number|null, last_credited?: Date|null) {
-        super();
-        this.category = category;
-        this.MandC_id = MandC_id;
-        this.leave_type_id = leave_type_id;
-        this.frequency = frequency;
-        this.region = region;
-        this.country = country;
-        this.location = location;
-        this.is_carryforward = is_carryforward;
-        this.carryforward_limit = carryforward_limit;
-        this.from_date = from_date;
-        this.to_date = to_date;
-        this.reason = reason;
-        this.emergency_balance_days = emergency_balance_days ?? null;
-        this.last_credited = last_credited ?? null;
-    }
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum enumFrequency {
+    Monthly = 'Monthly',
+    Yearly = 'Yearly',
+}
+
+//This model is used to store the Financial Grade declaration on the Admin Side
+@Entity({ name: 'leave_configuration' })
+export class LeaveConfiguration extends BaseModel {
+
+    @Column({ type: 'varchar', nullable: true })
+    category: string;
+
+    @Column({ type: 'int', nullable: true })
+    MandC_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    leave_type_id: number;
+
+    @Column({ type: 'varchar', nullable: true })
+    frequency: enumFrequency;
+
+    @Column({ type: 'varchar', nullable: true })
+    region: string;
+
+    @Column({ type: 'varchar', nullable: true })
+    country: string;
+
+    @Column({ type: 'varchar', nullable: true })
+    location: string;
+
+    @Column({ nullable: true, default: false })
+    is_carryforward: boolean;
+
+    @Column({ type: 'int', nullable: true, default: 0 })
+    carryforward_limit: number;
+
+    @Column({ type: 'date', nullable: true })
+    from_date: Date;
+
+    @Column({ type: 'date', nullable: true })
+    to_date: Date;
+
+    @Column({ type: 'varchar', nullable: true })
+    reason: string;
+
+    @Column({ type: 'int', nullable: true })
+    emergency_balance_days: number | null;
+
+    @Column({ type: 'date', nullable: true })
+    last_credited: Date | null;
+
+    constructor(category: string, MandC_id: number, leave_type_id: number, frequency: enumFrequency, region: string, country: string, location: string, is_carryforward: boolean, carryforward_limit: number, from_date: Date, to_date: Date, reason: string, emergency_balance_days?: number|null, last_credited?: Date|null) {
+        super();
+        this.category = category;
+        this.MandC_id = MandC_id;
+        this.leave_type_id = leave_type_id;
+        this.frequency = frequency;
+        this.region = region;
+        this.country = country;
+        this.location = location;
+        this.is_carryforward = is_carryforward;
+        this.carryforward_limit = carryforward_limit;
+        this.from_date = from_date;
+        this.to_date = to_date;
+        this.reason = reason;
+        this.emergency_balance_days = emergency_balance_days ?? null;
+        this.last_credited = last_credited ?? null;
+    }
 }