rez_core 3.1.168 → 3.1.169
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/meta/service/resolver.service.js +13 -8
- package/dist/module/meta/service/resolver.service.js.map +1 -1
- package/dist/module/notification/entity/notification.entity.d.ts +1 -0
- package/dist/module/notification/entity/notification.entity.js +4 -0
- package/dist/module/notification/entity/notification.entity.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/meta/service/resolver.service.ts +43 -18
- package/src/module/notification/entity/notification.entity.ts +3 -0
|
@@ -30,25 +30,30 @@ let ResolverService = class ResolverService {
|
|
|
30
30
|
const codeValue = entityData[field];
|
|
31
31
|
if (!codeValue)
|
|
32
32
|
continue;
|
|
33
|
-
if (attr.data_source_type === 'entity' ||
|
|
34
|
-
|
|
33
|
+
if (attr.data_source_type === 'entity' ||
|
|
34
|
+
attr.data_source_type === 'master') {
|
|
35
|
+
const type = attr.data_source_type === 'entity'
|
|
36
|
+
? attr.datasource_list
|
|
37
|
+
: attr.list_type;
|
|
35
38
|
const params = {};
|
|
36
39
|
if (Array.isArray(codeValue)) {
|
|
37
40
|
const resolvedValues = [];
|
|
38
41
|
for (const code of codeValue) {
|
|
39
|
-
const options = await this.listMasterService.getDropdownOptions(type, params, undefined, loggedInUser
|
|
40
|
-
const item = options.find(opt => opt.id === code || opt.code === code);
|
|
42
|
+
const options = await this.listMasterService.getDropdownOptions(type, params, undefined, loggedInUser);
|
|
43
|
+
const item = options.find((opt) => opt.id === code || opt.code === code);
|
|
41
44
|
resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
|
|
42
45
|
}
|
|
43
46
|
resolvedEntityData[field] = resolvedValues;
|
|
44
47
|
}
|
|
45
48
|
else {
|
|
46
|
-
const options = await this.listMasterService.getDropdownOptions(type, params, undefined, loggedInUser
|
|
47
|
-
const item = options.find(opt => opt.id === codeValue || opt.code === codeValue);
|
|
48
|
-
resolvedEntityData[field] =
|
|
49
|
+
const options = await this.listMasterService.getDropdownOptions(type, params, undefined, loggedInUser);
|
|
50
|
+
const item = options.find((opt) => opt.id === codeValue || opt.code === codeValue);
|
|
51
|
+
resolvedEntityData[field] =
|
|
52
|
+
item?.[attr.data_source_attribute] ?? codeValue;
|
|
49
53
|
}
|
|
50
54
|
}
|
|
51
|
-
else if (attr.element_type === 'date' ||
|
|
55
|
+
else if (attr.element_type === 'date' ||
|
|
56
|
+
attr.element_type === 'datetime') {
|
|
52
57
|
const dateValue = moment(codeValue).utcOffset('+05:30');
|
|
53
58
|
if (dateValue.isValid()) {
|
|
54
59
|
resolvedEntityData[field] =
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/resolver.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AACrC,2CAAoD;AAEpD,iCAAiC;AACjC,sFAAsF;AAG/E,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,
|
|
1
|
+
{"version":3,"file":"resolver.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/resolver.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AACrC,2CAAoD;AAEpD,iCAAiC;AACjC,sFAAsF;AAG/E,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YACmB,UAAsB,EAEtB,iBAAoC;QAFpC,eAAU,GAAV,UAAU,CAAY;QAEtB,sBAAiB,GAAjB,iBAAiB,CAAmB;IACpD,CAAC;IAEJ,KAAK,CAAC,eAAe,CACnB,YAAiB,EACjB,UAAe,EACf,UAAkB;QAElB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAChD,wFAAwF,EACxF,CAAC,UAAU,EAAE,YAAY,CAAC,eAAe,CAAC,CAC3C,CAAC;QAEF,MAAM,kBAAkB,GAAG,EAAE,GAAG,UAAU,EAAE,CAAC;QAE7C,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;YAClC,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC;YACjC,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;YAEpC,IAAI,CAAC,SAAS;gBAAE,SAAS;YAGzB,IACE,IAAI,CAAC,gBAAgB,KAAK,QAAQ;gBAClC,IAAI,CAAC,gBAAgB,KAAK,QAAQ,EAClC,CAAC;gBACD,MAAM,IAAI,GACR,IAAI,CAAC,gBAAgB,KAAK,QAAQ;oBAChC,CAAC,CAAC,IAAI,CAAC,eAAe;oBACtB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;gBACrB,MAAM,MAAM,GAAG,EAAE,CAAC;gBAElB,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC7B,MAAM,cAAc,GAAa,EAAE,CAAC;oBACpC,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;wBAC7B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAC7D,IAAI,EACJ,MAAM,EACN,SAAS,EACT,YAAY,CACb,CAAC;wBACF,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CACvB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,CAC9C,CAAC;wBACF,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,IAAI,CAAC,CAAC;oBAClE,CAAC;oBACD,kBAAkB,CAAC,KAAK,CAAC,GAAG,cAAc,CAAC;gBAC7C,CAAC;qBAAM,CAAC;oBACN,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAC7D,IAAI,EACJ,MAAM,EACN,SAAS,EACT,YAAY,CACb,CAAC;oBACF,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CACvB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,SAAS,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,CACxD,CAAC;oBACF,kBAAkB,CAAC,KAAK,CAAC;wBACvB,IAAI,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,SAAS,CAAC;gBACpD,CAAC;YACH,CAAC;iBAGI,IACH,IAAI,CAAC,YAAY,KAAK,MAAM;gBAC5B,IAAI,CAAC,YAAY,KAAK,UAAU,EAChC,CAAC;gBACD,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACxD,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;oBACxB,kBAAkB,CAAC,KAAK,CAAC;wBACvB,IAAI,CAAC,YAAY,KAAK,MAAM;4BAC1B,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC;4BAChC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;gBAChD,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,YAAsB,EACtB,OAAe,EACf,QAAa,EACb,UAAkB;QAElB,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;YACnE,OAAO,QAAQ,CAAC;QAClB,CAAC;QAGD,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACxC,8GAA8G,EAC9G,CAAC,UAAU,EAAE,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CACpD,CAAC;QAEF,IAAI,CAAC,IAAI;YAAE,OAAO,QAAQ,CAAC;QAG3B,IAAI,IAAI,CAAC,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YACvC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAC7C,qFAAqF,EACrF,CAAC,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,eAAe,CAAC,CACrD,CAAC;YAEF,IAAI,CAAC,SAAS;gBAAE,OAAO,QAAQ,CAAC;YAEhC,MAAM,SAAS,GAAG,SAAS,CAAC,aAAa,CAAC;YAE1C,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5B,MAAM,cAAc,GAAa,EAAE,CAAC;gBACpC,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;oBAC5B,MAAM,KAAK,GACT,SAAS,KAAK,kBAAkB;wBAC9B,CAAC,CAAC,iBAAiB,SAAS,iBAAiB;wBAC7C,CAAC,CAAC,iBAAiB,SAAS,uCAAuC,CAAC;oBAExE,MAAM,MAAM,GACV,SAAS,KAAK,kBAAkB;wBAC9B,CAAC,CAAC,CAAC,IAAI,CAAC;wBACR,CAAC,CAAC,CAAC,IAAI,EAAE,YAAY,CAAC,eAAe,CAAC,CAAC;oBAE3C,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;oBAC1D,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,IAAI,CAAC,CAAC;gBAClE,CAAC;gBACD,OAAO,cAAc,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,GACT,SAAS,KAAK,kBAAkB;oBAC9B,CAAC,CAAC,iBAAiB,SAAS,eAAe;oBAC3C,CAAC,CAAC,iBAAiB,SAAS,uCAAuC,CAAC;gBAExE,MAAM,MAAM,GACV,SAAS,KAAK,kBAAkB;oBAC9B,CAAC,CAAC,CAAC,QAAQ,CAAC;oBACZ,CAAC,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,eAAe,CAAC,CAAC;gBAE/C,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAC1D,OAAO,IAAI,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,QAAQ,CAAC;YACxD,CAAC;QACH,CAAC;aAGI,IAAI,IAAI,CAAC,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YAC5C,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5B,MAAM,cAAc,GAAa,EAAE,CAAC;gBACpC,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;oBAC5B,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACxC,yEAAyE,EACzE,CAAC,IAAI,EAAE,YAAY,CAAC,eAAe,CAAC,CACrC,CAAC;oBACF,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,IAAI,CAAC,CAAC;gBAClE,CAAC;gBACD,OAAO,cAAc,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACxC,yEAAyE,EACzE,CAAC,QAAQ,EAAE,YAAY,CAAC,eAAe,CAAC,CACzC,CAAC;gBACF,OAAO,IAAI,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,QAAQ,CAAC;YACxD,CAAC;QACH,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,YAAsB,EACtB,OAAe,EACf,YAAiB,EACjB,UAAkB;QAElB,IACE,YAAY,KAAK,IAAI;YACrB,YAAY,KAAK,SAAS;YAC1B,YAAY,KAAK,EAAE,EACnB,CAAC;YACD,OAAO,YAAY,CAAC;QACtB,CAAC;QAGD,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACxC;kFAC4E,EAC5E,CAAC,UAAU,EAAE,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CACpD,CAAC;QAEF,IAAI,CAAC,IAAI;YAAE,OAAO,YAAY,CAAC;QAG/B,IAAI,IAAI,CAAC,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YACvC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAC7C;8DACsD,EACtD,CAAC,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,eAAe,CAAC,CACrD,CAAC;YAEF,IAAI,CAAC,SAAS;gBAAE,OAAO,YAAY,CAAC;YAEpC,MAAM,SAAS,GAAG,SAAS,CAAC,aAAa,CAAC;YAE1C,MAAM,KAAK,GACT,SAAS,KAAK,kBAAkB;gBAC9B,CAAC,CAAC,kBAAkB,SAAS,UAAU,IAAI,CAAC,qBAAqB,MAAM;gBACvE,CAAC,CAAC,kBAAkB,SAAS,UAAU,IAAI,CAAC,qBAAqB,8BAA8B,CAAC;YAEpG,MAAM,MAAM,GACV,SAAS,KAAK,kBAAkB;gBAC9B,CAAC,CAAC,CAAC,YAAY,CAAC;gBAChB,CAAC,CAAC,CAAC,YAAY,EAAE,YAAY,CAAC,eAAe,CAAC,CAAC;YAEnD,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC1D,OAAO,IAAI,EAAE,EAAE,IAAI,YAAY,CAAC;QAClC,CAAC;aAGI,IAAI,IAAI,CAAC,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YAC5C,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACxC;iBACS,IAAI,CAAC,qBAAqB,8BAA8B,EACjE,CAAC,YAAY,EAAE,YAAY,CAAC,eAAe,CAAC,CAC7C,CAAC;YACF,OAAO,IAAI,EAAE,EAAE,IAAI,YAAY,CAAC;QAClC,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;CACF,CAAA;AAvOY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,eAAM,EAAC,mBAAmB,CAAC,CAAA;qCADC,oBAAU;QAEH,uCAAiB;GAJ5C,eAAe,CAuO3B"}
|
|
@@ -35,6 +35,10 @@ __decorate([
|
|
|
35
35
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
36
36
|
__metadata("design:type", String)
|
|
37
37
|
], NotificationData.prototype, "mapped_entity_type", void 0);
|
|
38
|
+
__decorate([
|
|
39
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
40
|
+
__metadata("design:type", Number)
|
|
41
|
+
], NotificationData.prototype, "task_id", void 0);
|
|
38
42
|
__decorate([
|
|
39
43
|
(0, typeorm_1.Column)({ name: 'is_read', type: 'boolean', default: false }),
|
|
40
44
|
__metadata("design:type", Boolean)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.entity.js","sourceRoot":"","sources":["../../../../src/module/notification/entity/notification.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAuE;AACvE,qCAAyC;AAGlC,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,+BAAU;
|
|
1
|
+
{"version":3,"file":"notification.entity.js","sourceRoot":"","sources":["../../../../src/module/notification/entity/notification.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAuE;AACvE,qCAAyC;AAGlC,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,+BAAU;CAqB/C,CAAA;AArBY,4CAAgB;AAE3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAClC;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACnD;AAG1B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACnC;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACF;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4DACA;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACX;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;iDAC5C;2BApBN,gBAAgB;IAD5B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;GACvB,gBAAgB,CAqB5B"}
|