fixing qa issues in designation master

sunbird-cb · Jul 25, 2024 · fafa843 · fafa843
1 parent bfce407
commit fafa843
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/...rc/lib/routes/home/routes/designation/components/designations/designations.component.html b/...rc/lib/routes/home/routes/designation/components/designations/designations.component.html
@@ -3,7 +3,7 @@
     <div class="mobile-margin text-capitalize mat-h2">{{designationConfig.mainHeading}}</div>
     <div>
       <button mat-raised-button class="importBtn" [routerLink]="'import-designation'" type="button">
-        Import from Igot master
+        Import from iGOT master
       </button>
     </div>
   </div>
@@ -13,9 +13,9 @@
       <div class="section-1">
         <div class="flex-4 mobile-margin text-capitalize mat-h2">{{designationConfig?.topsection?.heading}}</div>
         <ng-container *ngFor="let step of designationConfig?.topsection?.steps">
-          <div class="flex gap-4 mb-4">
+          <div class="flex gap-4">
             <div>
-              <mat-icon class="infoIcon">info_outlined</mat-icon>
+              <mat-icon class="infoIcon">error_outline</mat-icon>
             </div>
             <div>
               <p>{{step.title}}</p>
@@ -57,7 +57,7 @@
           <div class="w-full flex flex-col justify-center items-center emptyDesignations">
             <img src="/assets/icons/empty_data.svg" class="empty-desigantions-img">
             <div>
-              <p class="empty-desigantions-text">No deisgnation has been imported from iGOT master.</p>
+              <p class="empty-desigantions-text">No designation has been imported from iGOT master.</p>
             </div>
             <div class="mt-4">
               <button mat-raised-button class="importBtn" [routerLink]="'import-designation'">

diff --git a/.../src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/.../src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -58,6 +58,7 @@ export class DesignationsComponent implements OnInit {
 
   initializeDefaultValues() {
     this.configSvc = this.activateRoute.snapshot.data['configService']
+    this.designationsService.setUserProfile(_.get(this.configSvc, 'userProfileV2'))
     this.orgId = _.get(this.configSvc, 'userProfile.rootOrgId')
     this.actionMenuItem = [
       // {

diff --git a/...s/home/routes/designation/components/import-designation/import-designation.component.scss b/...s/home/routes/designation/components/import-designation/import-designation.component.scss
@@ -4,6 +4,7 @@
   height: 20px;
   color: #797979;
   pointer-events: all;
+  cursor: pointer;
 }
 
 .header-text {
@@ -129,10 +130,10 @@
     }
 
     .custom-user-card {
-      width: 292px;
+      width: 360px;
       border: 1px solid rgba(0, 0, 0, 0.16);
       border-radius: 4px;
-      height: 70px;
+      height: 82px;
     }
 
     .disableCard {

diff --git a/...tes/home/routes/designation/components/import-designation/import-designation.component.ts b/...tes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -78,7 +78,6 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
       requestedFields: [],
       pageSize: this.pageSize,
     }
-    // this.startIndex
     if (searchKey) {
       requestParams['searchString'] = searchKey
     }

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -38,12 +38,21 @@ export class DesignationsService {
   orgDesignationList: any = []
   selectedDesignationList: any = []
   frameWorkInfo: any
+  userProfile: any
 
   constructor(
     private http: HttpClient,
     private configSvc: ConfigurationsService,
   ) { }
 
+  setUserProfile(profileDetails: any) {
+    this.userProfile = profileDetails
+  }
+
+  get userProfileDetails() {
+    return this.userProfile
+  }
+
   createFrameWork(frameworkName: string, orgId: string, termName: string) {
     return this.http.get<any>(API_END_POINTS.CREATE_FRAME_WORK(frameworkName, orgId, termName))
   }
@@ -126,7 +135,9 @@ export class DesignationsService {
           if (associations.length > 0) {
             Object.assign(c, { children: associations })
           }
-          c['importedByName'] = _.get(c, 'additionalProperties.importedByName'),
+          const importedBy = _.get(c, 'additionalProperties.importedById', null) === _.get(this.userProfile, 'userId', '')
+            ? 'You' : _.get(c, 'additionalProperties.importedById', null)
+          c['importedByName'] = importedBy,
             c['importedOn'] = _.get(c, 'additionalProperties.importedOn'),
             c['importedById'] = _.get(c, 'additionalProperties.importedById')
           return c
@@ -182,7 +193,7 @@ export class DesignationsService {
       frameworkId,
       categoryId,
       categoryTermCode
-    )}`,                   reguestBody)
+    )}`, reguestBody)
   }
 
   publishFramework(frameworkName: string) {