rez_core 2.1.92 → 2.1.94
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/entity-table.service.js +6 -6
- package/dist/module/meta/service/entity-table.service.js.map +1 -1
- package/dist/module/user/service/login.service.js +3 -0
- package/dist/module/user/service/login.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/meta/service/entity-table.service.ts +36 -6
- package/src/module/user/service/login.service.ts +5 -0
package/package.json
CHANGED
|
@@ -96,12 +96,42 @@ export class EntityTableService {
|
|
|
96
96
|
entityTable.entity_type,
|
|
97
97
|
);
|
|
98
98
|
entityTableDto.operation_list = {
|
|
99
|
-
text: await this.listMasterService.getDropdownOptions(
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
99
|
+
text: await this.listMasterService.getDropdownOptions(
|
|
100
|
+
'OPT',
|
|
101
|
+
{},
|
|
102
|
+
[],
|
|
103
|
+
loggedInUser,
|
|
104
|
+
),
|
|
105
|
+
number: await this.listMasterService.getDropdownOptions(
|
|
106
|
+
'OPN',
|
|
107
|
+
{},
|
|
108
|
+
[],
|
|
109
|
+
loggedInUser,
|
|
110
|
+
),
|
|
111
|
+
date: await this.listMasterService.getDropdownOptions(
|
|
112
|
+
'OPD',
|
|
113
|
+
{},
|
|
114
|
+
[],
|
|
115
|
+
loggedInUser,
|
|
116
|
+
),
|
|
117
|
+
select: await this.listMasterService.getDropdownOptions(
|
|
118
|
+
'OPS',
|
|
119
|
+
{},
|
|
120
|
+
[],
|
|
121
|
+
loggedInUser,
|
|
122
|
+
),
|
|
123
|
+
multiselect: await this.listMasterService.getDropdownOptions(
|
|
124
|
+
'OPM',
|
|
125
|
+
{},
|
|
126
|
+
[],
|
|
127
|
+
loggedInUser,
|
|
128
|
+
),
|
|
129
|
+
year: await this.listMasterService.getDropdownOptions(
|
|
130
|
+
'OPY',
|
|
131
|
+
{},
|
|
132
|
+
[],
|
|
133
|
+
loggedInUser,
|
|
134
|
+
),
|
|
105
135
|
// Add any other operations you want to include
|
|
106
136
|
};
|
|
107
137
|
entityTableDto.default_filter =
|
|
@@ -34,6 +34,7 @@ export class LoginService {
|
|
|
34
34
|
async login(email: string, password: string) {
|
|
35
35
|
const user = await this.userService.findByEmailId(email);
|
|
36
36
|
|
|
37
|
+
console.log(user," user data");
|
|
37
38
|
if (!user) {
|
|
38
39
|
return {
|
|
39
40
|
success: false,
|
|
@@ -45,11 +46,15 @@ export class LoginService {
|
|
|
45
46
|
user.organization_id,
|
|
46
47
|
);
|
|
47
48
|
|
|
49
|
+
console.log(userOrgData ," user org data");
|
|
50
|
+
|
|
48
51
|
const resolveStatus = await this.listMasterService.getResolvedListCode(
|
|
49
52
|
STATUS_ACTIVE,
|
|
50
53
|
user?.organization_id || 0,
|
|
51
54
|
);
|
|
52
55
|
|
|
56
|
+
console.log(resolveStatus," resolve status");
|
|
57
|
+
|
|
53
58
|
if (
|
|
54
59
|
user.status != resolveStatus.id ||
|
|
55
60
|
userOrgData?.status != resolveStatus.id
|