rez_core 2.2.63 → 2.2.65
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/listmaster/repository/list-master.repository.js +2 -1
- package/dist/module/listmaster/repository/list-master.repository.js.map +1 -1
- package/dist/module/workflow/service/activity-log.service.js +24 -24
- package/dist/module/workflow/service/activity-log.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/listmaster/repository/list-master.repository.ts +2 -1
- package/src/module/workflow/service/activity-log.service.ts +24 -25
|
@@ -36,7 +36,8 @@ let ListMasterRepository = class ListMasterRepository {
|
|
|
36
36
|
const qb = this.repo
|
|
37
37
|
.createQueryBuilder('item')
|
|
38
38
|
.where('item.source = :source', { source: 'master' })
|
|
39
|
-
.andWhere('item.organization_id = :organizationId', { organizationId })
|
|
39
|
+
.andWhere('item.organization_id = :organizationId', { organizationId })
|
|
40
|
+
.andWhere('item.is_factory = :isFactory', { isFactory: false });
|
|
40
41
|
if (search?.trim()) {
|
|
41
42
|
qb.andWhere('(LOWER(item.name) LIKE :search OR LOWER(item.code) LIKE :search)', { search: `%${search.toLowerCase()}%` });
|
|
42
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-master.repository.js","sourceRoot":"","sources":["../../../../src/module/listmaster/repository/list-master.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qEAA8D;AAC9D,qCAAqC;AACrC,6CAAmD;AAG5C,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YAEmB,IAAgC;QAAhC,SAAI,GAAJ,IAAI,CAA4B;IAChD,CAAC;IAEJ,UAAU,CAAC,IAAY,EAAE,cAAuB;QAC9C,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACvB,KAAK,EAAE;gBACL,IAAI,EAAE,IAAI;gBACV,eAAe,EAAE,cAAc;aAChC;SACF,CAAC,CAAC;IACL,CAAC;IAGD,KAAK,CAAC,kBAAkB,CAAC,SAAkC;QACzD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,cAAsB,EAAE,MAAe;QACxD,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI;aACjB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;aACpD,QAAQ,CAAC,wCAAwC,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"list-master.repository.js","sourceRoot":"","sources":["../../../../src/module/listmaster/repository/list-master.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qEAA8D;AAC9D,qCAAqC;AACrC,6CAAmD;AAG5C,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YAEmB,IAAgC;QAAhC,SAAI,GAAJ,IAAI,CAA4B;IAChD,CAAC;IAEJ,UAAU,CAAC,IAAY,EAAE,cAAuB;QAC9C,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACvB,KAAK,EAAE;gBACL,IAAI,EAAE,IAAI;gBACV,eAAe,EAAE,cAAc;aAChC;SACF,CAAC,CAAC;IACL,CAAC;IAGD,KAAK,CAAC,kBAAkB,CAAC,SAAkC;QACzD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,cAAsB,EAAE,MAAe;QACxD,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI;aACjB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;aACpD,QAAQ,CAAC,wCAAwC,EAAE,EAAE,cAAc,EAAE,CAAC;aACtE,QAAQ,CAAC,8BAA8B,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;QAElE,IAAI,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;YACnB,EAAE,CAAC,QAAQ,CACT,kEAAkE,EAClE,EAAE,MAAM,EAAE,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE,CACxC,CAAC;QACJ,CAAC;QAGD,EAAE,CAAC,OAAO,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;QAExC,OAAO,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;IAC5B,CAAC;CACF,CAAA;AAvCY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,mCAAc,CAAC,CAAA;qCACV,oBAAU;GAHxB,oBAAoB,CAuChC"}
|
|
@@ -15,45 +15,45 @@ const activity_log_repository_1 = require("../repository/activity-log.repository
|
|
|
15
15
|
const entity_service_impl_service_1 = require("../../meta/service/entity-service-impl.service");
|
|
16
16
|
function enrichData(category, logData) {
|
|
17
17
|
switch (category) {
|
|
18
|
-
case '
|
|
19
|
-
logData.color = '#
|
|
20
|
-
logData.icon = '
|
|
18
|
+
case 'STAGE':
|
|
19
|
+
logData.color = '#f63d68';
|
|
20
|
+
logData.icon = 'stage';
|
|
21
21
|
break;
|
|
22
|
-
case '
|
|
23
|
-
logData.color = '#
|
|
24
|
-
logData.icon = '
|
|
22
|
+
case 'INTERACTION':
|
|
23
|
+
logData.color = '#7a5af8';
|
|
24
|
+
logData.icon = 'interaction';
|
|
25
25
|
break;
|
|
26
|
-
case '
|
|
26
|
+
case 'FORM':
|
|
27
27
|
logData.color = '#eaaa08';
|
|
28
|
-
logData.icon = '
|
|
28
|
+
logData.icon = 'form';
|
|
29
29
|
break;
|
|
30
|
-
case '
|
|
31
|
-
logData.color = '#
|
|
32
|
-
logData.icon = '
|
|
30
|
+
case 'ASSIGN':
|
|
31
|
+
logData.color = '#16b364';
|
|
32
|
+
logData.icon = 'assign';
|
|
33
33
|
break;
|
|
34
|
-
case '
|
|
34
|
+
case 'MEETING':
|
|
35
35
|
logData.color = '#f63d68';
|
|
36
|
-
logData.icon = '
|
|
36
|
+
logData.icon = 'meeting';
|
|
37
37
|
break;
|
|
38
|
-
case '
|
|
38
|
+
case 'PROCESS':
|
|
39
39
|
logData.color = '#f63d68';
|
|
40
|
-
logData.icon = '
|
|
40
|
+
logData.icon = 'process';
|
|
41
41
|
break;
|
|
42
|
-
case '
|
|
42
|
+
case 'STATUS':
|
|
43
43
|
logData.color = '#f63d68';
|
|
44
|
-
logData.icon = '
|
|
44
|
+
logData.icon = 'status';
|
|
45
45
|
break;
|
|
46
|
-
case '
|
|
47
|
-
logData.color = '#
|
|
48
|
-
logData.icon = '
|
|
46
|
+
case 'TASK':
|
|
47
|
+
logData.color = '#06aed4';
|
|
48
|
+
logData.icon = 'task';
|
|
49
49
|
break;
|
|
50
|
-
case '
|
|
50
|
+
case 'LEAD':
|
|
51
51
|
logData.color = '#f63d68';
|
|
52
|
-
logData.icon = '
|
|
52
|
+
logData.icon = 'lead';
|
|
53
53
|
break;
|
|
54
54
|
default:
|
|
55
55
|
logData.color = '#ff0000';
|
|
56
|
-
logData.icon = '
|
|
56
|
+
logData.icon = 'DEFAULT';
|
|
57
57
|
}
|
|
58
58
|
return logData;
|
|
59
59
|
}
|
|
@@ -63,7 +63,7 @@ let ActivityLogService = class ActivityLogService extends entity_service_impl_se
|
|
|
63
63
|
this.activityLogRepository = activityLogRepository;
|
|
64
64
|
}
|
|
65
65
|
async logActivity(logData, loggedInUser) {
|
|
66
|
-
const storeData = enrichData(logData.category, logData);
|
|
66
|
+
const storeData = enrichData(logData.category.toUpperCase(), logData);
|
|
67
67
|
storeData.entity_type = 'ACLG';
|
|
68
68
|
return super.createEntity(storeData, loggedInUser);
|
|
69
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-log.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/activity-log.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mFAA8E;AAG9E,gGAAwF;AAGxF,SAAS,UAAU,CAAC,QAAgB,EAAE,OAAY;IAChD,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,OAAO;YACV,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;YAC1B,OAAO,CAAC,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"activity-log.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/activity-log.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mFAA8E;AAG9E,gGAAwF;AAGxF,SAAS,UAAU,CAAC,QAAgB,EAAE,OAAY;IAChD,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,OAAO;YACV,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;YAC1B,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC;YACvB,MAAM;QACR,KAAK,aAAa;YAChB,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;YAC1B,OAAO,CAAC,IAAI,GAAG,aAAa,CAAC;YAC7B,MAAM;QACR,KAAK,MAAM;YACT,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;YAC1B,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;YACtB,MAAM;QACR,KAAK,QAAQ;YACX,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;YAC1B,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC;YACxB,MAAM;QACR,KAAK,SAAS;YACZ,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;YAC1B,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;YACzB,MAAM;QACR,KAAK,SAAS;YACZ,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;YAC1B,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;YACzB,MAAM;QACR,KAAK,QAAQ;YACX,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;YAC1B,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC;YACxB,MAAM;QACR,KAAK,MAAM;YACT,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;YAC1B,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;YACtB,MAAM;QACR,KAAK,MAAM;YACT,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;YAC1B,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;YACtB,MAAM;QAER;YACE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;YAC1B,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAGM,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,+CAAiB;IACvD,YAA6B,qBAA4C;QACvE,KAAK,EAAE,CAAC;QADmB,0BAAqB,GAArB,qBAAqB,CAAuB;IAEzE,CAAC;IAED,KAAK,CAAC,WAAW,CACf,OAAY,EACZ,YAAsB;QAEtB,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC;QACtE,SAAS,CAAC,WAAW,GAAG,MAAM,CAAC;QAC/B,OAAO,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,kBAA0B,EAC1B,gBAAiC,EACjC,QAAgB,EAChB,YAAY;QAEZ,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CACzD,kBAAkB,EAClB,gBAAgB,EAChB,QAAQ,EACR,YAAY,CACb,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAE1B,kBAA0B,EAC1B,YAAY;QAEZ,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,sBAAsB,CAE9D,kBAAkB,EAClB,YAAY,CACb,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AAzCY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAEyC,+CAAqB;GAD9D,kBAAkB,CAyC9B"}
|