From d53f91aa288762ee67923db84f54dab88786f6b4 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Wed, 31 Jul 2024 19:53:28 +0530 Subject: [PATCH 1/5] bug fix 1581 --- src/app/modules/private/private.page.ts | 2 +- .../pages/edit-profile/edit-profile.page.ts | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/app/modules/private/private.page.ts b/src/app/modules/private/private.page.ts index 842dfffd..f6228d15 100644 --- a/src/app/modules/private/private.page.ts +++ b/src/app/modules/private/private.page.ts @@ -184,7 +184,7 @@ getUser() { this.adminAccess = profileDetails.permissions ? this.permissionService.hasAdminAcess(this.actionsArrays,profileDetails?.permissions) : false; this.user = profileDetails; if (profileDetails.profile_mandatory_fields && profileDetails.profile_mandatory_fields.length > 0 || !profileDetails.about) { - this.router.navigate([`/${CommonRoutes.EDIT_PROFILE}`], { replaceUrl: true }); + this.router.navigate([`/${CommonRoutes.EDIT_PROFILE}`], { replaceUrl: true, queryParams: {redirectUrl: 'home'}}); } this.isMentor = this.profile.isMentor; }) diff --git a/src/app/pages/edit-profile/edit-profile.page.ts b/src/app/pages/edit-profile/edit-profile.page.ts index ce435b07..f342060e 100644 --- a/src/app/pages/edit-profile/edit-profile.page.ts +++ b/src/app/pages/edit-profile/edit-profile.page.ts @@ -22,9 +22,9 @@ import { AlertController, Platform } from '@ionic/angular'; import { isDeactivatable } from 'src/app/core/guards/canDeactive/deactive.guard'; import { TranslateService } from '@ngx-translate/core'; import { map } from 'rxjs/operators'; -import { Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { CommonRoutes } from 'src/global.routes'; -import { PlatformLocation } from '@angular/common'; +import { PlatformLocation, Location } from '@angular/common'; @Component({ selector: 'app-edit-profile', @@ -49,6 +49,7 @@ export class EditProfilePage implements OnInit, isDeactivatable { entityNames: any; entityList: any; formData: any; + redirectUrl: any; constructor( private form: FormService, private api: HttpService, @@ -62,7 +63,9 @@ export class EditProfilePage implements OnInit, isDeactivatable { private toast: ToastService, private utilService: UtilService, private router: Router, - private platformLocation: PlatformLocation + private platformLocation: PlatformLocation, + private activatedRoute: ActivatedRoute, + private location: Location ) { } @@ -73,6 +76,9 @@ export class EditProfilePage implements OnInit, isDeactivatable { history.pushState(null, '', location.href) }) } + this.activatedRoute.queryParams.subscribe(params => { + this.redirectUrl = params.redirectUrl; + }); } async ngOnInit() { this.userDetails = await this.localStorage.getLocalData(localKeys.USER_DETAILS); @@ -152,7 +158,11 @@ export class EditProfilePage implements OnInit, isDeactivatable { }); this.form1.myForm.markAsPristine(); const updated = await this.profileService.profileUpdate(form); - if(updated){ this.router.navigate([`${CommonRoutes.TABS}/${CommonRoutes.HOME}`], { replaceUrl: true })} + if(updated && this.redirectUrl){ + this.router.navigate([`${CommonRoutes.TABS}/${CommonRoutes.HOME}`], { replaceUrl: true }) + }else{ + this.location.back() + } } } else { this.toast.showToast('Please fill all the mandatory fields', 'danger'); From 58f891d83b8b5d2f3e3f164686af1dd920ebaccb Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Mon, 5 Aug 2024 14:48:11 +0530 Subject: [PATCH 2/5] bug fix 1519 --- src/app/pages/create-session/create-session.page.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/create-session/create-session.page.ts b/src/app/pages/create-session/create-session.page.ts index 713d4472..86a1067d 100644 --- a/src/app/pages/create-session/create-session.page.ts +++ b/src/app/pages/create-session/create-session.page.ts @@ -173,8 +173,8 @@ export class CreateSessionPage implements OnInit { this.getImageUploadUrl(this.localImage); } else { const form = Object.assign({}, {...this.form1.myForm.getRawValue(), ...this.form1.myForm.value}); - form.start_date = form.start_date.unix().toString(); - form.end_date = form.end_date.unix().toString(); + form.start_date = (Math.floor(form.start_date.unix() / 60) * 60).toString(); + form.end_date = (Math.floor(form.end_date.unix() / 60) * 60).toString(); const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone; form.time_zone = timezone; _.forEach(this.entityNames, (entityKey) => { From 7e9fd9cbfe933aa50cfb80cfde91132f3b4c3c44 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Mon, 5 Aug 2024 16:20:13 +0530 Subject: [PATCH 3/5] comments resolved --- src/app/modules/private/private.page.ts | 2 +- src/app/pages/edit-profile/edit-profile.page.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/modules/private/private.page.ts b/src/app/modules/private/private.page.ts index f6228d15..25281e39 100644 --- a/src/app/modules/private/private.page.ts +++ b/src/app/modules/private/private.page.ts @@ -184,7 +184,7 @@ getUser() { this.adminAccess = profileDetails.permissions ? this.permissionService.hasAdminAcess(this.actionsArrays,profileDetails?.permissions) : false; this.user = profileDetails; if (profileDetails.profile_mandatory_fields && profileDetails.profile_mandatory_fields.length > 0 || !profileDetails.about) { - this.router.navigate([`/${CommonRoutes.EDIT_PROFILE}`], { replaceUrl: true, queryParams: {redirectUrl: 'home'}}); + this.router.navigate([`/${CommonRoutes.EDIT_PROFILE}`], { replaceUrl: true, queryParams: {redirectUrl: [`${CommonRoutes.TABS}/${CommonRoutes.HOME}`]}}); } this.isMentor = this.profile.isMentor; }) diff --git a/src/app/pages/edit-profile/edit-profile.page.ts b/src/app/pages/edit-profile/edit-profile.page.ts index f342060e..55e00a29 100644 --- a/src/app/pages/edit-profile/edit-profile.page.ts +++ b/src/app/pages/edit-profile/edit-profile.page.ts @@ -159,7 +159,7 @@ export class EditProfilePage implements OnInit, isDeactivatable { this.form1.myForm.markAsPristine(); const updated = await this.profileService.profileUpdate(form); if(updated && this.redirectUrl){ - this.router.navigate([`${CommonRoutes.TABS}/${CommonRoutes.HOME}`], { replaceUrl: true }) + this.router.navigate(this.redirectUrl, { replaceUrl: true }) }else{ this.location.back() } From b6cd041f67b5d064a8be3bc03875f676b02225d5 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Mon, 5 Aug 2024 16:48:29 +0530 Subject: [PATCH 4/5] comments --- src/app/modules/private/private.page.ts | 2 +- src/app/pages/edit-profile/edit-profile.page.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/modules/private/private.page.ts b/src/app/modules/private/private.page.ts index 25281e39..431931d5 100644 --- a/src/app/modules/private/private.page.ts +++ b/src/app/modules/private/private.page.ts @@ -184,7 +184,7 @@ getUser() { this.adminAccess = profileDetails.permissions ? this.permissionService.hasAdminAcess(this.actionsArrays,profileDetails?.permissions) : false; this.user = profileDetails; if (profileDetails.profile_mandatory_fields && profileDetails.profile_mandatory_fields.length > 0 || !profileDetails.about) { - this.router.navigate([`/${CommonRoutes.EDIT_PROFILE}`], { replaceUrl: true, queryParams: {redirectUrl: [`${CommonRoutes.TABS}/${CommonRoutes.HOME}`]}}); + this.router.navigate([`/${CommonRoutes.EDIT_PROFILE}`], { replaceUrl: true, queryParams: {redirectUrl: '/tabs/home'}}); } this.isMentor = this.profile.isMentor; }) diff --git a/src/app/pages/edit-profile/edit-profile.page.ts b/src/app/pages/edit-profile/edit-profile.page.ts index 55e00a29..e447031d 100644 --- a/src/app/pages/edit-profile/edit-profile.page.ts +++ b/src/app/pages/edit-profile/edit-profile.page.ts @@ -159,7 +159,7 @@ export class EditProfilePage implements OnInit, isDeactivatable { this.form1.myForm.markAsPristine(); const updated = await this.profileService.profileUpdate(form); if(updated && this.redirectUrl){ - this.router.navigate(this.redirectUrl, { replaceUrl: true }) + this.router.navigate([this.redirectUrl], { replaceUrl: true }) }else{ this.location.back() } From 583a63191a64637cb99ba987e97c26f7f8833e69 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Tue, 6 Aug 2024 11:06:40 +0530 Subject: [PATCH 5/5] BUG fix 1385 --- src/app/shared/components/input-chip/input-chip.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/components/input-chip/input-chip.component.html b/src/app/shared/components/input-chip/input-chip.component.html index 35a91eac..e476671f 100644 --- a/src/app/shared/components/input-chip/input-chip.component.html +++ b/src/app/shared/components/input-chip/input-chip.component.html @@ -19,7 +19,7 @@ [ngClass]="selectedChips.has(chip) ? 'selected-chip' : ''" > - + {{ chip.label }}