Merge branch 'cbrelease-4.8.16' of github.com:sunbird-cb/sunbird-cb-o…

…rgportal into odcs-designations
sunbird-cb · Jul 25, 2024 · 92345a4 · 92345a4
2 parents ee337f5 + 41a99e2
commit 92345a4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -86,10 +86,13 @@
                 </mat-form-field>
                 <mat-icon class="verified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileGroupStatus === 'VERIFIED'">
-                  check_circle</mat-icon>
+                  check_circle</mat-icon> <span *ngIf="user?.profileDetails?.profileGroupStatus === 'VERIFIED'"
+                  class="mat-caption status-text ws-mat-black40-text"> Verified</span>
+
                 <mat-icon class="nonverified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileGroupStatus === 'NOT-VERIFIED'">
-                  cancel</mat-icon>
+                  cancel</mat-icon> <span *ngIf="user?.profileDetails?.profileGroupStatus === 'NOT-VERIFIED'"
+                  class="mat-caption status-text ws-mat-black40-text"> Not-verified</span>
               </div>
               <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label">Designation</label>
@@ -110,9 +113,13 @@
                 <mat-icon class="verified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileDesignationStatus === 'VERIFIED'">
                   check_circle</mat-icon>
+                <span *ngIf="user?.profileDetails?.profileDesignationStatus === 'VERIFIED'"
+                  class="mat-caption status-text ws-mat-black40-text"> Verified</span>
                 <mat-icon class="nonverified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileDesignationStatus === 'NOT-VERIFIED'">
                   cancel</mat-icon>
+                <span *ngIf="user?.profileDetails?.profileDesignationStatus === 'NOT-VERIFIED'"
+                  class="mat-caption status-text ws-mat-black40-text"> Not-verified</span>
               </div>
             </div>
           </div>

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -368,4 +368,9 @@ label {
     border-radius: 4px;
     border: 1px solid rgba(0, 0, 0, .14);
     font-family: Lato;
+}
+
+.status-text {
+  position: relative;
+  top: -2px;
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
@@ -11,9 +11,9 @@ <h1 class="mat-heading-1">{{odcConfig?.mainHeading}}</h1>
       <div class="flex">
         <span class="mat-body-1 font-bold-imp flex-1">{{odcConfig?.topsection?.heading}}</span>
         <mat-icon class="cursor-pointer mat-icon mr-4" *ngIf="showTopSection"
-          (click)="showTopSection = !showTopSection">keyboard_arrow_up</mat-icon>
+          (click)="showTopSection = !showTopSection; callResizeEvent($event)">keyboard_arrow_up</mat-icon>
         <mat-icon class="cursor-pointer mat-icon mr-4" *ngIf="!showTopSection"
-          (click)="showTopSection = !showTopSection">keyboard_arrow_down</mat-icon>
+          (click)="showTopSection = !showTopSection; callResizeEvent($event)">keyboard_arrow_down</mat-icon>
       </div>
       <div class="mt-5" *ngIf="showTopSection">
         <div class="flex">
@@ -32,7 +32,7 @@ <h1 class="mat-heading-1">{{odcConfig?.mainHeading}}</h1>
         </div>
       </div>
     </mat-card>
-    <div>
+    <div *ngIf="environmentVal && environmentVal.frameworkName">
       <lib-taxonomy-view [environment]="environmentVal" [taxonomyConfig]="taxonomyConfig"></lib-taxonomy-view>
     </div>
   </div>

diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -19,7 +19,6 @@ export class OdcsMappingComponent implements OnInit {
   showLoader = false
   loaderMsg = ''
   orgId = ''
-
   constructor(
     private activateRoute: ActivatedRoute,
     private designationsService: DesignationsService,
@@ -50,6 +49,12 @@ export class OdcsMappingComponent implements OnInit {
     }
   }
 
+  callResizeEvent(_event: any) {
+    setTimeout(() => {
+      window.dispatchEvent(new Event('resize'))
+    }, 100)
+  }
+
   createFreamwork() {
     this.loaderMsg = this.odcConfig.frameworkCreationMSg
     const departmentName = _.get(this.configSvc, 'userProfile.departmentName').replace(/\s/g, '')
@@ -74,7 +79,7 @@ export class OdcsMappingComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        },         10000)
+        }, 10000)
       }
     })
   }