Commit 385e82f7 authored by sohail amjad's avatar sohail amjad
Browse files

P1 issues fixed

Showing with 14 additions and 5 deletions
+14 -5
...@@ -67,7 +67,7 @@ export class AdminGoodStandingForeignVerificationComponent { ...@@ -67,7 +67,7 @@ export class AdminGoodStandingForeignVerificationComponent {
profQualificationArray = ['ANM', 'Midwife', 'HW', 'Nurse', 'Bsc 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'
......
...@@ -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>
......
...@@ -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:
......
...@@ -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", "UPNM", "UPDC","UPMC"] councilTypeArray:string[]=["UPSMF", "UPNC", "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", "UPNM", "UPDC","UPMC"] this.councilTypeArray = ["UPSMF", "UPNC", "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", "UPNM", "UPDC","UPMC"] this.councilTypeArray = ["UPSMF", "UPNC", "UPDC","UPMC"]
} }
else { else {
this.councilTypeArray =["UPSMF", "UPNM", "UPDC","UPMC"] this.councilTypeArray =["UPSMF", "UPNC", "UPDC","UPMC"]
} }
this.newUserformGroup.setValue({ this.newUserformGroup.setValue({
fName: firstName, fName: firstName,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment