Merge pull request #357 from GSuma21/release-2.5.0

issue #fix translate and sessin card
ELEVATE-Project · Jan 22, 2024 · a028721 · a028721
2 parents 9de0d52 + 50209a6
commit a028721
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/src/app/pages/auth/login/login.page.ts b/src/app/pages/auth/login/login.page.ts
@@ -78,6 +78,7 @@ export class LoginPage implements OnInit {
   }
 
   async translateText() {
+    this.translateService.setDefaultLang('en');
     this.translateService.get(this.labels).subscribe(translatedLabel => {
       let labelKeys = Object.keys(translatedLabel);
       labelKeys.forEach((key) => {

diff --git a/src/app/pages/auth/otp/otp.page.ts b/src/app/pages/auth/otp/otp.page.ts
@@ -65,6 +65,7 @@ export class OtpPage implements OnInit {
   }
 
   async translateText() {
+    this.translateService.setDefaultLang('en');
     this.translateService.get(this.labels).subscribe(translatedLabel => {
       let labelKeys = Object.keys(translatedLabel);
       labelKeys.forEach((key) => {

diff --git a/src/app/pages/auth/persona-selection/persona-selection.page.ts b/src/app/pages/auth/persona-selection/persona-selection.page.ts
@@ -35,6 +35,7 @@ export class PersonaSelectionPage implements OnInit {
   }
 
   async translateText() {
+    this.translateService.setDefaultLang('en');
     this.translateService.get(this.labels).subscribe(translatedLabel => {
       let labelKeys = Object.keys(translatedLabel);
       labelKeys.forEach((key)=>{

diff --git a/src/app/pages/auth/register/register.page.ts b/src/app/pages/auth/register/register.page.ts
@@ -121,6 +121,7 @@ export class RegisterPage implements OnInit {
   }
 
   async translateText() {
+    this.translateService.setDefaultLang('en');
     this.translateService.get(this.labels).subscribe(translatedLabel => {
       let labelKeys = Object.keys(translatedLabel);
       labelKeys.forEach((key) => {

diff --git a/src/app/pages/auth/reset-password/reset-password.page.ts b/src/app/pages/auth/reset-password/reset-password.page.ts
@@ -86,6 +86,7 @@ export class ResetPasswordPage implements OnInit {
     this.translateText();
   }
   async translateText() {
+    this.translateService.setDefaultLang('en');
     this.translateService.get(this.labels).subscribe(translatedLabel => {
       let labelKeys = Object.keys(translatedLabel);
       labelKeys.forEach((key) => {

diff --git a/src/app/shared/components/session-card/session-card.component.html b/src/app/shared/components/session-card/session-card.component.html
@@ -1,6 +1,6 @@
 <ion-card (click)="onCardClick(data)" class="session-card card-shadow-bottom">
-  <span class="status-badge d-flex flex-justify-center" *ngIf="data?.status == 'LIVE'">
-    {{data?.status | titlecase}}
+  <span class="status-badge d-flex flex-justify-center" *ngIf="data?.status?.value == 'LIVE'">
+    {{data?.status?.value| titlecase}}
   </span>
   <ion-grid class="ion-no-padding">
     <ion-row>
@@ -25,9 +25,9 @@ <h5 class="text-align">{{data?.name || data?.title}}</h5>
       <ion-row class="d-flex flex-align-items-center" style="padding-left: 10px;">
         <ion-icon name="calendar-number-outline"></ion-icon>
         <div>
-          <ion-label *ngIf="startDate && data?.status=='PUBLISHED'" class="platform-date-label">{{"STARTS_ON"|translate}} {{startDate|date:'dd/MM/yyyy'}} {{"AT"|translate}} {{startDate|date:'shortTime'}}</ion-label>
-          <ion-label *ngIf="startDate && data?.status=='LIVE'" class="platform-date-label">{{"STARTED_ON"|translate}} {{startDate|date:'dd/MM/yyyy'}} {{"AT"|translate}} {{startDate|date:'shortTime'}}</ion-label>
-          <ion-label *ngIf="endDate && data?.status=='COMPLETED'" class="platform-date-label">{{"COMPLETED_ON"|translate}} {{endDate|date:'dd/MM/yyyy'}} {{"AT"|translate}} {{endDate|date:'shortTime'}}</ion-label>
+          <ion-label *ngIf="startDate && data?.status?.value=='PUBLISHED'" class="platform-date-label">{{"STARTS_ON"|translate}} {{startDate|date:'dd/MM/yyyy'}} {{"AT"|translate}} {{startDate|date:'shortTime'}}</ion-label>
+          <ion-label *ngIf="startDate && data?.status?.value=='LIVE'" class="platform-date-label">{{"STARTED_ON"|translate}} {{startDate|date:'dd/MM/yyyy'}} {{"AT"|translate}} {{startDate|date:'shortTime'}}</ion-label>
+          <ion-label *ngIf="endDate && data?.status?.value=='COMPLETED'" class="platform-date-label">{{"COMPLETED_ON"|translate}} {{endDate|date:'dd/MM/yyyy'}} {{"AT"|translate}} {{endDate|date:'shortTime'}}</ion-label>
         </div> 
       </ion-row>
       <ion-row class="d-flex flex-justify-center meeting-platform" *ngIf="!(meetingPlatform?.platform == 'OFF' && isCreator) ">
@@ -49,7 +49,7 @@ <h5 class="text-align">{{data?.name || data?.title}}</h5>
       </ion-row>
     </ion-col>
     <ion-col class="d-flex flex-justify-flex-end flex-align-items-center" style="float: right;" size="4">
-      <ion-button *ngIf="data?.status!='COMPLETED'" class="button"  [disabled]="!buttonConfig?.isEnabled && buttonConfig?.label !='ENROLL'" (click)="$event.stopPropagation();onButtonClick(data,buttonConfig?.type)" color="primary"> {{buttonConfig?.label | translate}}</ion-button>
+      <ion-button *ngIf="data?.status?.value!='COMPLETED'" class="button"  [disabled]="!buttonConfig?.isEnabled && buttonConfig?.label !='ENROLL'" (click)="$event.stopPropagation();onButtonClick(data,buttonConfig?.type)" color="primary"> {{buttonConfig?.label | translate}}</ion-button>
     </ion-col>
   </ion-grid>
 </ion-card>