@platform-modules/civil-aviation-authority 2.3.261 → 2.3.264
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.
- package/dist/models/MultiPurposeHallRequestModel.d.ts +1 -0
- package/dist/models/MultiPurposeHallRequestModel.js +4 -0
- package/dist/models/SlaApprovalsViewModel.js +47 -47
- package/dist/models/VipHallRequestModel.d.ts +1 -0
- package/dist/models/VipHallRequestModel.js +4 -0
- package/package.json +1 -1
- package/sql/vw_sla_approvals.sql +108 -54
- package/src/models/MultiPurposeHallRequestModel.ts +3 -0
- package/src/models/SlaApprovalsViewModel.ts +135 -135
- package/src/models/VipHallRequestModel.ts +3 -0
|
@@ -39,6 +39,7 @@ export declare class MultiPurposeHallRequests extends BaseModel {
|
|
|
39
39
|
project_maintenance_support_required: boolean;
|
|
40
40
|
number_of_guests: number | null;
|
|
41
41
|
special_requirements: string | null;
|
|
42
|
+
duration: string | null;
|
|
42
43
|
status: MultiPurposeHallRequestStatus;
|
|
43
44
|
workflow_execution_id: string | null;
|
|
44
45
|
}
|
|
@@ -130,6 +130,10 @@ __decorate([
|
|
|
130
130
|
(0, typeorm_1.Column)({ type: "text", nullable: true }),
|
|
131
131
|
__metadata("design:type", Object)
|
|
132
132
|
], MultiPurposeHallRequests.prototype, "special_requirements", void 0);
|
|
133
|
+
__decorate([
|
|
134
|
+
(0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: true }),
|
|
135
|
+
__metadata("design:type", Object)
|
|
136
|
+
], MultiPurposeHallRequests.prototype, "duration", void 0);
|
|
133
137
|
__decorate([
|
|
134
138
|
(0, typeorm_1.Column)({
|
|
135
139
|
type: "enum",
|
|
@@ -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 caa_services svc
|
|
45
|
-
ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
|
|
46
|
-
LEFT JOIN caa_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 caa_services svc
|
|
45
|
+
ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
|
|
46
|
+
LEFT JOIN caa_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).
|
|
@@ -38,6 +38,7 @@ export declare class VipHallRequests extends BaseModel {
|
|
|
38
38
|
project_maintenance_support_required: boolean;
|
|
39
39
|
number_of_guests: number | null;
|
|
40
40
|
special_requirements: string | null;
|
|
41
|
+
duration: string | null;
|
|
41
42
|
status: VipHallRequestStatus;
|
|
42
43
|
workflow_execution_id: string | null;
|
|
43
44
|
}
|
|
@@ -133,6 +133,10 @@ __decorate([
|
|
|
133
133
|
(0, typeorm_1.Column)({ type: "text", nullable: true }),
|
|
134
134
|
__metadata("design:type", Object)
|
|
135
135
|
], VipHallRequests.prototype, "special_requirements", void 0);
|
|
136
|
+
__decorate([
|
|
137
|
+
(0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: true }),
|
|
138
|
+
__metadata("design:type", Object)
|
|
139
|
+
], VipHallRequests.prototype, "duration", void 0);
|
|
136
140
|
__decorate([
|
|
137
141
|
(0, typeorm_1.Column)({
|
|
138
142
|
type: "enum",
|
package/package.json
CHANGED
package/sql/vw_sla_approvals.sql
CHANGED
|
@@ -1,54 +1,108 @@
|
|
|
1
|
-
-- SLA approvals read model: joined display names for approval routing.
|
|
2
|
-
|
|
3
|
-
--
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
sa.
|
|
20
|
-
|
|
21
|
-
sa.
|
|
22
|
-
|
|
23
|
-
sa.
|
|
24
|
-
|
|
25
|
-
sa.
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
TRIM(COALESCE(
|
|
30
|
-
|
|
31
|
-
TRIM(COALESCE(
|
|
32
|
-
|
|
33
|
-
sa.
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
1
|
+
-- SLA approvals read model: joined display names for approval routing.
|
|
2
|
+
|
|
3
|
+
-- Approver-scope filtering is applied in Reports_Service (TypeORM), not in this view.
|
|
4
|
+
|
|
5
|
+
-- Run once against the EmpPortal PostgreSQL database:
|
|
6
|
+
|
|
7
|
+
-- psql -U <user> -d <database> -f sql/vw_sla_approvals.sql
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
DROP VIEW IF EXISTS vw_sla_approvals CASCADE;
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
CREATE VIEW vw_sla_approvals AS
|
|
16
|
+
|
|
17
|
+
SELECT
|
|
18
|
+
|
|
19
|
+
sa.id AS sla_approval_id,
|
|
20
|
+
|
|
21
|
+
sa.source_approval_id,
|
|
22
|
+
|
|
23
|
+
sa.request_id,
|
|
24
|
+
|
|
25
|
+
sa.service_id AS service_id,
|
|
26
|
+
|
|
27
|
+
sa.sub_service_id AS sub_service_id,
|
|
28
|
+
|
|
29
|
+
TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
|
|
30
|
+
|
|
31
|
+
TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
|
|
32
|
+
|
|
33
|
+
sa.approver_role_id AS approval_role_id,
|
|
34
|
+
|
|
35
|
+
TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
|
|
36
|
+
|
|
37
|
+
sa.department_id AS approval_department_id,
|
|
38
|
+
|
|
39
|
+
TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
|
|
40
|
+
|
|
41
|
+
sa.section_id AS approval_section_id,
|
|
42
|
+
|
|
43
|
+
TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
|
|
44
|
+
|
|
45
|
+
sa.approval_status::TEXT AS approval_status,
|
|
46
|
+
|
|
47
|
+
sr.status::TEXT AS request_status,
|
|
48
|
+
|
|
49
|
+
sa.level AS level,
|
|
50
|
+
|
|
51
|
+
sa.approver_user_id AS approver_user_id,
|
|
52
|
+
|
|
53
|
+
TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
|
|
54
|
+
|
|
55
|
+
sa.delegate_user_id AS delegate_user_id,
|
|
56
|
+
|
|
57
|
+
TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
|
|
58
|
+
|
|
59
|
+
sa.approved_by AS approved_by,
|
|
60
|
+
|
|
61
|
+
TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
|
|
62
|
+
|
|
63
|
+
sa.comment::TEXT AS comment,
|
|
64
|
+
|
|
65
|
+
sa.created_at AS created_at,
|
|
66
|
+
|
|
67
|
+
sa.updated_at AS updated_at
|
|
68
|
+
|
|
69
|
+
FROM sla_approval sa
|
|
70
|
+
|
|
71
|
+
INNER JOIN sla_requests sr
|
|
72
|
+
|
|
73
|
+
ON sr.request_id = sa.request_id AND COALESCE(sr.is_deleted, false) = false
|
|
74
|
+
|
|
75
|
+
LEFT JOIN caa_services svc
|
|
76
|
+
|
|
77
|
+
ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
|
|
78
|
+
|
|
79
|
+
LEFT JOIN caa_sub_services subsvc
|
|
80
|
+
|
|
81
|
+
ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
|
|
82
|
+
|
|
83
|
+
LEFT JOIN departments adpt
|
|
84
|
+
|
|
85
|
+
ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
|
|
86
|
+
|
|
87
|
+
LEFT JOIN sections asec
|
|
88
|
+
|
|
89
|
+
ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
|
|
90
|
+
|
|
91
|
+
LEFT JOIN role ar
|
|
92
|
+
|
|
93
|
+
ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
|
|
94
|
+
|
|
95
|
+
LEFT JOIN users au
|
|
96
|
+
|
|
97
|
+
ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
|
|
98
|
+
|
|
99
|
+
LEFT JOIN users du
|
|
100
|
+
|
|
101
|
+
ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
|
|
102
|
+
|
|
103
|
+
LEFT JOIN users ab
|
|
104
|
+
|
|
105
|
+
ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
|
|
106
|
+
|
|
107
|
+
WHERE COALESCE(sa.is_deleted, false) = false;
|
|
108
|
+
|
|
@@ -100,6 +100,9 @@ export class MultiPurposeHallRequests extends BaseModel {
|
|
|
100
100
|
@Column({ type: "text", nullable: true })
|
|
101
101
|
special_requirements: string | null;
|
|
102
102
|
|
|
103
|
+
@Column({ type: "varchar", length: 100, nullable: true })
|
|
104
|
+
duration: string | null;
|
|
105
|
+
|
|
103
106
|
@Column({
|
|
104
107
|
type: "enum",
|
|
105
108
|
enum: MultiPurposeHallRequestStatus,
|
|
@@ -1,135 +1,135 @@
|
|
|
1
|
-
import { ViewColumn, ViewEntity } from "typeorm";
|
|
2
|
-
|
|
3
|
-
const VW_SLA_APPROVALS_SQL = `
|
|
4
|
-
SELECT
|
|
5
|
-
sa.id AS sla_approval_id,
|
|
6
|
-
sa.source_approval_id,
|
|
7
|
-
sa.request_id,
|
|
8
|
-
sa.service_id AS service_id,
|
|
9
|
-
sa.sub_service_id AS sub_service_id,
|
|
10
|
-
TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
|
|
11
|
-
TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
|
|
12
|
-
sa.approver_role_id AS approval_role_id,
|
|
13
|
-
TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
|
|
14
|
-
sa.department_id AS approval_department_id,
|
|
15
|
-
TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
|
|
16
|
-
sa.section_id AS approval_section_id,
|
|
17
|
-
TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
|
|
18
|
-
sa.approval_status::TEXT AS approval_status,
|
|
19
|
-
sr.status::TEXT AS request_status,
|
|
20
|
-
sa.level AS level,
|
|
21
|
-
sa.approver_user_id AS approver_user_id,
|
|
22
|
-
TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
|
|
23
|
-
sa.delegate_user_id AS delegate_user_id,
|
|
24
|
-
TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
|
|
25
|
-
sa.approved_by AS approved_by,
|
|
26
|
-
TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
|
|
27
|
-
sa.comment::TEXT AS comment,
|
|
28
|
-
sa.created_at AS created_at,
|
|
29
|
-
sa.updated_at AS updated_at
|
|
30
|
-
FROM sla_approval sa
|
|
31
|
-
INNER JOIN sla_requests sr
|
|
32
|
-
ON sr.request_id = sa.request_id AND COALESCE(sr.is_deleted, false) = false
|
|
33
|
-
LEFT JOIN caa_services svc
|
|
34
|
-
ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
|
|
35
|
-
LEFT JOIN caa_sub_services subsvc
|
|
36
|
-
ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
|
|
37
|
-
LEFT JOIN departments adpt
|
|
38
|
-
ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
|
|
39
|
-
LEFT JOIN sections asec
|
|
40
|
-
ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
|
|
41
|
-
LEFT JOIN role ar
|
|
42
|
-
ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
|
|
43
|
-
LEFT JOIN users au
|
|
44
|
-
ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
|
|
45
|
-
LEFT JOIN users du
|
|
46
|
-
ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
|
|
47
|
-
LEFT JOIN users ab
|
|
48
|
-
ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
|
|
49
|
-
WHERE COALESCE(sa.is_deleted, false) = false
|
|
50
|
-
`;
|
|
51
|
-
|
|
52
|
-
/**
|
|
53
|
-
* Read-only view for SLA approvals listings (TypeORM).
|
|
54
|
-
* Approver matching (`sla_approval_matches_user` semantics) is applied in Reports_Service queries.
|
|
55
|
-
*/
|
|
56
|
-
@ViewEntity({
|
|
57
|
-
name: "vw_sla_approvals",
|
|
58
|
-
expression: VW_SLA_APPROVALS_SQL,
|
|
59
|
-
})
|
|
60
|
-
export class SlaApprovalsView {
|
|
61
|
-
@ViewColumn()
|
|
62
|
-
sla_approval_id: number;
|
|
63
|
-
|
|
64
|
-
@ViewColumn()
|
|
65
|
-
source_approval_id: number;
|
|
66
|
-
|
|
67
|
-
@ViewColumn()
|
|
68
|
-
request_id: number;
|
|
69
|
-
|
|
70
|
-
@ViewColumn()
|
|
71
|
-
service_id: number;
|
|
72
|
-
|
|
73
|
-
@ViewColumn()
|
|
74
|
-
sub_service_id: number;
|
|
75
|
-
|
|
76
|
-
@ViewColumn()
|
|
77
|
-
service_name: string;
|
|
78
|
-
|
|
79
|
-
@ViewColumn()
|
|
80
|
-
sub_service_name: string;
|
|
81
|
-
|
|
82
|
-
@ViewColumn()
|
|
83
|
-
approval_role_id: number;
|
|
84
|
-
|
|
85
|
-
@ViewColumn()
|
|
86
|
-
approval_role_name: string;
|
|
87
|
-
|
|
88
|
-
@ViewColumn()
|
|
89
|
-
approval_department_id: number;
|
|
90
|
-
|
|
91
|
-
@ViewColumn()
|
|
92
|
-
approval_department_name: string;
|
|
93
|
-
|
|
94
|
-
@ViewColumn()
|
|
95
|
-
approval_section_id: number;
|
|
96
|
-
|
|
97
|
-
@ViewColumn()
|
|
98
|
-
approval_section_name: string;
|
|
99
|
-
|
|
100
|
-
@ViewColumn()
|
|
101
|
-
approval_status: string;
|
|
102
|
-
|
|
103
|
-
@ViewColumn()
|
|
104
|
-
request_status: string;
|
|
105
|
-
|
|
106
|
-
@ViewColumn()
|
|
107
|
-
level: number;
|
|
108
|
-
|
|
109
|
-
@ViewColumn()
|
|
110
|
-
approver_user_id: number;
|
|
111
|
-
|
|
112
|
-
@ViewColumn()
|
|
113
|
-
approver_user_name: string;
|
|
114
|
-
|
|
115
|
-
@ViewColumn()
|
|
116
|
-
delegate_user_id: number;
|
|
117
|
-
|
|
118
|
-
@ViewColumn()
|
|
119
|
-
delegate_user_name: string;
|
|
120
|
-
|
|
121
|
-
@ViewColumn()
|
|
122
|
-
approved_by: number;
|
|
123
|
-
|
|
124
|
-
@ViewColumn()
|
|
125
|
-
approved_by_name: string;
|
|
126
|
-
|
|
127
|
-
@ViewColumn()
|
|
128
|
-
comment: string;
|
|
129
|
-
|
|
130
|
-
@ViewColumn()
|
|
131
|
-
created_at: Date;
|
|
132
|
-
|
|
133
|
-
@ViewColumn()
|
|
134
|
-
updated_at: Date;
|
|
135
|
-
}
|
|
1
|
+
import { ViewColumn, ViewEntity } from "typeorm";
|
|
2
|
+
|
|
3
|
+
const VW_SLA_APPROVALS_SQL = `
|
|
4
|
+
SELECT
|
|
5
|
+
sa.id AS sla_approval_id,
|
|
6
|
+
sa.source_approval_id,
|
|
7
|
+
sa.request_id,
|
|
8
|
+
sa.service_id AS service_id,
|
|
9
|
+
sa.sub_service_id AS sub_service_id,
|
|
10
|
+
TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
|
|
11
|
+
TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
|
|
12
|
+
sa.approver_role_id AS approval_role_id,
|
|
13
|
+
TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
|
|
14
|
+
sa.department_id AS approval_department_id,
|
|
15
|
+
TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
|
|
16
|
+
sa.section_id AS approval_section_id,
|
|
17
|
+
TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
|
|
18
|
+
sa.approval_status::TEXT AS approval_status,
|
|
19
|
+
sr.status::TEXT AS request_status,
|
|
20
|
+
sa.level AS level,
|
|
21
|
+
sa.approver_user_id AS approver_user_id,
|
|
22
|
+
TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
|
|
23
|
+
sa.delegate_user_id AS delegate_user_id,
|
|
24
|
+
TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
|
|
25
|
+
sa.approved_by AS approved_by,
|
|
26
|
+
TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
|
|
27
|
+
sa.comment::TEXT AS comment,
|
|
28
|
+
sa.created_at AS created_at,
|
|
29
|
+
sa.updated_at AS updated_at
|
|
30
|
+
FROM sla_approval sa
|
|
31
|
+
INNER JOIN sla_requests sr
|
|
32
|
+
ON sr.request_id = sa.request_id AND COALESCE(sr.is_deleted, false) = false
|
|
33
|
+
LEFT JOIN caa_services svc
|
|
34
|
+
ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
|
|
35
|
+
LEFT JOIN caa_sub_services subsvc
|
|
36
|
+
ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
|
|
37
|
+
LEFT JOIN departments adpt
|
|
38
|
+
ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
|
|
39
|
+
LEFT JOIN sections asec
|
|
40
|
+
ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
|
|
41
|
+
LEFT JOIN role ar
|
|
42
|
+
ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
|
|
43
|
+
LEFT JOIN users au
|
|
44
|
+
ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
|
|
45
|
+
LEFT JOIN users du
|
|
46
|
+
ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
|
|
47
|
+
LEFT JOIN users ab
|
|
48
|
+
ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
|
|
49
|
+
WHERE COALESCE(sa.is_deleted, false) = false
|
|
50
|
+
`;
|
|
51
|
+
|
|
52
|
+
/**
|
|
53
|
+
* Read-only view for SLA approvals listings (TypeORM).
|
|
54
|
+
* Approver matching (`sla_approval_matches_user` semantics) is applied in Reports_Service queries.
|
|
55
|
+
*/
|
|
56
|
+
@ViewEntity({
|
|
57
|
+
name: "vw_sla_approvals",
|
|
58
|
+
expression: VW_SLA_APPROVALS_SQL,
|
|
59
|
+
})
|
|
60
|
+
export class SlaApprovalsView {
|
|
61
|
+
@ViewColumn()
|
|
62
|
+
sla_approval_id: number;
|
|
63
|
+
|
|
64
|
+
@ViewColumn()
|
|
65
|
+
source_approval_id: number;
|
|
66
|
+
|
|
67
|
+
@ViewColumn()
|
|
68
|
+
request_id: number;
|
|
69
|
+
|
|
70
|
+
@ViewColumn()
|
|
71
|
+
service_id: number;
|
|
72
|
+
|
|
73
|
+
@ViewColumn()
|
|
74
|
+
sub_service_id: number;
|
|
75
|
+
|
|
76
|
+
@ViewColumn()
|
|
77
|
+
service_name: string;
|
|
78
|
+
|
|
79
|
+
@ViewColumn()
|
|
80
|
+
sub_service_name: string;
|
|
81
|
+
|
|
82
|
+
@ViewColumn()
|
|
83
|
+
approval_role_id: number;
|
|
84
|
+
|
|
85
|
+
@ViewColumn()
|
|
86
|
+
approval_role_name: string;
|
|
87
|
+
|
|
88
|
+
@ViewColumn()
|
|
89
|
+
approval_department_id: number;
|
|
90
|
+
|
|
91
|
+
@ViewColumn()
|
|
92
|
+
approval_department_name: string;
|
|
93
|
+
|
|
94
|
+
@ViewColumn()
|
|
95
|
+
approval_section_id: number;
|
|
96
|
+
|
|
97
|
+
@ViewColumn()
|
|
98
|
+
approval_section_name: string;
|
|
99
|
+
|
|
100
|
+
@ViewColumn()
|
|
101
|
+
approval_status: string;
|
|
102
|
+
|
|
103
|
+
@ViewColumn()
|
|
104
|
+
request_status: string;
|
|
105
|
+
|
|
106
|
+
@ViewColumn()
|
|
107
|
+
level: number;
|
|
108
|
+
|
|
109
|
+
@ViewColumn()
|
|
110
|
+
approver_user_id: number;
|
|
111
|
+
|
|
112
|
+
@ViewColumn()
|
|
113
|
+
approver_user_name: string;
|
|
114
|
+
|
|
115
|
+
@ViewColumn()
|
|
116
|
+
delegate_user_id: number;
|
|
117
|
+
|
|
118
|
+
@ViewColumn()
|
|
119
|
+
delegate_user_name: string;
|
|
120
|
+
|
|
121
|
+
@ViewColumn()
|
|
122
|
+
approved_by: number;
|
|
123
|
+
|
|
124
|
+
@ViewColumn()
|
|
125
|
+
approved_by_name: string;
|
|
126
|
+
|
|
127
|
+
@ViewColumn()
|
|
128
|
+
comment: string;
|
|
129
|
+
|
|
130
|
+
@ViewColumn()
|
|
131
|
+
created_at: Date;
|
|
132
|
+
|
|
133
|
+
@ViewColumn()
|
|
134
|
+
updated_at: Date;
|
|
135
|
+
}
|
|
@@ -101,6 +101,9 @@ export class VipHallRequests extends BaseModel {
|
|
|
101
101
|
@Column({ type: "text", nullable: true })
|
|
102
102
|
special_requirements: string | null;
|
|
103
103
|
|
|
104
|
+
@Column({ type: "varchar", length: 100, nullable: true })
|
|
105
|
+
duration: string | null;
|
|
106
|
+
|
|
104
107
|
@Column({
|
|
105
108
|
type: "enum",
|
|
106
109
|
enum: VipHallRequestStatus,
|