Merge branch 'feature/optmization-ui' of https://github.com/Sphere/ea…

…gle-fusion into prod-release-new-home-design
Sphere · Jun 20, 2024 · 91e6bcc · 91e6bcc
2 parents be73ca9 + c807e45
commit 91e6bcc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/...t/ws/app/src/lib/routes/app-toc/components/app-toc-desktop/app-toc-desktop.component.html b/...t/ws/app/src/lib/routes/app-toc/components/app-toc-desktop/app-toc-desktop.component.html
@@ -142,7 +142,7 @@
           </a>
         </ng-container>
         <ng-template #elseBlock1>
-          <a *ngIf="showStart.show && !isPostAssessment && batchData?.enrolled && optmisticPercentage < 100 || content!.completionPercentage < 100;"
+          <a *ngIf="showStart.show && !isPostAssessment && batchData?.enrolled && optmisticPercentage <= 100 || content!.completionPercentage <= 100;"
             (click)="redirectPage(updatedContentFound)" class="banner-btn resumeButton cursor-pointer">
             <ng-container i18n>
               Resume

diff --git a/src/app/routes/profile-view/mobile-profile-dashboard/mobile-profile-dashboard.component.ts b/src/app/routes/profile-view/mobile-profile-dashboard/mobile-profile-dashboard.component.ts
@@ -268,7 +268,14 @@ export class MobileProfileDashboardComponent implements OnInit {
   setAcademicDetail(data: any) {
     if (data) {
       this.userProfileData = data.profileDetails.profileReq
-      this.currentProfession = this.userProfileData.professionalDetails[0].profession
+      if (this.userProfileData
+        && this.userProfileData.professionalDetails
+        && this.userProfileData.professionalDetails.length > 0) {
+        this.currentProfession = this.userProfileData.professionalDetails[0].profession
+      } else {
+        this.currentProfession = 'Not specified'
+      }
+      //this.currentProfession = this.userProfileData.professionalDetails[0].profession
       if (_.get(this.userProfileData, 'personalDetails')) {
         this.photoUrl = this.userProfileData.personalDetails.photo
       } else {
@@ -350,7 +357,14 @@ export class MobileProfileDashboardComponent implements OnInit {
             this.loader = false
             this.userProfileData = await data.profileDetails.profileReq
             this.userData = await data
-            this.currentProfession = this.userProfileData.professionalDetails[0].profession
+            //this.currentProfession = this.userProfileData.professionalDetails[0].profession
+            if (this.userProfileData
+              && this.userProfileData.professionalDetails
+              && this.userProfileData.professionalDetails.length > 0) {
+              this.currentProfession = this.userProfileData.professionalDetails[0].profession
+            } else {
+              this.currentProfession = 'Not specified'
+            }
             const lang = (data && data.profileDetails && data.profileDetails!.preferences && data.profileDetails!.preferences!.language !== undefined) ? data.profileDetails.preferences.language : location.href.includes('/hi/') ? 'hi' : 'en'
             this.language = lang
             console.log(lang, 'oo')

diff --git a/src/app/routes/web-nav-link/web-nav-link-page.component.ts b/src/app/routes/web-nav-link/web-nav-link-page.component.ts
@@ -130,6 +130,7 @@ export class WebNavLinkPageComponent implements OnInit {
         this.showProfile = false
         this.showHome = false
         this.showCompetency = false
+        let url = url1 === 'hi' ? '/page/home' : 'page/home'
         this.router.navigate(['/app/about-you'], { queryParams: { redirect: `${url1}${url}` } })
       }
     } else if (text === 'competency') {

diff --git a/src/app/routes/your-location/your-location.component.ts b/src/app/routes/your-location/your-location.component.ts
@@ -60,6 +60,7 @@ export class YourLocationComponent implements OnInit {
     })
   }
   countrySelect(option: any) {
+    console.log(this.aboutYouForm.controls)
     this.setCountryCode(option)
     if (option === 'India') {
       this.selectDisable = false
@@ -84,7 +85,8 @@ export class YourLocationComponent implements OnInit {
     }
   }
   disableNextBtn() {
-    if (this.aboutYouForm.controls.dob) {
+    console.log(this.aboutYouForm.controls.dob)
+    if (this.aboutYouForm.controls.dob.value) {
       if (this.aboutYouForm.controls.country.value !== 'India') {
         this.nextBtnDisable = false
       } else if (this.aboutYouForm.controls.country.value === 'India') {
@@ -94,7 +96,7 @@ export class YourLocationComponent implements OnInit {
           this.nextBtnDisable = true
         }
       } else {
-        this.nextBtnDisable = true
+        this.nextBtnDisable = false
       }
     } else {
       this.nextBtnDisable = true
@@ -117,8 +119,11 @@ export class YourLocationComponent implements OnInit {
   }
 
   dobData(event: any) {
+    console.log(event)
+    console.log(this.aboutYouForm.controls)
     this.aboutYouForm.patchValue({
       dob: event,
     })
+    this.disableNextBtn()
   }
 }