Release 2.4.0 ap

src/app/core/services/util/util.service.ts

@@ -51,20 +51,21 @@ export class UtilService {
         header: texts[msg.header],
         message: texts[msg.message],
         buttons: [
+          {
+            text: texts[msg.submit],
+            cssClass: 'alert-button-bg-white',
+            handler: () => {
+              resolve(true);
+            }
+          },
           {
             text: texts[msg.cancel],
             role: 'cancel',
-            cssClass: 'alert-button-bg-white',
+            cssClass: 'alert-button-red',
             handler: (blah) => {
               resolve(false);
             }
-          }, {
-            text: texts[msg.submit],
-            cssClass: 'alert-button-red',
-            handler: () => {
-              resolve(true);
-            }
-          }
+          },
         ]
       });
       await alert.present();

src/app/pages/create-session/create-session.page.ts

@@ -114,7 +114,7 @@ export class CreateSessionPage implements OnInit {
     if(this.type=='default'){
       if (!this.form1?.myForm.pristine || this.profileImageData.haveValidationError) {
         let texts: any;
-        this.translate.get(['SESSION_FORM_UNSAVED_DATA', 'EXIT', 'BACK', 'EXIT_HEADER_LABEL']).subscribe(text => {
+        this.translate.get(['SESSION_FORM_UNSAVED_DATA', 'EXIT', 'CANCEL', 'EXIT_HEADER_LABEL']).subscribe(text => {
           texts = text;
         })
         const alert = await this.alert.create({
@@ -123,13 +123,13 @@ export class CreateSessionPage implements OnInit {
           buttons: [
             {
               text: texts['EXIT'],
-              cssClass: "alert-button",
+              cssClass: "alert-button-bg-white",
               role: 'exit',
               handler: () => { }
             },
             {
-              text: texts['BACK'],
-              cssClass: "alert-button-bg-white",
+              text: texts['CANCEL'],
+              cssClass: "alert-button-red",
               role: 'cancel',
               handler: () => { }
             }

src/app/pages/home-search/home-search.page.html

@@ -1,7 +1,7 @@
 <app-page-header [config]="headerConfig"></app-page-header>
 <ion-content class="ion-padding">
   <ion-toolbar>
-    <ion-searchbar class="top-padding" [(ngModel)]="searchText" placeholder="" (ionInput)="checkInput()" debounce="100"></ion-searchbar>
+    <ion-searchbar class="top-padding" [(ngModel)]="searchText" placeholder="" (keypress)="checkInput($event)" debounce="100"></ion-searchbar>
   </ion-toolbar>
   <ion-segment (ionChange)="segmentChanged($event)" [value]="type">
     <ion-segment-button value="all-sessions">

src/app/pages/home-search/home-search.page.ts

@@ -53,8 +53,11 @@ export class HomeSearchPage implements OnInit {
     this.searching = false;
   }
 
-  checkInput(){
-    this.searchText=this.searchText.replace(/^ +/gm, '')
+  checkInput(event: any){
+    this.searchText=this.searchText.replace(/^ +/gm, '');
+    if(event.keyCode == 13){
+      this.search();
+    }
   }
 
   search(){

src/app/pages/session-detail/session-detail.page.html

@@ -33,8 +33,8 @@ <h6 class="title-font">{{detailData?.data?.title}}</h6>
     <div *ngIf="detailData?.data?.isEnrolled && detailData?.data?.status==='published' && !isEnabled">
       <ion-button class="load-more-button" expand="full" (click)="onCancel()">{{"UN_ENROLL" | translate}}</ion-button>
     </div>
-    <div *ngIf="detailData?.data?.isEnrolled && detailData?.data?.status!='completed' && isEnabled">
-      <ion-button class="load-more-button" expand="full" (click)="onJoin()">{{"JOIN" | translate}}</ion-button>
+    <div *ngIf="detailData?.data?.isEnrolled && detailData?.data?.status!='completed' && isEnabled" class="join-button">
+      <ion-button class="load-more-button" expand="full" (click)="onJoin()" [disabled]="platformOff">{{"JOIN" | translate}}</ion-button>
     </div>
   </ng-template>
 </ion-footer>

src/app/pages/session-detail/session-detail.page.scss

@@ -48,4 +48,7 @@ ion-item {
     --padding-end: 0px;
     --inner-padding-end: 0px;
     --padding-start: 0px;
-  }
+  }
+.join-button{
+    background: var(--white);
+}

src/app/pages/session-detail/session-detail.page.ts

@@ -262,8 +262,8 @@ export class SessionDetailPage implements OnInit {
     let msg = {
       header: 'CANCEL_SESSION',
       message: 'CANCEL_CONFIRM_MESSAGE',
-      cancel: 'CLOSE',
-      submit: 'CANCEL'
+      cancel: 'CANCEL',
+      submit: 'UN_ENROLL'
     }
     this.utilService.alertPopup(msg).then(async data => {
       if (data) {

src/app/pages/tabs/profile/profile.page.ts

@@ -81,6 +81,7 @@ export class ProfilePage implements OnInit {
       this.visited=true;
     }
     this.gotToTop();
+    this.profileDetailsApi();
   }
 
   gotToTop() {
@@ -89,15 +90,18 @@ export class ProfilePage implements OnInit {
 
 
   async doRefresh(event){
-    var result = await this.profileService.getProfileDetailsFromAPI(this.user?.isAMentor,this.user?._id);
-    if(result){
-      this.formData.data = result;
-      this.formData.data.emailId = result.email.address;
-    }
+    this.profileDetailsApi();
     event.target.complete();
   }
 
   feedback() {
     this.navCtrl.navigateForward([CommonRoutes.FEEDBACK]);
   }
+  async profileDetailsApi(){
+    var result = await this.profileService.getProfileDetailsFromAPI(this.user?.isAMentor,this.user?._id);
+    if(result){
+      this.formData.data = result;
+      this.formData.data.emailId = result.email.address;
+    }
+  }
 }

src/assets/i18n/en.json

@@ -47,7 +47,7 @@
     "SIGN_UP_TO_MENTOR_ED":"Sign up to AP-MentorED",
     "ADD":"Add",
     "CANCEL": "Cancel",
-    "CANCEL_SESSION":"Cancel Session",
+    "CANCEL_SESSION":"Unenroll session",
     "OK": "Ok",
     "LOG_IN":"Log In",
     "SHOW_PASSWORD":"Show password",
@@ -96,7 +96,7 @@
     "NO_DATA_AVAILABLE": "No data available",
     "CONFIRM":"Confirm",
     "FORM_UNSAVED_DATA":"You have unsaved data, please save your data before closing.",
-    "SESSION_FORM_UNSAVED_DATA": "Are you sure you want to exit? You will lose all data if you leave this page?",
+    "SESSION_FORM_UNSAVED_DATA": "Are you sure you want to exit? Your data will not be saved.",
     "SAVE":"Save",
     "TERMS_OF_USE": "Terms of use",
     "SOMETHING_WENT_WRONG":"Something went wrong",