Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
upsmf-registrations-and-ecreds-ui-module
Commits
385e82f7
Commit
385e82f7
authored
1 year ago
by
sohail amjad
Browse files
Options
Download
Patches
Plain Diff
P1 issues fixed
parent
dc02b361
main
dependabot/npm_and_yarn/upsmf-registration-and-ecreds-web-module/babel/traverse-7.23.2
dependabot/npm_and_yarn/upsmf-registration-and-ecreds-web-module/follow-redirects-1.15.4
newStructFix
1 merge request
!120
P1 issues fixed
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
upsmf-registration-and-ecreds-web-module/src/app/modules/shared/components/admin-good-standing-foreign-verification/admin-good-standing-foreign-verification.component.ts
+1
-1
...ion/admin-good-standing-foreign-verification.component.ts
upsmf-registration-and-ecreds-web-module/src/app/modules/shared/components/user-profile/user-profile.component.html
+5
-0
...hared/components/user-profile/user-profile.component.html
upsmf-registration-and-ecreds-web-module/src/app/modules/shared/components/user-profile/user-profile.component.ts
+4
-0
.../shared/components/user-profile/user-profile.component.ts
upsmf-registration-and-ecreds-web-module/src/app/modules/super-admin-management/user-management/components/add-user/add-user.component.ts
+4
-4
...user-management/components/add-user/add-user.component.ts
with
14 additions
and
5 deletions
+14
-5
upsmf-registration-and-ecreds-web-module/src/app/modules/shared/components/admin-good-standing-foreign-verification/admin-good-standing-foreign-verification.component.ts
+
1
−
1
View file @
385e82f7
...
@@ -67,7 +67,7 @@ export class AdminGoodStandingForeignVerificationComponent {
...
@@ -67,7 +67,7 @@ export class AdminGoodStandingForeignVerificationComponent {
profQualificationArray
=
[
'
A
N
M
'
,
'
Midwife
'
,
'
HW
'
,
'
Nurse
'
,
'
B
sc
Nursing
'
];
profQualificationArray
=
[
'
A
.N.
M
'
,
'
Midwife
'
,
'
H
.
W
'
,
'
Nurse
'
,
'
B
.SC.
Nursing
'
];
months
=
[
months
=
[
'
January
'
,
'
February
'
,
'
March
'
,
'
April
'
,
'
May
'
,
'
June
'
,
'
January
'
,
'
February
'
,
'
March
'
,
'
April
'
,
'
May
'
,
'
June
'
,
'
July
'
,
'
August
'
,
'
September
'
,
'
October
'
,
'
November
'
,
'
December
'
'
July
'
,
'
August
'
,
'
September
'
,
'
October
'
,
'
November
'
,
'
December
'
...
...
This diff is collapsed.
Click to expand it.
upsmf-registration-and-ecreds-web-module/src/app/modules/shared/components/user-profile/user-profile.component.html
+
5
−
0
View file @
385e82f7
...
@@ -56,6 +56,11 @@
...
@@ -56,6 +56,11 @@
</div>
</div>
</div>
</div>
<div
class=
"first-container"
>
<mat-label
class=
"label-text"
>
Role
</mat-label>
<h3
class=
"textData"
*ngIf=
"userDetails"
>
{{userProfileRole}}
</h3>
</div>
</div>
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
upsmf-registration-and-ecreds-web-module/src/app/modules/shared/components/user-profile/user-profile.component.ts
+
4
−
0
View file @
385e82f7
...
@@ -15,6 +15,7 @@ export class UserProfileComponent implements OnInit {
...
@@ -15,6 +15,7 @@ export class UserProfileComponent implements OnInit {
userDetails
:
any
;
userDetails
:
any
;
userRole
:
any
;
userRole
:
any
;
endPointUrl
:
string
=
''
endPointUrl
:
string
=
''
userProfileRole
:
string
=
''
breadcrumbItems
:
BreadcrumbItem
[]
=
[
breadcrumbItems
:
BreadcrumbItem
[]
=
[
{
label
:
'
Home
'
,
url
:
'
/
'
},
{
label
:
'
Home
'
,
url
:
'
/
'
},
{
label
:
'
Profile
'
,
url
:
'
/user-profile
'
},
{
label
:
'
Profile
'
,
url
:
'
/user-profile
'
},
...
@@ -35,14 +36,17 @@ breadcrumbItems: BreadcrumbItem[] = [
...
@@ -35,14 +36,17 @@ breadcrumbItems: BreadcrumbItem[] = [
switch
(
this
.
userRole
)
{
switch
(
this
.
userRole
)
{
case
'
StudentFromUP
'
:
case
'
StudentFromUP
'
:
this
.
endPointUrl
=
this
.
configService
.
urlConFig
.
URLS
.
STUDENT
.
GET_STUDENT_DETAILS
this
.
endPointUrl
=
this
.
configService
.
urlConFig
.
URLS
.
STUDENT
.
GET_STUDENT_DETAILS
this
.
userProfileRole
=
'
Student
'
this
.
getUserDetails
()
this
.
getUserDetails
()
break
;
break
;
case
'
Regulator
'
:
case
'
Regulator
'
:
this
.
endPointUrl
=
this
.
configService
.
urlConFig
.
URLS
.
ADMIN
.
GET_ADMIN_DETAILS
this
.
endPointUrl
=
this
.
configService
.
urlConFig
.
URLS
.
ADMIN
.
GET_ADMIN_DETAILS
this
.
userProfileRole
=
'
Admin
'
this
.
getUserDetails
()
this
.
getUserDetails
()
break
;
break
;
case
'
SuperAdmin
'
:
case
'
SuperAdmin
'
:
this
.
endPointUrl
=
this
.
configService
.
urlConFig
.
URLS
.
SUPERADMIN
.
GET_SUPERADMIN_DETAILS
this
.
endPointUrl
=
this
.
configService
.
urlConFig
.
URLS
.
SUPERADMIN
.
GET_SUPERADMIN_DETAILS
this
.
userProfileRole
=
'
Super Admin
'
this
.
getUserDetails
()
this
.
getUserDetails
()
break
;
break
;
default
:
default
:
...
...
This diff is collapsed.
Click to expand it.
upsmf-registration-and-ecreds-web-module/src/app/modules/super-admin-management/user-management/components/add-user/add-user.component.ts
+
4
−
4
View file @
385e82f7
...
@@ -25,7 +25,7 @@ export class AddUserComponent {
...
@@ -25,7 +25,7 @@ export class AddUserComponent {
userIds
:
string
=
''
userIds
:
string
=
''
roleTypesArray
=
[
"
CouncilAdmin
"
,
"
ExternalCouncil
"
,
"
ExamBody
"
,
"
Regulator
"
];
roleTypesArray
=
[
"
CouncilAdmin
"
,
"
ExternalCouncil
"
,
"
ExamBody
"
,
"
Regulator
"
];
councilTypeArray
:
string
[]
=
[
"
UPSMF
"
,
"
UPN
M
"
,
"
UPDC
"
,
"
UPMC
"
]
councilTypeArray
:
string
[]
=
[
"
UPSMF
"
,
"
UPN
C
"
,
"
UPDC
"
,
"
UPMC
"
]
activeStatusArray
=
[
"
Active
"
,
"
Inactive
"
];
activeStatusArray
=
[
"
Active
"
,
"
Inactive
"
];
breadcrumbItems
:
BreadcrumbItem
[]
=
[
breadcrumbItems
:
BreadcrumbItem
[]
=
[
{
label
:
'
Workspace
'
,
url
:
'
/super-admin
'
},
{
label
:
'
Workspace
'
,
url
:
'
/super-admin
'
},
...
@@ -72,16 +72,16 @@ export class AddUserComponent {
...
@@ -72,16 +72,16 @@ export class AddUserComponent {
lastName
=
this
.
userDetails
.
lastName
lastName
=
this
.
userDetails
.
lastName
};
};
if
(
this
.
userDetails
?.
attributes
.
role
[
0
]
===
'
CouncilAdmin
'
){
if
(
this
.
userDetails
?.
attributes
.
role
[
0
]
===
'
CouncilAdmin
'
){
this
.
councilTypeArray
=
[
"
UPSMF
"
,
"
UPN
M
"
,
"
UPDC
"
,
"
UPMC
"
]
this
.
councilTypeArray
=
[
"
UPSMF
"
,
"
UPN
C
"
,
"
UPDC
"
,
"
UPMC
"
]
}
}
else
if
(
this
.
userDetails
?.
attributes
.
role
[
0
]
===
'
ExternalCouncil
'
){
else
if
(
this
.
userDetails
?.
attributes
.
role
[
0
]
===
'
ExternalCouncil
'
){
this
.
councilTypeArray
=
[
'
OtherState
'
]
this
.
councilTypeArray
=
[
'
OtherState
'
]
}
}
else
if
(
this
.
userDetails
?.
attributes
.
role
[
0
]
===
'
Regulator
'
){
else
if
(
this
.
userDetails
?.
attributes
.
role
[
0
]
===
'
Regulator
'
){
this
.
councilTypeArray
=
[
"
UPSMF
"
,
"
UPN
M
"
,
"
UPDC
"
,
"
UPMC
"
]
this
.
councilTypeArray
=
[
"
UPSMF
"
,
"
UPN
C
"
,
"
UPDC
"
,
"
UPMC
"
]
}
}
else
{
else
{
this
.
councilTypeArray
=
[
"
UPSMF
"
,
"
UPN
M
"
,
"
UPDC
"
,
"
UPMC
"
]
this
.
councilTypeArray
=
[
"
UPSMF
"
,
"
UPN
C
"
,
"
UPDC
"
,
"
UPMC
"
]
}
}
this
.
newUserformGroup
.
setValue
({
this
.
newUserformGroup
.
setValue
({
fName
:
firstName
,
fName
:
firstName
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets