@platform-modules/civil-aviation-authority 2.0.24 → 2.0.25

package/.env

@@ -1,11 +1,5 @@
-# DB_HOST=localhost
-# DB_PORT=5433
-# DB_USER=postgres
-# DB_PASS=123
-# DB_NAME=CAA
-
-DB_HOST=164.52.222.169
-DB_PORT=5432
-DB_USER=postgres_admin_user
-DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+DB_HOST=localhost
+DB_PORT=5433
+DB_USER=postgres
+DB_PASS=123
 DB_NAME=CAA

package/dist/data-source.js

@@ -9,12 +9,12 @@ const user_1 = require("./models/user"); // import all entities here
 const user_sessions_1 = require("./models/user-sessions");
 const role_1 = require("./models/role");
 const ITHelpDeskModel_1 = require("./models/ITHelpDeskModel");
-const ITServicesTypesSalalahModel_1 = require("./models/ITServicesTypesSalalahModel");
-const ITServicesTypesMuscatModel_1 = require("./models/ITServicesTypesMuscatModel");
+// import { ITServicesTypesSalalah } from './models/ITServicesTypesSalalahModel'; // REMOVED - table no longer used
+// import { ITServicesTypesMuscat } from './models/ITServicesTypesMuscatModel'; // REMOVED - table no longer used
 const ServiceTypeModel_1 = require("./models/ServiceTypeModel");
 const CAAServices_1 = require("./models/CAAServices");
 const CAASubServices_1 = require("./models/CAASubServices");
-const ITApprovalSettings_1 = require("./models/ITApprovalSettings");
+// import { ITApprovalSettings } from './models/ITApprovalSettings'; // REMOVED - table no longer used
 // import { Workflows } from './models/Workflows';
 const ItApprovalsModel_1 = require("./models/ItApprovalsModel");
 const ItWorkflowModel_1 = require("./models/ItWorkflowModel");
@@ -42,8 +42,6 @@ const LogisticsAttachmentModel_1 = require("./models/LogisticsAttachmentModel");
 const LogisticsWorkflowModel_1 = require("./models/LogisticsWorkflowModel");
 const importantLinksModel_1 = require("./models/importantLinksModel");
 const DelegateSettingsModel_1 = require("./models/DelegateSettingsModel");
-const feedbackModel_1 = require("./models/feedbackModel");
-const PortalFeedbackModel_1 = require("./models/PortalFeedbackModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -57,12 +55,12 @@ exports.AppDataSource = new typeorm_1.DataSource({
         user_1.User, user_sessions_1.userSessions,
         role_1.Role,
         ITHelpDeskModel_1.ITHelpDeskRequests,
-        ITServicesTypesSalalahModel_1.ITServicesTypesSalalah,
-        ITServicesTypesMuscatModel_1.ITServicesTypesMuscat,
+        // ITServicesTypesSalalah, // REMOVED - table no longer used
+        // ITServicesTypesMuscat, // REMOVED - table no longer used
         ServiceTypeModel_1.ServiceType,
         CAAServices_1.CAAServices,
         CAASubServices_1.CAASubServices,
-        ITApprovalSettings_1.ITApprovalSettings,
+        // ITApprovalSettings, // REMOVED - table no longer used
         // Workflows, 
         ItApprovalsModel_1.ItApprovalDetails,
         ItWorkflowModel_1.ItWorkFlow,
@@ -89,8 +87,6 @@ exports.AppDataSource = new typeorm_1.DataSource({
         LogisticsAttachmentModel_1.LogisticsRequestAttachment,
         LogisticsWorkflowModel_1.LogisticsWorkFlow,
         importantLinksModel_1.ImportantLinks,
-        DelegateSettingsModel_1.DelegateSettings,
-        feedbackModel_1.Feedback,
-        PortalFeedbackModel_1.PortalFeedback
+        DelegateSettingsModel_1.DelegateSettings
     ],
 });

package/dist/index.d.ts

@@ -2,12 +2,9 @@ export * from './models/user';
 export * from './models/role';
 export * from './models/user-sessions';
 export * from './models/ITHelpDeskModel';
-export * from './models/ITServicesTypesSalalahModel';
-export * from './models/ITServicesTypesMuscatModel';
 export * from './models/ServiceTypeModel';
 export * from './models/CAAServices';
 export * from './models/CAASubServices';
-export * from './models/ITApprovalSettings';
 export * from './models/ItApprovalsModel';
 export * from './models/ItWorkflowModel';
 export * from './models/WorkflowDefinitions';
@@ -34,5 +31,3 @@ export * from './models/LogisticsAttachmentModel';
 export * from './models/importantLinksModel';
 export * from './models/LogisticsWorkflowModel';
 export * from './models/DelegateSettingsModel';
-export * from './models/feedbackModel';
-export * from './models/PortalFeedbackModel';

package/dist/index.js

@@ -18,13 +18,13 @@ __exportStar(require("./models/user"), exports);
 __exportStar(require("./models/role"), exports);
 __exportStar(require("./models/user-sessions"), exports);
 __exportStar(require("./models/ITHelpDeskModel"), exports);
-__exportStar(require("./models/ITServicesTypesSalalahModel"), exports);
-__exportStar(require("./models/ITServicesTypesMuscatModel"), exports);
+// export * from './models/ITServicesTypesSalalahModel'; // REMOVED - table no longer used
+// export * from './models/ITServicesTypesMuscatModel'; // REMOVED - table no longer used
 __exportStar(require("./models/ServiceTypeModel"), exports);
 __exportStar(require("./models/CAAServices"), exports);
 __exportStar(require("./models/CAASubServices"), exports);
-__exportStar(require("./models/ITApprovalSettings"), exports);
-// export * from './models/Workflows';
+// export * from './models/ITApprovalSettings'; // REMOVED - table no longer used
+// export * from './models/Workflows'; // REMOVED - table no longer used
 __exportStar(require("./models/ItApprovalsModel"), exports);
 __exportStar(require("./models/ItWorkflowModel"), exports);
 __exportStar(require("./models/WorkflowDefinitions"), exports);
@@ -51,5 +51,3 @@ __exportStar(require("./models/LogisticsAttachmentModel"), exports);
 __exportStar(require("./models/importantLinksModel"), exports);
 __exportStar(require("./models/LogisticsWorkflowModel"), exports);
 __exportStar(require("./models/DelegateSettingsModel"), exports);
-__exportStar(require("./models/feedbackModel"), exports);
-__exportStar(require("./models/PortalFeedbackModel"), exports);

package/dist/models/ITHelpDeskModel.d.ts

@@ -22,11 +22,8 @@ export declare class ITHelpDeskRequests extends BaseModel {
     extn_num: string;
     contact_num: string;
     request_date: Date;
-    attachment_url: string;
     user_id: number;
-    reporting_manager: number;
-    assigned_to: number;
     status: status;
     workflow_execution_id: string | null;
-    constructor(service_id: number, sub_service_id: number, problem: string, request_for: ContactFor, description: string, extn_num: string, contact_num: string, request_date: Date, attachment_url: string, reporting_manager: number, assigned_to: number, status: status, workflow_execution_id?: string, req_user_department_id?: number | null, req_user_section_id?: number | null, service_type_id?: number | null);
+    constructor(service_id: number, sub_service_id: number, problem: string, request_for: ContactFor, description: string, extn_num: string, contact_num: string, request_date: Date, status: status, workflow_execution_id?: string, req_user_department_id?: number | null, req_user_section_id?: number | null, service_type_id?: number | null);
 }

package/dist/models/ITHelpDeskModel.js

@@ -26,7 +26,7 @@ var status;
     status["REJECTED"] = "Rejected";
 })(status || (exports.status = status = {}));
 let ITHelpDeskRequests = class ITHelpDeskRequests extends BaseModel_1.BaseModel {
-    constructor(service_id, sub_service_id, problem, request_for, description, extn_num, contact_num, request_date, attachment_url, reporting_manager, assigned_to, status, workflow_execution_id, req_user_department_id, req_user_section_id, service_type_id) {
+    constructor(service_id, sub_service_id, problem, request_for, description, extn_num, contact_num, request_date, status, workflow_execution_id, req_user_department_id, req_user_section_id, service_type_id) {
         super();
         this.service_id = service_id;
         this.sub_service_id = sub_service_id;
@@ -36,9 +36,6 @@ let ITHelpDeskRequests = class ITHelpDeskRequests extends BaseModel_1.BaseModel
         this.extn_num = extn_num;
         this.contact_num = contact_num;
         this.request_date = request_date;
-        this.attachment_url = attachment_url;
-        this.reporting_manager = reporting_manager;
-        this.assigned_to = assigned_to;
         this.status = status;
         this.workflow_execution_id = workflow_execution_id || null;
         this.req_user_department_id = req_user_department_id || null;
@@ -96,22 +93,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "date", nullable: false }),
     __metadata("design:type", Date)
 ], ITHelpDeskRequests.prototype, "request_date", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
-], ITHelpDeskRequests.prototype, "attachment_url", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: false }),
     __metadata("design:type", Number)
 ], ITHelpDeskRequests.prototype, "user_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Number)
