diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts
index 1d16e33a..360a5175 100644
--- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts
+++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts
@@ -443,9 +443,9 @@ export class SubmitAbsenceComponent implements OnInit {
this.textInput = new TextInput(
feildsList[i].SEGMENT_PROMPT,
feildsList[i].APPLICATION_COLUMN_NAME,
- defaultValText,
+ defaultVal,
containerId,
- defaultVal,
+ defaultValText,
feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG
diff --git a/Mohem/src/app/authentication/check-user/check-user.component.html b/Mohem/src/app/authentication/check-user/check-user.component.html
index 0f28d541..841a2b96 100644
--- a/Mohem/src/app/authentication/check-user/check-user.component.html
+++ b/Mohem/src/app/authentication/check-user/check-user.component.html
@@ -23,7 +23,7 @@
-
{{ts.trPK('login','verify-login-with')}}
{{ts.trPK('login','verify-fingerprint')}}
{{ts.trPK('login','verify-faceId')}}
{{ts.trPK('login','verify-fingerprint')}}
{{ts.trPK('login','verify-faceId')}}
{{'verificationcode,title' | translate}} {{'verificationcode,verificationcode' | translate}} {{'verificationcode,by' | translate}} - {{'verificationcode , sms' | translate}} - {{'verificationcode , whatsapp' | translate}} - + {{'verificationcode , sms' | translate}} + {{'verificationcode , whatsapp' | translate}} + {{'verificationcode,instruct' | translate}} {{'general,submit' | translate}}
diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.ts b/Mohem/src/app/authentication/sms-page/sms-page.page.ts index c3f4819f..631dcd70 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -47,6 +47,7 @@ export class SmsPageComponent implements OnInit { user_name: string; public isPostNoLoad = true; loginType: any; + activeType: any; constructor( @@ -60,6 +61,8 @@ export class SmsPageComponent implements OnInit { ) {} ngOnInit() { + this.activeType=this.common.getActiveTypeLogin(); + console.log("activeType :"+this.activeType); this.count = 0; this.initTimer(); this.startTimer(); @@ -73,7 +76,14 @@ export class SmsPageComponent implements OnInit { } console.log('deviceToken :' + this.deviceToken); this.loginTypeData = this.common.sharedService.getSharedData(SMSCheckRequest.SHARED_DATA, false); - this.loginType = this.loginTypeData.loginType; + if( this.loginTypeData){ + this.loginType=this.loginTypeData.loginType; + + console.log("loginType :"+this.loginTypeData.loginType); + }else{ + this.loginType=1; + } + } initTimer() { diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.html b/Mohem/src/app/eit/add-eit/add-eit.component.html index 57c528f6..9b604048 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.html +++ b/Mohem/src/app/eit/add-eit/add-eit.component.html @@ -16,17 +16,18 @@ --> - + (trigger)="closeModal()" + > + -More Action
+{{ts.trPK('general','moreAction')}}