Merge pull request #8302 from pradoshKumar/release-5.0.0

Issue #SB-30999 fix: Before joining the course 'Last date for enrolment' message and after joining the course, 'Batch expiring' message is center aligned

src/app/client/src/app/modules/learn/components/course-consumption/course-consumption-header/course-consumption-header.component.html

@@ -61,12 +61,7 @@
   </div>
       </div>
 
-<div *ngIf="batchEndDate && showBatchCounter" class="d-flex">
-  <span class="fnormal sb-color-gray-400">{{resourceService?.frmelmnts?.lbl?.BatchExpiringIn}}:&nbsp;</span>
-  <span class="fsmall font-weight-bold mb-8 sb-color-gray-800">
-    <h6>{{batchRemaningTime}}</h6>
-  </span>
-</div>
+
   <div class="d-flex flex-w-wrap flex-ai-center textbook cc-player ml-auto">
     <div class="batch-details__created mt-8 fsmall mx-8"
       *ngIf="!enrolledBatchInfo && isValidEnrollmentEndDate(enrollmentEndDate)">
@@ -76,6 +71,12 @@
       <span class="sb-label-status-error"
         *ngIf="isEnrollmentAllowed(enrollmentEndDate)">{{resourceService?.messages?.emsg?.m008 | interpolate:'{endDate}':enrollmentEndDate}}</span>
     </div>
+    <div *ngIf="batchEndDate && showBatchCounter" class="d-flex">
+      <span class="fnormal sb-color-gray-400">{{resourceService?.frmelmnts?.lbl?.BatchExpiringIn}}:&nbsp;</span>
+      <span class="fsmall font-weight-bold mb-8 sb-color-gray-800">
+        <h6>{{batchRemaningTime}}</h6>
+      </span>
+    </div>
     <div class="d-flex flex-dc flex-basis-1 mr-32">
       <!-- Info displaying if course is flagged -->
       <h6 class="ui small negative message" *ngIf="courseHierarchy.status === 'Flagged'">