-], ITHelpDeskRequests.prototype, "reporting_manager", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Number)
-], ITHelpDeskRequests.prototype, "assigned_to", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: "enum",
@@ -127,5 +112,5 @@ __decorate([
 ], ITHelpDeskRequests.prototype, "workflow_execution_id", void 0);
 exports.ITHelpDeskRequests = ITHelpDeskRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'it_help_desk_requests' }),
-    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, Date, String, Number, Number, String, String, Object, Object, Object])
+    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, Date, String, String, Object, Object, Object])
 ], ITHelpDeskRequests);

package/dist/models/ItApprovalsModel.d.ts

@@ -8,11 +8,11 @@ export declare class ItApprovalDetails extends BaseModel {
     request_id: number;
     level: number;
     approver_user_id: number | null;
-    approver_role_id: number;
+    approver_role_id: number | null;
     department_id: number | null;
     section_id: number | null;
     approved_by: number | null;
     comment: string;
     approval_status: ApprovalStatus;
-    constructor(request_id: number, approver_user_id: number | null, approver_role_id: number, comment: string, approval_status: ApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approved_by?: number | null);
+    constructor(request_id: number, approver_user_id: number | null, approver_role_id: number | null, comment: string, approval_status: ApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approved_by?: number | null);
 }

package/dist/models/ItApprovalsModel.js

@@ -47,7 +47,7 @@ __decorate([
 ], ItApprovalDetails.prototype, "approver_user_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
-    __metadata("design:type", Number)
+    __metadata("design:type", Object)
 ], ItApprovalDetails.prototype, "approver_role_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
@@ -71,5 +71,5 @@ __decorate([
 ], ItApprovalDetails.prototype, "approval_status", void 0);
 exports.ItApprovalDetails = ItApprovalDetails = __decorate([
     (0, typeorm_1.Entity)({ name: 'it_approvals' }),
-    __metadata("design:paramtypes", [Number, Object, Number, String, String, Number, Object, Object, Object])
+    __metadata("design:paramtypes", [Number, Object, Object, String, String, Number, Object, Object, Object])
 ], ItApprovalDetails);

package/dist/models/ItWorkflowModel.d.ts

@@ -6,7 +6,8 @@ export declare enum workFlowStatus {
 }
 export declare class ItWorkFlow extends BaseModel {
     request_id: number;
+    order: number | null;
     content: string;
     status: workFlowStatus;
-    constructor(request_id: number, content: string, status: workFlowStatus);
+    constructor(request_id: number, content: string, status: workFlowStatus, order?: number);
 }

package/dist/models/ItWorkflowModel.js

@@ -20,11 +20,12 @@ var workFlowStatus;
 })(workFlowStatus || (exports.workFlowStatus = workFlowStatus = {}));
 //This model is used to store the store the leave apporval matrix(HOD, Manager, HR, Director) based on leave type along with the levels
 let ItWorkFlow = class ItWorkFlow extends BaseModel_1.BaseModel {
-    constructor(request_id, content, status) {
+    constructor(request_id, content, status, order) {
         super();
         this.request_id = request_id;
         this.content = content;
         this.status = status;
+        this.order = order || null;
     }
 };
 exports.ItWorkFlow = ItWorkFlow;
@@ -32,6 +33,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: false }),
     __metadata("design:type", Number)
 ], ItWorkFlow.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], ItWorkFlow.prototype, "order", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
     __metadata("design:type", String)
@@ -42,5 +47,5 @@ __decorate([
 ], ItWorkFlow.prototype, "status", void 0);
 exports.ItWorkFlow = ItWorkFlow = __decorate([
     (0, typeorm_1.Entity)({ name: 'it_work_flows' }),
-    __metadata("design:paramtypes", [Number, String, String])
+    __metadata("design:paramtypes", [Number, String, String, Number])
 ], ItWorkFlow);

package/dist/models/LogisticsApprovalModel.d.ts

@@ -1,7 +1,6 @@
 import { BaseModel } from './BaseModel';
 export declare enum LogisticsApprovalStatus {
     PENDING = "Pending",
-    IN_PROGRESS = "In Progress",
     APPROVED = "Approved",
     REJECTED = "Rejected"
 }

package/dist/models/LogisticsApprovalModel.js

@@ -15,7 +15,6 @@ const BaseModel_1 = require("./BaseModel");
 var LogisticsApprovalStatus;
 (function (LogisticsApprovalStatus) {
     LogisticsApprovalStatus["PENDING"] = "Pending";
-    LogisticsApprovalStatus["IN_PROGRESS"] = "In Progress";
     LogisticsApprovalStatus["APPROVED"] = "Approved";
     LogisticsApprovalStatus["REJECTED"] = "Rejected";
 })(LogisticsApprovalStatus || (exports.LogisticsApprovalStatus = LogisticsApprovalStatus = {}));

