fix merge

mekawy-issues
ashwaq 6 years ago
commit 57e6c1e5b3

@ -7,12 +7,12 @@
.alert-radio-label.sc-ion-alert-md, .alert-radio-label.sc-ion-alert-md,
.alert-radio-label.sc-ion-alert-ios { .alert-radio-label.sc-ion-alert-ios {
//white-space: normal; white-space: normal;
} }
.alert-tappable.sc-ion-alert-md, .alert-tappable.sc-ion-alert-md,
.alert-tappable.sc-ion-alert-ios { .alert-tappable.sc-ion-alert-ios {
//height: 50px; height: 70px;
} }
.main-badge{ .main-badge{
position: absolute; position: absolute;

@ -34,7 +34,9 @@
<!-- <type-writer *ngIf="!onlySMSBox" [text]="'login, verify-fingerprint' | translate" class="description" <!-- <type-writer *ngIf="!onlySMSBox" [text]="'login, verify-fingerprint' | translate" class="description"
color="primary" fontSize="0.55cm" lineHeight="1cm" fontSize="0.55cm"></type-writer> color="primary" fontSize="0.55cm" lineHeight="1cm" fontSize="0.55cm"></type-writer>
--> -->
<div *ngIf="!onlySMSBox"><p>{{ts.trPK('login','verify-fingerprint')}}</p></div>
<div *ngIf="!onlySMSBox && FFloginType == 2"><p>{{ts.trPK('login','verify-fingerprint')}}</p></div>
<div *ngIf="!onlySMSBox && FFloginType == 3"><p>{{ts.trPK('login','verify-faceId')}}</p></div>
</ion-col> </ion-col>

@ -73,6 +73,7 @@ export class ConfirmLoginComponent implements OnInit {
empname: string; empname: string;
lastLoginDate: string; lastLoginDate: string;
user_name: string; user_name: string;
FFloginType: any;
constructor( constructor(
@ -515,8 +516,8 @@ export class ConfirmLoginComponent implements OnInit {
loginWithFingurePrint(el: any) { loginWithFingurePrint(el: any) {
if (!el.disabled) { if (!el.disabled) {
this.FFloginType=el.value;
this.startBiometricLoginIfAvailable(); this.startBiometricLoginIfAvailable();
@ -527,7 +528,7 @@ export class ConfirmLoginComponent implements OnInit {
faceReconization(el: any) { faceReconization(el: any) {
if (!el.disabled) { if (!el.disabled) {
this.FFloginType=el.value;
this.startBiometricLoginIfAvailable(); this.startBiometricLoginIfAvailable();
} }
@ -700,7 +701,6 @@ export class ConfirmLoginComponent implements OnInit {
} }
}else { }else {
this.onlySMSBox = false; this.onlySMSBox = false;
this.button(); this.button();

@ -107,7 +107,9 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy {
// let todayDate = month + '/' + day + '/' + year; // let todayDate = month + '/' + day + '/' + year;
// this.lastLoginTime = moment(this.cs.evaluteDateAsObject(this.lastLoginDate)).format("HH:mm"); // this.lastLoginTime = moment(this.cs.evaluteDateAsObject(this.lastLoginDate)).format("HH:mm");
this.logintype = parseInt(this.logintype) // this.logintype = parseInt(this.user.LoginType)
this.logintype = this.user.LoginType;
console.log(" this.lastLoginTime" + this.lastLoginTime); console.log(" this.lastLoginTime" + this.lastLoginTime);
console.log(" this.lastLoginDate" + this.lastLoginDate); console.log(" this.lastLoginDate" + this.lastLoginDate);

@ -79,7 +79,7 @@
<ion-label> <ion-label>
<ion-badge [ngClass]=" direction === 'rtl' ? 'end-badge' : 'start-badge'" slot="end" color="danger" class="main-badge">{{notBadge}}</ion-badge> <ion-badge [ngClass]=" direction === 'rtl' ? 'end-badge' : 'start-badge'" slot="end" color="danger" class="main-badge">{{notBadge}}</ion-badge>
<p [ngClass]="item.RULE_STATUS === 'Inactive' ? 'red-status' : 'green-status' ">{{item.RULE_STATUS}}</p><br/> <p [ngClass]="item.RULE_STATUS === 'Inactive' || item.RULE_STATUS === 'غير ساري' ? 'red-status' : 'green-status' ">{{item.RULE_STATUS}}</p><br/>
<p class="textBold" > {{item.RULE_NAME}} | {{item.ITEM_TYPE_DISPLAY_NAME}}</p><br/> <p class="textBold" > {{item.RULE_NAME}} | {{item.ITEM_TYPE_DISPLAY_NAME}}</p><br/>
<p class="label">{{item.BEGIN_DATE | dateString }} - {{item.END_DATE | dateString}}</p> <p class="label">{{item.BEGIN_DATE | dateString }} - {{item.END_DATE | dateString}}</p>
<!-- <br/> <!-- <br/>

@ -72,12 +72,12 @@
</ion-row> </ion-row>
<ion-row> <ion-row>
<!-- mode="ios" --> <!-- style="max-width: 100% !important;; width: 100% !important;" mode="ios" -->
<ion-item class="selectItem " *ngIf="notifTypeSelP2=='sel_opt'" > <ion-item class="selectItem " *ngIf="notifTypeSelP2=='sel_opt'" >
<ion-label>{{'vacation-rule, notification' | translate}}</ion-label> <ion-label>{{'vacation-rule, notification' | translate}}</ion-label>
<ion-select class="notifiSelect select-full-width" okText='{{"general, ok" | translate }}' cancelText='{{"general, cancel" | translate }}' <ion-select mode="ios" class="notifiSelect" okText='{{"general, ok" | translate }}' cancelText='{{"general, cancel" | translate }}'
[(ngModel)]="var_notification" (ionChange)="notificationSel($event)" > [(ngModel)]="var_notification" (ionChange)="notificationSel($event)" >
<ion-select-option value="{{i}}" *ngFor="let x of notification_list; let i=index"> <ion-select-option style="min-height: 100% !important; height: 100% !important;" value="{{i}}" *ngFor="let x of notification_list; let i=index">
{{x.NOTIFICATION_DISPLAY_NAME}} {{x.NOTIFICATION_DISPLAY_NAME}}
</ion-select-option> </ion-select-option>
</ion-select> </ion-select>

@ -92,11 +92,6 @@ color: black !important;
margin:0; margin:0;
} }
.select-full-width {
max-width: 100% !important;
width: 100% !important;
padding-left: 0 !important;
}
// .progcontainer { // .progcontainer {
// margin: auto; // margin: auto;
// text-align: center; // text-align: center;

@ -154,6 +154,10 @@
"en": "To activate fingerprint login service, please verify by using one of the following options. ", "en": "To activate fingerprint login service, please verify by using one of the following options. ",
"ar": "لتفعيل خدمة الدخول بالبصمة، يرجى التحقق من خلال احدى الخيارات التالية" "ar": "لتفعيل خدمة الدخول بالبصمة، يرجى التحقق من خلال احدى الخيارات التالية"
}, },
"verify-faceId": {
"en": "To activate face ID login service, please verify by using one of the following options. ",
"ar": "لتفعيل خدمة الدخول ببصمة الوجه، يرجى التحقق من خلال احدى الخيارات التالية"
},
"Verify-text":{ "Verify-text":{
"en":"Verify its you", "en":"Verify its you",
"ar":"Verify its you" "ar":"Verify its you"

@ -1516,6 +1516,5 @@ table.monthview-datetable th small {
} }
.alert-wrapper { .alert-wrapper {
min-width: 80px;//what ever you like min-width: 80% !important;//what ever you like
} }

Loading…
Cancel
Save