From c62ed57483fd8ec49e2418a897f9f76d886a4628 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Tue, 8 Aug 2023 12:02:45 +0530 Subject: [PATCH 1/9] bug fix 864 --- src/app/pages/home-search/home-search.page.html | 2 +- src/app/pages/home-search/home-search.page.ts | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/pages/home-search/home-search.page.html b/src/app/pages/home-search/home-search.page.html index 710f9d718..a595ae582 100644 --- a/src/app/pages/home-search/home-search.page.html +++ b/src/app/pages/home-search/home-search.page.html @@ -1,7 +1,7 @@ - + diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts index f33b4bf08..5cbb405e3 100644 --- a/src/app/pages/home-search/home-search.page.ts +++ b/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(){ From aa2fbe636f744487b86b4218f7221266dcc91d46 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Fri, 18 Aug 2023 10:17:44 +0530 Subject: [PATCH 2/9] bug fix 877 --- src/app/pages/session-detail/session-detail.page.ts | 2 +- src/assets/i18n/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/session-detail/session-detail.page.ts b/src/app/pages/session-detail/session-detail.page.ts index 7685657f0..2822e5090 100644 --- a/src/app/pages/session-detail/session-detail.page.ts +++ b/src/app/pages/session-detail/session-detail.page.ts @@ -262,7 +262,7 @@ export class SessionDetailPage implements OnInit { let msg = { header: 'CANCEL_SESSION', message: 'CANCEL_CONFIRM_MESSAGE', - cancel: 'CLOSE', + cancel: 'UN_ENROLL', submit: 'CANCEL' } this.utilService.alertPopup(msg).then(async data => { diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 716eb8888..52d5e2e0b 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -47,7 +47,7 @@ "SIGN_UP_TO_MENTOR_ED":"Sign up to MentorED", "ADD":"Add", "CANCEL": "Cancel", - "CANCEL_SESSION":"Cancel Session", + "CANCEL_SESSION":"Unenroll session", "OK": "Ok", "LOG_IN":"Log In", "SHOW_PASSWORD":"Show password", From c39acdafcb6efaecceb96c648030b1b4358afa14 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Fri, 18 Aug 2023 17:21:00 +0530 Subject: [PATCH 3/9] bug 876 fixed --- src/app/pages/session-detail/session-detail.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/session-detail/session-detail.page.html b/src/app/pages/session-detail/session-detail.page.html index 61c65c2dc..83e62d865 100644 --- a/src/app/pages/session-detail/session-detail.page.html +++ b/src/app/pages/session-detail/session-detail.page.html @@ -34,7 +34,7 @@
{{detailData?.data?.title}}
{{"UN_ENROLL" | translate}}
- {{"JOIN" | translate}} + {{"JOIN" | translate}}
\ No newline at end of file From 7445a3621973d77aa9d66bb3f75e2237af773e5a Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Tue, 22 Aug 2023 15:07:05 +0530 Subject: [PATCH 4/9] unenroll button fixes --- src/app/pages/session-detail/session-detail.page.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/session-detail/session-detail.page.ts b/src/app/pages/session-detail/session-detail.page.ts index 2822e5090..b9fa985d5 100644 --- a/src/app/pages/session-detail/session-detail.page.ts +++ b/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: 'UN_ENROLL', - submit: 'CANCEL' + cancel: 'CANCEL', + submit: 'UN_ENROLL' } this.utilService.alertPopup(msg).then(async data => { if (data) { From 42b21354015e8156e91bb68d3cf9703bab269c7b Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Wed, 23 Aug 2023 16:41:56 +0530 Subject: [PATCH 5/9] bug fix 882 --- src/app/pages/session-detail/session-detail.page.html | 2 +- src/app/pages/session-detail/session-detail.page.scss | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/pages/session-detail/session-detail.page.html b/src/app/pages/session-detail/session-detail.page.html index 83e62d865..e69fae671 100644 --- a/src/app/pages/session-detail/session-detail.page.html +++ b/src/app/pages/session-detail/session-detail.page.html @@ -33,7 +33,7 @@
{{detailData?.data?.title}}
{{"UN_ENROLL" | translate}}
-
+
{{"JOIN" | translate}}
diff --git a/src/app/pages/session-detail/session-detail.page.scss b/src/app/pages/session-detail/session-detail.page.scss index 26f542ba8..0db0c3191 100644 --- a/src/app/pages/session-detail/session-detail.page.scss +++ b/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; - } \ No newline at end of file + } +.join-button{ + background: var(--white); +} \ No newline at end of file From cee88c2f117d1ab0efe2e3c14ee35cf95cf4ddb6 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Thu, 24 Aug 2023 09:11:55 +0530 Subject: [PATCH 6/9] bug 884 fix --- src/app/pages/tabs/profile/profile.page.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/app/pages/tabs/profile/profile.page.ts b/src/app/pages/tabs/profile/profile.page.ts index cd1aa6458..9f7f32532 100644 --- a/src/app/pages/tabs/profile/profile.page.ts +++ b/src/app/pages/tabs/profile/profile.page.ts @@ -81,6 +81,7 @@ export class ProfilePage implements OnInit { this.visited=true; } this.gotToTop(); + this.profileFormUpdateApi(); } 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.profileFormUpdateApi(); event.target.complete(); } feedback() { this.navCtrl.navigateForward([CommonRoutes.FEEDBACK]); } + async profileFormUpdateApi(){ + 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; + } + } } From 197d774444e8002196b05ef0abb3a5b1147dd481 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Thu, 24 Aug 2023 10:18:55 +0530 Subject: [PATCH 7/9] function name change --- src/app/pages/tabs/profile/profile.page.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/tabs/profile/profile.page.ts b/src/app/pages/tabs/profile/profile.page.ts index 9f7f32532..cd244c722 100644 --- a/src/app/pages/tabs/profile/profile.page.ts +++ b/src/app/pages/tabs/profile/profile.page.ts @@ -81,7 +81,7 @@ export class ProfilePage implements OnInit { this.visited=true; } this.gotToTop(); - this.profileFormUpdateApi(); + this.profileDetailsApi(); } gotToTop() { @@ -90,14 +90,14 @@ export class ProfilePage implements OnInit { async doRefresh(event){ - this.profileFormUpdateApi(); + this.profileDetailsApi(); event.target.complete(); } feedback() { this.navCtrl.navigateForward([CommonRoutes.FEEDBACK]); } - async profileFormUpdateApi(){ + async profileDetailsApi(){ var result = await this.profileService.getProfileDetailsFromAPI(this.user?.isAMentor,this.user?._id); if(result){ this.formData.data = result; From c039ca572df742caf2c87d036f7935c321a6accb Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Thu, 24 Aug 2023 18:42:07 +0530 Subject: [PATCH 8/9] story : 1007 Text changes in the pop-ups --- src/app/core/services/util/util.service.ts | 17 +++++++++-------- .../pages/create-session/create-session.page.ts | 8 ++++---- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/app/core/services/util/util.service.ts b/src/app/core/services/util/util.service.ts index ea3722b61..00acf66ab 100644 --- a/src/app/core/services/util/util.service.ts +++ b/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(); diff --git a/src/app/pages/create-session/create-session.page.ts b/src/app/pages/create-session/create-session.page.ts index 1c204d2a7..496ee9bac 100644 --- a/src/app/pages/create-session/create-session.page.ts +++ b/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: () => { } } From 6e501805101944896a14f3ff689c60d665abe539 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Fri, 25 Aug 2023 16:34:33 +0530 Subject: [PATCH 9/9] bug fix for story 1007 --- src/assets/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 52d5e2e0b..08882a215 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -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",