package/dist/models/LogisticsForeignVehicleModel.d.ts

@@ -1,8 +1,9 @@
 import { BaseModel } from './BaseModel';
 export declare enum Foreign_Purpose_of_Travel {
-    SITE = "Site Visit",
-    AIRPORT = "Airport Duty",
-    OFFICIAL = "Official Meeting",
+    AIRPORT_PICKUP = "Airport Pickup/Drop-off",
+    OFFICIAL_MEETING = "Official Meeting",
+    SITE_VISIT = "Site Visit",
+    CONFERENCE = "Conference/Event",
     OTHER = "Other"
 }
 export declare enum Foreign_Vehicle_Required_Location {

package/dist/models/LogisticsForeignVehicleModel.js

@@ -14,9 +14,10 @@ const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 var Foreign_Purpose_of_Travel;
 (function (Foreign_Purpose_of_Travel) {
-    Foreign_Purpose_of_Travel["SITE"] = "Site Visit";
-    Foreign_Purpose_of_Travel["AIRPORT"] = "Airport Duty";
-    Foreign_Purpose_of_Travel["OFFICIAL"] = "Official Meeting";
+    Foreign_Purpose_of_Travel["AIRPORT_PICKUP"] = "Airport Pickup/Drop-off";
+    Foreign_Purpose_of_Travel["OFFICIAL_MEETING"] = "Official Meeting";
+    Foreign_Purpose_of_Travel["SITE_VISIT"] = "Site Visit";
+    Foreign_Purpose_of_Travel["CONFERENCE"] = "Conference/Event";
     Foreign_Purpose_of_Travel["OTHER"] = "Other";
 })(Foreign_Purpose_of_Travel || (exports.Foreign_Purpose_of_Travel = Foreign_Purpose_of_Travel = {}));
 var Foreign_Vehicle_Required_Location;

package/dist/models/NotificationModel.d.ts

@@ -1,6 +1,9 @@
 import { BaseModel } from './BaseModel';
 export declare enum NotificationType {
     REQUEST_RAISED = "request raised",
+    REQUEST_APPROVE = "request approve",
+    REQUEST_REJECT = "request reject",
+    REQUEST_WITHDRAW = "request withdraw",
     REMINDER = "reminder",
     IMPORT = "import"
 }

package/dist/models/NotificationModel.js

@@ -15,6 +15,9 @@ const BaseModel_1 = require("./BaseModel");
 var NotificationType;
 (function (NotificationType) {
     NotificationType["REQUEST_RAISED"] = "request raised";
+    NotificationType["REQUEST_APPROVE"] = "request approve";
+    NotificationType["REQUEST_REJECT"] = "request reject";
+    NotificationType["REQUEST_WITHDRAW"] = "request withdraw";
     NotificationType["REMINDER"] = "reminder";
     NotificationType["IMPORT"] = "import";
 })(NotificationType || (exports.NotificationType = NotificationType = {}));

package/dist/models/WorkflowTask.d.ts

@@ -3,5 +3,8 @@ export declare class WorkflowTask extends BaseModel {
     task_id: number;
     name: string;
     task_type: string;
-    constructor(name: string, task_id?: number, task_type?: string);
+    service_id: number | null;
+    sub_service_id: number | null;
+    service_type: string | null;
+    constructor(name: string, task_id?: number, task_type?: string, service_id?: number | null, sub_service_id?: number | null, service_type?: string | null);
 }

package/dist/models/WorkflowTask.js

@@ -13,11 +13,14 @@ exports.WorkflowTask = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let WorkflowTask = class WorkflowTask extends BaseModel_1.BaseModel {
-    constructor(name, task_id, task_type) {
+    constructor(name, task_id, task_type, service_id, sub_service_id, service_type) {
         super();
         this.name = name;
         this.task_id = task_id || 0;
         this.task_type = task_type || '';
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.service_type = service_type || null;
     }
 };
 exports.WorkflowTask = WorkflowTask;
@@ -33,7 +36,19 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 200, nullable: true }),
     __metadata("design:type", String)
 ], WorkflowTask.prototype, "task_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], WorkflowTask.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], WorkflowTask.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", Object)
+], WorkflowTask.prototype, "service_type", void 0);
 exports.WorkflowTask = WorkflowTask = __decorate([
     (0, typeorm_1.Entity)({ name: 'workflow_tasks' }),
-    __metadata("design:paramtypes", [String, Number, String])
+    __metadata("design:paramtypes", [String, Number, String, Object, Object, Object])
 ], WorkflowTask);

