From 489db754f674c8266a506789ca83f4814cf2be31 Mon Sep 17 00:00:00 2001
From: Surya Prakash G <surya.prakash@tarento.com>
Date: Thu, 20 Jun 2024 12:11:52 +0530
Subject: [PATCH 1/2] changes to resume btn

---
 .../components/app-toc-desktop/app-toc-desktop.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/app-toc/components/app-toc-desktop/app-toc-desktop.component.html b/project/ws/app/src/lib/routes/app-toc/components/app-toc-desktop/app-toc-desktop.component.html
index df5490fda..ebaaeecec 100644
--- a/project/ws/app/src/lib/routes/app-toc/components/app-toc-desktop/app-toc-desktop.component.html
+++ b/project/ws/app/src/lib/routes/app-toc/components/app-toc-desktop/app-toc-desktop.component.html
@@ -138,7 +138,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

From c807e45f250689d657b0f2b8d92194e4d81df791 Mon Sep 17 00:00:00 2001
From: Surya Prakash G <surya.prakash@tarento.com>
Date: Thu, 20 Jun 2024 14:31:40 +0530
Subject: [PATCH 2/2] Fix for SBT-1186

---
 .../mobile-profile-dashboard.component.ts      | 18 ++++++++++++++++--
 .../web-nav-link-page.component.ts             |  1 +
 .../your-location/your-location.component.ts   |  9 +++++++--
 3 files changed, 24 insertions(+), 4 deletions(-)

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
index 82f162ce9..918409302 100644
--- 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
@@ -232,7 +232,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 {
@@ -314,7 +321,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
index 1050af0b2..dca5f6edd 100644
--- 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
index c613bee0f..ef457ba48 100644
--- 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()
   }
 }