@platform-modules/civil-aviation-authority 2.0.42 → 2.0.50

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 (47) hide show
  1. package/.env +2 -2
  2. package/dist/data-source.js +1 -11
  3. package/dist/index.d.ts +0 -5
  4. package/dist/index.js +0 -5
  5. package/dist/models/ITRequestAttachmentModel.d.ts +3 -1
  6. package/dist/models/ITRequestAttachmentModel.js +12 -2
  7. package/dist/models/ItApprovalsModel.d.ts +3 -1
  8. package/dist/models/ItApprovalsModel.js +12 -2
  9. package/dist/models/ItWorkflowModel.d.ts +3 -1
  10. package/dist/models/ItWorkflowModel.js +12 -2
  11. package/dist/models/VpnApprovalModel.d.ts +2 -1
  12. package/dist/models/VpnApprovalModel.js +7 -2
  13. package/dist/models/WorkflowTask.d.ts +4 -1
  14. package/dist/models/WorkflowTask.js +17 -2
  15. package/package.json +1 -1
  16. package/src/data-source.ts +1 -11
  17. package/src/index.ts +0 -5
  18. package/src/models/ITRequestAttachmentModel.ts +11 -1
  19. package/src/models/ItApprovalsModel.ts +11 -1
  20. package/src/models/ItWorkflowModel.ts +9 -1
  21. package/src/models/VpnApprovalModel.ts +6 -1
  22. package/src/models/WorkflowTask.ts +16 -1
  23. package/dist/models/HotelApprovalModel.d.ts +0 -22
  24. package/dist/models/HotelApprovalModel.js +0 -91
  25. package/dist/models/HotelAttachedModel.d.ts +0 -12
  26. package/dist/models/HotelAttachedModel.js +0 -64
  27. package/dist/models/HotelChatModel.d.ts +0 -17
  28. package/dist/models/HotelChatModel.js +0 -67
  29. package/dist/models/HotelWorkFlowModel.d.ts +0 -14
  30. package/dist/models/HotelWorkFlowModel.js +0 -56
  31. package/dist/models/HotelreservationModal.d.ts +0 -30
  32. package/dist/models/HotelreservationModal.js +0 -119
  33. package/dist/models/HotelreservationModel.d.ts +0 -44
  34. package/dist/models/HotelreservationModel.js +0 -171
  35. package/dist/models/ITApprovalSettings.d.ts +0 -7
  36. package/dist/models/ITApprovalSettings.js +0 -40
  37. package/dist/models/ITServicesTypesMuscatModel.d.ts +0 -6
  38. package/dist/models/ITServicesTypesMuscatModel.js +0 -34
  39. package/dist/models/ITServicesTypesSalalahModel.d.ts +0 -6
  40. package/dist/models/ITServicesTypesSalalahModel.js +0 -34
  41. package/dist/models/Workflows.d.ts +0 -0
  42. package/dist/models/Workflows.js +0 -31
  43. package/src/models/HotelApprovalModel.ts +0 -79
  44. package/src/models/HotelAttachedModel.ts +0 -54
  45. package/src/models/HotelChatModel.ts +0 -55
  46. package/src/models/HotelWorkFlowModel.ts +0 -42
  47. package/src/models/HotelreservationModel.ts +0 -159
package/.env CHANGED
@@ -1,5 +1,5 @@
1
1
  DB_HOST=localhost
2
- DB_PORT=5433
2
+ DB_PORT=5432
3
3
  DB_USER=postgres
4
- DB_PASS=123
4
+ DB_PASS=stevejobs
5
5
  DB_NAME=CAA
@@ -49,11 +49,6 @@ const VpnApprovalModel_1 = require("./models/VpnApprovalModel");
49
49
  const VpnWorkflowModel_1 = require("./models/VpnWorkflowModel");
50
50
  const VpnRequestAttachmentModel_1 = require("./models/VpnRequestAttachmentModel");
51
51
  const VpnRequestChatModel_1 = require("./models/VpnRequestChatModel");
