rez_core 2.2.82 → 2.2.84
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/module/workflow/controller/activity-log.controller.d.ts +1 -1
- package/dist/module/workflow/repository/activity-log.repository.d.ts +1 -1
- package/dist/module/workflow/repository/activity-log.repository.js +3 -1
- package/dist/module/workflow/repository/activity-log.repository.js.map +1 -1
- package/dist/module/workflow/repository/stage-group.repository.js +2 -17
- package/dist/module/workflow/repository/stage-group.repository.js.map +1 -1
- package/dist/module/workflow/service/activity-log.service.d.ts +1 -1
- package/dist/module/workflow/service/stage-group.service.d.ts +4 -1
- package/dist/module/workflow/service/stage-group.service.js +38 -8
- package/dist/module/workflow/service/stage-group.service.js.map +1 -1
- package/dist/module/workflow/service/task.service.js +26 -20
- package/dist/module/workflow/service/task.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/workflow/repository/activity-log.repository.ts +4 -1
- package/src/module/workflow/repository/stage-group.repository.ts +2 -22
- package/src/module/workflow/service/stage-group.service.ts +60 -10
- package/src/module/workflow/service/task.service.ts +36 -24
|
@@ -5,6 +5,7 @@ export declare class ActivityLogController {
|
|
|
5
5
|
getAllActivityLog(req: Request & {
|
|
6
6
|
user: any;
|
|
7
7
|
}, mapped_entity_type: string, mapped_entity_id: string, category: string): Promise<{
|
|
8
|
+
category: string;
|
|
8
9
|
user_name: any;
|
|
9
10
|
profile: any;
|
|
10
11
|
created_date: string | null;
|
|
@@ -12,7 +13,6 @@ export declare class ActivityLogController {
|
|
|
12
13
|
mapped_entity_id: string;
|
|
13
14
|
title: string;
|
|
14
15
|
description: string;
|
|
15
|
-
category: string;
|
|
16
16
|
action: string;
|
|
17
17
|
icon: string;
|
|
18
18
|
color: string;
|
|
@@ -20,6 +20,7 @@ export declare class ActivityLogRepository {
|
|
|
20
20
|
private readonly mediaDataService;
|
|
21
21
|
constructor(activityLogRepository: Repository<ActivityLog>, mediaDataService: MediaDataService);
|
|
22
22
|
getAllActivityLog(mapped_entity_type: string, mapped_entity_id: number | string, category: string | undefined, loggedInUser: any): Promise<{
|
|
23
|
+
category: string;
|
|
23
24
|
user_name: any;
|
|
24
25
|
profile: any;
|
|
25
26
|
created_date: string | null;
|
|
@@ -27,7 +28,6 @@ export declare class ActivityLogRepository {
|
|
|
27
28
|
mapped_entity_id: string;
|
|
28
29
|
title: string;
|
|
29
30
|
description: string;
|
|
30
|
-
category: string;
|
|
31
31
|
action: string;
|
|
32
32
|
icon: string;
|
|
33
33
|
color: string;
|
|
@@ -17,7 +17,7 @@ const typeorm_1 = require("@nestjs/typeorm");
|
|
|
17
17
|
const media_data_service_1 = require("../../meta/service/media-data.service");
|
|
18
18
|
const activity_log_entity_1 = require("../entity/activity-log.entity");
|
|
19
19
|
const typeorm_2 = require("typeorm");
|
|
20
|
-
const moment = require("moment
|
|
20
|
+
const moment = require("moment");
|
|
21
21
|
exports.ACTIVITY_CATEGORIES = {
|
|
22
22
|
ASSIGN: 'ASSIGN',
|
|
23
23
|
INTERACTION: 'INTERACTION',
|
|
@@ -64,6 +64,8 @@ let ActivityLogRepository = class ActivityLogRepository {
|
|
|
64
64
|
}
|
|
65
65
|
return {
|
|
66
66
|
...entity,
|
|
67
|
+
category: entity.category.slice(0, 1).toUpperCase() +
|
|
68
|
+
entity.category.slice(1).toLowerCase(),
|
|
67
69
|
user_name: rows.raw[i].user_name,
|
|
68
70
|
profile,
|
|
69
71
|
created_date: entity.created_date
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-log.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/activity-log.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAmD;AACnD,8EAA8E;AAC9E,uEAA4D;AAC5D,qCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"activity-log.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/activity-log.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,12 +52,8 @@ let StageGroupRepository = class StageGroupRepository {
|
|
|
52
52
|
const stageGroupIds = stageGroups.map((sg) => sg.id);
|
|
53
53
|
const stagesRaw = await this.dataSource.query(`
|
|
54
54
|
SELECT
|
|
55
|
-
cr_wf_stage
|
|
56
|
-
eth_user_profile.name AS created_by_name,
|
|
57
|
-
eth_user_profile.profile_image AS profile_image
|
|
55
|
+
cr_wf_stage.*
|
|
58
56
|
FROM cr_wf_stage
|
|
59
|
-
LEFT JOIN eth_user_profile
|
|
60
|
-
ON cr_wf_stage.created_by = eth_user_profile.parent_id
|
|
61
57
|
WHERE cr_wf_stage.stage_group_id IN (${stageGroupIds.map(() => '?').join(',')})
|
|
62
58
|
AND cr_wf_stage.organization_id = ?
|
|
63
59
|
ORDER BY cr_wf_stage.sequence ASC
|
|
@@ -91,19 +87,8 @@ let StageGroupRepository = class StageGroupRepository {
|
|
|
91
87
|
Number(row.stage_id),
|
|
92
88
|
Number(row.send_comm_count),
|
|
93
89
|
]));
|
|
94
|
-
const stages = await Promise.all(stagesRaw.map(async (stage) => {
|
|
95
|
-
const profileImageId = stage.profile_image;
|
|
96
|
-
let profile = null;
|
|
97
|
-
if (profileImageId) {
|
|
98
|
-
profile = await this.mediaDataService.getMediaDownloadUrl(profileImageId, loggedInUser);
|
|
99
|
-
}
|
|
100
|
-
return {
|
|
101
|
-
...stage,
|
|
102
|
-
profile,
|
|
103
|
-
};
|
|
104
|
-
}));
|
|
105
90
|
const stageMap = new Map();
|
|
106
|
-
for (const stage of
|
|
91
|
+
for (const stage of stagesRaw) {
|
|
107
92
|
const stageId = Number(stage.id);
|
|
108
93
|
stage.task_count = taskCountMap.get(stageId) || 0;
|
|
109
94
|
stage.meeting_count = meetingCountMap.get(stageId) || 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stage-group.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/stage-group.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAKwB;AACxB,qEAA0D;AAC1D,6CAAmD;AACnD,qCAAiD;AACjD,8EAA8E;AAGvE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YAEmB,oBAA4C,EAC5C,UAAsB,EACtB,gBAAkC;QAFlC,yBAAoB,GAApB,oBAAoB,CAAwB;QAC5C,eAAU,GAAV,UAAU,CAAY;QACtB,qBAAgB,GAAhB,gBAAgB,CAAkB;IAClD,CAAC;IAEJ,KAAK,CAAC,gBAAgB,CAAC,WAAmB,EAAE,eAAuB;QACjE,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,4BAAmB,CAAC,yBAAyB,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;YAClD,KAAK,EAAE;gBACL,WAAW;gBACX,eAAe;aAChB;YACD,KAAK,EAAE;gBACL,QAAQ,EAAE,KAAK;aAChB;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,0BAAiB,CACzB,iDAAiD,CAClD,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,iCAAiC,CACrC,WAAmB,EACnB,eAAuB,EACvB,YAAiB,EACjB,OAAe;QAEf,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,4BAAmB,CAAC,yBAAyB,CAAC,CAAC;QAC3D,CAAC;QAGD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAC7C,WAAW,EACX,eAAe,CAChB,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QAGnC,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAC3C
|
|
1
|
+
{"version":3,"file":"stage-group.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/stage-group.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export declare class ActivityLogService extends EntityServiceImpl {
|
|
|
7
7
|
constructor(activityLogRepository: ActivityLogRepository);
|
|
8
8
|
logActivity(logData: any, loggedInUser: UserData): Promise<ActivityLog[]>;
|
|
9
9
|
getAllActivityLog(mapped_entity_type: string, mapped_entity_id: number | string, category: string, loggedInUser: any): Promise<{
|
|
10
|
+
category: string;
|
|
10
11
|
user_name: any;
|
|
11
12
|
profile: any;
|
|
12
13
|
created_date: string | null;
|
|
@@ -14,7 +15,6 @@ export declare class ActivityLogService extends EntityServiceImpl {
|
|
|
14
15
|
mapped_entity_id: string;
|
|
15
16
|
title: string;
|
|
16
17
|
description: string;
|
|
17
|
-
category: string;
|
|
18
18
|
action: string;
|
|
19
19
|
icon: string;
|
|
20
20
|
color: string;
|
|
@@ -6,19 +6,22 @@ import { StageService } from './stage.service';
|
|
|
6
6
|
import { DataSource, Repository } from 'typeorm';
|
|
7
7
|
import { WorkflowLevelMappingEntity } from '../entity/workflow-level-mapping.entity';
|
|
8
8
|
import { StageMovementData } from '../entity/stage-movement-data.entity';
|
|
9
|
+
import { MediaDataService } from 'src/module/meta/service/media-data.service';
|
|
9
10
|
export declare class StageGroupService extends EntityServiceImpl {
|
|
10
11
|
private readonly stageGroupRepository;
|
|
11
12
|
private readonly stageService;
|
|
12
13
|
private readonly dataSource;
|
|
13
14
|
private readonly workflowLevelMappingRepo;
|
|
14
15
|
private readonly stageMovementRepo;
|
|
15
|
-
|
|
16
|
+
private readonly mediaDataService;
|
|
17
|
+
constructor(stageGroupRepository: StageGroupRepository, stageService: StageService, dataSource: DataSource, workflowLevelMappingRepo: Repository<WorkflowLevelMappingEntity>, stageMovementRepo: Repository<StageMovementData>, mediaDataService: MediaDataService);
|
|
16
18
|
getAllStageGroup(workflow_id: number, organization_id: number): Promise<import("../entity/stage-group.entity").StageGroup[]>;
|
|
17
19
|
getAllStageGroupAndStageHierarchy(loggedInUser: UserData, lead_id: number): Promise<{
|
|
18
20
|
[key: string]: any;
|
|
19
21
|
stages: any[];
|
|
20
22
|
stage_group_status?: string;
|
|
21
23
|
}[] | null>;
|
|
24
|
+
getUserNameAndProfilePic(userId: number, loggedInUser: UserData): Promise<any>;
|
|
22
25
|
calculateTimeSpent(start: Date | string, end?: Date | string): Promise<string>;
|
|
23
26
|
updateEntity(entityData: BaseEntity, loggedInUser: UserData): Promise<any>;
|
|
24
27
|
getEntityData(entityType: string, id: number, loggedInUser?: UserData): Promise<BaseEntity | null>;
|
|
@@ -21,15 +21,17 @@ const typeorm_1 = require("typeorm");
|
|
|
21
21
|
const workflow_level_mapping_entity_1 = require("../entity/workflow-level-mapping.entity");
|
|
22
22
|
const typeorm_2 = require("@nestjs/typeorm");
|
|
23
23
|
const stage_movement_data_entity_1 = require("../entity/stage-movement-data.entity");
|
|
24
|
-
const moment = require("moment
|
|
24
|
+
const moment = require("moment");
|
|
25
|
+
const media_data_service_1 = require("../../meta/service/media-data.service");
|
|
25
26
|
let StageGroupService = class StageGroupService extends entity_service_impl_service_1.EntityServiceImpl {
|
|
26
|
-
constructor(stageGroupRepository, stageService, dataSource, workflowLevelMappingRepo, stageMovementRepo) {
|
|
27
|
+
constructor(stageGroupRepository, stageService, dataSource, workflowLevelMappingRepo, stageMovementRepo, mediaDataService) {
|
|
27
28
|
super();
|
|
28
29
|
this.stageGroupRepository = stageGroupRepository;
|
|
29
30
|
this.stageService = stageService;
|
|
30
31
|
this.dataSource = dataSource;
|
|
31
32
|
this.workflowLevelMappingRepo = workflowLevelMappingRepo;
|
|
32
33
|
this.stageMovementRepo = stageMovementRepo;
|
|
34
|
+
this.mediaDataService = mediaDataService;
|
|
33
35
|
}
|
|
34
36
|
async getAllStageGroup(workflow_id, organization_id) {
|
|
35
37
|
return await this.stageGroupRepository.getAllStageGroup(workflow_id, organization_id);
|
|
@@ -52,9 +54,9 @@ let StageGroupService = class StageGroupService extends entity_service_impl_serv
|
|
|
52
54
|
if (!workflowLevelMapping)
|
|
53
55
|
return null;
|
|
54
56
|
let leadStatus = null;
|
|
55
|
-
const leadData = await this.dataSource.query(`SELECT lead_status FROM crm_lead WHERE id =
|
|
56
|
-
if (leadData.length > 0) {
|
|
57
|
-
const leadStatusResolved = await this.dataSource.query(`SELECT name FROM cr_list_master_items WHERE id =
|
|
57
|
+
const leadData = await this.dataSource.query(`SELECT lead_status FROM crm_lead WHERE id = ?`, [lead_id]);
|
|
58
|
+
if (leadData.length > 0 && leadData[0].lead_status != null) {
|
|
59
|
+
const leadStatusResolved = await this.dataSource.query(`SELECT name FROM cr_list_master_items WHERE id = ? AND organization_id = ?`, [leadData[0].lead_status, loggedInUser.organization_id]);
|
|
58
60
|
if (leadStatusResolved.length > 0) {
|
|
59
61
|
leadStatus = leadStatusResolved[0].name;
|
|
60
62
|
}
|
|
@@ -76,8 +78,9 @@ let StageGroupService = class StageGroupService extends entity_service_impl_serv
|
|
|
76
78
|
stageMovementMap.set(movement.stage_id, movement);
|
|
77
79
|
}
|
|
78
80
|
let foundInProgressGroup = false;
|
|
81
|
+
const userCache = new Map();
|
|
79
82
|
for (const group of stageGroupAndStageHierarchy) {
|
|
80
|
-
|
|
83
|
+
const stagePromises = (group.stages || []).map(async (stage) => {
|
|
81
84
|
const movement = stageMovementMap.get(Number(stage.id));
|
|
82
85
|
if (movement) {
|
|
83
86
|
stage.is_current = movement.is_current === 'Y';
|
|
@@ -89,6 +92,13 @@ let StageGroupService = class StageGroupService extends entity_service_impl_serv
|
|
|
89
92
|
? moment.utc(movement.end_date).local().format('DD-MMM, hh:mm A')
|
|
90
93
|
: null;
|
|
91
94
|
stage.time_spent = await this.calculateTimeSpent(movement.start_date, movement.end_date ?? new Date());
|
|
95
|
+
if (movement.current_user_id) {
|
|
96
|
+
if (!userCache.has(movement.current_user_id)) {
|
|
97
|
+
const user = await this.getUserNameAndProfilePic(movement.current_user_id, loggedInUser);
|
|
98
|
+
userCache.set(movement.current_user_id, user);
|
|
99
|
+
}
|
|
100
|
+
Object.assign(stage, userCache.get(movement.current_user_id));
|
|
101
|
+
}
|
|
92
102
|
}
|
|
93
103
|
else {
|
|
94
104
|
stage.is_current = false;
|
|
@@ -97,11 +107,13 @@ let StageGroupService = class StageGroupService extends entity_service_impl_serv
|
|
|
97
107
|
stage.end_time = null;
|
|
98
108
|
stage.time_spent = null;
|
|
99
109
|
stage.created_by_name = null;
|
|
110
|
+
stage.profile = null;
|
|
100
111
|
}
|
|
101
112
|
if (leadStatus) {
|
|
102
113
|
stage.lead_status = leadStatus;
|
|
103
114
|
}
|
|
104
|
-
}
|
|
115
|
+
});
|
|
116
|
+
await Promise.all(stagePromises);
|
|
105
117
|
if (group.stages.length === 0) {
|
|
106
118
|
group.stage_group_status = 'TODO';
|
|
107
119
|
continue;
|
|
@@ -121,6 +133,23 @@ let StageGroupService = class StageGroupService extends entity_service_impl_serv
|
|
|
121
133
|
}
|
|
122
134
|
return stageGroupAndStageHierarchy;
|
|
123
135
|
}
|
|
136
|
+
async getUserNameAndProfilePic(userId, loggedInUser) {
|
|
137
|
+
const user = await this.dataSource.query(`SELECT eth_user_profile.name AS created_by_name,
|
|
138
|
+
eth_user_profile.profile_image AS profile_image
|
|
139
|
+
FROM eth_user_profile
|
|
140
|
+
WHERE eth_user_profile.id = ?;`, [userId]);
|
|
141
|
+
if (user.length === 0)
|
|
142
|
+
return null;
|
|
143
|
+
let profileImageId = user[0].profile_image;
|
|
144
|
+
let profile = null;
|
|
145
|
+
if (profileImageId) {
|
|
146
|
+
profile = await this.mediaDataService.getMediaDownloadUrl(profileImageId, loggedInUser);
|
|
147
|
+
}
|
|
148
|
+
return {
|
|
149
|
+
created_by_name: user[0].created_by_name,
|
|
150
|
+
profile: profile,
|
|
151
|
+
};
|
|
152
|
+
}
|
|
124
153
|
async calculateTimeSpent(start, end) {
|
|
125
154
|
const startMoment = moment(start);
|
|
126
155
|
const endMoment = end ? moment(end) : moment();
|
|
@@ -170,6 +199,7 @@ exports.StageGroupService = StageGroupService = __decorate([
|
|
|
170
199
|
stage_service_1.StageService,
|
|
171
200
|
typeorm_1.DataSource,
|
|
172
201
|
typeorm_1.Repository,
|
|
173
|
-
typeorm_1.Repository
|
|
202
|
+
typeorm_1.Repository,
|
|
203
|
+
media_data_service_1.MediaDataService])
|
|
174
204
|
], StageGroupService);
|
|
175
205
|
//# sourceMappingURL=stage-group.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stage-group.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/stage-group.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,gGAAwF;AACxF,iFAA4E;AAG5E,mDAA+C;AAC/C,qCAAiD;AACjD,2FAAqF;AACrF,6CAAmD;AACnD,qFAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"stage-group.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/stage-group.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
|
|
|
38
38
|
mapped_entity_id: entityData.mapped_entity_id,
|
|
39
39
|
mapped_entity_type: entityData.mapped_entity_type,
|
|
40
40
|
title: `Task added`,
|
|
41
|
-
description: `A new task ${entityData.
|
|
41
|
+
description: `A new task ${entityData.name} was added`,
|
|
42
42
|
category: activity_log_repository_1.ACTIVITY_CATEGORIES.TASK,
|
|
43
43
|
action: 'add',
|
|
44
44
|
appcode: loggedInUser.appcode,
|
|
@@ -67,7 +67,14 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
|
|
|
67
67
|
statusRows[0].name?.toLowerCase() === 'completed';
|
|
68
68
|
entityData.is_completed = isCompletedStatus;
|
|
69
69
|
entityData.is_done = isCompletedStatus;
|
|
70
|
-
const
|
|
70
|
+
const isMandatory = String(entityData.is_mandatory).toLowerCase() === 'true' ||
|
|
71
|
+
entityData.is_mandatory === true ||
|
|
72
|
+
entityData.is_mandatory === 1 ||
|
|
73
|
+
entityData.is_mandatory === '1';
|
|
74
|
+
const updatedEntity = await super.updateEntity({
|
|
75
|
+
...entityData,
|
|
76
|
+
is_mandatory: isMandatory,
|
|
77
|
+
}, loggedInUser, appcode);
|
|
71
78
|
if (updatedEntity && typeof updatedEntity['is_mandatory'] === 'boolean') {
|
|
72
79
|
updatedEntity['is_mandatory'] = updatedEntity['is_mandatory'] ? '1' : '0';
|
|
73
80
|
}
|
|
@@ -153,27 +160,26 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
|
|
|
153
160
|
LEFT JOIN cr_user u ON t.created_by = u.id
|
|
154
161
|
LEFT JOIN cr_user u2 ON t.task_owner = u2.id
|
|
155
162
|
WHERE ${whereClauses.join(' AND ')}
|
|
156
|
-
ORDER BY t.
|
|
163
|
+
ORDER BY t.created_date DESC
|
|
157
164
|
`;
|
|
158
165
|
const taskData = await this.dataSource.query(sql, params);
|
|
166
|
+
if (taskData.length === 0) {
|
|
167
|
+
return [];
|
|
168
|
+
}
|
|
169
|
+
const taskStatusQuery = `
|
|
170
|
+
SELECT id, name
|
|
171
|
+
FROM cr_list_master_items
|
|
172
|
+
WHERE organization_id = ?
|
|
173
|
+
AND listtype = 'TKST'
|
|
174
|
+
`;
|
|
175
|
+
const taskAllStatus = await this.dataSource.query(taskStatusQuery, [
|
|
176
|
+
loggedInUser.organization_id,
|
|
177
|
+
]);
|
|
178
|
+
const statusMap = new Map(taskAllStatus.map((row) => [String(row.id), row.name]));
|
|
159
179
|
for (const task of taskData) {
|
|
160
|
-
|
|
161
|
-
task.
|
|
162
|
-
|
|
163
|
-
}
|
|
164
|
-
const taskStatusQuery = `
|
|
165
|
-
SELECT name
|
|
166
|
-
FROM cr_list_master_items
|
|
167
|
-
WHERE id = ?
|
|
168
|
-
AND organization_id = ?
|
|
169
|
-
AND listtype = 'TKST'
|
|
170
|
-
LIMIT 1;
|
|
171
|
-
`;
|
|
172
|
-
const [statusRow] = await this.dataSource.query(taskStatusQuery, [
|
|
173
|
-
task.status,
|
|
174
|
-
loggedInUser.organization_id,
|
|
175
|
-
]);
|
|
176
|
-
task.task_status = statusRow?.name || null;
|
|
180
|
+
task.task_status = task.status
|
|
181
|
+
? statusMap.get(String(task.status)) || null
|
|
182
|
+
: null;
|
|
177
183
|
}
|
|
178
184
|
return taskData.map((task) => ({
|
|
179
185
|
...task,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/task.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,gGAAwF;AAExF,mEAA+D;AAC/D,+DAA0D;AAC1D,qCAAoD;AAEpD,iEAA4D;AAC5D,mFAA4E;AAGrE,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,+CAAiB;IAChD,YACmB,cAA8B,EAC9B,iBAAoC,EACpC,UAAsB,EAEtB,kBAAsC;QAEvD,KAAK,EAAE,CAAC;QANS,mBAAc,GAAd,cAAc,CAAgB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,eAAU,GAAV,UAAU,CAAY;QAEtB,uBAAkB,GAAlB,kBAAkB,CAAoB;IAGzD,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAe,EACf,YAAiB,EACjB,OAA8B,EAC9B,OAAgB;QAEhB,IAAI,UAAU,IAAI,OAAO,UAAU,CAAC,cAAc,CAAC,KAAK,QAAQ,EAAE,CAAC;YACjE,UAAU,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC,cAAc,CAAC,KAAK,GAAG,CAAC;QAClE,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,YAAY,CACrC,UAAU,EACV,YAAY,EACZ,OAAO,EACP,OAAO,CACR,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,OAAO,GAAG;gBACd,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;gBAC7C,kBAAkB,EAAE,UAAU,CAAC,kBAAkB;gBACjD,KAAK,EAAE,YAAY;gBACnB,WAAW,EAAE,cAAc,UAAU,CAAC,IAAI,YAAY;gBACtD,QAAQ,EAAE,6CAAmB,CAAC,IAAI;gBAClC,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,YAAY,CAAC,OAAO;aAC9B,CAAC;YAEF,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACnE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CACX,qCAAqC,EACrC,KAAK,EAAE,OAAO,IAAI,KAAK,CACxB,CAAC;QAEJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAU,EACV,YAAsB,EACtB,OAAgB;QAEhB,MAAM,eAAe,GAAG;;;;;;;GAOzB,CAAC;QAEA,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,eAAe,EAAE;YAC9D,UAAU,CAAC,MAAM;YACjB,YAAY,CAAC,eAAe;SAC7B,CAAC,CAAC;QAEH,MAAM,iBAAiB,GACrB,UAAU,CAAC,MAAM,GAAG,CAAC;YACrB,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,WAAW,CAAC;QAGpD,UAAU,CAAC,YAAY,GAAG,iBAAiB,CAAC;QAC5C,UAAU,CAAC,OAAO,GAAG,iBAAiB,CAAC;QAEvC,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,YAAY,CAC5C,UAAU,
|
|
1
|
+
{"version":3,"file":"task.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/task.service.ts"],"names":[],"mappings":"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"}
|