From a49ef62bd3be52ee706558d2ead9c700a5efee29 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Fri, 5 Jul 2024 17:42:30 +0530 Subject: [PATCH 01/36] 1474 bug fix --- src/app/pages/tabs/mentor-directory/mentor-directory.page.html | 2 +- src/app/pages/tabs/mentor-directory/mentor-directory.page.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/pages/tabs/mentor-directory/mentor-directory.page.html b/src/app/pages/tabs/mentor-directory/mentor-directory.page.html index 0b643a32..d861bba2 100644 --- a/src/app/pages/tabs/mentor-directory/mentor-directory.page.html +++ b/src/app/pages/tabs/mentor-directory/mentor-directory.page.html @@ -19,7 +19,7 @@ -
+
diff --git a/src/app/pages/tabs/mentor-directory/mentor-directory.page.ts b/src/app/pages/tabs/mentor-directory/mentor-directory.page.ts index 0b74e6d8..14aa0e62 100644 --- a/src/app/pages/tabs/mentor-directory/mentor-directory.page.ts +++ b/src/app/pages/tabs/mentor-directory/mentor-directory.page.ts @@ -55,6 +55,7 @@ export class MentorDirectoryPage implements OnInit { async ionViewWillEnter() { this.page = 1; + this.mentors = []; this.getMentors(); this.gotToTop(); } From d9bd3f94ba10d3a7d68a1596ecbd4f43c02c343a Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Tue, 9 Jul 2024 14:46:49 +0530 Subject: [PATCH 02/36] buf fix 1406 --- .../admin/components/manage-session/manage-session.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/admin/components/manage-session/manage-session.component.ts b/src/app/modules/admin/components/manage-session/manage-session.component.ts index f2672a03..e63b97d0 100644 --- a/src/app/modules/admin/components/manage-session/manage-session.component.ts +++ b/src/app/modules/admin/components/manage-session/manage-session.component.ts @@ -207,7 +207,7 @@ export class ManageSessionComponent implements OnInit { }); } this.tableData = data; - this.noDataMessage = this.searchText ? "SEARCH_RESULT_NOT_FOUND" : "THIS_SPACE_LOOKS_EMPTY" + this.noDataMessage = this.searchText ? "SEARCH_RESULT_NOT_FOUND" : "SEARCH_RESULT_NOT_FOUND" } createSession(){ From 033c3f37eb009dce5f8e63cbdc949de64e37b697 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Wed, 10 Jul 2024 14:19:33 +0530 Subject: [PATCH 03/36] error resolved --- .../components/search-and-select/search-and-select.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/components/search-and-select/search-and-select.component.ts b/src/app/shared/components/search-and-select/search-and-select.component.ts index 04be3355..4b62f0ba 100644 --- a/src/app/shared/components/search-and-select/search-and-select.component.ts +++ b/src/app/shared/components/search-and-select/search-and-select.component.ts @@ -87,7 +87,7 @@ export class SearchAndSelectComponent implements OnInit, ControlValueAccessor { popover.onDidDismiss().then((data) => { if (data.data) { this.selectedData = data.data; - const values = this.control.meta.multiSelect ? data.data.map(obj => obj.id) : data.data[0].id; + const values = this.control.meta.multiSelect ? data.data.map(obj => obj.id) : data?.data[0]?.id; this.onChange(values); this.icon = this.selectedData.length ? this.closeIconLight : this.addIconDark } From 7e4cc6f6dc8288a3987a4690e29b5157c2df2dbf Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Thu, 11 Jul 2024 13:31:34 +0530 Subject: [PATCH 04/36] bug fix 1392 --- .../components/generic-search/generic-search.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/components/generic-search/generic-search.component.html b/src/app/shared/components/generic-search/generic-search.component.html index 5b1e3270..28aed9f3 100644 --- a/src/app/shared/components/generic-search/generic-search.component.html +++ b/src/app/shared/components/generic-search/generic-search.component.html @@ -26,7 +26,7 @@ - + From abc6acea29e5e44e92f71d7bc67bc7ab877e3ec1 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Thu, 11 Jul 2024 18:05:52 +0530 Subject: [PATCH 05/36] bug fix 1476, 1490 --- src/app/core/constants/urlConstants.ts | 3 ++- src/app/core/services/profile/profile.service.ts | 15 +++++++++++++++ src/app/pages/home-search/home-search.page.ts | 8 ++++---- src/app/pages/language/language.page.ts | 2 +- .../mentor-search-directory.page.ts | 6 +++--- src/app/pages/tabs/home/home.page.ts | 4 ++-- src/assets/i18n/en.json | 2 +- 7 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/app/core/constants/urlConstants.ts b/src/app/core/constants/urlConstants.ts index 16ed3a72..a045e860 100644 --- a/src/app/core/constants/urlConstants.ts +++ b/src/app/core/constants/urlConstants.ts @@ -62,6 +62,7 @@ export const urlConstants = { ENROLLED_MENTEES_LIST:"/mentoring/v1/sessions/enrolledMentees/", GET_PLATFORM_CONFIG: "/mentoring/v1/platform/config", CHANGE_PASSWORD: "/user/v1/account/changePassword", - LOGIN_ACTIVITY: "/user/v1/account/sessions" + LOGIN_ACTIVITY: "/user/v1/account/sessions" , + UPDATE_LANGUAGE: "/user/v1/user/setLanguagePreference" } }; diff --git a/src/app/core/services/profile/profile.service.ts b/src/app/core/services/profile/profile.service.ts index 17757c45..664863d1 100644 --- a/src/app/core/services/profile/profile.service.ts +++ b/src/app/core/services/profile/profile.service.ts @@ -233,4 +233,19 @@ export class ProfileService { } } + async updateLanguage(formData, showToast=true){ + const config = { + url: urlConstants.API_URLS.UPDATE_LANGUAGE, + payload: formData, + }; + try { + let data: any = await this.httpService.patch(config); + (showToast)?this.toast.showToast(data.message, "success"):null; + return data; + } + catch (error) { + this.loaderService.stopLoader(); + } + } + } diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts index e9df26fe..ffdcc730 100644 --- a/src/app/pages/home-search/home-search.page.ts +++ b/src/app/pages/home-search/home-search.page.ts @@ -96,12 +96,12 @@ export class HomeSearchPage implements OnInit { modal.onDidDismiss().then(async (dataReturned) => { this.filteredDatas = [] if (dataReturned !== null) { - if (dataReturned.data.data.selectedFilters) { - for (let key in dataReturned.data.data.selectedFilters) { - this.filteredDatas[key] = dataReturned.data.data.selectedFilters[key].slice(0, dataReturned.data.data.selectedFilters[key].length).map(obj => obj.value).join(',').toString() + if (dataReturned?.data?.data?.selectedFilters) { + for (let key in dataReturned?.data?.data?.selectedFilters) { + this.filteredDatas[key] = dataReturned?.data?.data?.selectedFilters[key].slice(0, dataReturned?.data?.data?.selectedFilters[key].length).map(obj => obj.value).join(',').toString() } } - this.extractLabels(dataReturned.data.data.selectedFilters); + this.extractLabels(dataReturned?.data?.data?.selectedFilters); this.getUrlQueryData(); } this.page = 1; diff --git a/src/app/pages/language/language.page.ts b/src/app/pages/language/language.page.ts index 6b549a47..1193dfe8 100644 --- a/src/app/pages/language/language.page.ts +++ b/src/app/pages/language/language.page.ts @@ -40,7 +40,7 @@ export class LanguagePage implements OnInit { onSubmit(){ let showProfileUpdateToast = false; - this.profile.profileUpdate({preferred_language:this.selectedLanguage}, showProfileUpdateToast).then((result)=>{ + this.profile.updateLanguage({preferred_language:this.selectedLanguage}, showProfileUpdateToast).then((result)=>{ if(result){ this.setLanguage(this.selectedLanguage); } diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts index 576a1668..3881f3d3 100644 --- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts +++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts @@ -185,10 +185,10 @@ export class MentorSearchDirectoryPage implements OnInit { } async getMentors(){ - var obj = {page: this.page, pageSize: this.pageSize, searchText: this.searchText, selectedChip: this.selectedChipName, urlQueryData: this.urlQueryData}; + var obj = {page: this.page, pageSize: this.pageSize, searchText: this.searchText.trim(), selectedChip: this.selectedChipName, urlQueryData: this.urlQueryData}; let data = await this.profileService.getMentors(true,obj); - this.data = data.result.data; - this.totalCount = data.result.count; + this.data = data?.result?.data; + this.totalCount = data?.result?.count; } } diff --git a/src/app/pages/tabs/home/home.page.ts b/src/app/pages/tabs/home/home.page.ts index 45b45ea9..d88482c5 100644 --- a/src/app/pages/tabs/home/home.page.ts +++ b/src/app/pages/tabs/home/home.page.ts @@ -166,8 +166,8 @@ export class HomePage implements OnInit { async getSessions() { var obj = {page: this.page, limit: this.limit} let data = await this.sessionService.getSessions(obj); - this.sessions = data.result; - this.sessionsCount = data.result.count; + this.sessions = data?.result; + this.sessionsCount = data?.result?.count; } async openModal() { const modal = await this.modalController.create({ diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index d023177a..c52b10d0 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -235,7 +235,7 @@ "PLEASE_UPLOAD_IMAGE_FILE":"Please, upload image file.", "SESSION_LIST":"Session list", "DOWNLOAD":"Download", - "SEARCH_RESULT_NOT_FOUND":"Search result not found", + "SEARCH_RESULT_NOT_FOUND":"Search results not found", "THIS_SPACE_LOOKS_EMPTY":"This space looks empty", "SSESSIONS_MENTOR_SEARCH_PLACEHOLDER":"Search for sessions,mentors", "PORTAL_ONLY_TOAST_MESSAGE": "Portal is recommended for administrative tasks", From 6560fc483f1d5eb6f413ae8bddbd747329eeb268 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Thu, 11 Jul 2024 18:58:59 +0530 Subject: [PATCH 06/36] comments resolved --- src/app/pages/home-search/home-search.page.ts | 6 +++--- .../mentor-search-directory.page.ts | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts index ffdcc730..f874610e 100644 --- a/src/app/pages/home-search/home-search.page.ts +++ b/src/app/pages/home-search/home-search.page.ts @@ -101,7 +101,7 @@ export class HomeSearchPage implements OnInit { this.filteredDatas[key] = dataReturned?.data?.data?.selectedFilters[key].slice(0, dataReturned?.data?.data?.selectedFilters[key].length).map(obj => obj.value).join(',').toString() } } - this.extractLabels(dataReturned?.data?.data?.selectedFilters); + this.extractLabels(dataReturned.data.data.selectedFilters); this.getUrlQueryData(); } this.page = 1; @@ -114,8 +114,8 @@ export class HomeSearchPage implements OnInit { async fetchSessionList() { var obj={page: this.page, limit: this.limit, type: this.type, searchText : this.searchText, selectedChip : this.criteriaChip?.name, filterData : this.urlQueryData} var response = await this.sessionService.getSessionsList(obj); - this.results = response?.result?.data; - this.totalCount = response?.result?.count; + this.results = response.result.data; + this.totalCount = response.result.count; this.noDataMessage = obj.searchText ? "SEARCH_RESULT_NOT_FOUND" : "THIS_SPACE_LOOKS_EMPTY" } diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts index 3881f3d3..61f4c480 100644 --- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts +++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts @@ -94,14 +94,14 @@ export class MentorSearchDirectoryPage implements OnInit { modal.onDidDismiss().then(async (dataReturned) => { this.filteredDatas = [] - if (dataReturned !== null) { - if (dataReturned?.data?.data?.selectedFilters) { - for (let key in dataReturned?.data?.data?.selectedFilters) { - this.filteredDatas[key] = dataReturned?.data?.data?.selectedFilters[key].slice(0, dataReturned?.data?.data?.selectedFilters[key].length).map(obj => obj.value).join(',').toString() + if (dataReturned.data && dataReturned.data.data) { + if (dataReturned.data.data.selectedFilters) { + for (let key in dataReturned.data.data.selectedFilters) { + this.filteredDatas[key] = dataReturned.data.data.selectedFilters[key].slice(0, dataReturned.data.data.selectedFilters[key].length).map(obj => obj.value).join(',').toString() } this.selectedChips = true; } - this.extractLabels(dataReturned?.data?.data?.selectedFilters); + this.extractLabels(dataReturned.data.data.selectedFilters); this.getUrlQueryData(); } this.page = 1; @@ -187,8 +187,8 @@ export class MentorSearchDirectoryPage implements OnInit { async getMentors(){ var obj = {page: this.page, pageSize: this.pageSize, searchText: this.searchText.trim(), selectedChip: this.selectedChipName, urlQueryData: this.urlQueryData}; let data = await this.profileService.getMentors(true,obj); - this.data = data?.result?.data; - this.totalCount = data?.result?.count; + this.data = data.result.data; + this.totalCount = data.result.count; } } From c9d79f231147dc4ebf12b4000f94e42c16a1508d Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Thu, 11 Jul 2024 19:36:11 +0530 Subject: [PATCH 07/36] resolved comments --- src/app/pages/home-search/home-search.page.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts index f874610e..39d6632d 100644 --- a/src/app/pages/home-search/home-search.page.ts +++ b/src/app/pages/home-search/home-search.page.ts @@ -95,10 +95,10 @@ export class HomeSearchPage implements OnInit { modal.onDidDismiss().then(async (dataReturned) => { this.filteredDatas = [] - if (dataReturned !== null) { - if (dataReturned?.data?.data?.selectedFilters) { - for (let key in dataReturned?.data?.data?.selectedFilters) { - this.filteredDatas[key] = dataReturned?.data?.data?.selectedFilters[key].slice(0, dataReturned?.data?.data?.selectedFilters[key].length).map(obj => obj.value).join(',').toString() + if (dataReturned.data && dataReturned.data.data) { + if (dataReturned.data.data.selectedFilters) { + for (let key in dataReturned.data.data.selectedFilters) { + this.filteredDatas[key] = dataReturned.data.data.selectedFilters[key].slice(0, dataReturned.data.data.selectedFilters[key].length).map(obj => obj.value).join(',').toString() } } this.extractLabels(dataReturned.data.data.selectedFilters); From 5c27cee5b4695afd85f5efc70ae840368fddc6bb Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Thu, 11 Jul 2024 19:40:38 +0530 Subject: [PATCH 08/36] comments resolved --- src/app/pages/tabs/home/home.page.ts | 4 ++-- .../search-and-select/search-and-select.component.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/tabs/home/home.page.ts b/src/app/pages/tabs/home/home.page.ts index d88482c5..45b45ea9 100644 --- a/src/app/pages/tabs/home/home.page.ts +++ b/src/app/pages/tabs/home/home.page.ts @@ -166,8 +166,8 @@ export class HomePage implements OnInit { async getSessions() { var obj = {page: this.page, limit: this.limit} let data = await this.sessionService.getSessions(obj); - this.sessions = data?.result; - this.sessionsCount = data?.result?.count; + this.sessions = data.result; + this.sessionsCount = data.result.count; } async openModal() { const modal = await this.modalController.create({ diff --git a/src/app/shared/components/search-and-select/search-and-select.component.ts b/src/app/shared/components/search-and-select/search-and-select.component.ts index 4b62f0ba..23a2af25 100644 --- a/src/app/shared/components/search-and-select/search-and-select.component.ts +++ b/src/app/shared/components/search-and-select/search-and-select.component.ts @@ -85,9 +85,9 @@ export class SearchAndSelectComponent implements OnInit, ControlValueAccessor { }); popover.onDidDismiss().then((data) => { - if (data.data) { + if (data && data.data) { this.selectedData = data.data; - const values = this.control.meta.multiSelect ? data.data.map(obj => obj.id) : data?.data[0]?.id; + const values = this.control.meta.multiSelect ? data.data.map(obj => obj.id) : data.data[0].id; this.onChange(values); this.icon = this.selectedData.length ? this.closeIconLight : this.addIconDark } From 2fa91acca6b558e87d58c4fc84db794450f480fe Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Wed, 17 Jul 2024 18:57:02 +0530 Subject: [PATCH 09/36] bug fix 1361, 1393,1508 --- src/app/core/services/form/form.service.ts | 2 +- src/app/core/services/util/util.service.ts | 34 +++++++++++++++++++ .../pages/edit-profile/edit-profile.page.ts | 23 +++++++++---- src/app/pages/home-search/home-search.page.ts | 33 ++++-------------- .../mentor-search-directory.page.ts | 34 +++++-------------- src/assets/i18n/en.json | 5 ++- 6 files changed, 71 insertions(+), 60 deletions(-) diff --git a/src/app/core/services/form/form.service.ts b/src/app/core/services/form/form.service.ts index 195716ba..6a9a9122 100644 --- a/src/app/core/services/form/form.service.ts +++ b/src/app/core/services/form/form.service.ts @@ -91,7 +91,7 @@ export class FormService { async filterList(obj){ const config = { - url: urlConstants.API_URLS.FILTER_LIST + '&type=' + obj, + url: urlConstants.API_URLS.FILTER_LIST + '&organization=' + obj?.org + '&filter_type=' + obj?.filterType, payload: {}, }; try { diff --git a/src/app/core/services/util/util.service.ts b/src/app/core/services/util/util.service.ts index 0598f242..bdd8ab7e 100644 --- a/src/app/core/services/util/util.service.ts +++ b/src/app/core/services/util/util.service.ts @@ -230,5 +230,39 @@ export class UtilService { }); await alert.present(); } + + + async transformToFilterData(responseData, obj) { + const result = []; + for (const key in responseData) { + if (key !== 'entity_types') { + const title = key.charAt(0).toUpperCase() + key.slice(1); + const name = 'organization_ids'; + const options = responseData[key].map(item => ({ + id: item.value, + label: item.name, + value: item.id + })); + const type = "checkbox"; + result.push({ title, name, options, type }); + } + } + const entityTypes = responseData?.entity_types; + + const filterData = Object.keys(entityTypes).map(type => { + const entityType = entityTypes[type][0]; + return { + title: entityType.label, + name: entityType.value, + options: entityType.entities.map(entity => ({ + label: entity.label, + value: entity.value + })), + type: "checkbox" + }; + }); + const data = [...filterData, ...result] + return data; + } } diff --git a/src/app/pages/edit-profile/edit-profile.page.ts b/src/app/pages/edit-profile/edit-profile.page.ts index f21da6b7..f90a457b 100644 --- a/src/app/pages/edit-profile/edit-profile.page.ts +++ b/src/app/pages/edit-profile/edit-profile.page.ts @@ -24,6 +24,7 @@ import { TranslateService } from '@ngx-translate/core'; import { map } from 'rxjs/operators'; import { Router } from '@angular/router'; import { CommonRoutes } from 'src/global.routes'; +import { PlatformLocation } from '@angular/common'; @Component({ selector: 'app-edit-profile', @@ -60,9 +61,19 @@ export class EditProfilePage implements OnInit, isDeactivatable { private translate: TranslateService, private toast: ToastService, private utilService: UtilService, - private router: Router + private router: Router, + private platformLocation: PlatformLocation ) { } + + ionViewWillEnter() { + if(this.userDetails?.profile_mandatory_fields?.length || !this.userDetails?.about){ + history.pushState(null, '', location.href); + this.platformLocation.onPopState(()=>{ + history.pushState(null, '', location.href) + }) + } + } async ngOnInit() { this.userDetails = await this.localStorage.getLocalData(localKeys.USER_DETAILS); const response = await this.form.getForm(EDIT_PROFILE_FORM); @@ -95,22 +106,22 @@ export class EditProfilePage implements OnInit, isDeactivatable { if (this.form1 && !this.form1.myForm.pristine || !this.profileImageData.isUploaded) { let texts: any; this.translate - .get(['FORM_UNSAVED_DATA', 'CANCEL', 'OK', 'EXIT_HEADER_LABEL']) + .get(['PROFILE_FORM_UNSAVED_DATA', 'DONOT_SAVE', 'SAVE', 'PROFILE_EXIT_HEADER_LABEL']) .subscribe((text) => { texts = text; }); const alert = await this.alert.create({ - header: texts['EXIT_HEADER_LABEL'], - message: texts['FORM_UNSAVED_DATA'], + header: texts['PROFILE_EXIT_HEADER_LABEL'], + message: texts['PROFILE_FORM_UNSAVED_DATA'], buttons: [ { - text: texts['CANCEL'], + text: texts['DONOT_SAVE'], cssClass: 'alert-button-bg-white', role: 'exit', handler: () => { }, }, { - text: texts['OK'], + text: texts['SAVE'], role: 'cancel', cssClass: 'alert-button-red', handler: () => { }, diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts index 39d6632d..69ea6d26 100644 --- a/src/app/pages/home-search/home-search.page.ts +++ b/src/app/pages/home-search/home-search.page.ts @@ -1,13 +1,11 @@ import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ModalController } from '@ionic/angular'; -import { HttpService, LoaderService, LocalStorageService, ToastService } from 'src/app/core/services'; -import { AdminWorkapceService } from 'src/app/core/services/admin-workspace/admin-workapce.service'; +import { LocalStorageService, ToastService, UtilService } from 'src/app/core/services'; import { SessionService } from 'src/app/core/services/session/session.service'; import { FilterPopupComponent } from 'src/app/shared/components/filter-popup/filter-popup.component'; import { CommonRoutes } from 'src/global.routes'; import { MatPaginator } from '@angular/material/paginator'; -import { paginatorConstants } from 'src/app/core/constants/paginatorConstants'; import { localKeys } from 'src/app/core/constants/localStorage.keys'; import { ProfileService } from 'src/app/core/services/profile/profile.service'; import { Location } from '@angular/common'; @@ -51,14 +49,15 @@ export class HomeSearchPage implements OnInit { urlQueryData: string; pageSize: any; - constructor(private modalCtrl: ModalController, private adminWorkapceService: AdminWorkapceService,private httpService: HttpService, private router: Router, private toast: ToastService, + constructor(private modalCtrl: ModalController, private router: Router, private toast: ToastService, private sessionService: SessionService, private localStorage: LocalStorageService, private profileService: ProfileService, private location: Location, private activatedRoute: ActivatedRoute, private permissionService: PermissionService, - private formService: FormService + private formService: FormService, + private utilService: UtilService ) { this.activatedRoute.queryParamMap.subscribe(async (params) => { this.params = params; @@ -76,8 +75,9 @@ export class HomeSearchPage implements OnInit { } async ionViewWillEnter() { - let data = await this.formService.filterList('session'); - this.filterData = this.transformData(data); + const obj = {filterType: 'session', org: false}; + let data = await this.formService.filterList(obj); + this.filterData = await this.utilService.transformToFilterData(data, obj); } search(event) { @@ -186,25 +186,6 @@ export class HomeSearchPage implements OnInit { this.fetchSessionList() } - transformData(responseData) { - const entityTypes = responseData.entity_types; - - const filterData = Object.keys(entityTypes).map(type => { - const entityType = entityTypes[type][0]; - return { - title: entityType.label, - name: entityType.value, - options: entityType.entities.map(entity => ({ - label: entity.label, - value: entity.value - })), - type: "checkbox" - }; - }); - - return filterData; - } - selectChip(chip) { this.criteriaChip = chip; this.fetchSessionList() diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts index 61f4c480..71b1dc39 100644 --- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts +++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts @@ -1,10 +1,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { MatPaginator } from '@angular/material/paginator'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Router } from '@angular/router'; import { ModalController } from '@ionic/angular'; import { paginatorConstants } from 'src/app/core/constants/paginatorConstants'; -import { urlConstants } from 'src/app/core/constants/urlConstants'; -import { HttpService, LoaderService } from 'src/app/core/services'; +import { UtilService } from 'src/app/core/services'; import { FormService } from 'src/app/core/services/form/form.service'; import { PermissionService } from 'src/app/core/services/permission/permission.service'; import { ProfileService } from 'src/app/core/services/profile/profile.service'; @@ -49,16 +48,18 @@ export class MentorSearchDirectoryPage implements OnInit { private profileService: ProfileService, private modalCtrl: ModalController, private permissionService: PermissionService, - private formService: FormService + private formService: FormService, + private utilService: UtilService ) { } async ngOnInit() { this.getMentors(); this.permissionService.getPlatformConfig().then((config)=>{ this.overlayChips = config?.result?.search_config?.search?.mentor?.fields; - }) - let data = await this.formService.filterList('profile') - this.filterData = this.transformData(data) + }); + const obj = {filterType: 'mentor', org: true}; + let data = await this.formService.filterList(obj); + this.filterData = await this.utilService.transformToFilterData(data, obj); } onSearch(){ @@ -111,25 +112,6 @@ export class MentorSearchDirectoryPage implements OnInit { modal.present(); } - transformData(responseData) { - const entityTypes = responseData?.entity_types; - - const filterData = Object.keys(entityTypes).map(type => { - const entityType = entityTypes[type][0]; - return { - title: entityType.label, - name: entityType.value, - options: entityType.entities.map(entity => ({ - label: entity.label, - value: entity.value - })), - type: "checkbox" - }; - }); - - return filterData; - } - extractLabels(data) { this.chips = []; for (const key in data) { diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index c52b10d0..4a2c69fe 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -276,5 +276,8 @@ "MENTOR_SEARCH_RESULT": "Mentors search result for", "SETUP_PROFILE": "Setup profile", "SETUP_PROFILE_MESSAGE": "Finish setting up your profile to get started", - "NO_SESSION_MESSAGE_DESCRIPTION": "Looks like we couldn’t find what you were looking for, try searching for something else." + "NO_SESSION_MESSAGE_DESCRIPTION": "Looks like we couldn’t find what you were looking for, try searching for something else.", + "PROFILE_FORM_UNSAVED_DATA": "You have unsaved data, would you like to save it before exiting?", + "PROFILE_EXIT_HEADER_LABEL": "Save Data?", + "DONOT_SAVE": "Don't Save" } \ No newline at end of file From 5cbbbba0c4ac3dc9b48f883fe8cdffc0d243898d Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Thu, 18 Jul 2024 16:38:39 +0530 Subject: [PATCH 10/36] BUG fix 1477 --- src/app/core/services/util/util.service.ts | 14 ++++++-- .../pages/home-search/home-search.page.html | 4 ++- src/app/pages/home-search/home-search.page.ts | 36 ++++++++++++------- .../mentor-search-directory.page.html | 3 +- .../mentor-search-directory.page.ts | 14 +++++--- src/app/pages/tabs/home/home.page.ts | 16 +++++---- src/assets/i18n/en.json | 3 +- 7 files changed, 62 insertions(+), 28 deletions(-) diff --git a/src/app/core/services/util/util.service.ts b/src/app/core/services/util/util.service.ts index bdd8ab7e..5245635c 100644 --- a/src/app/core/services/util/util.service.ts +++ b/src/app/core/services/util/util.service.ts @@ -6,9 +6,8 @@ import { environment } from 'src/environments/environment'; import { ISocialSharing } from '../../interface/soical-sharing-interface'; import { ModelComponent } from 'src/app/shared/components/model/model.component'; import * as Bowser from "bowser" -import { Subject } from 'rxjs'; +import { BehaviorSubject, Subject } from 'rxjs'; import * as Papa from 'papaparse'; -import { localKeys } from '../../constants/localStorage.keys'; import { LocalStorageService } from '../localstorage.service'; @Injectable({ @@ -17,6 +16,10 @@ import { LocalStorageService } from '../localstorage.service'; export class UtilService { modal: any; public canIonMenuShow = new Subject(); + private searchTextSource = new BehaviorSubject(''); + private criteriaChipSource = new BehaviorSubject(''); + currentSearchText = this.searchTextSource.asObservable(); + currentCriteriaChip = this.criteriaChipSource.asObservable(); ionMenuShow(data:boolean) { this.canIonMenuShow.next(data); @@ -264,5 +267,12 @@ export class UtilService { const data = [...filterData, ...result] return data; } + + subscribeSearchText(searchText: string) { + this.searchTextSource.next(searchText); + } + subscribeCriteriaChip(criteriaChip: string) { + this.criteriaChipSource.next(criteriaChip); + } } diff --git a/src/app/pages/home-search/home-search.page.html b/src/app/pages/home-search/home-search.page.html index a845556a..b0c05cd8 100644 --- a/src/app/pages/home-search/home-search.page.html +++ b/src/app/pages/home-search/home-search.page.html @@ -1,6 +1,8 @@
-
diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts index 69ea6d26..9158cb39 100644 --- a/src/app/pages/home-search/home-search.page.ts +++ b/src/app/pages/home-search/home-search.page.ts @@ -11,6 +11,7 @@ import { ProfileService } from 'src/app/core/services/profile/profile.service'; import { Location } from '@angular/common'; import { PermissionService } from 'src/app/core/services/permission/permission.service'; import { FormService } from 'src/app/core/services/form/form.service'; +import { Subscription } from 'rxjs'; @Component({ selector: 'app-home-search', @@ -43,30 +44,30 @@ export class HomeSearchPage implements OnInit { criteriaChip: any; chips =[] criteriaChipName: any; - params: any; overlayChips: any; isOpen = false; urlQueryData: string; pageSize: any; + searchTextSubscription: Subscription; + criteriaChipSubscription: Subscription; constructor(private modalCtrl: ModalController, private router: Router, private toast: ToastService, private sessionService: SessionService, private localStorage: LocalStorageService, private profileService: ProfileService, private location: Location, - private activatedRoute: ActivatedRoute, private permissionService: PermissionService, private formService: FormService, - private utilService: UtilService - ) { - this.activatedRoute.queryParamMap.subscribe(async (params) => { - this.params = params; - this.criteriaChip = JSON.parse(params.get('criteriaChip')); - this.searchText = this.params.get('searchString'); - }) - } + private utilService: UtilService, + ) { } async ngOnInit() { + this.searchTextSubscription = this.utilService.currentSearchText.subscribe(searchText => { + this.searchText = searchText; + }); + this.criteriaChipSubscription = this.utilService.currentCriteriaChip.subscribe(selectedCriteria => { + this.criteriaChip = JSON.parse(selectedCriteria); + }); this.user = this.localStorage.getLocalData(localKeys.USER_DETAILS) this.fetchSessionList() this.permissionService.getPlatformConfig().then((config)=>{ @@ -81,9 +82,13 @@ export class HomeSearchPage implements OnInit { } search(event) { - this.searchText = event; - this.isOpen = false; - this.fetchSessionList() + if (event.length >= 3) { + this.searchText = event; + this.isOpen = false; + this.fetchSessionList() + } else { + this.toast.showToast("ENTER_MIN_CHARACTER","danger"); + } } async onClickFilter() { @@ -222,4 +227,9 @@ export class HomeSearchPage implements OnInit { } } } + + ngOnDestroy() { + this.searchTextSubscription.unsubscribe(); + this.criteriaChipSubscription.unsubscribe(); + } } diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.html b/src/app/pages/mentor-search-directory/mentor-search-directory.page.html index f47d65ce..4fcc4caf 100644 --- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.html +++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.html @@ -1,7 +1,8 @@
diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts index 71b1dc39..4ad92968 100644 --- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts +++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts @@ -3,7 +3,7 @@ import { MatPaginator } from '@angular/material/paginator'; import { Router } from '@angular/router'; import { ModalController } from '@ionic/angular'; import { paginatorConstants } from 'src/app/core/constants/paginatorConstants'; -import { UtilService } from 'src/app/core/services'; +import { ToastService, UtilService } from 'src/app/core/services'; import { FormService } from 'src/app/core/services/form/form.service'; import { PermissionService } from 'src/app/core/services/permission/permission.service'; import { ProfileService } from 'src/app/core/services/profile/profile.service'; @@ -49,7 +49,8 @@ export class MentorSearchDirectoryPage implements OnInit { private modalCtrl: ModalController, private permissionService: PermissionService, private formService: FormService, - private utilService: UtilService + private utilService: UtilService, + private toast: ToastService ) { } async ngOnInit() { @@ -62,8 +63,13 @@ export class MentorSearchDirectoryPage implements OnInit { this.filterData = await this.utilService.transformToFilterData(data, obj); } - onSearch(){ - this.getMentors() + onSearch(event){ + if (event.length >= 3) { + this.searchText = event; + this.getMentors(); + } else { + this.toast.showToast("ENTER_MIN_CHARACTER","danger"); + } } selectChip(chip) { diff --git a/src/app/pages/tabs/home/home.page.ts b/src/app/pages/tabs/home/home.page.ts index 45b45ea9..91e31444 100644 --- a/src/app/pages/tabs/home/home.page.ts +++ b/src/app/pages/tabs/home/home.page.ts @@ -2,13 +2,12 @@ import { HttpClient } from '@angular/common/http'; import { Component, OnInit, ViewChild } from '@angular/core'; import { JsonFormData } from 'src/app/shared/components/dynamic-form/dynamic-form.component'; import { CommonRoutes } from 'src/global.routes'; -import { ModalController, NavController, Platform, IonContent } from '@ionic/angular'; +import { ModalController, NavController, IonContent } from '@ionic/angular'; import { SKELETON } from 'src/app/core/constants/skeleton.constant'; import { Router } from '@angular/router'; import { localKeys } from 'src/app/core/constants/localStorage.keys'; import { ProfileService } from 'src/app/core/services/profile/profile.service'; import { HttpService, LoaderService, LocalStorageService, ToastService, UserService, UtilService } from 'src/app/core/services'; -import { urlConstants } from 'src/app/core/constants/urlConstants'; import { SessionService } from 'src/app/core/services/session/session.service'; import { TermsAndConditionsPage } from '../../terms-and-conditions/terms-and-conditions.page'; import { App, AppState } from '@capacitor/app'; @@ -63,7 +62,8 @@ export class HomePage implements OnInit { private userService: UserService, private localStorage: LocalStorageService, private toast: ToastService, - private permissionService: PermissionService) { } + private permissionService: PermissionService, + private utilService: UtilService) { } ngOnInit() { this.isMentor = this.profileService.isMentor @@ -146,10 +146,14 @@ export class HomePage implements OnInit { this.router.navigate([`/${CommonRoutes.SESSIONS}`], { queryParams: { type: data } }); } - search(q: string) { + search(event: string) { this.isOpen = false; - if(q){ - this.router.navigate([`/${CommonRoutes.HOME_SEARCH}`], {queryParams: { criteriaChip: JSON.stringify(this.criteriaChip), searchString: q}}); + if(event && event.length >= 3){ + this.utilService.subscribeSearchText(event); + this.utilService.subscribeCriteriaChip(JSON.stringify(this.criteriaChip)) + this.router.navigate([`/${CommonRoutes.HOME_SEARCH}`]); + }else { + this.toast.showToast("ENTER_MIN_CHARACTER","danger"); } this.criteriaChip = null; } diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 4a2c69fe..ec74d0e9 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -279,5 +279,6 @@ "NO_SESSION_MESSAGE_DESCRIPTION": "Looks like we couldn’t find what you were looking for, try searching for something else.", "PROFILE_FORM_UNSAVED_DATA": "You have unsaved data, would you like to save it before exiting?", "PROFILE_EXIT_HEADER_LABEL": "Save Data?", - "DONOT_SAVE": "Don't Save" + "DONOT_SAVE": "Don't Save", + "ENTER_MIN_CHARACTER": "Please enter at least three characters to search." } \ No newline at end of file From 2e0d67367ca184e8b8ca85cb117a8cb83024ce69 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Thu, 18 Jul 2024 17:02:45 +0530 Subject: [PATCH 11/36] bug fix : 1411 --- src/app/pages/mentor-details/mentor-details.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/mentor-details/mentor-details.page.html b/src/app/pages/mentor-details/mentor-details.page.html index 0ebe44ca..f03dd5d6 100644 --- a/src/app/pages/mentor-details/mentor-details.page.html +++ b/src/app/pages/mentor-details/mentor-details.page.html @@ -1,4 +1,4 @@ - +
From 13a9e0aeba0db5f6a4c972248a6af9460d0db347 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Fri, 19 Jul 2024 15:32:33 +0530 Subject: [PATCH 12/36] BUG fix : 1407,1401 --- .../components/filter-tree/filter-tree.component.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/shared/components/filter-tree/filter-tree.component.ts b/src/app/shared/components/filter-tree/filter-tree.component.ts index 7c9ad2a8..8afde640 100644 --- a/src/app/shared/components/filter-tree/filter-tree.component.ts +++ b/src/app/shared/components/filter-tree/filter-tree.component.ts @@ -11,17 +11,18 @@ export class FilterTreeComponent implements OnInit { @Input() filterData: any; @Output() filtersChanged = new EventEmitter(); - ogArrObj: any; constructor() { } - ngOnInit() { - this.ogArrObj = _.cloneDeep(this.filterData); - } + ngOnInit() { } clearAll() { - this.filterData = _.cloneDeep(this.ogArrObj) + if (this.filterData) { + this.filterData.forEach(filter => + filter.options = filter.options.map(option => ({ ...option, selected: false })) + ); + } this.filtersChanged.emit([]) } From c4740aa7e41748942b2cd7d4f2841014b5fe6701 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Fri, 19 Jul 2024 17:57:02 +0530 Subject: [PATCH 13/36] BUG fix 1334 --- src/app/pages/tabs/dashboard/dashboard.page.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/pages/tabs/dashboard/dashboard.page.ts b/src/app/pages/tabs/dashboard/dashboard.page.ts index 4cf5f8bd..e78aaca1 100644 --- a/src/app/pages/tabs/dashboard/dashboard.page.ts +++ b/src/app/pages/tabs/dashboard/dashboard.page.ts @@ -41,14 +41,13 @@ export class DashboardPage implements OnInit { private profile: ProfileService, private apiService: HttpService) { } - ngOnInit() { + ngOnInit() { } + + ionViewWillEnter() { this.isMentor = this.profile.isMentor; this.segment = this.isMentor ? "mentor" : "mentee"; this.dataAvailable = true; this.getReports(); - } - - ionViewWillEnter() { this.gotToTop(); } From f7098772a6182a3e7a16c7167146eed0c11fac39 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Fri, 19 Jul 2024 17:57:34 +0530 Subject: [PATCH 14/36] console error fix --- .../admin/components/manage-session/manage-session.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/admin/components/manage-session/manage-session.component.ts b/src/app/modules/admin/components/manage-session/manage-session.component.ts index e63b97d0..da7344c7 100644 --- a/src/app/modules/admin/components/manage-session/manage-session.component.ts +++ b/src/app/modules/admin/components/manage-session/manage-session.component.ts @@ -171,7 +171,7 @@ export class ManageSessionComponent implements OnInit { modal.onDidDismiss().then(async (dataReturned) => { this.filteredDatas = [] - if (dataReturned !== null) { + if (dataReturned.data && dataReturned.data.data) { if (dataReturned.data.data.selectedFilters) { for (let key in dataReturned.data.data.selectedFilters) { this.filteredDatas[key] = dataReturned.data.data.selectedFilters[key].slice(0, dataReturned.data.data.selectedFilters[key].length).map(obj => obj.value).join(',').toString() From 95da12f484b927fbc27c5eacf02464bf82a838d6 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Fri, 19 Jul 2024 17:59:03 +0530 Subject: [PATCH 15/36] bug fix : 1403 --- src/app/pages/home-search/home-search.page.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts index 9158cb39..c2349ddd 100644 --- a/src/app/pages/home-search/home-search.page.ts +++ b/src/app/pages/home-search/home-search.page.ts @@ -66,7 +66,7 @@ export class HomeSearchPage implements OnInit { this.searchText = searchText; }); this.criteriaChipSubscription = this.utilService.currentCriteriaChip.subscribe(selectedCriteria => { - this.criteriaChip = JSON.parse(selectedCriteria); + this.criteriaChip = selectedCriteria ? JSON.parse(selectedCriteria) : ""; }); this.user = this.localStorage.getLocalData(localKeys.USER_DETAILS) this.fetchSessionList() @@ -227,6 +227,12 @@ export class HomeSearchPage implements OnInit { } } } + + ionViewWillLeave(){ + this.searchText = ""; + this.criteriaChip = ""; + this.chips = []; + } ngOnDestroy() { this.searchTextSubscription.unsubscribe(); From 0f90889b2ddaf43d1a7050a98950567d0dbb9c42 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Sat, 20 Jul 2024 20:47:58 +0530 Subject: [PATCH 16/36] mentor search fix --- .../mentor-search-directory.page.html | 8 +++---- .../mentor-search-directory.page.ts | 23 ++++++++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.html b/src/app/pages/mentor-search-directory/mentor-search-directory.page.html index 4fcc4caf..1f98b2a2 100644 --- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.html +++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.html @@ -22,7 +22,7 @@ *ngFor="let chip of overlayChips; let i = index" (click)="selectChip(chip)" [ngClass]="{'selected-chip': selectedChipLabel === chip.label}"> - + {{ chip.label }} @@ -32,16 +32,16 @@ - +
- {{selectedChipLabel}} + {{showSelectedCriteria}}
-
+
diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts index 4ad92968..8476e4f6 100644 --- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts +++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts @@ -42,6 +42,7 @@ export class MentorSearchDirectoryPage implements OnInit { totalCount: any; limit: any; chips = []; + showSelectedCriteria: any; constructor( private router: Router, @@ -66,6 +67,7 @@ export class MentorSearchDirectoryPage implements OnInit { onSearch(event){ if (event.length >= 3) { this.searchText = event; + this.showSelectedCriteria = this.selectedChipLabel; this.getMentors(); } else { this.toast.showToast("ENTER_MIN_CHARACTER","danger"); @@ -73,23 +75,25 @@ export class MentorSearchDirectoryPage implements OnInit { } selectChip(chip) { - this.selectedChipLabel = chip.label; - this.selectedChipName = chip.name; - this.isOpen = false; - this.getMentors() + if (this.selectedChipLabel === chip.label) { + this.selectedChipLabel = null; + this.selectedChipName = null; + } else { + this.selectedChipLabel = chip.label; + this.selectedChipName = chip.name; + } } closeCriteriaChip(){ this.selectedChipLabel = ""; this.selectedChipName = ""; - this.getMentors() + this.showSelectedCriteria = ""; } removeChip(chip: string,index: number) { this.chips.splice(index, 1); this.removeFilteredData(chip) this.getUrlQueryData(); - this.getMentors() } async onClickFilter() { @@ -175,8 +179,11 @@ export class MentorSearchDirectoryPage implements OnInit { async getMentors(){ var obj = {page: this.page, pageSize: this.pageSize, searchText: this.searchText.trim(), selectedChip: this.selectedChipName, urlQueryData: this.urlQueryData}; let data = await this.profileService.getMentors(true,obj); - this.data = data.result.data; - this.totalCount = data.result.count; + if(data && data.result){ + this.isOpen = false; + this.data = data.result.data; + this.totalCount = data.result.count; + } } } From 8738de8b14d67aa02296e31dd49c847118ba6c36 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Sat, 20 Jul 2024 21:29:03 +0530 Subject: [PATCH 17/36] session search fix --- src/app/pages/home-search/home-search.page.html | 8 ++++---- src/app/pages/home-search/home-search.page.ts | 13 +++++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/app/pages/home-search/home-search.page.html b/src/app/pages/home-search/home-search.page.html index b0c05cd8..f1758332 100644 --- a/src/app/pages/home-search/home-search.page.html +++ b/src/app/pages/home-search/home-search.page.html @@ -24,7 +24,7 @@ *ngFor="let chip of overlayChips; let i = index" (click)="selectChip(chip)" [ngClass]="{'selected-chip': criteriaChip?.label === chip.label}"> - + {{ chip.label }} @@ -33,16 +33,16 @@ - +
- {{criteriaChip?.label}} + {{showSelectedCriteria?.label}}
-
+
diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts index c2349ddd..5dfbc71f 100644 --- a/src/app/pages/home-search/home-search.page.ts +++ b/src/app/pages/home-search/home-search.page.ts @@ -50,6 +50,7 @@ export class HomeSearchPage implements OnInit { pageSize: any; searchTextSubscription: Subscription; criteriaChipSubscription: Subscription; + showSelectedCriteria: any; constructor(private modalCtrl: ModalController, private router: Router, private toast: ToastService, private sessionService: SessionService, @@ -76,6 +77,7 @@ export class HomeSearchPage implements OnInit { } async ionViewWillEnter() { + this.showSelectedCriteria = this.criteriaChip? this.criteriaChip : ""; const obj = {filterType: 'session', org: false}; let data = await this.formService.filterList(obj); this.filterData = await this.utilService.transformToFilterData(data, obj); @@ -84,6 +86,7 @@ export class HomeSearchPage implements OnInit { search(event) { if (event.length >= 3) { this.searchText = event; + this.showSelectedCriteria = this.criteriaChip; this.isOpen = false; this.fetchSessionList() } else { @@ -187,14 +190,16 @@ export class HomeSearchPage implements OnInit { closeCriteriaChip(){ this.criteriaChip = null; + this.showSelectedCriteria = null; this.router.navigate(['/' + CommonRoutes.HOME_SEARCH], { queryParams: {searchString : this.searchText} }); - this.fetchSessionList() } selectChip(chip) { - this.criteriaChip = chip; - this.fetchSessionList() - this.isOpen = false; + if (this.criteriaChip === chip) { + this.criteriaChip = null; + } else { + this.criteriaChip = chip; + } } getUrlQueryData() { From e95a5a7fe30ed78d7ddd7bd5c3ae337233047075 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Mon, 22 Jul 2024 09:46:35 +0530 Subject: [PATCH 18/36] mentor page issue --- src/app/pages/home-search/home-search.page.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts index 5dfbc71f..d952f032 100644 --- a/src/app/pages/home-search/home-search.page.ts +++ b/src/app/pages/home-search/home-search.page.ts @@ -236,6 +236,7 @@ export class HomeSearchPage implements OnInit { ionViewWillLeave(){ this.searchText = ""; this.criteriaChip = ""; + this.showSelectedCriteria = ""; this.chips = []; } From 4a48a9b2c4d0fd3470e636488baf64991eca23dc Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Mon, 22 Jul 2024 10:08:27 +0530 Subject: [PATCH 19/36] bug fix 1263 --- src/app/core/services/http/http.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/services/http/http.service.ts b/src/app/core/services/http/http.service.ts index 5dceb788..765befb4 100644 --- a/src/app/core/services/http/http.service.ts +++ b/src/app/core/services/http/http.service.ts @@ -213,7 +213,7 @@ export class HttpService { break default: - this.toastService.showToast(msg ? msg : 'SOMETHING_WENT_WRONG', 'danger') + // this.toastService.showToast(msg ? msg : 'SOMETHING_WENT_WRONG', 'danger') } throw Error(result); } From c1c81de2f9ee246664abfe2c83888b156c1e1bb2 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Mon, 22 Jul 2024 10:52:10 +0530 Subject: [PATCH 20/36] BUg fix 1417 --- .../pages/home-search/home-search.page.html | 2 +- .../mentor-search-directory.page.html | 4 +-- .../mentor-search-directory.page.scss | 25 ++++++++++++++----- .../filter-tree/filter-tree.component.scss | 2 +- .../generic-search.component.html | 2 +- .../generic-search.component.scss | 24 ++++++++++++++---- 6 files changed, 43 insertions(+), 16 deletions(-) diff --git a/src/app/pages/home-search/home-search.page.html b/src/app/pages/home-search/home-search.page.html index f1758332..1fa3215a 100644 --- a/src/app/pages/home-search/home-search.page.html +++ b/src/app/pages/home-search/home-search.page.html @@ -7,7 +7,7 @@
- + - + @@ -79,7 +79,7 @@ {{totalCount}} {{"SEARCH_RESULT" | translate}}
-
+
diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.scss b/src/app/pages/mentor-search-directory/mentor-search-directory.page.scss index 08ff662c..031b3bfd 100644 --- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.scss +++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.scss @@ -90,15 +90,28 @@ display: flex; justify-content: space-between; } -.search-result-count{ - display: flex; - padding-left: 24%; -} .search-result-label{ display: flex; align-items: center; } .search-result-count{ display: flex; - padding-left: 24%; -} \ No newline at end of file + padding-left: 18%; +} +@media only screen and (max-width: 767px) { + .search-navigation { + display: flex; + flex-direction: column; + } + .search-result-count{ + display: flex; + padding-left: 11%; + } + .paginator { + order: 2; + display: -webkit-box; + } + .search-result { + order: 1; + } + } \ No newline at end of file diff --git a/src/app/shared/components/filter-tree/filter-tree.component.scss b/src/app/shared/components/filter-tree/filter-tree.component.scss index ea578937..c81b0b64 100644 --- a/src/app/shared/components/filter-tree/filter-tree.component.scss +++ b/src/app/shared/components/filter-tree/filter-tree.component.scss @@ -6,7 +6,7 @@ .wrapper-class { display: flex; justify-content: end; - padding: 5px 5px; + padding: 10px 20px 0px 0px; } .underline { cursor: pointer; diff --git a/src/app/shared/components/generic-search/generic-search.component.html b/src/app/shared/components/generic-search/generic-search.component.html index 28aed9f3..65db2337 100644 --- a/src/app/shared/components/generic-search/generic-search.component.html +++ b/src/app/shared/components/generic-search/generic-search.component.html @@ -10,7 +10,7 @@ {{totalCount}} {{"SEARCH_RESULT" | translate}} -
+
diff --git a/src/app/shared/components/generic-search/generic-search.component.scss b/src/app/shared/components/generic-search/generic-search.component.scss index eae6bd73..34f85af4 100644 --- a/src/app/shared/components/generic-search/generic-search.component.scss +++ b/src/app/shared/components/generic-search/generic-search.component.scss @@ -4,13 +4,27 @@ } .search-result-count{ display: flex; - padding-left: 24%; + padding-left: 18%; } .search-result-label{ display: flex; align-items: center; } -.search-result-count{ - display: flex; - padding-left: 24%; -} \ No newline at end of file + +@media only screen and (max-width: 767px) { + .search-navigation { + display: flex; + flex-direction: column; + } + .search-result-count{ + display: flex; + padding-left: 11%; + } + .paginator { + order: 2; + display: -webkit-box; + } + .search-result { + order: 1; + } + } \ No newline at end of file From 7159d6881217f5fb534fec45c6dd235daf800deb Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Mon, 22 Jul 2024 10:53:42 +0530 Subject: [PATCH 21/36] uncomment the 1263 fix --- src/app/core/services/http/http.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/services/http/http.service.ts b/src/app/core/services/http/http.service.ts index 765befb4..5dceb788 100644 --- a/src/app/core/services/http/http.service.ts +++ b/src/app/core/services/http/http.service.ts @@ -213,7 +213,7 @@ export class HttpService { break default: - // this.toastService.showToast(msg ? msg : 'SOMETHING_WENT_WRONG', 'danger') + this.toastService.showToast(msg ? msg : 'SOMETHING_WENT_WRONG', 'danger') } throw Error(result); } From a8a05d92f777adb0cf4d51efdd3f106196f958e8 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Mon, 22 Jul 2024 11:55:54 +0530 Subject: [PATCH 22/36] bug fix for 1395 --- src/app/pages/tabs/home/home.page.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/pages/tabs/home/home.page.ts b/src/app/pages/tabs/home/home.page.ts index 91e31444..fb8bbeae 100644 --- a/src/app/pages/tabs/home/home.page.ts +++ b/src/app/pages/tabs/home/home.page.ts @@ -221,6 +221,10 @@ export class HomePage implements OnInit { } selectChip(chip: any) { - this.criteriaChip = chip; + if (this.criteriaChip === chip) { + this.criteriaChip = null; + } else { + this.criteriaChip = chip; + } } } From 72a47d8899db12c8fe75bb53f9d3003b3d666d80 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Mon, 22 Jul 2024 18:53:44 +0530 Subject: [PATCH 23/36] bug fix 1403 --- src/app/pages/home-search/home-search.page.ts | 4 +++- .../mentor-search-directory.page.html | 2 +- .../mentor-search-directory.page.ts | 9 +++++++++ src/app/pages/tabs/home/home.page.html | 2 +- src/app/pages/tabs/home/home.page.ts | 11 ++++++++++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts index d952f032..649eac7e 100644 --- a/src/app/pages/home-search/home-search.page.ts +++ b/src/app/pages/home-search/home-search.page.ts @@ -233,11 +233,13 @@ export class HomeSearchPage implements OnInit { } } - ionViewWillLeave(){ + ionViewDidLeave(){ this.searchText = ""; this.criteriaChip = ""; this.showSelectedCriteria = ""; this.chips = []; + this.utilService.subscribeSearchText(''); + this.utilService.subscribeCriteriaChip('') } ngOnDestroy() { diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.html b/src/app/pages/mentor-search-directory/mentor-search-directory.page.html index 1c0337ed..4f6f9a39 100644 --- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.html +++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.html @@ -1,7 +1,7 @@
diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts index 8476e4f6..1958f8cf 100644 --- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts +++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts @@ -186,4 +186,13 @@ export class MentorSearchDirectoryPage implements OnInit { } } + ionViewDidLeave(){ + this.searchText = ""; + this.showSelectedCriteria = ""; + this.selectedChipName = null; + this.chips = []; + this.utilService.subscribeSearchText(''); + this.utilService.subscribeCriteriaChip('') + } + } diff --git a/src/app/pages/tabs/home/home.page.html b/src/app/pages/tabs/home/home.page.html index aaa1bf82..406fad22 100644 --- a/src/app/pages/tabs/home/home.page.html +++ b/src/app/pages/tabs/home/home.page.html @@ -9,7 +9,7 @@

diff --git a/src/app/pages/tabs/home/home.page.ts b/src/app/pages/tabs/home/home.page.ts index fb8bbeae..2cae6f89 100644 --- a/src/app/pages/tabs/home/home.page.ts +++ b/src/app/pages/tabs/home/home.page.ts @@ -50,6 +50,7 @@ export class HomePage implements OnInit { chips= []; criteriaChip: any; + searchText: string; constructor( private http: HttpClient, private router: Router, @@ -149,13 +150,15 @@ export class HomePage implements OnInit { search(event: string) { this.isOpen = false; if(event && event.length >= 3){ - this.utilService.subscribeSearchText(event); + this.searchText = event ? event : ""; + this.utilService.subscribeSearchText(this.searchText); this.utilService.subscribeCriteriaChip(JSON.stringify(this.criteriaChip)) this.router.navigate([`/${CommonRoutes.HOME_SEARCH}`]); }else { this.toast.showToast("ENTER_MIN_CHARACTER","danger"); } this.criteriaChip = null; + this.searchText = null; } getUser() { this.profileService.profileDetails().then(data => { @@ -227,4 +230,10 @@ export class HomePage implements OnInit { this.criteriaChip = chip; } } + + ionViewDidLeave(){ + this.criteriaChip = ''; + this.searchText = ''; + } + } From db3d99bd8911f514c4af9cf4917aee3b8b2fcb12 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Tue, 23 Jul 2024 10:19:04 +0530 Subject: [PATCH 24/36] bug fix for saerch bar --- src/app/pages/tabs/home/home.page.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/tabs/home/home.page.html b/src/app/pages/tabs/home/home.page.html index 406fad22..79098a90 100644 --- a/src/app/pages/tabs/home/home.page.html +++ b/src/app/pages/tabs/home/home.page.html @@ -9,8 +9,8 @@

+ [(ngModel)]="searchText" + (keyup.enter)="search(searchText)">