52
- const HotelreservationModel_1 = require("./models/HotelreservationModel");
53
- const HotelApprovalModel_1 = require("./models/HotelApprovalModel");
54
- const HotelWorkFlowModel_1 = require("./models/HotelWorkFlowModel");
55
- const HotelChatModel_1 = require("./models/HotelChatModel");
56
- const HotelAttachedModel_1 = require("./models/HotelAttachedModel");
57
52
  exports.AppDataSource = new typeorm_1.DataSource({
58
53
  type: 'postgres',
59
54
  host: process.env.DB_HOST || 'localhost',
@@ -106,11 +101,6 @@ exports.AppDataSource = new typeorm_1.DataSource({
106
101
  VpnApprovalModel_1.VpnApprovalDetails,
107
102
  VpnWorkflowModel_1.VpnWorkFlow,
108
103
  VpnRequestAttachmentModel_1.VpnRequestAttachment,
109
- VpnRequestChatModel_1.VpnRequestChat,
110
- HotelreservationModel_1.HotelReservation,
111
- HotelApprovalModel_1.HotelApprovalDetails,
112
- HotelWorkFlowModel_1.HotelWorkFlow,
113
- HotelChatModel_1.HotelRequestChat,
114
- HotelAttachedModel_1.HotelRequestAttachment
104
+ VpnRequestChatModel_1.VpnRequestChat
115
105
  ],
116
106
  });
package/dist/index.d.ts CHANGED
@@ -38,8 +38,3 @@ export * from './models/VpnApprovalModel';
38
38
  export * from './models/VpnWorkflowModel';
39
39
  export * from './models/VpnRequestChatModel';
40
40
  export * from './models/VpnRequestAttachmentModel';
41
- export * from './models/HotelreservationModel';
42
- export * from './models/HotelApprovalModel';
43
- export * from './models/HotelWorkFlowModel';
44
- export * from './models/HotelChatModel';
45
- export * from './models/HotelAttachedModel';
package/dist/index.js CHANGED
@@ -58,8 +58,3 @@ __exportStar(require("./models/VpnApprovalModel"), exports);
58
58
  __exportStar(require("./models/VpnWorkflowModel"), exports);
59
59
  __exportStar(require("./models/VpnRequestChatModel"), exports);
60
60
  __exportStar(require("./models/VpnRequestAttachmentModel"), exports);
61
- __exportStar(require("./models/HotelreservationModel"), exports);
62
- __exportStar(require("./models/HotelApprovalModel"), exports);
63
- __exportStar(require("./models/HotelWorkFlowModel"), exports);
64
- __exportStar(require("./models/HotelChatModel"), exports);
65
- __exportStar(require("./models/HotelAttachedModel"), exports);
@@ -4,6 +4,8 @@ import { User } from './user';
4
4
  export declare class ITRequestAttachment extends BaseModel {
5
5
  request_id: number;
6
6
  request: ITHelpDeskRequests;
7
+ service_id: number | null;
8
+ sub_service_id: number | null;
7
9
  uploaded_by: number;
8
10
  user: User;
9
11
  file_url: string;
@@ -11,5 +13,5 @@ export declare class ITRequestAttachment extends BaseModel {
11
13
  file_type: string;
12
14
  file_size: number | null;
13
15
  description: string;
14
- constructor(request_id: number, uploaded_by: number, file_url: string, file_name?: string, file_type?: string, file_size?: number, description?: string);
16
+ constructor(request_id: number, uploaded_by: number, file_url: string, file_name?: string, file_type?: string, file_size?: number, description?: string, service_id?: number | null, sub_service_id?: number | null);
15
17
  }
@@ -15,7 +15,7 @@ const BaseModel_1 = require("./BaseModel");
15
15
  const ITHelpDeskModel_1 = require("./ITHelpDeskModel");
16
16
  const user_1 = require("./user");
17
17
  let ITRequestAttachment = class ITRequestAttachment extends BaseModel_1.BaseModel {
18
- constructor(request_id, uploaded_by, file_url, file_name, file_type, file_size, description) {
18
+ constructor(request_id, uploaded_by, file_url, file_name, file_type, file_size, description, service_id, sub_service_id) {
19
19
  super();
20
20
  this.request_id = request_id;
21
21
  this.uploaded_by = uploaded_by;
@@ -24,6 +24,8 @@ let ITRequestAttachment = class ITRequestAttachment extends BaseModel_1.BaseMode
24
24
  this.file_type = file_type || '';
25
25
  this.file_size = file_size || null;
26
26
  this.description = description || '';
27
+ this.service_id = service_id ?? null;
28
+ this.sub_service_id = sub_service_id ?? null;
27
29
  }
28
30
  };
29
31
  exports.ITRequestAttachment = ITRequestAttachment;
@@ -36,6 +38,14 @@ __decorate([
36
38
  (0, typeorm_1.JoinColumn)({ name: 'request_id' }),
37
39
  __metadata("design:type", ITHelpDeskModel_1.ITHelpDeskRequests)
38
40
  ], ITRequestAttachment.prototype, "request", void 0);
41
+ __decorate([
42
+ (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
43
+ __metadata("design:type", Object)
44
+ ], ITRequestAttachment.prototype, "service_id", void 0);
45
+ __decorate([
46
+ (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
47
+ __metadata("design:type", Object)
48
+ ], ITRequestAttachment.prototype, "sub_service_id", void 0);
39
49
  __decorate([
40
50
  (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
41
51
  __metadata("design:type", Number)
@@ -67,5 +77,5 @@ __decorate([
67
77
  ], ITRequestAttachment.prototype, "description", void 0);
68
78
  exports.ITRequestAttachment = ITRequestAttachment = __decorate([
69
79
  (0, typeorm_1.Entity)({ name: 'it_request_attachments' }),
70
- __metadata("design:paramtypes", [Number, Number, String, String, String, Number, String])
80
+ __metadata("design:paramtypes", [Number, Number, String, String, String, Number, String, Object, Object])
71
81
  ], ITRequestAttachment);
@@ -6,6 +6,8 @@ export declare enum ApprovalStatus {
6
6
  }
7
7
  export declare class ItApprovalDetails extends BaseModel {
8
8
  request_id: number;
9
+ service_id: number | null;
10
+ sub_service_id: number | null;
9
11
  level: number;
10
12
  approver_user_id: number | null;
11
13
  approver_role_id: number | null;
@@ -14,5 +16,5 @@ export declare class ItApprovalDetails extends BaseModel {
14
16
  approved_by: number | null;
15
17
  comment: string;
16
18
  approval_status: ApprovalStatus;
17
- 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);
19
+ 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, service_id?: number | null, sub_service_id?: number | null);
18
20
  }
@@ -19,7 +19,7 @@ var ApprovalStatus;
19
19
  ApprovalStatus["REJECTED"] = "Rejected";
20
20
  })(ApprovalStatus || (exports.ApprovalStatus = ApprovalStatus = {}));
21
21
  let ItApprovalDetails = class ItApprovalDetails extends BaseModel_1.BaseModel {
22
- constructor(request_id, approver_user_id, approver_role_id, comment, approval_status, level, department_id, section_id, approved_by) {
22
+ constructor(request_id, approver_user_id, approver_role_id, comment, approval_status, level, department_id, section_id, approved_by, service_id, sub_service_id) {
23
23
  super();
24
24
  this.request_id = request_id;
25
25
  this.approver_user_id = approver_user_id;
@@ -30,6 +30,8 @@ let ItApprovalDetails = class ItApprovalDetails extends BaseModel_1.BaseModel {
30
30
  this.department_id = department_id || null;
31
31
  this.section_id = section_id || null;
32
32
  this.approved_by = approved_by || null;
33
+ this.service_id = service_id ?? null;
34
+ this.sub_service_id = sub_service_id ?? null;
33
35
  }
34
36
  };
35
37
  exports.ItApprovalDetails = ItApprovalDetails;
@@ -37,6 +39,14 @@ __decorate([
37
39
  (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
38
40
  __metadata("design:type", Number)
39
41
  ], ItApprovalDetails.prototype, "request_id", void 0);
42
+ __decorate([
43
+ (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
44
+ __metadata("design:type", Object)
45
+ ], ItApprovalDetails.prototype, "service_id", void 0);
46
+ __decorate([
47
+ (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
48
+ __metadata("design:type", Object)
49
+ ], ItApprovalDetails.prototype, "sub_service_id", void 0);
40
50
  __decorate([
41
51
  (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
42
52
  __metadata("design:type", Number)
@@ -71,5 +81,5 @@ __decorate([
71
81
  ], ItApprovalDetails.prototype, "approval_status", void 0);
72
82
  exports.ItApprovalDetails = ItApprovalDetails = __decorate([
73
83
  (0, typeorm_1.Entity)({ name: 'it_approvals' }),
74
- __metadata("design:paramtypes", [Number, Object, Object, String, String, Number, Object, Object, Object])
84
+ __metadata("design:paramtypes", [Number, Object, Object, String, String, Number, Object, Object, Object, Object, Object])
75
85
  ], ItApprovalDetails);
@@ -6,8 +6,10 @@ export declare enum workFlowStatus {
6
6
  }
7
7
  export declare class ItWorkFlow extends BaseModel {
8
8
  request_id: number;
9
+ service_id: number | null;
10
+ sub_service_id: number | null;
9
11
  order: number | null;
10
12
  content: string;
11
13
  status: workFlowStatus;
12
- constructor(request_id: number, content: string, status: workFlowStatus, order?: number);
14
+ constructor(request_id: number, content: string, status: workFlowStatus, order?: number, service_id?: number | null, sub_service_id?: number | null);
13
15
  }
@@ -20,12 +20,14 @@ var workFlowStatus;
20
20
  })(workFlowStatus || (exports.workFlowStatus = workFlowStatus = {}));
21
21
  //This model is used to store the store the leave apporval matrix(HOD, Manager, HR, Director) based on leave type along with the levels
22
22
  let ItWorkFlow = class ItWorkFlow extends BaseModel_1.BaseModel {
23
- constructor(request_id, content, status, order) {
23
+ constructor(request_id, content, status, order, service_id, sub_service_id) {
24
24
  super();
25
25
  this.request_id = request_id;
26
26
  this.content = content;
27
27
  this.status = status;
28
28
  this.order = order || null;
29
+ this.service_id = service_id ?? null;
30
+ this.sub_service_id = sub_service_id ?? null;
29
31
  }
30
32
  };
31
33
  exports.ItWorkFlow = ItWorkFlow;
@@ -33,6 +35,14 @@ __decorate([
33
35
  (0, typeorm_1.Column)({ type: 'int', nullable: false }),
34
36
  __metadata("design:type", Number)
35
37
  ], ItWorkFlow.prototype, "request_id", void 0);
38
+ __decorate([
39
+ (0, typeorm_1.Column)({ type: 'int', nullable: true }),
40
+ __metadata("design:type", Object)
41
+ ], ItWorkFlow.prototype, "service_id", void 0);
42
+ __decorate([
43
+ (0, typeorm_1.Column)({ type: 'int', nullable: true }),
44
+ __metadata("design:type", Object)
45
+ ], ItWorkFlow.prototype, "sub_service_id", void 0);
36
46
  __decorate([
37
47
  (0, typeorm_1.Column)({ type: 'int', nullable: true }),
38
48
  __metadata("design:type", Object)
@@ -47,5 +57,5 @@ __decorate([
47
57
  ], ItWorkFlow.prototype, "status", void 0);
48
58
  exports.ItWorkFlow = ItWorkFlow = __decorate([
49
59
  (0, typeorm_1.Entity)({ name: 'it_work_flows' }),
50
- __metadata("design:paramtypes", [Number, String, String, Number])
60
+ __metadata("design:paramtypes", [Number, String, String, Number, Object, Object])
51
61
  ], ItWorkFlow);
@@ -15,5 +15,6 @@ export declare class VpnApprovalDetails extends BaseModel {
15
15
  approved_by: number | null;
16
16
  comment: string;
17
17
  approval_status: VpnApprovalStatus;
18
- constructor(request_id: number, approver_user_id: number | null, approver_role_id: number | null, comment: string, approval_status: VpnApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approved_by?: number | null);
18
+ is_manager: boolean;
19
+ constructor(request_id: number, approver_user_id: number | null, approver_role_id: number | null, comment: string, approval_status: VpnApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approved_by?: number | null, is_manager?: boolean);
19
20
  }
@@ -20,7 +20,7 @@ var VpnApprovalStatus;
20
20
  VpnApprovalStatus["REJECTED"] = "Rejected";
21
21
  })(VpnApprovalStatus || (exports.VpnApprovalStatus = VpnApprovalStatus = {}));
22
22
  let VpnApprovalDetails = class VpnApprovalDetails extends BaseModel_1.BaseModel {
23
- constructor(request_id, approver_user_id, approver_role_id, comment, approval_status, level, department_id, section_id, approved_by) {
23
+ constructor(request_id, approver_user_id, approver_role_id, comment, approval_status, level, department_id, section_id, approved_by, is_manager) {
24
24
  super();
25
25
  this.request_id = request_id;
26
26
  this.approver_user_id = approver_user_id;
@@ -31,6 +31,7 @@ let VpnApprovalDetails = class VpnApprovalDetails extends BaseModel_1.BaseModel
31
31
  this.department_id = department_id || null;
32
32
  this.section_id = section_id || null;
33
33
  this.approved_by = approved_by || null;
34
+ this.is_manager = is_manager ?? false;
34
35
  }
35
36
  };
36
37
  exports.VpnApprovalDetails = VpnApprovalDetails;
@@ -75,7 +76,11 @@ __decorate([
75
76
  }),
76
77
  __metadata("design:type", String)
77
78
  ], VpnApprovalDetails.prototype, "approval_status", void 0);
79
+ __decorate([
80
+ (0, typeorm_1.Column)({ type: "boolean", default: false, nullable: false }),
81
+ __metadata("design:type", Boolean)
82
+ ], VpnApprovalDetails.prototype, "is_manager", void 0);
78
83
  exports.VpnApprovalDetails = VpnApprovalDetails = __decorate([
79
84
  (0, typeorm_1.Entity)({ name: "vpn_approvals" }),
80
- __metadata("design:paramtypes", [Number, Object, Object, String, String, Number, Object, Object, Object])
85
+ __metadata("design:paramtypes", [Number, Object, Object, String, String, Number, Object, Object, Object, Boolean])
81
86
  ], VpnApprovalDetails);
@@ -4,7 +4,10 @@ import { CategoryType } from "./WorkflowTaskNames";
4
4
  export declare class WorkflowTask extends BaseModel {
5
5
  task_id: number;
6
6
  name: string;
7
+ service_id?: number | null;
8
+ sub_service_id?: number | null;
9
+ service_type?: string | null;
7
10
  task_type: TaskType;
8
11
  category: CategoryType;
9
- constructor(name: string, task_id?: number, task_type?: TaskType, category?: CategoryType);
12
+ constructor(name: string, task_id?: number, task_type?: TaskType, category?: CategoryType, service_id?: number | null, sub_service_id?: number | null, service_type?: string | null);
10
13
  }
@@ -24,12 +24,15 @@ const WorkflowTaskNames_2 = require("./WorkflowTaskNames");
24
24
  // NOTIFICATION = 'NOTIFICATION'
25
25
  // }
26
26
  let WorkflowTask = class WorkflowTask extends BaseModel_1.BaseModel {
27
- constructor(name, task_id, task_type, category) {
27
+ constructor(name, task_id, task_type, category, service_id, sub_service_id, service_type) {
28
28
  super();
29
29
  this.name = name;
30
30
  this.task_id = task_id || 0;
31
31
  this.task_type = task_type || WorkflowTaskNames_1.TaskType.SIMPLE;
32
32
  this.category = category || WorkflowTaskNames_2.CategoryType.CREATE;
33
+ this.service_id = service_id ?? null;
34
+ this.sub_service_id = sub_service_id ?? null;
35
+ this.service_type = service_type ?? null;
33
36
  }
34
37
  };
35
38
  exports.WorkflowTask = WorkflowTask;
@@ -41,6 +44,18 @@ __decorate([
41
44
  (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
42
45
  __metadata("design:type", String)
43
46
  ], WorkflowTask.prototype, "name", void 0);
47
+ __decorate([
48
+ (0, typeorm_1.Column)({ type: 'int', nullable: true }),
49
+ __metadata("design:type", Object)
50
+ ], WorkflowTask.prototype, "service_id", void 0);
51
+ __decorate([
52
+ (0, typeorm_1.Column)({ type: 'int', nullable: true }),
53
+ __metadata("design:type", Object)
54
+ ], WorkflowTask.prototype, "sub_service_id", void 0);
55
+ __decorate([
56
+ (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
57
+ __metadata("design:type", Object)
58
+ ], WorkflowTask.prototype, "service_type", void 0);
44
59
  __decorate([
45
60
  (0, typeorm_1.Column)({
46
61
  type: 'enum',
@@ -59,5 +74,5 @@ __decorate([
59
74
  ], WorkflowTask.prototype, "category", void 0);
60
75
  exports.WorkflowTask = WorkflowTask = __decorate([
61
76
  (0, typeorm_1.Entity)({ name: 'workflow_tasks' }),
62
- __metadata("design:paramtypes", [String, Number, String, String])
77
+ __metadata("design:paramtypes", [String, Number, String, String, Object, Object, Object])
63
78
  ], WorkflowTask);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@platform-modules/civil-aviation-authority",
3
- "version": "2.0.42",
3
+ "version": "2.0.50",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "scripts": {
@@ -47,11 +47,6 @@ import { VpnWorkFlow } from './models/VpnWorkflowModel';
47
47
  import { VpnRequestAttachment } from './models/VpnRequestAttachmentModel';
48
48
  import { VpnRequestChat } from './models/VpnRequestChatModel';
49
49
 
50
- import { HotelReservation } from './models/HotelreservationModel'
51
- import { HotelApprovalDetails } from './models/HotelApprovalModel';
52
- import { HotelWorkFlow } from './models/HotelWorkFlowModel';
53
- import { HotelRequestChat } from './models/HotelChatModel';
54
- import { HotelRequestAttachment } from './models/HotelAttachedModel';
55
50
 
56
51
  export const AppDataSource = new DataSource({
57
52
  type: 'postgres',
@@ -105,11 +100,6 @@ export const AppDataSource = new DataSource({
105
100
  VpnApprovalDetails,
106
101
  VpnWorkFlow,
107
102
  VpnRequestAttachment,
108
- VpnRequestChat,
109
- HotelReservation,
110
- HotelApprovalDetails,
111
- HotelWorkFlow,
112
- HotelRequestChat,
113
- HotelRequestAttachment
103
+ VpnRequestChat
114
104
  ],
115
105
  });
package/src/index.ts CHANGED
@@ -42,8 +42,3 @@ export * from './models/VpnApprovalModel';
42
42
  export * from './models/VpnWorkflowModel';
43
43
  export * from './models/VpnRequestChatModel';
44
44
  export * from './models/VpnRequestAttachmentModel';
45
- export * from './models/HotelreservationModel';
46
- export * from './models/HotelApprovalModel';
47
- export * from './models/HotelWorkFlowModel';
48
- export * from './models/HotelChatModel';
49
- export * from './models/HotelAttachedModel';
@@ -13,6 +13,12 @@ export class ITRequestAttachment extends BaseModel {
13
13
  @JoinColumn({ name: 'request_id' })
14
14
  request: ITHelpDeskRequests;
15
15
 
16
+ @Column({ type: 'integer', nullable: true })
17
+ service_id: number | null;
18
+
19
+ @Column({ type: 'integer', nullable: true })
20
+ sub_service_id: number | null;
21
+
16
22
  @Column({ type: 'integer', nullable: false })
17
23
  uploaded_by: number;
18
24
 
@@ -42,7 +48,9 @@ export class ITRequestAttachment extends BaseModel {
42
48
  file_name?: string,
43
49
  file_type?: string,
44
50
  file_size?: number,
45
- description?: string
51
+ description?: string,
52
+ service_id?: number | null,
53
+ sub_service_id?: number | null
46
54
  ) {
47
55
  super();
48
56
  this.request_id = request_id;
@@ -52,6 +60,8 @@ export class ITRequestAttachment extends BaseModel {
52
60
  this.file_type = file_type || '';
53
61
  this.file_size = file_size || null;
54
62
  this.description = description || '';
63
+ this.service_id = service_id ?? null;
64
+ this.sub_service_id = sub_service_id ?? null;
55
65
  }
56
66
  }
57
67
 
@@ -13,6 +13,12 @@ export class ItApprovalDetails extends BaseModel {
13
13
  @Column({ type: 'integer', nullable: false })
14
14
  request_id: number;
15
15
 
16
+ @Column({ type: 'integer', nullable: true })
17
+ service_id: number | null;
18
+
19
+ @Column({ type: 'integer', nullable: true })
20
+ sub_service_id: number | null;
21
+
16
22
  @Column({ type: 'integer', nullable: false })
17
23
  level: number;
18
24
 
@@ -46,7 +52,9 @@ export class ItApprovalDetails extends BaseModel {
46
52
  level: number,
47
53
  department_id?: number | null,
48
54
  section_id?: number | null,
49
- approved_by?: number | null
55
+ approved_by?: number | null,
56
+ service_id?: number | null,
57
+ sub_service_id?: number | null
50
58
  ) {
51
59
  super();
52
60
  this.request_id = request_id;
@@ -58,5 +66,7 @@ export class ItApprovalDetails extends BaseModel {
58
66
  this.department_id = department_id || null;
59
67
  this.section_id = section_id || null;
60
68
  this.approved_by = approved_by || null;
69
+ this.service_id = service_id ?? null;
70
+ this.sub_service_id = sub_service_id ?? null;
61
71
  }
62
72
  }
@@ -13,6 +13,12 @@ export class ItWorkFlow extends BaseModel {
13
13
  @Column({ type: 'int', nullable: false })
14
14
  request_id: number;
15
15
 
16
+ @Column({ type: 'int', nullable: true })
17
+ service_id: number | null;
18
+
19
+ @Column({ type: 'int', nullable: true })
20
+ sub_service_id: number | null;
21
+
16
22
  @Column({ type: 'int', nullable: true })
17
23
  order: number | null;
18
24
 
@@ -22,11 +28,13 @@ export class ItWorkFlow extends BaseModel {
22
28
  @Column({ type: 'enum', enum: workFlowStatus, default: workFlowStatus.NOT_YET_STARTED, nullable: false })
23
29
  status: workFlowStatus;
24
30
 
25
- constructor(request_id: number, content: string, status: workFlowStatus, order?: number) {
31
+ constructor(request_id: number, content: string, status: workFlowStatus, order?: number, service_id?: number | null, sub_service_id?: number | null) {
26
32
  super();
27
33
  this.request_id = request_id;
28
34
  this.content = content;
29
35
  this.status = status;
30
36
  this.order = order || null;
37
+ this.service_id = service_id ?? null;
38
+ this.sub_service_id = sub_service_id ?? null;
31
39
  }
32
40
  }
@@ -42,6 +42,9 @@ export class VpnApprovalDetails extends BaseModel {
42
42
  })
43
43
  approval_status: VpnApprovalStatus;
44
44
 
45
+ @Column({ type: "boolean", default: false, nullable: false })
46
+ is_manager: boolean;
47
+
45
48
  constructor(
46
49
  request_id: number,
47
50
  approver_user_id: number | null,
@@ -51,7 +54,8 @@ export class VpnApprovalDetails extends BaseModel {
51
54
  level: number,
52
55
  department_id?: number | null,
53
56
  section_id?: number | null,
54
- approved_by?: number | null
57
+ approved_by?: number | null,
58
+ is_manager?: boolean
55
59
  ) {
56
60
  super();
57
61
  this.request_id = request_id;
@@ -63,6 +67,7 @@ export class VpnApprovalDetails extends BaseModel {
63
67
  this.department_id = department_id || null;
64
68
  this.section_id = section_id || null;
65
69
  this.approved_by = approved_by || null;
70
+ this.is_manager = is_manager ?? false;
66
71
  }
67
72
  }
68
73
 
@@ -24,6 +24,15 @@ export class WorkflowTask extends BaseModel {
24
24
  @Column({ type: 'varchar', length: 100, nullable: false })
25
25
  name: string;
26
26
 
27
+ @Column({ type: 'int', nullable: true })
28
+ service_id?: number | null;
29
+
30
+ @Column({ type: 'int', nullable: true })
31
+ sub_service_id?: number | null;
32
+
33
+ @Column({ type: 'varchar', length: 50, nullable: true })
34
+ service_type?: string | null;
35
+
27
36
  @Column({
28
37
  type: 'enum',
29
38
  enum: TaskType,
@@ -42,12 +51,18 @@ export class WorkflowTask extends BaseModel {
42
51
  name: string,
43
52
  task_id?: number,
44
53
  task_type?: TaskType,
45
- category?: CategoryType
54
+ category?: CategoryType,
55
+ service_id?: number | null,
56
+ sub_service_id?: number | null,
57
+ service_type?: string | null
46
58
  ) {
47
59
  super();
48
60
  this.name = name;
49
61
  this.task_id = task_id || 0;
50
62
  this.task_type = task_type || TaskType.SIMPLE;
51
63
  this.category = category || CategoryType.CREATE;
64
+ this.service_id = service_id ?? null;
65
+ this.sub_service_id = sub_service_id ?? null;
66
+ this.service_type = service_type ?? null;
52
67
  }
53
68
  }
@@ -1,22 +0,0 @@
1
- import { BaseModel } from './BaseModel';
2
- export declare enum HotelApprovalStatus {
3
- PENDING = "Pending",
4
- IN_PROGRESS = "In Progress",
5
- APPROVED = "Approved",
6
- REJECTED = "Rejected"
7
- }
8
- export declare class HotelApprovalDetails extends BaseModel {
9
- request_id: number;
10
- service_id: number | null;
11
- sub_service_id: number | null;
12
- level: number;
13
- approver_role_id: number;
14
- department_id: number | null;
15
- section_id: number | null;
16
- approver_user_id: number | null;
17
- delegate_user_id: number | null;
18
- approved_by: number | null;
19
- comment: string;
20
- approval_status: HotelApprovalStatus;
21
- constructor(request_id: number, approver_role_id: number, comment: string, approval_status: HotelApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approver_user_id?: number | null, delegate_user_id?: number | null, approved_by?: number | null, service_id?: number, sub_service_id?: number);
22
- }
@@ -1,91 +0,0 @@
1
- "use strict";
2
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
- 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;
6
- return c > 3 && r && Object.defineProperty(target, key, r), r;
7
- };
8
- var __metadata = (this && this.__metadata) || function (k, v) {
9
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
- };
11
- Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.HotelApprovalDetails = exports.HotelApprovalStatus = void 0;
13
- const typeorm_1 = require("typeorm");
14
- const BaseModel_1 = require("./BaseModel");
15
- var HotelApprovalStatus;
16
- (function (HotelApprovalStatus) {
17
- HotelApprovalStatus["PENDING"] = "Pending";
18
- HotelApprovalStatus["IN_PROGRESS"] = "In Progress";
19
- HotelApprovalStatus["APPROVED"] = "Approved";
20
- HotelApprovalStatus["REJECTED"] = "Rejected";
21
- })(HotelApprovalStatus || (exports.HotelApprovalStatus = HotelApprovalStatus = {}));
22
- let HotelApprovalDetails = class HotelApprovalDetails extends BaseModel_1.BaseModel {
23
- constructor(request_id, approver_role_id, comment, approval_status, level, department_id, section_id, approver_user_id, delegate_user_id, approved_by, service_id, sub_service_id) {
24
- super();
25
- this.request_id = request_id;
26
- this.service_id = service_id || null;
27
- this.sub_service_id = sub_service_id || null;
28
- this.approver_role_id = approver_role_id;
29
- this.comment = comment;
30
- this.approval_status = approval_status;
31
- this.level = level;
32
- this.department_id = department_id || null;
33
- this.section_id = section_id || null;
34
- this.approver_user_id = approver_user_id || null;
35
- this.delegate_user_id = delegate_user_id || null;
36
- this.approved_by = approved_by || null;
37
- }
38
- };
39
- exports.HotelApprovalDetails = HotelApprovalDetails;
40
- __decorate([
41
- (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
42
- __metadata("design:type", Number)
43
- ], HotelApprovalDetails.prototype, "request_id", void 0);
44
- __decorate([
45
- (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
46
- __metadata("design:type", Object)
47
- ], HotelApprovalDetails.prototype, "service_id", void 0);
48
- __decorate([
49
- (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
50
- __metadata("design:type", Object)
51
- ], HotelApprovalDetails.prototype, "sub_service_id", void 0);
52
- __decorate([
53
- (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
54
- __metadata("design:type", Number)
55
- ], HotelApprovalDetails.prototype, "level", void 0);
56
- __decorate([
57
- (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
58
- __metadata("design:type", Number)
59
- ], HotelApprovalDetails.prototype, "approver_role_id", void 0);
60
- __decorate([
61
- (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
62
- __metadata("design:type", Object)
63
- ], HotelApprovalDetails.prototype, "department_id", void 0);
64
- __decorate([
65
- (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
66
- __metadata("design:type", Object)
67
- ], HotelApprovalDetails.prototype, "section_id", void 0);
68
- __decorate([
69
- (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
70
- __metadata("design:type", Object)
71
- ], HotelApprovalDetails.prototype, "approver_user_id", void 0);
72
- __decorate([
73
- (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
74
- __metadata("design:type", Object)
75
- ], HotelApprovalDetails.prototype, "delegate_user_id", void 0);
76
- __decorate([
77
- (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
78
- __metadata("design:type", Object)
79
- ], HotelApprovalDetails.prototype, "approved_by", void 0);
80
- __decorate([
81
- (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true, default: '' }),
82
- __metadata("design:type", String)
83
- ], HotelApprovalDetails.prototype, "comment", void 0);
84
- __decorate([
85
- (0, typeorm_1.Column)({ type: 'enum', enum: HotelApprovalStatus, default: HotelApprovalStatus.PENDING, nullable: false }),
86
- __metadata("design:type", String)
87
- ], HotelApprovalDetails.prototype, "approval_status", void 0);
88
- exports.HotelApprovalDetails = HotelApprovalDetails = __decorate([
89
- (0, typeorm_1.Entity)({ name: 'hotelapprovals' }),
90
- __metadata("design:paramtypes", [Number, Number, String, String, Number, Object, Object, Object, Object, Object, Number, Number])
91
- ], HotelApprovalDetails);
@@ -1,12 +0,0 @@
1
- import { BaseModel } from './BaseModel';
2
- export declare class HotelRequestAttachment extends BaseModel {
3
- request_id: number;
4
- service_id: number | null;
5
- sub_service_id: number | null;
6
- file_url: string;
7
- file_name: string;
8
- file_type: string;
9
- file_size: number | null;
10
- chat_id: number | null;
11
- constructor(request_id: number, file_url: string, file_name?: string, file_type?: string, file_size?: number, service_id?: number, sub_service_id?: number, chat_id?: number);
12
- }