@platform-modules/foreign-ministry 1.3.332 → 1.3.334

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (86) hide show
  1. package/.env +5 -10
  2. package/dist/helpers/services-notification-config.helper.js +2 -6
  3. package/dist/models/CityMasterModel.d.ts +1 -0
  4. package/dist/models/CityMasterModel.js +4 -0
  5. package/dist/models/DepartmentsModel.d.ts +1 -0
  6. package/dist/models/DepartmentsModel.js +4 -0
  7. package/dist/models/DiplomaticTitlesMasterModel.d.ts +1 -0
  8. package/dist/models/DiplomaticTitlesMasterModel.js +4 -0
  9. package/dist/models/EmbassyEvaluationCycleModel.d.ts +5 -0
  10. package/dist/models/EmbassyEvaluationCycleModel.js +4 -0
  11. package/dist/models/GroupNamesModel.d.ts +1 -0
  12. package/dist/models/GroupNamesModel.js +4 -0
  13. package/dist/models/LocationModel.d.ts +1 -0
  14. package/dist/models/LocationModel.js +4 -0
  15. package/dist/models/SectionModel.d.ts +1 -0
  16. package/dist/models/SectionModel.js +4 -0
  17. package/dist/models/SlaApprovalsViewModel.js +47 -47
  18. package/dist/models/SlaMyRequestsViewModel.js +52 -52
  19. package/dist/models/role.d.ts +2 -1
  20. package/dist/models/role.js +7 -2
  21. package/package.json +35 -35
  22. package/scripts/check-column-types.js +38 -38
  23. package/scripts/check-service-tables.js +42 -42
  24. package/scripts/sync-sla-reports-sql.js +95 -95
  25. package/sql/sla-reports-sync.manifest.json +7 -7
  26. package/sql/sla_reports_admin_procedures.sql +283 -283
  27. package/sql/sla_reports_approvals_workbook.sql +383 -383
  28. package/sql/sla_reports_procedures.sql +874 -874
  29. package/sql/vw_sla_approvals.sql +108 -108
  30. package/sql/vw_sla_my_requests.sql +55 -55
  31. package/src/data-source.ts +686 -686
  32. package/src/helpers/employee-evaluation-request.utils.ts +178 -178
  33. package/src/helpers/evaluation-eligibility.utils.ts +126 -126
  34. package/src/helpers/services-notification-config.helper.ts +1 -6
  35. package/src/index.ts +617 -617
  36. package/src/models/CityMasterModel.ts +3 -0
  37. package/src/models/DepartmentsModel.ts +3 -0
  38. package/src/models/DiplomaticAcademyRequestModel.ts +80 -80
  39. package/src/models/DiplomaticTitlesMasterModel.ts +3 -0
  40. package/src/models/DocumentationFileModel.ts +40 -40
  41. package/src/models/EmbassyEvaluationCycleModel.ts +45 -38
  42. package/src/models/EmbassyEvaluationRequestModel.ts +59 -59
  43. package/src/models/EmployeeEvaluationAnswerModel.ts +26 -26
  44. package/src/models/EvaluationEligibilitySettingModel.ts +51 -51
  45. package/src/models/EvaluationFormModel.ts +44 -44
  46. package/src/models/GroupNamesModel.ts +3 -0
  47. package/src/models/LMSExternalEntityTrainedPersonModel.ts +45 -45
  48. package/src/models/LanguageCourseRequestModel.ts +67 -67
  49. package/src/models/LeaveApprovalsModel.ts +66 -66
  50. package/src/models/LeaveConfigModel.ts +71 -71
  51. package/src/models/LocationModel.ts +3 -0
  52. package/src/models/MissionTravelApprovalModel.ts +101 -101
  53. package/src/models/MissionTravelAttachmentModel.ts +56 -56
  54. package/src/models/MissionTravelChatModel.ts +52 -52
  55. package/src/models/MissionTravelPersonModel.ts +105 -105
  56. package/src/models/MissionTravelWorkflowModel.ts +54 -54
  57. package/src/models/ProjectContactsModel.ts +51 -51
  58. package/src/models/ProjectFaqModel.ts +36 -36
  59. package/src/models/ProjectInvoicesModel.ts +41 -41
  60. package/src/models/ProjectModel.ts +75 -75
  61. package/src/models/ProjectTasksModel.ts +75 -75
  62. package/src/models/SectionModel.ts +38 -35
  63. package/src/models/ServiceSlaApprovalModel.ts +63 -63
  64. package/src/models/ServicesNotificationConfigsModel.ts +55 -55
  65. package/src/models/SlaApprovalsViewModel.ts +135 -135
  66. package/src/models/SlaMyRequestsViewModel.ts +172 -172
  67. package/src/models/role.ts +7 -3
  68. package/src/sla-report-views.ts +3 -3
  69. package/dist/models/EmbassyEvaluationDepartmentSettingModel.d.ts +0 -14
  70. package/dist/models/EmbassyEvaluationDepartmentSettingModel.js +0 -56
  71. package/dist/models/EvaluationMastersModel.d.ts +0 -16
  72. package/dist/models/EvaluationMastersModel.js +0 -67
  73. package/dist/models/EvaluationQuestionMasterModel.d.ts +0 -10
  74. package/dist/models/EvaluationQuestionMasterModel.js +0 -42
  75. package/dist/models/EvaluationSectionMasterModel.d.ts +0 -7
  76. package/dist/models/EvaluationSectionMasterModel.js +0 -36
  77. package/dist/models/EvaluationWorkflowModel.d.ts +0 -60
  78. package/dist/models/EvaluationWorkflowModel.js +0 -215
  79. package/dist/models/IneligibleForEvaluationModel.d.ts +0 -8
  80. package/dist/models/IneligibleForEvaluationModel.js +0 -44
  81. package/dist/models/MissionTravelClassConfigModel.d.ts +0 -10
  82. package/dist/models/MissionTravelClassConfigModel.js +0 -50
  83. package/dist/models/MissionTravelPerdiemModel.d.ts +0 -10
  84. package/dist/models/MissionTravelPerdiemModel.js +0 -54
  85. package/dist/models/UuidAuditModel.d.ts +0 -9
  86. package/dist/models/UuidAuditModel.js +0 -41
