Merge pull request #475 from GSuma21/release-2.6.1

issue text change
ELEVATE-Project · Apr 8, 2024 · 940076d · 940076d
2 parents 29a3a67 + 43cc1f5
commit 940076d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
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
@@ -10,7 +10,6 @@ import { UtilService } from 'src/app/core/services';
 import { SessionService } from 'src/app/core/services/session/session.service';
 import { MenteeListPopupComponent } from 'src/app/shared/components/mentee-list-popup/mentee-list-popup.component';
 import *  as moment from 'moment';
-import { ProfileService } from 'src/app/core/services/profile/profile.service';
 
 @Component({
   selector: 'app-manage-session',
@@ -25,7 +24,7 @@ export class ManageSessionComponent implements OnInit {
     // label: 'MANAGE_SESSION'
   };
   receivedEventData: any;
-  constructor(private adminWorkapceService: AdminWorkapceService, private router: Router, private modalCtrl: ModalController,private utilService:UtilService, private sessionService:SessionService, private profileService:ProfileService) { }
+  constructor(private adminWorkapceService: AdminWorkapceService, private router: Router, private modalCtrl: ModalController,private utilService:UtilService, private sessionService:SessionService) { }
   headingText = "SESSION_LIST"
   download = "DOWNLOAD";
   page = 1;
@@ -92,7 +91,6 @@ export class ManageSessionComponent implements OnInit {
     'LIVE': [{ icon: 'eye', cssColor: 'white-color' ,action:'VIEW'}, { icon: 'create', cssColor: 'white-color' ,action:'EDIT'}],
     'COMPLETED': [{ icon: 'eye', cssColor: 'white-color' ,action:'VIEW'}]
   };
-  user:any;
 
   async ngOnInit() {
     this.fetchSessionList()
@@ -186,7 +184,6 @@ export class ManageSessionComponent implements OnInit {
      this.adminWorkapceService.downloadcreatedSessionsBySessionManager(obj);
   }
   async fetchSessionList() {
-    this.profileService.profileDetails().then(data => { this.user = data })
     var obj = { page: this.page, limit: this.limit, status: this.type, order: this.sortingData?.order, sort_by: this.sortingData?.sort_by, searchText: this.searchText, filteredData:this.filteredDatas };
     var response = await this.adminWorkapceService.createdSessionBySessionManager(obj);
     this.totalCount = response.count;
@@ -209,13 +206,7 @@ export class ManageSessionComponent implements OnInit {
   }
 
   createSession(){
-    if (this.user?.about != null) {
       this.router.navigate([`${CommonRoutes.CREATE_SESSION}`]); 
-    } else {
-      this.profileService.upDateProfilePopup()
-    }
-  }
-
-
+  } 
 
 }
diff --git a/src/app/pages/auth/otp/otp.page.ts b/src/app/pages/auth/otp/otp.page.ts
@@ -66,7 +66,7 @@ export class OtpPage implements OnInit {
   }
 
   ngOnInit() {
-    this.labels = this.actionType == 'signup' ? ['VERIFY_ACCOUNT'] : ['ENTER_OTP'];
+    this.labels = this.actionType == 'signup' ? ['VERIFY_ACCOUNT'] : ['VALIDATE_OTP'];
     this.translateText();
   }
 

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -265,6 +265,6 @@
     "LOGGED_IN": "Logged in",
     "LOGGED_OUT_AT": "Logged out at",
     "EXPIRED": "Expired",
-    "GENERATE_OTP":"Generate otp",
-    "VALIDATE_OTP": "Validate otp"
+    "GENERATE_OTP":"Generate OTP",
+    "VALIDATE_OTP": "Validate OTP"
 }