package/dist/models/user.d.ts

@@ -21,7 +21,7 @@ export declare class User extends BaseModel {
     mobile?: string;
     office_number?: string;
     department?: number;
-    category: "CAA" | "Embassy";
+    category?: string;
     directorate?: string;
     section?: number;
     position?: number;
@@ -34,7 +34,6 @@ export declare class User extends BaseModel {
     passport_number?: string;
     personal_email?: string;
     extension_number?: number;
-    fax_number?: string;
     diplomatic_name?: string;
     avatar?: string;
     father_name?: string;
@@ -42,5 +41,5 @@ export declare class User extends BaseModel {
     children1_name?: string;
     children2_name?: string;
     address?: string;
-    constructor(employee_id?: number, civil_employee_id?: number, employee_name?: string, employee_arabic_name?: string, person_type?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, qualification?: string, marital_status?: string, nationality?: string, email?: string, blood_type?: string, national_id?: number, manpower_id?: number, mobile?: string, office_number?: string, department?: number, category?: "CAA" | "Embassy", directorate?: string, section?: number, position?: number, arabic_position?: string, grade?: number, location?: string, supervisor_emp_id?: number, supervisor_emp_name?: string, passport_number?: string, personal_email?: string, extension_number?: number, fax_number?: string, diplomatic_name?: string, avatar?: string, father_name?: string, spouse_name?: string, children1_name?: string, children2_name?: string, address?: string);
+    constructor(employee_id?: number, civil_employee_id?: number, employee_name?: string, employee_arabic_name?: string, person_type?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, qualification?: string, marital_status?: string, nationality?: string, email?: string, blood_type?: string, national_id?: number, manpower_id?: number, mobile?: string, office_number?: string, department?: number, category?: string, directorate?: string, section?: number, position?: number, arabic_position?: string, grade?: number, location?: string, supervisor_emp_id?: number, supervisor_emp_name?: string, passport_number?: string, personal_email?: string, extension_number?: number, diplomatic_name?: string, avatar?: string, father_name?: string, spouse_name?: string, children1_name?: string, children2_name?: string, address?: string);
 }

package/dist/models/user.js

@@ -13,7 +13,7 @@ exports.User = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let User = class User extends BaseModel_1.BaseModel {
-    constructor(employee_id, civil_employee_id, employee_name, employee_arabic_name, person_type, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, qualification, marital_status, nationality, email, blood_type, national_id, manpower_id, mobile, office_number, department, category, directorate, section, position, arabic_position, grade, location, supervisor_emp_id, supervisor_emp_name, passport_number, personal_email, extension_number, fax_number, diplomatic_name, avatar, father_name, spouse_name, children1_name, children2_name, address) {
+    constructor(employee_id, civil_employee_id, employee_name, employee_arabic_name, person_type, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, qualification, marital_status, nationality, email, blood_type, national_id, manpower_id, mobile, office_number, department, category, directorate, section, position, arabic_position, grade, location, supervisor_emp_id, supervisor_emp_name, passport_number, personal_email, extension_number, diplomatic_name, avatar, father_name, spouse_name, children1_name, children2_name, address) {
         super();
         this.employee_id = employee_id;
         this.civil_employee_id = civil_employee_id;
@@ -36,7 +36,7 @@ let User = class User extends BaseModel_1.BaseModel {
         this.mobile = mobile;
         this.office_number = office_number;
         this.department = department;
-        this.category = category || "CAA";
+        this.category = category;
         this.directorate = directorate;
         this.section = section;
         this.position = position;
@@ -48,7 +48,6 @@ let User = class User extends BaseModel_1.BaseModel {
         this.passport_number = passport_number;
         this.personal_email = personal_email;
         this.extension_number = extension_number;
-        this.fax_number = fax_number;
         this.diplomatic_name = diplomatic_name;
         this.avatar = avatar;
         this.father_name = father_name;
@@ -144,7 +143,7 @@ __decorate([
     __metadata("design:type", Number)
 ], User.prototype, "department", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "enum", enum: ["CAA", "Embassy"], nullable: false, default: "CAA" }),
+    (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], User.prototype, "category", void 0);
 __decorate([
@@ -195,10 +194,6 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", Number)
 ], User.prototype, "extension_number", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", length: 20, nullable: true }),
-    __metadata("design:type", String)
-], User.prototype, "fax_number", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
@@ -229,5 +224,5 @@ __decorate([
 ], User.prototype, "address", void 0);
 exports.User = User = __decorate([
     (0, typeorm_1.Entity)({ name: 'users' }),
-    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, String, String, String, String, String, String, String, String, String, Number, Number, String, String, Number, String, String, Number, Number, String, Number, String, Number, String, String, String, Number, String, String, String, String, String, String, String, String])
+    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, String, String, String, String, String, String, String, String, String, Number, Number, String, String, Number, String, String, Number, Number, String, Number, String, Number, String, String, String, Number, String, String, String, String, String, String, String])
 ], User);

package/package.json

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

package/src/data-source.ts

@@ -6,12 +6,12 @@ import { User } from './models/user'; // import all entities here
 import { userSessions } from './models/user-sessions';
 import { Role } from './models/role';
 import { ITHelpDeskRequests } from './models/ITHelpDeskModel';
-import { ITServicesTypesSalalah } from './models/ITServicesTypesSalalahModel';
-import { ITServicesTypesMuscat } from './models/ITServicesTypesMuscatModel';
+// import { ITServicesTypesSalalah } from './models/ITServicesTypesSalalahModel'; // REMOVED - table no longer used
+// import { ITServicesTypesMuscat } from './models/ITServicesTypesMuscatModel'; // REMOVED - table no longer used
 import { ServiceType } from './models/ServiceTypeModel';
 import { CAAServices } from './models/CAAServices';
 import { CAASubServices } from './models/CAASubServices';
-import { ITApprovalSettings } from './models/ITApprovalSettings';
+// import { ITApprovalSettings } from './models/ITApprovalSettings'; // REMOVED - table no longer used
 // import { Workflows } from './models/Workflows';
 import { ItApprovalDetails } from './models/ItApprovalsModel';
 import { ItWorkFlow } from './models/ItWorkflowModel';
@@ -56,12 +56,12 @@ export const AppDataSource = new DataSource({
     User,userSessions,
     Role, 
     ITHelpDeskRequests, 
-    ITServicesTypesSalalah, 
-    ITServicesTypesMuscat,
+    // ITServicesTypesSalalah, // REMOVED - table no longer used
+    // ITServicesTypesMuscat, // REMOVED - table no longer used
     ServiceType,
     CAAServices, 
     CAASubServices, 
-    ITApprovalSettings, 
+    // ITApprovalSettings, // REMOVED - table no longer used
     // Workflows, 
     ItApprovalDetails, 
     ItWorkFlow, 

package/src/index.ts

@@ -2,13 +2,13 @@ export * from './models/user';
 export * from './models/role';
 export * from './models/user-sessions';
 export * from './models/ITHelpDeskModel';
-export * from './models/ITServicesTypesSalalahModel';
-export * from './models/ITServicesTypesMuscatModel';
+// export * from './models/ITServicesTypesSalalahModel'; // REMOVED - table no longer used
+// export * from './models/ITServicesTypesMuscatModel'; // REMOVED - table no longer used
 export * from './models/ServiceTypeModel';
 export * from './models/CAAServices';   
 export * from './models/CAASubServices';
-export * from './models/ITApprovalSettings';
-// export * from './models/Workflows';
+// export * from './models/ITApprovalSettings'; // REMOVED - table no longer used
+// export * from './models/Workflows'; // REMOVED - table no longer used
 export * from './models/ItApprovalsModel';
 export * from './models/ItWorkflowModel';
 export * from './models/WorkflowDefinitions';

package/src/models/ITHelpDeskModel.ts

@@ -53,17 +53,9 @@ export class ITHelpDeskRequests extends BaseModel {
     @Column({ type: "date", nullable: false })
     request_date: Date;
 
-    @Column({ nullable: true })
-    attachment_url: string;
-
     @Column({ nullable: false })
     user_id: number;
 
-    @Column({ nullable: true })
-    reporting_manager: number;
-
-    @Column({ nullable: true })
-    assigned_to: number;
 
     @Column({
         type: "enum",
@@ -85,9 +77,6 @@ export class ITHelpDeskRequests extends BaseModel {
         extn_num: string,
         contact_num: string, 
         request_date: Date,
-        attachment_url: string,
-        reporting_manager: number,
-        assigned_to: number,
         status: status,     
         workflow_execution_id?: string,
         req_user_department_id?: number | null,
@@ -103,9 +92,6 @@ export class ITHelpDeskRequests extends BaseModel {
         this.extn_num = extn_num;
         this.contact_num = contact_num;
         this.request_date = request_date;
-        this.attachment_url = attachment_url;
-        this.reporting_manager = reporting_manager;
-        this.assigned_to = assigned_to;
         this.status = status;
         this.workflow_execution_id = workflow_execution_id || null;
         this.req_user_department_id = req_user_department_id || null;

package/src/models/ItApprovalsModel.ts

@@ -20,7 +20,7 @@ export class ItApprovalDetails extends BaseModel {
   approver_user_id: number | null;
 
   @Column({ type: 'integer', nullable: false })
-  approver_role_id: number;
+  approver_role_id: number | null;
 
   @Column({ type: 'integer', nullable: true })
   department_id: number | null;
@@ -40,7 +40,7 @@ export class ItApprovalDetails extends BaseModel {
     constructor(
       request_id: number, 
       approver_user_id: number | null, 
-      approver_role_id: number, 
+      approver_role_id: number | null, 
       comment: string, 
       approval_status: ApprovalStatus, 
       level: number,

package/src/models/ItWorkflowModel.ts

@@ -13,16 +13,20 @@ export class ItWorkFlow extends BaseModel {
   @Column({ type: 'int', nullable: false })
   request_id: number;
 
+  @Column({ type: 'int', nullable: true })
+  order: number | null;
+
   @Column({ type: 'varchar', length: 255, nullable: false })
   content: string;
 
   @Column({ type: 'enum', enum: workFlowStatus, default: workFlowStatus.NOT_YET_STARTED, nullable: false })
   status: workFlowStatus;
 
-  constructor(request_id: number, content: string, status: workFlowStatus) {
+  constructor(request_id: number, content: string, status: workFlowStatus, order?: number) {
     super();
     this.request_id = request_id;
     this.content = content;
     this.status = status;
+    this.order = order || null;
   }
 }

package/src/models/NotificationModel.ts

@@ -4,6 +4,9 @@ import { BaseModel } from './BaseModel';
 
 export enum NotificationType {
     REQUEST_RAISED = 'request raised',
+    REQUEST_APPROVE = 'request approve',
+    REQUEST_REJECT = 'request reject',
+    REQUEST_WITHDRAW = 'request withdraw',
     REMINDER = 'reminder',
     IMPORT = 'import',
 }

package/src/models/WorkflowTask.ts

@@ -13,14 +13,29 @@ export class WorkflowTask extends BaseModel {
     @Column({ type: 'varchar', length: 200, nullable: true })
     task_type: string;
 
+    @Column({ type: 'int', nullable: true })
+    service_id: number | null;
+
+    @Column({ type: 'int', nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: 'varchar', length: 50, nullable: true })
+    service_type: string | null;
+
     constructor(
         name: string,
         task_id?: number,
-        task_type?: string
+        task_type?: string,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        service_type?: string | null
     ) {
         super();
         this.name = name;
         this.task_id = task_id || 0;
         this.task_type = task_type || '';
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.service_type = service_type || null;
     }
 }

package/dist/models/PortalFeedbackModel.d.ts

@@ -1,8 +0,0 @@
-import { BaseModel } from './BaseModel';
-import { Rating } from './feedbackModel';
-export declare class PortalFeedback extends BaseModel {
-    comment: string;
-    rating: Rating;
-    user_Id: number;
-    constructor(comment: string, rating: Rating, user_Id: number);
-}

package/dist/models/PortalFeedbackModel.js

@@ -1,44 +0,0 @@
-"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.PortalFeedback = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-const feedbackModel_1 = require("./feedbackModel");
-let PortalFeedback = class PortalFeedback extends BaseModel_1.BaseModel {
-    constructor(comment, rating, user_Id) {
-        super();
-        this.comment = comment,
-            this.rating = rating,
-            this.user_Id = user_Id;
-    }
-};
-exports.PortalFeedback = PortalFeedback;
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
-], PortalFeedback.prototype, "comment", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        type: "enum",
-        enum: feedbackModel_1.Rating,
-        nullable: true,
-    }),
-    __metadata("design:type", Number)
-], PortalFeedback.prototype, "rating", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Number)
-], PortalFeedback.prototype, "user_Id", void 0);
-exports.PortalFeedback = PortalFeedback = __decorate([
-    (0, typeorm_1.Entity)({ name: 'portal_feedback' }),
-    __metadata("design:paramtypes", [String, Number, Number])
-], PortalFeedback);

package/dist/models/feedbackModel.d.ts

@@ -1,16 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare enum Rating {
-    ONE = 1,
-    TWO = 2,
-    THREE = 3,
-    FOUR = 4,
-    FIVE = 5
-}
-export declare class Feedback extends BaseModel {
-    comment: string;
-    rating: Rating;
-    category_Id: number;
-    sub_category_Id: number;
-    user_Id: number;
-    constructor(comment: string, rating: Rating, category_Id: number, sub_category_Id: number, user_Id: number);
-}

package/dist/models/feedbackModel.js

@@ -1,61 +0,0 @@
-"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.Feedback = exports.Rating = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-var Rating;
-(function (Rating) {
-    Rating[Rating["ONE"] = 1] = "ONE";
-    Rating[Rating["TWO"] = 2] = "TWO";
-    Rating[Rating["THREE"] = 3] = "THREE";
-    Rating[Rating["FOUR"] = 4] = "FOUR";
-    Rating[Rating["FIVE"] = 5] = "FIVE";
-})(Rating || (exports.Rating = Rating = {}));
-let Feedback = class Feedback extends BaseModel_1.BaseModel {
-    constructor(comment, rating, category_Id, sub_category_Id, user_Id) {
-        super();
-        this.comment = comment,
-            this.rating = rating,
-            this.category_Id = category_Id,
-            this.sub_category_Id = sub_category_Id,
-            this.user_Id = user_Id;
-    }
-};
-exports.Feedback = Feedback;
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
-], Feedback.prototype, "comment", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        type: "enum",
-        enum: Rating,
-        nullable: true,
-    }),
-    __metadata("design:type", Number)
-], Feedback.prototype, "rating", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Number)
-], Feedback.prototype, "category_Id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Number)
-], Feedback.prototype, "sub_category_Id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Number)
-], Feedback.prototype, "user_Id", void 0);
-exports.Feedback = Feedback = __decorate([
-    (0, typeorm_1.Entity)({ name: 'feedback' }),
-    __metadata("design:paramtypes", [String, Number, Number, Number, Number])
-], Feedback);

package/src/models/ITApprovalSettings.ts

@@ -1,29 +0,0 @@
-import { Column, Entity, Unique } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'it_approval_settings' })
-@Unique(['workflow_id', 'level'])
-export class ITApprovalSettings extends BaseModel {
-    
-
-    @Column({ type: 'int', nullable: false })
-    level: number;
-
-    @Column({ type: 'int', nullable: false })
-    approval_role_id: number;
-
-    @Column({ type: 'int', nullable: false })
-    workflow_id: number;
-    constructor(
-        level: number,
-        approval_role_id: number,
-        workflow_id: number
-    ) {
-        super();
-        this.level = level;
-        this.approval_role_id = approval_role_id;
-        this.workflow_id = workflow_id;
-        }
-}
-
-

package/src/models/ITServicesTypesMuscatModel.ts

@@ -1,22 +0,0 @@
-
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'it_services_types_muscat' })
-export class ITServicesTypesMuscat extends BaseModel {
-
-    @Column({ nullable: false })
-    name: string;
-
-    @Column({ nullable: false })
-    name_in_arabic: string;
-
-    constructor(     
-        name: string,
-        name_in_arabic: string
-    ) {
-        super();     
-        this.name = name
-        this.name_in_arabic = name_in_arabic
-    }
-}

package/src/models/ITServicesTypesSalalahModel.ts

@@ -1,22 +0,0 @@
-
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'it_services_types_salalah' })
-export class ITServicesTypesSalalah extends BaseModel {
-
-    @Column({ nullable: false })
-    name: string;
-
-    @Column({ nullable: false })
-    name_in_arabic: string;
-
-    constructor(     
-        name: string,
-        name_in_arabic: string
-    ) {
-        super();     
-        this.name = name
-        this.name_in_arabic = name_in_arabic
-    }
-}

package/src/models/Workflows.ts

@@ -1,40 +0,0 @@
-// import { Column, Entity, Unique } from "typeorm";
-// import { BaseModel } from './BaseModel';
-
-// @Entity({ name: 'workflows' })
-// @Unique(['service_id', 'sub_service_id', 'request_for'])
-// export class Workflows extends BaseModel {
-
-//     @Column({ type: 'varchar', length: 100, nullable: false })
-//     name: string;
-
-//     @Column({ type: 'bigint', nullable: false })
-//     service_id: number;
-
-//     @Column({ type: 'bigint', nullable: false })
-//     sub_service_id: number;
-
-//     @Column({ type: 'varchar', length: 20, nullable: false })
-//     request_for: string; // 'Self' | 'Behalf of' | 'Internal'
-
-//     @Column({ type: 'int', nullable: false })
-//     levels: number;
-
-
-//     constructor(
-//         name: string,
-//         service_id: number,
-//         sub_service_id: number,
-//         request_for: string,
-//         levels: number,
-//     ) {
-//         super();
-//         this.name = name;
-//         this.service_id = service_id;
-//         this.sub_service_id = sub_service_id;
-//         this.request_for = request_for;
-//         this.levels = levels;
-//     }
-// }
-
-