Skip to content

Commit fafa843

Browse files
fixing qa issues in designation master
1 parent bfce407 commit fafa843

File tree

5 files changed

+21
-9
lines changed

5 files changed

+21
-9
lines changed

project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="mobile-margin text-capitalize mat-h2">{{designationConfig.mainHeading}}</div>
44
<div>
55
<button mat-raised-button class="importBtn" [routerLink]="'import-designation'" type="button">
6-
Import from Igot master
6+
Import from iGOT master
77
</button>
88
</div>
99
</div>
@@ -13,9 +13,9 @@
1313
<div class="section-1">
1414
<div class="flex-4 mobile-margin text-capitalize mat-h2">{{designationConfig?.topsection?.heading}}</div>
1515
<ng-container *ngFor="let step of designationConfig?.topsection?.steps">
16-
<div class="flex gap-4 mb-4">
16+
<div class="flex gap-4">
1717
<div>
18-
<mat-icon class="infoIcon">info_outlined</mat-icon>
18+
<mat-icon class="infoIcon">error_outline</mat-icon>
1919
</div>
2020
<div>
2121
<p>{{step.title}}</p>
@@ -57,7 +57,7 @@
5757
<div class="w-full flex flex-col justify-center items-center emptyDesignations">
5858
<img src="/assets/icons/empty_data.svg" class="empty-desigantions-img">
5959
<div>
60-
<p class="empty-desigantions-text">No deisgnation has been imported from iGOT master.</p>
60+
<p class="empty-desigantions-text">No designation has been imported from iGOT master.</p>
6161
</div>
6262
<div class="mt-4">
6363
<button mat-raised-button class="importBtn" [routerLink]="'import-designation'">

project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export class DesignationsComponent implements OnInit {
5858

5959
initializeDefaultValues() {
6060
this.configSvc = this.activateRoute.snapshot.data['configService']
61+
this.designationsService.setUserProfile(_.get(this.configSvc, 'userProfileV2'))
6162
this.orgId = _.get(this.configSvc, 'userProfile.rootOrgId')
6263
this.actionMenuItem = [
6364
// {

project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
height: 20px;
55
color: #797979;
66
pointer-events: all;
7+
cursor: pointer;
78
}
89

910
.header-text {
@@ -129,10 +130,10 @@
129130
}
130131

131132
.custom-user-card {
132-
width: 292px;
133+
width: 360px;
133134
border: 1px solid rgba(0, 0, 0, 0.16);
134135
border-radius: 4px;
135-
height: 70px;
136+
height: 82px;
136137
}
137138

138139
.disableCard {

project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
7878
requestedFields: [],
7979
pageSize: this.pageSize,
8080
}
81-
// this.startIndex
8281
if (searchKey) {
8382
requestParams['searchString'] = searchKey
8483
}

project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,21 @@ export class DesignationsService {
3838
orgDesignationList: any = []
3939
selectedDesignationList: any = []
4040
frameWorkInfo: any
41+
userProfile: any
4142

4243
constructor(
4344
private http: HttpClient,
4445
private configSvc: ConfigurationsService,
4546
) { }
4647

48+
setUserProfile(profileDetails: any) {
49+
this.userProfile = profileDetails
50+
}
51+
52+
get userProfileDetails() {
53+
return this.userProfile
54+
}
55+
4756
createFrameWork(frameworkName: string, orgId: string, termName: string) {
4857
return this.http.get<any>(API_END_POINTS.CREATE_FRAME_WORK(frameworkName, orgId, termName))
4958
}
@@ -126,7 +135,9 @@ export class DesignationsService {
126135
if (associations.length > 0) {
127136
Object.assign(c, { children: associations })
128137
}
129-
c['importedByName'] = _.get(c, 'additionalProperties.importedByName'),
138+
const importedBy = _.get(c, 'additionalProperties.importedById', null) === _.get(this.userProfile, 'userId', '')
139+
? 'You' : _.get(c, 'additionalProperties.importedById', null)
140+
c['importedByName'] = importedBy,
130141
c['importedOn'] = _.get(c, 'additionalProperties.importedOn'),
131142
c['importedById'] = _.get(c, 'additionalProperties.importedById')
132143
return c
@@ -182,7 +193,7 @@ export class DesignationsService {
182193
frameworkId,
183194
categoryId,
184195
categoryTermCode
185-
)}`, reguestBody)
196+
)}`, reguestBody)
186197
}
187198

188199
publishFramework(frameworkName: string) {

0 commit comments

Comments
 (0)