diff --git a/src/app/core/services/form/form.service.ts b/src/app/core/services/form/form.service.ts index 693d2353..195716ba 100644 --- a/src/app/core/services/form/form.service.ts +++ b/src/app/core/services/form/form.service.ts @@ -69,6 +69,10 @@ export class FormService { allow_custom_entities: entity.allow_custom_entities, allow_filtering: entity.allow_filtering }; + formData.validators = { + ...formData.validators, + required: entity.required + } } }); return formData diff --git a/src/app/core/services/util/util.service.ts b/src/app/core/services/util/util.service.ts index 5870d189..0598f242 100644 --- a/src/app/core/services/util/util.service.ts +++ b/src/app/core/services/util/util.service.ts @@ -209,5 +209,26 @@ export class UtilService { snakeToNormal(text: string): string { return text.split('_').map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(' '); } + + async profileUpdatePopup(msg){ + let texts; + this.translate.get([msg.header, msg.message, msg.cancel]).subscribe(text => { + texts = text; + }) + const alert = await this.alert.create({ + cssClass: 'my-custom-class', + header: texts[msg.header], + message: texts[msg.message], + buttons: [ + { + text: texts[msg.cancel], + role: 'cancel', + cssClass: 'alert-button-red' + }, + ], + backdropDismiss: false + }); + await alert.present(); + } } diff --git a/src/app/modules/private/private.page.html b/src/app/modules/private/private.page.html index 868a5085..42d916dc 100644 --- a/src/app/modules/private/private.page.html +++ b/src/app/modules/private/private.page.html @@ -1,6 +1,6 @@ - +
@@ -23,7 +23,7 @@
- +
diff --git a/src/app/modules/private/private.page.scss b/src/app/modules/private/private.page.scss index 27abdfa8..07670eb3 100644 --- a/src/app/modules/private/private.page.scss +++ b/src/app/modules/private/private.page.scss @@ -109,4 +109,9 @@ } .user-role-labels{ padding-top: 3%; +} +.disable-div{ + pointer-events: none; /* Disable all pointer events (clicks, hovers, etc.) */ + opacity: 0.5; /* Make the header appear grayed out */ + background-color: lightgray; } \ No newline at end of file diff --git a/src/app/modules/private/private.page.ts b/src/app/modules/private/private.page.ts index 4372eab2..842dfffd 100644 --- a/src/app/modules/private/private.page.ts +++ b/src/app/modules/private/private.page.ts @@ -183,6 +183,9 @@ getUser() { this.profile.profileDetails(false).then(profileDetails => { 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.isMentor = this.profile.isMentor; }) } diff --git a/src/app/pages/edit-profile/edit-profile.page.html b/src/app/pages/edit-profile/edit-profile.page.html index cfd2855f..657879db 100644 --- a/src/app/pages/edit-profile/edit-profile.page.html +++ b/src/app/pages/edit-profile/edit-profile.page.html @@ -11,6 +11,6 @@ - {{'SUBMIT' | translate}} + {{'SUBMIT' | translate}} \ No newline at end of file diff --git a/src/app/pages/edit-profile/edit-profile.page.ts b/src/app/pages/edit-profile/edit-profile.page.ts index f5dc6932..8022c3de 100644 --- a/src/app/pages/edit-profile/edit-profile.page.ts +++ b/src/app/pages/edit-profile/edit-profile.page.ts @@ -14,6 +14,7 @@ import { LoaderService, LocalStorageService, ToastService, + UtilService, } from 'src/app/core/services'; import { localKeys } from 'src/app/core/constants/localStorage.keys'; import { urlConstants } from 'src/app/core/constants/urlConstants'; @@ -21,6 +22,8 @@ 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 { CommonRoutes } from 'src/global.routes'; @Component({ selector: 'app-edit-profile', @@ -34,10 +37,8 @@ export class EditProfilePage implements OnInit, isDeactivatable { type: 'profile', }; public headerConfig: any = { - // menu: true, - backButton: { - label: 'PROFILE_DETAILS', - }, + backButton: true, + label: 'PROFILE_DETAILS', notification: false, }; path; @@ -57,23 +58,37 @@ export class EditProfilePage implements OnInit, isDeactivatable { private loaderService: LoaderService, private alert: AlertController, private translate: TranslateService, - private toast: ToastService + private toast: ToastService, + private utilService: UtilService, + private router: Router ) { } async ngOnInit() { + this.userDetails = await this.localStorage.getLocalData(localKeys.USER_DETAILS); const response = await this.form.getForm(EDIT_PROFILE_FORM); this.profileImageData.isUploaded = true; this.formData = _.get(response, 'data.fields'); - this.entityNames = await this.form.getEntityNames(this.formData) - this.entityList = await this.form.getEntities(this.entityNames, 'PROFILE') + const entityNames = await this.form.getEntityNames(this.formData); + this.entityNames = await this.updateEntityArray(this.userDetails?.profile_mandatory_fields, entityNames); + this.entityList = await this.form.getEntities(this.entityNames, 'PROFILE'); this.formData = await this.form.populateEntity(this.formData, this.entityList) this.changeDetRef.detectChanges(); - this.userDetails = await this.localStorage.getLocalData(localKeys.USER_DETAILS); if (this.userDetails) { this.profileImageData.image = this.userDetails.image; this.profileService.prefillData(this.userDetails, this.entityNames, this.formData); this.showForm = true; } + if(this.userDetails?.profile_mandatory_fields?.length){ + this.headerConfig.backButton = false; + let msg = { + header: 'SETUP_PROFILE', + message: 'SETUP_PROFILE_MESSAGE', + cancel: "CONTINUE" + } + this.utilService.profileUpdatePopup(msg) + }else{ + this.headerConfig.backButton = true; + } } async canPageLeave() { @@ -125,7 +140,8 @@ export class EditProfilePage implements OnInit, isDeactivatable { form[entityKey] = control.multiple ? _.map(form[entityKey], 'value') : form[entityKey] }); this.form1.myForm.markAsPristine(); - this.profileService.profileUpdate(form); + const updated = this.profileService.profileUpdate(form); + if(updated){ this.router.navigate([`${CommonRoutes.TABS}/${CommonRoutes.HOME}`], { replaceUrl: true })} } } else { this.toast.showToast('Please fill all the mandatory fields', 'danger'); @@ -168,4 +184,13 @@ export class EditProfilePage implements OnInit, isDeactivatable { let data: any = await this.api.get(config); return this.upload(file, data.result).subscribe() } + + updateEntityArray(arr1: string[], arr2: string[]) { + arr1.forEach(value => { + if (!arr2.includes(value)) { + arr2.push(value); + } + }); + return arr2 + } } diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 72d683ad..3b412cdc 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -273,5 +273,7 @@ "NO_SESSIONS_AVAILABLE":"No sessions available", "SESSSION_SEARCH_RESULT": "Session search result for", "SEARCH_RESULT": "Search results found", - "MENTOR_SEARCH_RESULT": "Mentors search result for" + "MENTOR_SEARCH_RESULT": "Mentors search result for", + "SETUP_PROFILE": "Setup profile", + "SETUP_PROFILE_MESSAGE": "Finish setting up your profile to get started" } \ No newline at end of file