fix sms text, RFC Empty,Notifi-P_information

mekawy-issues
ashwaq 6 years ago
parent 2903783e41
commit 0f84f35d5a

@ -318,6 +318,12 @@ export class ConfirmLoginComponent implements OnInit {
console.log(el.value); console.log(el.value);
localStorage.setItem("login-type",el.value); localStorage.setItem("login-type",el.value);
console.log("login-type: "+ localStorage.getItem("login-type")) console.log("login-type: "+ localStorage.getItem("login-type"))
if(this.FFloginType == 3 || this.FFloginType == 2 ){
this.cs.setActiveTypeLogin(el.value);
}else{
this.cs.setActiveTypeLogin(0);
}
this.loginWithSMS(el); this.loginWithSMS(el);
break; break;
@ -339,7 +345,7 @@ export class ConfirmLoginComponent implements OnInit {
console.log(el.value); console.log(el.value);
this.faceReconization(el); this.faceReconization(el);
break; break;
@ -349,8 +355,12 @@ export class ConfirmLoginComponent implements OnInit {
console.log(el.value); console.log(el.value);
localStorage.setItem("login-type",el.value); localStorage.setItem("login-type",el.value);
if(this.FFloginType == 3 || this.FFloginType == 2 ){
this.cs.setActiveTypeLogin(el.value);
}else{
this.cs.setActiveTypeLogin(0);
}
this.loginWithWhatsapp(el); this.loginWithWhatsapp(el);
break; break;

@ -21,9 +21,9 @@
<p class="leftDiv">{{'verificationcode,title' | translate}} <p class="leftDiv">{{'verificationcode,title' | translate}}
<span class="boldTxtNav">{{'verificationcode,verificationcode' | translate}}</span> <span class="boldTxtNav">{{'verificationcode,verificationcode' | translate}}</span>
{{'verificationcode,by' | translate}} {{'verificationcode,by' | translate}}
<span *ngIf="loginType == 1" class="boldTxtNav">{{'verificationcode , sms' | translate}}</span> <span *ngIf="loginType == 1 || activeType == 1" class="boldTxtNav">{{'verificationcode , sms' | translate}}</span>
<span *ngIf="loginType == 4" class="boldTxtNav">{{'verificationcode , whatsapp' | translate}}</span> <span *ngIf="loginType == 4 || activeType == 4" class="boldTxtNav">{{'verificationcode , whatsapp' | translate}}</span>
{{'verificationcode,instruct' | translate}} {{'verificationcode,instruct' | translate}}
<span class="boldTxtNav">{{'general,submit' | translate}}</span <span class="boldTxtNav">{{'general,submit' | translate}}</span
></p> ></p>

@ -82,6 +82,7 @@ export class SmsPageComponent implements OnInit {
code: any; code: any;
user_name: string; user_name: string;
loginType: any; loginType: any;
activeType: any;
constructor( constructor(
@ -107,7 +108,8 @@ export class SmsPageComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.activeType=this.common.getActiveTypeLogin();
console.log("activeType :"+this.activeType);
this.count = 0; this.count = 0;
this.initTimer(); this.initTimer();

@ -81,6 +81,7 @@ export class CommonService {
public updateImage:boolean=false; public updateImage:boolean=false;
public setUpdateImg:any; public setUpdateImg:any;
DT: any; DT: any;
activeType: any;
constructor( constructor(
public nav: NavController, public nav: NavController,
public router: Router, public router: Router,
@ -1430,5 +1431,12 @@ public getMonthNameAr(value: number): string {
return this.DT; return this.DT;
} }
setActiveTypeLogin(activeType){
this.activeType=activeType;
}
getActiveTypeLogin(){
return this.activeType;
}
} }

@ -10,9 +10,9 @@
<ion-content > <ion-content >
<div *ngIf="!messageSuccess"> <div *ngIf="!messageSuccess">
<div class="tipsPadding boldTxtNav"> <!-- <div [hidden]="!RFCEmployeeListListRes > 0" class="boldTxtNav">
{{'replacementRoll , msgRFC' | translate}} {{'replacementRoll , msgRFC' | translate}}
</div> </div> -->
<!-- <ion-list (ionChange)="radioChecked($event)" radio-group> <!-- <ion-list (ionChange)="radioChecked($event)" radio-group>
<ion-item *ngFor="let rfcEmployeeList of RFCEmployeeListListRes; let i = index;"> <ion-item *ngFor="let rfcEmployeeList of RFCEmployeeListListRes; let i = index;">
<ion-label>{{rfcEmployeeList.EMPLOYEE_DISPLAY_NAME}}</ion-label> <ion-label>{{rfcEmployeeList.EMPLOYEE_DISPLAY_NAME}}</ion-label>
@ -23,7 +23,9 @@
<div class="noDataDiv" *ngIf="!RFCEmployeeListListRes > 0">
<p>{{ 'worklistMain, no-employee-available' | translate}}</p>
</div>
<ion-item lines="none"> <ion-item lines="none">
<div class="square-container"> <div class="square-container">

@ -36,8 +36,9 @@
<div *ngIf="pInformation && pInformation != '' " class="tipsPadding">{{pInformation}}</div>
<ng-container *ngIf="activeSegment === 'info'"> <ng-container *ngIf="activeSegment === 'info'">
<div *ngIf="pInformation && pInformation != '' " class="tipsPadding">{{pInformation}}</div>
<div *ngIf="notificationBodyRes?.length > 0 "> <div *ngIf="notificationBodyRes?.length > 0 ">
<ion-card *ngFor="let item of notificationBodyRes;let i=index; "> <ion-card *ngFor="let item of notificationBodyRes;let i=index; ">

@ -1,11 +1,4 @@
.tipsPadding{
padding: 10px 10px;
border-radius: 10px;
margin: 10px;
border: 2px solid #e4e5e7;
color: var(--customnavy);
}
.actionBtn{ .actionBtn{

@ -1938,6 +1938,10 @@
} }
}, },
"worklistMain": { "worklistMain": {
"no-employee-available": {
"en": "No employees available to return for correction",
"ar": "لا يوجد موظفون متاحون للعودة للتصحيح"
},
"more": { "more": {
"en": "More", "en": "More",
"ar": "المزيد" "ar": "المزيد"

@ -494,6 +494,17 @@ left: 66px;
.less { .less {
max-height: 54px; max-height: 54px;
} }
.tipsPadding{
padding: 10px 10px;
border-radius: 10px;
margin: 10px;
border: 2px solid #e4e5e7;
color: var(--darkblue);
background: white;
font-weight: bold;
text-align: justify;
}
.noDataDiv{ .noDataDiv{
background: #ffffff; background: #ffffff;

Loading…
Cancel
Save