rez_core 5.0.113 → 5.0.115
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
|
@@ -23,6 +23,7 @@ export class TaskService extends EntityServiceImpl {
|
|
|
23
23
|
) {
|
|
24
24
|
super();
|
|
25
25
|
}
|
|
26
|
+
|
|
26
27
|
name: string = 'add_task';
|
|
27
28
|
|
|
28
29
|
async execute(payload: any): Promise<any> {
|
|
@@ -153,13 +154,13 @@ export class TaskService extends EntityServiceImpl {
|
|
|
153
154
|
|
|
154
155
|
const oldStatusRows = oldRow
|
|
155
156
|
? await listRepo.find({
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
157
|
+
where: {
|
|
158
|
+
id: oldRow.status,
|
|
159
|
+
organization_id: loggedInUser.organization_id,
|
|
160
|
+
listtype: 'TKST',
|
|
161
|
+
},
|
|
162
|
+
take: 1,
|
|
163
|
+
})
|
|
163
164
|
: [];
|
|
164
165
|
|
|
165
166
|
const isStatusChanged =
|
|
@@ -303,19 +304,21 @@ export class TaskService extends EntityServiceImpl {
|
|
|
303
304
|
|
|
304
305
|
if (mandatory !== undefined) {
|
|
305
306
|
qb.andWhere('t.is_mandatory = :mandatory', {
|
|
306
|
-
mandatory: mandatory
|
|
307
|
+
mandatory: mandatory,
|
|
307
308
|
});
|
|
308
309
|
}
|
|
309
310
|
|
|
310
311
|
if (overdue) {
|
|
311
|
-
qb.andWhere(
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
312
|
+
qb.andWhere(`
|
|
313
|
+
(
|
|
314
|
+
t.due_date < CURRENT_DATE
|
|
315
|
+
OR (
|
|
316
|
+
t.due_date = CURRENT_DATE
|
|
317
|
+
AND t.due_time::time < CURRENT_TIME
|
|
316
318
|
)
|
|
317
|
-
|
|
318
|
-
|
|
319
|
+
)
|
|
320
|
+
`)
|
|
321
|
+
.andWhere('t.is_done = :is_done', { is_done: false });
|
|
319
322
|
}
|
|
320
323
|
|
|
321
324
|
qb.orderBy('t.created_date', 'DESC');
|