rez_core 2.0.79 → 2.0.81
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/filter/service/filter.service.js.map +1 -1
- package/dist/module/meta/service/entity-table.service.js +1 -0
- package/dist/module/meta/service/entity-table.service.js.map +1 -1
- package/dist/module/user/service/role.service.d.ts +1 -1
- package/dist/module/user/service/role.service.js +3 -5
- package/dist/module/user/service/role.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/filter/service/filter.service.ts +0 -2
- package/src/module/meta/service/entity-table.service.ts +1 -0
- package/src/module/user/service/role.service.ts +4 -7
package/package.json
CHANGED
|
@@ -21,7 +21,6 @@ export class FilterService {
|
|
|
21
21
|
) {}
|
|
22
22
|
private readonly skipLevelFilterEntities = ['USR','UPR'];
|
|
23
23
|
|
|
24
|
-
|
|
25
24
|
private async gettab_value_counts(
|
|
26
25
|
tableName: string,
|
|
27
26
|
column: string | undefined,
|
|
@@ -142,7 +141,6 @@ export class FilterService {
|
|
|
142
141
|
},
|
|
143
142
|
});
|
|
144
143
|
}
|
|
145
|
-
|
|
146
144
|
|
|
147
145
|
// Build query for tab counts (no tab.value filter here)
|
|
148
146
|
const allTabs = await this.gettab_value_counts(
|
|
@@ -94,6 +94,7 @@ export class EntityTableService {
|
|
|
94
94
|
date: await this.listMasterService.getDropdownOptions('OPD', {}),
|
|
95
95
|
select: await this.listMasterService.getDropdownOptions('OPS', {}),
|
|
96
96
|
multiselect: await this.listMasterService.getDropdownOptions('OPM', {}),
|
|
97
|
+
year: await this.listMasterService.getDropdownOptions('OPY', {}),
|
|
97
98
|
// Add any other operations you want to include
|
|
98
99
|
};
|
|
99
100
|
entityTableDto.default_filter =
|
|
@@ -22,16 +22,13 @@ export class RoleService extends EntityServiceImpl {
|
|
|
22
22
|
|
|
23
23
|
async createEntity(
|
|
24
24
|
entityData: BaseEntity,
|
|
25
|
-
loggedInUser: UserData
|
|
26
|
-
manager?: EntityManager,
|
|
27
|
-
appcode?: string,
|
|
25
|
+
loggedInUser: UserData,
|
|
28
26
|
): Promise<BaseEntity> {
|
|
29
27
|
let role = entityData as Role;
|
|
30
28
|
|
|
31
|
-
if
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
}
|
|
29
|
+
// if level_type and level_id are not provided, use loggedInUser's values
|
|
30
|
+
role.level_type = entityData.level_type || loggedInUser.level_type;
|
|
31
|
+
role.level_id = entityData.level_id || loggedInUser.level_id;
|
|
35
32
|
|
|
36
33
|
if (
|
|
37
34
|
await this.roleRepository.isRoleNameWithLevelExists(role.name, {
|