Merge pull request #3696 from ArjunKhetia-NIIT/release-2.8.0

Issue #SB-16233 fix: Inconsistency in profile page - District and State field (also subject)

src/app/client/src/app/plugins/profile/components/profile-page/profile-page.component.html

@@ -157,22 +157,22 @@
     <div class="ui container">
       <div class="d-flex flex-jc-center relative">
         <div class="max-w-400 computer only">
-          <div class="mb-15 d-flex flex-jc-center">
+          <div class="mb-15 d-flex flex-jc-center" *ngIf="convertToString(userProfile.framework.board)">
             <span class="fs-1-16 white-space-nowrap">{{resourceService.frmelmnts.lbl.boards}} :</span>
             <span class="fs-1-16 font-w-bold pl-5"
               *ngIf="userProfile.framework">{{convertToString(userProfile.framework.board)}}</span>
           </div>
-          <div class="mb-15 d-flex flex-jc-center">
+          <div class="mb-15 d-flex flex-jc-center" *ngIf="convertToString(userProfile.framework.medium)">
             <span class="fs-1-16 white-space-nowrap">{{resourceService.frmelmnts.lbl.medium}} :</span>
             <span class="fs-1-16 font-w-bold pl-5"
               *ngIf="userProfile.framework">{{convertToString(userProfile.framework.medium)}}</span>
           </div>
-          <div class="mb-15 d-flex flex-jc-center">
+          <div class="mb-15 d-flex flex-jc-center" *ngIf="convertToString(userProfile.framework.gradeLevel)">
             <span class="fs-1-16 white-space-nowrap">{{resourceService.frmelmnts.lbl.classes}} :</span>
             <span class="fs-1-16 font-w-bold pl-5"
               *ngIf="userProfile.framework">{{convertToString(userProfile.framework.gradeLevel)}}</span>
           </div>
-          <div class="d-flex flex-jc-center">
+          <div class="d-flex flex-jc-center" *ngIf="convertToString(userProfile.framework.subject)">
             <span class="fs-1-16 white-space-nowrap">{{resourceService.frmelmnts.lbl.subjects}} :</span>
             <span class="fs-1-16 font-w-bold pl-5"
               *ngIf="userProfile.framework">{{convertToString(userProfile.framework.subject)}}</span>
@@ -291,4 +291,4 @@
 <app-update-user-details (close)="showEditUserDetailsPopup = !showEditUserDetailsPopup" *ngIf="showEditUserDetailsPopup"
   [userProfile]="userProfile"></app-update-user-details>
   <app-account-recovery-info *ngIf="showRecoveryId" [mode]="mode" (close)="showRecoveryId = !showRecoveryId"></app-account-recovery-info>
-<router-outlet></router-outlet>
\ No newline at end of file
+<router-outlet></router-outlet>