package/.env CHANGED
@@ -1,10 +1,5 @@
1
- # DB_HOST=localhost
2
- # DB_PORT=5432
3
- # DB_USER=postgres
4
- # DB_PASS=stevejobs
5
- # DB_NAME=FM
6
-
7
- DB_HOST = 164.52.222.169
8
- DB_USER = postgres_admin_user
9
- DB_PASS = pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
10
- DB_NAME=FM
1
+ DB_HOST=localhost
2
+ DB_PORT=5432
3
+ DB_USER=postgres
4
+ DB_PASS=Fa@123
5
+ DB_NAME=FM
@@ -80,7 +80,7 @@ async function collectFmServicesNotificationConfigRecipients(manager, params) {
80
80
  * Inserts portal notifications for users resolved from `services_notification_configs`.
81
81
  */
82
82
  async function sendFmServicesNotificationConfigNotifications(manager, params) {
83
- const { serviceId, subServiceId, pendingCount, requestId, status, approvalLevel, shortProductName, requestTypeKey, routePath, createdBy, logPrefix = '[FM notification config]', } = params;
83
+ const { serviceId, subServiceId, pendingCount, requestId, status, shortProductName, requestTypeKey, routePath, createdBy, logPrefix = '[FM notification config]', } = params;
84
84
  if (!serviceId || !subServiceId)
85
85
  return { sentCount: 0 };
86
86
  const notificationConfigs = await manager
@@ -126,10 +126,7 @@ async function sendFmServicesNotificationConfigNotifications(manager, params) {
126
126
  console.warn(`${logPrefix} No users found for ${notificationConfig.trigger} config (dept ${notificationConfig.department_id}${notificationConfig.section_id != null ? `, section ${notificationConfig.section_id}` : ''})`);
127
127
  continue;
128
128
  }
129
- const isEveryApproval = notificationConfig.trigger === ServicesNotificationConfigsModel_1.ServicesNotificationTriggerType.EVERY_APPROVAL;
130
- const notificationTitle = isEveryApproval
131
- ? `${shortProductName} Request ${status} at Level ${approvalLevel}`
132
- : `${shortProductName} Request ${status}`;
129
+ const notificationTitle = `${shortProductName} Request ${status}`;
133
130
  const notificationData = `${shortProductName} request #${requestId} has been ${status}.`;
134
131
  for (const ur of userRoles) {
135
132
  const targetUserId = ur.user_id;
@@ -160,7 +157,6 @@ async function sendFmServicesNotificationConfigNotifications(manager, params) {
160
157
  requestId,
161
158
  requestType: requestTypeKey,
162
159
  status,
163
- level: approvalLevel,
164
160
  timestamp: new Date().toISOString(),
165
161
  },
166
162
  is_read: false,
@@ -2,6 +2,7 @@ import { BaseModel } from './BaseModel';
2
2
  export declare class CityMaster extends BaseModel {
3
3
  country_id: number | null;
4
4
  city_name: string;
5
+ city_arabic_name: string | null;
5
6
  city_code: string | null;
6
7
  description: string | null;
7
8
  constructor(city_name: string);
@@ -27,6 +27,10 @@ __decorate([
27
27
  (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
28
28
  __metadata("design:type", String)
29
29
  ], CityMaster.prototype, "city_name", void 0);
30
+ __decorate([
31
+ (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
32
+ __metadata("design:type", Object)
33
+ ], CityMaster.prototype, "city_arabic_name", void 0);
30
34
  __decorate([
31
35
  (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
32
36
  __metadata("design:type", Object)
@@ -1,6 +1,7 @@
1
1
  import { BaseModel } from './BaseModel';
2
2
  export declare class Departments extends BaseModel {
3
3
  department_name: string;
4
+ department_arabic_name: string | null;
4
5
  department_code: string;
5
6
  department_description: string;
6
7
  undersecretary_department_id: number | null;
@@ -27,6 +27,10 @@ __decorate([
27
27
  (0, typeorm_1.Column)({ type: 'varchar', length: 64, nullable: false }),
28
28
  __metadata("design:type", String)
29
29
  ], Departments.prototype, "department_name", void 0);
30
+ __decorate([
31
+ (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
32
+ __metadata("design:type", Object)
33
+ ], Departments.prototype, "department_arabic_name", void 0);
30
34
  __decorate([
31
35
  (0, typeorm_1.Column)({ type: 'varchar', length: 64, nullable: false }),
32
36
  __metadata("design:type", String)
@@ -5,6 +5,7 @@ export declare enum TitleCategory {
5
5
  }
6
6
  export declare class DiplomaticTitlesMaster extends BaseModel {
7
7
  title: string;
8
+ diplomatic_title_arabic_name: string | null;
8
9
  category: TitleCategory;
9
10
  constructor(title: string, category: TitleCategory);
10
11
  }
@@ -29,6 +29,10 @@ __decorate([
29
29
  (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
30
30
  __metadata("design:type", String)
31
31
  ], DiplomaticTitlesMaster.prototype, "title", void 0);
32
+ __decorate([
33
+ (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
34
+ __metadata("design:type", Object)
35
+ ], DiplomaticTitlesMaster.prototype, "diplomatic_title_arabic_name", void 0);
32
36
  __decorate([
33
37
  (0, typeorm_1.Column)({ type: 'enum', enum: TitleCategory, nullable: false, default: TitleCategory.EMPLOYEE }),
34
38
  __metadata("design:type", String)
@@ -11,6 +11,11 @@ export declare class EmbassyEvaluationCycle extends BaseModel {
11
11
  start_date: string;
12
12
  /** End of evaluation window, format MM-DD. Submissions locked after this date in the active year. */
13
13
  end_date: string;
14
+ /**
15
+ * Last day submissions are allowed (MM-DD). Closing reminders use this date.
16
+ * When null, `end_date` is used for submission and reminders.
17
+ */
18
+ last_evaluation_date: string | null;
14
19
  status: EmbassyEvaluationCycleStatus;
15
20
  service_id: number | null;
16
21
  sub_service_id: number | null;
@@ -34,6 +34,10 @@ __decorate([
34
34
  (0, typeorm_1.Column)({ type: 'varchar', length: 10, nullable: false }),
35
35
  __metadata("design:type", String)
36
36
  ], EmbassyEvaluationCycle.prototype, "end_date", void 0);
37
+ __decorate([
38
+ (0, typeorm_1.Column)({ type: 'varchar', length: 10, nullable: true }),
39
+ __metadata("design:type", Object)
40
+ ], EmbassyEvaluationCycle.prototype, "last_evaluation_date", void 0);
37
41
  __decorate([
38
42
  (0, typeorm_1.Column)({
39
43
  type: 'enum',
@@ -1,6 +1,7 @@
1
1
  import { BaseModel } from './BaseModel';
2
2
  export declare class GroupNames extends BaseModel {
3
3
  name: string;
4
+ group_arabic_name: string | null;
4
5
  description: string;
5
6
  constructor(name: string, description: string);
6
7
  }
@@ -24,6 +24,10 @@ __decorate([
24
24
  (0, typeorm_1.Column)({ nullable: false }),
25
25
  __metadata("design:type", String)
26
26
  ], GroupNames.prototype, "name", void 0);
27
+ __decorate([
28
+ (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
29
+ __metadata("design:type", Object)
30
+ ], GroupNames.prototype, "group_arabic_name", void 0);
27
31
  __decorate([
28
32
  (0, typeorm_1.Column)({ nullable: true }),
29
33
  __metadata("design:type", String)
@@ -1,6 +1,7 @@
1
1
  export declare class Location {
2
2
  id: number;
3
3
  name: string;
4
+ location_arabic_name: string | null;
4
5
  description: string;
5
6
  is_active: boolean;
6
7
  is_deleted: boolean;
@@ -28,6 +28,10 @@ __decorate([
28
28
  (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
29
29
  __metadata("design:type", String)
30
30
  ], Location.prototype, "name", void 0);
31
+ __decorate([
32
+ (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
33
+ __metadata("design:type", Object)
34
+ ], Location.prototype, "location_arabic_name", void 0);
31
35
  __decorate([
32
36
  (0, typeorm_1.Column)({ type: 'text', nullable: true }),
33
37
  __metadata("design:type", String)
@@ -1,6 +1,7 @@
1
1
  import { BaseModel } from './BaseModel';
2
2
  export declare class Sections extends BaseModel {
3
3
  section_name: string;
4
+ section_arabic_name: string | null;
4
5
  section_code: string;
5
6
  section_description: string;
6
7
  department_id: number;
@@ -27,6 +27,10 @@ __decorate([
27
27
  (0, typeorm_1.Column)({ type: 'varchar', length: 64, nullable: false }),
28
28
  __metadata("design:type", String)
29
29
  ], Sections.prototype, "section_name", void 0);
30
+ __decorate([
31
+ (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
32
+ __metadata("design:type", Object)
33
+ ], Sections.prototype, "section_arabic_name", void 0);
30
34
  __decorate([
31
35
  (0, typeorm_1.Column)({ type: 'varchar', length: 64, nullable: false }),
32
36
  __metadata("design:type", String)
@@ -11,53 +11,53 @@ var __metadata = (this && this.__metadata) || function (k, v) {
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.SlaApprovalsView = void 0;
13
13
  const typeorm_1 = require("typeorm");
14
- const VW_SLA_APPROVALS_SQL = `
15
- SELECT
16
- sa.id AS sla_approval_id,
17
- sa.source_approval_id,
18
- sa.request_id,
19
- sa.service_id AS service_id,
20
- sa.sub_service_id AS sub_service_id,
21
- TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
22
- TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
23
- sa.approver_role_id AS approval_role_id,
24
- TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
25
- sa.department_id AS approval_department_id,
26
- TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
27
- sa.section_id AS approval_section_id,
28
- TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
29
- sa.approval_status::TEXT AS approval_status,
30
- sr.status::TEXT AS request_status,
31
- sa.level AS level,
32
- sa.approver_user_id AS approver_user_id,
33
- TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
34
- sa.delegate_user_id AS delegate_user_id,
35
- TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
36
- sa.approved_by AS approved_by,
37
- TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
38
- sa.comment::TEXT AS comment,
39
- sa.created_at AS created_at,
40
- sa.updated_at AS updated_at
41
- FROM sla_approval sa
42
- INNER JOIN sla_requests sr
43
- ON sr.request_id = sa.request_id AND COALESCE(sr.is_deleted, false) = false
44
- LEFT JOIN fm_services svc
45
- ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
46
- LEFT JOIN fm_sub_services subsvc
47
- ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
48
- LEFT JOIN departments adpt
49
- ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
50
- LEFT JOIN sections asec
51
- ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
52
- LEFT JOIN role ar
53
- ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
54
- LEFT JOIN users au
55
- ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
56
- LEFT JOIN users du
57
- ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
58
- LEFT JOIN users ab
59
- ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
60
- WHERE COALESCE(sa.is_deleted, false) = false
14
+ const VW_SLA_APPROVALS_SQL = `
15
+ SELECT
16
+ sa.id AS sla_approval_id,
17
+ sa.source_approval_id,
18
+ sa.request_id,
19
+ sa.service_id AS service_id,
20
+ sa.sub_service_id AS sub_service_id,
21
+ TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
22
+ TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
23
+ sa.approver_role_id AS approval_role_id,
24
+ TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
25
+ sa.department_id AS approval_department_id,
26
+ TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
27
+ sa.section_id AS approval_section_id,
28
+ TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
29
+ sa.approval_status::TEXT AS approval_status,
30
+ sr.status::TEXT AS request_status,
31
+ sa.level AS level,
32
+ sa.approver_user_id AS approver_user_id,
33
+ TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
34
+ sa.delegate_user_id AS delegate_user_id,
35
+ TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
36
+ sa.approved_by AS approved_by,
37
+ TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
38
+ sa.comment::TEXT AS comment,
39
+ sa.created_at AS created_at,
40
+ sa.updated_at AS updated_at
41
+ FROM sla_approval sa
42
+ INNER JOIN sla_requests sr
43
+ ON sr.request_id = sa.request_id AND COALESCE(sr.is_deleted, false) = false
44
+ LEFT JOIN fm_services svc
45
+ ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
46
+ LEFT JOIN fm_sub_services subsvc
47
+ ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
48
+ LEFT JOIN departments adpt
49
+ ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
50
+ LEFT JOIN sections asec
51
+ ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
52
+ LEFT JOIN role ar
53
+ ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
54
+ LEFT JOIN users au
55
+ ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
56
+ LEFT JOIN users du
57
+ ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
58
+ LEFT JOIN users ab
59
+ ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
60
+ WHERE COALESCE(sa.is_deleted, false) = false
61
61
  `;
62
62
  /**
63
63
  * Read-only view for SLA approvals listings (TypeORM).
@@ -36,58 +36,58 @@ exports.SLA_MY_REQUESTS_REQUEST_OBJ_EXCLUDED_KEYS = [
36
36
  "sla_request",
37
37
  "sla_request_id",
38
38
  ];
39
- const VW_SLA_MY_REQUESTS_SQL = `
40
- SELECT
41
- sr.id AS sla_request_id,
42
- sr.user_id,
43
- sr.service_id AS service_id,
44
- sr.sub_service_id AS sub_service_id,
45
- TRIM(COALESCE(creator.employee_name, ''))::TEXT AS created_by,
46
- sr.created_at,
47
- TRIM(COALESCE(dept.department_name, ''))::TEXT AS req_user_department_id,
48
- TRIM(COALESCE(sec.section_name, ''))::TEXT AS req_user_section_id,
49
- TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
50
- TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
51
- sr.status::TEXT AS status,
52
- sr.request_id,
53
- (
54
- COALESCE(sr.request_obj, '{}'::jsonb)
55
- - 'id'
56
- - 'status'
57
- - 'role_id'
58
- - 'user_id'
59
- - 'createdBy'
60
- - 'created_at'
61
- - 'updated_by'
62
- - 'updated_at'
63
- - 'req_user_department_id'
64
- - 'workflow_execution_id'
65
- - 'department_id'
66
- - 'req_user_section_id'
67
- - 'service_type_id'
68
- - 'service_type'
69
- - 'created_by'
70
- - 'service_id'
71
- - 'sub_service_id'
72
- - 'attachments'
73
- - 'is_deleted'
74
- - 'sla_request'
75
- - 'sla_request_id'
76
- ) AS request_fields
77
- FROM sla_requests sr
78
- LEFT JOIN users creator
79
- ON sr.created_by ~ '^[0-9]+$'
80
- AND creator.id = sr.created_by::integer
81
- AND COALESCE(creator.is_deleted, false) = false
82
- LEFT JOIN departments dept
83
- ON dept.id = sr.req_user_department_id AND COALESCE(dept.is_deleted, false) = false
84
- LEFT JOIN sections sec
85
- ON sec.id = sr.req_user_section_id AND COALESCE(sec.is_deleted, false) = false
86
- LEFT JOIN fm_services svc
87
- ON svc.id = sr.service_id AND COALESCE(svc.is_deleted, false) = false
88
- LEFT JOIN fm_sub_services subsvc
89
- ON subsvc.id = sr.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
90
- WHERE COALESCE(sr.is_deleted, false) = false
39
+ const VW_SLA_MY_REQUESTS_SQL = `
40
+ SELECT
41
+ sr.id AS sla_request_id,
42
+ sr.user_id,
43
+ sr.service_id AS service_id,
44
+ sr.sub_service_id AS sub_service_id,
45
+ TRIM(COALESCE(creator.employee_name, ''))::TEXT AS created_by,
46
+ sr.created_at,
47
+ TRIM(COALESCE(dept.department_name, ''))::TEXT AS req_user_department_id,
48
+ TRIM(COALESCE(sec.section_name, ''))::TEXT AS req_user_section_id,
49
+ TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
50
+ TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
51
+ sr.status::TEXT AS status,
52
+ sr.request_id,
53
+ (
54
+ COALESCE(sr.request_obj, '{}'::jsonb)
55
+ - 'id'
56
+ - 'status'
57
+ - 'role_id'
58
+ - 'user_id'
59
+ - 'createdBy'
60
+ - 'created_at'
61
+ - 'updated_by'
62
+ - 'updated_at'
63
+ - 'req_user_department_id'
64
+ - 'workflow_execution_id'
65
+ - 'department_id'
66
+ - 'req_user_section_id'
67
+ - 'service_type_id'
68
+ - 'service_type'
69
+ - 'created_by'
70
+ - 'service_id'
71
+ - 'sub_service_id'
72
+ - 'attachments'
73
+ - 'is_deleted'
74
+ - 'sla_request'
75
+ - 'sla_request_id'
76
+ ) AS request_fields
77
+ FROM sla_requests sr
78
+ LEFT JOIN users creator
79
+ ON sr.created_by ~ '^[0-9]+$'
80
+ AND creator.id = sr.created_by::integer
81
+ AND COALESCE(creator.is_deleted, false) = false
82
+ LEFT JOIN departments dept
83
+ ON dept.id = sr.req_user_department_id AND COALESCE(dept.is_deleted, false) = false
84
+ LEFT JOIN sections sec
85
+ ON sec.id = sr.req_user_section_id AND COALESCE(sec.is_deleted, false) = false
86
+ LEFT JOIN fm_services svc
87
+ ON svc.id = sr.service_id AND COALESCE(svc.is_deleted, false) = false
88
+ LEFT JOIN fm_sub_services subsvc
89
+ ON subsvc.id = sr.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
90
+ WHERE COALESCE(sr.is_deleted, false) = false
91
91
  `;
92
92
  /**
93
93
  * Read-only view for SLA "my requests" listings.
@@ -11,6 +11,7 @@ Userrole Information will store
11
11
  import { BaseModel } from './BaseModel';
12
12
  export declare class Role extends BaseModel {
13
13
  name: string;
14
+ arabic_name: string | null;
14
15
  is_deleted?: boolean;
15
- constructor(name: string, is_deleted: boolean);
16
+ constructor(name: string, is_deleted: boolean, arabic_name?: string | null);
16
17
  }
@@ -23,10 +23,11 @@ exports.Role = void 0;
23
23
  const typeorm_1 = require("typeorm");
24
24
  const BaseModel_1 = require("./BaseModel");
25
25
  let Role = class Role extends BaseModel_1.BaseModel {
26
- constructor(name, is_deleted) {
26
+ constructor(name, is_deleted, arabic_name = null) {
27
27
  super();
28
28
  this.name = name;
29
29
  this.is_deleted = is_deleted;
30
+ this.arabic_name = arabic_name;
30
31
  }
31
32
  };
32
33
  exports.Role = Role;
@@ -34,11 +35,15 @@ __decorate([
34
35
  (0, typeorm_1.Column)({ nullable: true }),
35
36
  __metadata("design:type", String)
36
37
  ], Role.prototype, "name", void 0);
38
+ __decorate([
39
+ (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
40
+ __metadata("design:type", Object)
41
+ ], Role.prototype, "arabic_name", void 0);
37
42
  __decorate([
38
43
  (0, typeorm_1.Column)({ nullable: true }),
39
44
  __metadata("design:type", Boolean)
40
45
  ], Role.prototype, "is_deleted", void 0);
41
46
  exports.Role = Role = __decorate([
42
47
  (0, typeorm_1.Entity)({ name: 'role' }),
43
- __metadata("design:paramtypes", [String, Boolean])
48
+ __metadata("design:paramtypes", [String, Boolean, Object])
44
49
  ], Role);
package/package.json CHANGED
@@ -1,35 +1,35 @@
1
- {
2
- "name": "@platform-modules/foreign-ministry",
3
- "version": "1.3.332",
4
- "main": "dist/index.js",
5
- "types": "dist/index.d.ts",
6
- "exports": {
7
- ".": {
8
- "types": "./dist/index.d.ts",
9
- "default": "./dist/index.js"
10
- },
11
- "./sla-report-views": {
12
- "types": "./dist/sla-report-views.d.ts",
13
- "default": "./dist/sla-report-views.js"
14
- }
15
- },
16
- "scripts": {
17
- "build": "tsc",
18
- "dev": "ts-node src/scripts.ts",
19
- "sync:sla-sql": "node scripts/sync-sla-reports-sql.js"
20
- },
21
- "publishConfig": {
22
- "access": "public"
23
- },
24
- "dependencies": {
25
- "moment-timezone": "^0.6.0",
26
- "pg": "^8.16.0",
27
- "typeorm": "^0.3.17"
28
- },
29
- "devDependencies": {
30
- "@types/moment-timezone": "^0.5.30",
31
- "dotenv": "^16.5.0",
32
- "ts-node": "^10.9.2",
33
- "typescript": "^5.2.0"
34
- }
35
- }
1
+ {
2
+ "name": "@platform-modules/foreign-ministry",
3
+ "version": "1.3.334",
4
+ "main": "dist/index.js",
5
+ "types": "dist/index.d.ts",
6
+ "exports": {
7
+ ".": {
8
+ "types": "./dist/index.d.ts",
9
+ "default": "./dist/index.js"
10
+ },
11
+ "./sla-report-views": {
12
+ "types": "./dist/sla-report-views.d.ts",
13
+ "default": "./dist/sla-report-views.js"
14
+ }
15
+ },
16
+ "scripts": {
17
+ "build": "tsc",
18
+ "dev": "ts-node src/scripts.ts",
19
+ "sync:sla-sql": "node scripts/sync-sla-reports-sql.js"
20
+ },
21
+ "publishConfig": {
22
+ "access": "public"
23
+ },
24
+ "dependencies": {
25
+ "moment-timezone": "^0.6.0",
26
+ "pg": "^8.16.0",
27
+ "typeorm": "^0.3.17"
28
+ },
29
+ "devDependencies": {
30
+ "@types/moment-timezone": "^0.5.30",
31
+ "dotenv": "^16.5.0",
32
+ "ts-node": "^10.9.2",
33
+ "typescript": "^5.2.0"
34
+ }
35
+ }
@@ -1,38 +1,38 @@
1
- const dotenv = require('dotenv');
2
- const { Client } = require('pg');
3
-
4
- dotenv.config({ path: '../Reports_Service/.env' });
5
- dotenv.config({ path: '.env', override: true });
6
-
7
- async function main() {
8
- const client = new Client({
9
- host: process.env.DB_HOST.trim(),
10
- port: 5432,
11
- user: process.env.DB_USER.trim(),
12
- password: process.env.DB_PASS,
13
- database: process.env.DB_NAME.trim(),
14
- });
15
- await client.connect();
16
-
17
- const tables = ['sla_requests', 'users', 'departments', 'sections', 'fm_services', 'fm_sub_services'];
18
- for (const table of tables) {
19
- const { rows } = await client.query(
20
- `SELECT column_name, data_type
21
- FROM information_schema.columns
22
- WHERE table_schema = 'public' AND table_name = $1
23
- ORDER BY ordinal_position`,
24
- [table]
25
- );
26
- console.log(`\n${table}:`);
27
- for (const row of rows) {
28
- console.log(` ${row.column_name}: ${row.data_type}`);
29
- }
30
- }
31
-
32
- await client.end();
33
- }
34
-
35
- main().catch((err) => {
36
- console.error(err.message);
37
- process.exit(1);
38
- });
1
+ const dotenv = require('dotenv');
2
+ const { Client } = require('pg');
3
+
4
+ dotenv.config({ path: '../Reports_Service/.env' });
5
+ dotenv.config({ path: '.env', override: true });
6
+
7
+ async function main() {
8
+ const client = new Client({
9
+ host: process.env.DB_HOST.trim(),
10
+ port: 5432,
11
+ user: process.env.DB_USER.trim(),
12
+ password: process.env.DB_PASS,
13
+ database: process.env.DB_NAME.trim(),
14
+ });
15
+ await client.connect();
16
+
17
+ const tables = ['sla_requests', 'users', 'departments', 'sections', 'fm_services', 'fm_sub_services'];
18
+ for (const table of tables) {
19
+ const { rows } = await client.query(
20
+ `SELECT column_name, data_type
21
+ FROM information_schema.columns
22
+ WHERE table_schema = 'public' AND table_name = $1
23
+ ORDER BY ordinal_position`,
24
+ [table]
25
+ );
26
+ console.log(`\n${table}:`);
27
+ for (const row of rows) {
28
+ console.log(` ${row.column_name}: ${row.data_type}`);
29
+ }
30
+ }
31
+
32
+ await client.end();
33
+ }
34
+
35
+ main().catch((err) => {
36
+ console.error(err.message);
37
+ process.exit(1);
38
+ });