rez_core 5.0.154 → 5.0.155
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/package.json
CHANGED
|
@@ -154,13 +154,13 @@ export class TaskService extends EntityServiceImpl {
|
|
|
154
154
|
|
|
155
155
|
const oldStatusRows = oldRow
|
|
156
156
|
? await listRepo.find({
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
157
|
+
where: {
|
|
158
|
+
id: oldRow.status,
|
|
159
|
+
organization_id: loggedInUser.organization_id,
|
|
160
|
+
listtype: 'TKST',
|
|
161
|
+
},
|
|
162
|
+
take: 1,
|
|
163
|
+
})
|
|
164
164
|
: [];
|
|
165
165
|
|
|
166
166
|
const isStatusChanged =
|
|
@@ -284,9 +284,9 @@ export class TaskService extends EntityServiceImpl {
|
|
|
284
284
|
.addSelect('sg.name', 'stage_group_name')
|
|
285
285
|
.addSelect('s.name', 'stage_name')
|
|
286
286
|
.addSelect('a.name', 'action_name')
|
|
287
|
-
.
|
|
288
|
-
.
|
|
289
|
-
.
|
|
287
|
+
.leftJoin('frm_wf_stage', 's', 't.stage_id::text = s.id::text')
|
|
288
|
+
.leftJoin('frm_wf_stage_group', 'sg', 's.stage_group_id = sg.id')
|
|
289
|
+
.leftJoin('frm_wf_action', 'a', 't.action_id::text = a.id::text')
|
|
290
290
|
.where('t.mapped_entity_type = :mapped_entity_type', {
|
|
291
291
|
mapped_entity_type,
|
|
292
292
|
})
|
|
@@ -309,7 +309,8 @@ export class TaskService extends EntityServiceImpl {
|
|
|
309
309
|
}
|
|
310
310
|
|
|
311
311
|
if (overdue) {
|
|
312
|
-
qb.andWhere(
|
|
312
|
+
qb.andWhere(
|
|
313
|
+
`
|
|
313
314
|
(
|
|
314
315
|
t.due_date < CURRENT_DATE
|
|
315
316
|
OR (
|
|
@@ -317,8 +318,8 @@ export class TaskService extends EntityServiceImpl {
|
|
|
317
318
|
AND t.due_time::time < CURRENT_TIME
|
|
318
319
|
)
|
|
319
320
|
)
|
|
320
|
-
|
|
321
|
-
|
|
321
|
+
`,
|
|
322
|
+
).andWhere('t.is_done = :is_done', { is_done: false });
|
|
322
323
|
}
|
|
323
324
|
|
|
324
325
|
qb.orderBy('t.created_date', 'DESC');
|