fix conflict

mekawy-issues
ashwaq 6 years ago
commit c3397479d8

@ -30,15 +30,11 @@
<p class="text1" style="font-size: 28px;margin-bottom: 0px" >{{empname}}</p>
-->
</ion-col>
</ion-row> <div *ngIf="onlySMSBox"><p>{{ts.trPK('login','verify-login-with')}}</p></div>
<!-- <type-writer *ngIf="!onlySMSBox" [text]="'login, verify-fingerprint' | translate" class="description"
color="primary" fontSize="0.55cm" lineHeight="1cm" fontSize="0.55cm"></type-writer>
-->
</ion-row>
<div *ngIf="onlySMSBox"><p>{{ts.trPK('login','verify-login-with')}}</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-row>

@ -92,10 +92,26 @@ export class LoginComponent implements OnInit, OnDestroy {
requestGetLoginInfo: any;
logoutFlage: boolean ;
getuser: any = '';
getlastlogin: any;
private checkUserResult: CheckUserAuthenticationResponse;
ionViewWillEnter(){
console.log("ionViewWillEnter");
}
ngOnInit() {
// if(!this.cs.getIsTimeSessionOut()){
// this.getlastlogin = this.cs.sharedService.getSharedData(
// AuthenticationService.IMEI_USER_DATA,
// false
// );
// console.log("this.getlastlogin"+ this.getlastlogin);
// }
this.currentLang = TranslatorService.getCurrentLanguageCode();
console.log(TranslatorService.CURRENT_LANGUAGE)
console.log(TranslatorService.EN)
@ -127,8 +143,14 @@ export class LoginComponent implements OnInit, OnDestroy {
this.user = user;
});
this.deviceToken = localStorage.getItem('devicyeToken');
this.deviceToken1 =this.cs.getDeviceToken();
//this.deviceToken = localStorage.getItem('devicyeToken');
//this.deviceToken1 =this.cs.getDeviceToken();
console.log(" this.user login in init" + this.user);
//this.deviceToken = localStorage.getItem('devicyeToken');
this.deviceToken =this.cs.getDeviceToken();
console.log('lngOnInit localStorage: ' + this.deviceToken1);
console.log('lngOnInit getDeviceToken: ' + this.deviceToken);
@ -382,7 +404,7 @@ export class LoginComponent implements OnInit, OnDestroy {
getLastLoginInfo() {
this.requestGetLoginInfo = {
DeviceType: this.cs.getDeviceType(), // "Android",//this.cs.getDeviceType(),
DeviceToken: this.deviceToken// "5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36"//this.deviceToken
DeviceToken: this.cs.getDeviceToken()// "5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36"//this.deviceToken
};
this.authService.getLoginInfo(this.requestGetLoginInfo, () => {}, this.ts.trPK('general', 'ok')).subscribe(res => {
if (this.cs.validResponse(res)) {

@ -22,11 +22,12 @@
<span class="boldTxtNav">{{'verificationcode,verificationcode' | translate}}</span>
{{'verificationcode,by' | translate}}
<span *ngIf="loginType == 1" class="boldTxtNav">{{'verificationcode , sms' | translate}}</span>
<span *ngIf="loginType == 4" class="boldTxtNav">whatsapp</span>
<span *ngIf="loginType == 4" class="boldTxtNav">{{'verificationcode , whatsapp' | translate}}</span>
{{'verificationcode,instruct' | translate}}
<span class="boldTxtNav">{{'general,submit' | translate}}</span
></p>
<!-- <p class="leftDiv">{{'verificationcode,title' | translate}}<span class="boldTxtNav">{{'verificationcode,verificationcode' | translate}}</span> {{'verificationcode,by' | translate}}<span class="boldTxtNav">{{'verificationcode,sms' | translate}}</span>{{'verificationcode,instruct' | translate}}<span class="boldTxtNav">{{'general,submit' | translate}}</span></p> -->
</ion-col>
</ion-row>
</ion-grid>

@ -139,8 +139,9 @@ 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;
// console.log("loginType :"+this.loginTypeData.loginType);
console.log("loginType :"+this.loginTypeData.loginType);
@ -419,7 +420,7 @@ export class SmsPageComponent implements OnInit {
console.log("successful insertMobileLogin" );
});

@ -1,6 +1,6 @@
<!-- <ion-header>
<ion-toolbar class="header-toolbar-new">
<ion-buttons slot="start">
<ion-buttons *ngIf="getPassdirfromNotifiPage != true" slot="start">
<nav-buttons backLink=""></nav-buttons>
</ion-buttons>
<ion-title color="light">{{headerTitle}}</ion-title>
@ -12,14 +12,22 @@
</ion-buttons>
</ion-toolbar>
</ion-header> -->
</ion-header>
-->
<!-- <app-generic-header
showBack="!getPassdirfromNotifiPage"
[updateDirection]="getPassdirfromNotifiPage"
[headerText]="headerTitle"
(trigger)="closemodal()">
</app-generic-header> -->
<app-generic-header
showBack="true"
[headerText]="headerTitle">
</app-generic-header>
<ion-content padding>
<div #containerDiv id="containerDiv">
</div>

@ -168,11 +168,12 @@ export class PushService {
localStorage.setItem('deviceToken', data);
}
if (this.authService.isAuthenticated()) {
this.registerAuthenticatedUser(data);
} else {
this.registerNotAuthenticatedUser(data);
}
//
// if (this.authService.isAuthenticated()) {
// this.registerAuthenticatedUser(data);
// } else {
// this.registerNotAuthenticatedUser(data);
// }
}

@ -12,6 +12,24 @@
<img [src]="userImage"/>
</div>
</ion-col>
<!-- *ngIf="getPassdirfromNotifiPage == true" -->
<ion-col *ngIf="updateDirection" [size]="2" style="padding: 0;" (click)="closeModal()">
<div class="profile-image-container">
<img style="
width: 20px;
height: 20px;
margin-top: 5px;"
[src]="close"
/>
</div>
<!-- <ion-buttons slot="primary" >
<ion-button style="background: red !important;">
<ion-icon slot="icon-only" name="close"></ion-icon>
</ion-button>
</ion-buttons> -->
</ion-col>
</ion-row>
</ion-toolbar>
</ion-header>

@ -1,4 +1,4 @@
import { Component, OnInit, Input } from '@angular/core';
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { CommonService } from '../../services/common/common.service';
@Component({
@ -12,16 +12,35 @@ export class GenericHeaderComponent implements OnInit {
@Input() showMenu = false;
@Input() showBack = false;
@Input() navigate = true;
@Input() showClose = false;
@Input() updateDirection = false;
@Input() headerText = '';
@Input() backLink: string;
@Output() trigger= new EventEmitter();
public close = 'assets/imgs/cancel.png';
constructor(public common: CommonService) { }
ngOnInit() {}
ngOnInit() {
console.log(this.updateDirection);
console.log(this.showClose);
console.log(this.showBack);
if(this.updateDirection){
this.showBack=false;
}else{
}
}
openProfilePage() {
this.common.openEditProfile();
}
closeModal(){
console.log("closeModal");
this.trigger.emit();
}
}

@ -1,6 +1,9 @@
<ion-header *ngIf="!messageSuccess">
<ion-toolbar >
<ion-title color="dark">{{ 'workListMain, rfc' | translate}}</ion-title>
<ion-title color="dark">
{{ts.trPK('worklistMain','rfc')}}
</ion-title>
</ion-toolbar>
</ion-header>

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 635 B

@ -33,7 +33,6 @@
"en": "Register",
"ar": "التسجيل"
},
"sign-out": {
"en": "Are you sure you want to Sign Out",
"ar": "هل أنت متأكد من إغلاق الحساب"
@ -196,6 +195,10 @@
"en": "SMS",
"ar": " رسالة نصية "
},
"whatsapp": {
"en": "Whatsapp",
"ar": " الواتس اب"
},
"instruct": {
"en": " fill the code and ",
"ar": " ادخل الرمز و اضغط "
@ -210,7 +213,6 @@
"en": "SAR",
"ar": "ريال"
},
"load-more": {
"en": "Load More",
"ar": "إظهار المزيد"
@ -219,10 +221,6 @@
"en": " The connection timeout expired due to an error in the network or servers may be busy!",
"ar": " انتهت مهلة الاتصال بسبب خطأ في الشبكة أو الخوادم قد تكون مشغولة!"
},
"alert": {
"en": "Alert",
"ar": "تنبية"
},
"details": {
"en": "Details",
"ar": "التفاصيل"
@ -363,10 +361,6 @@
"en": "Year",
"ar": "سنة"
},
"delete": {
"en": "Delete",
"ar": "إحذف"
},
"add": {
"en": "Add",
"ar": "أضف"
@ -383,10 +377,6 @@
"en": "Measure time",
"ar": "وقت القياس"
},
"save": {
"en": "Save",
"ar": "إحفظ"
},
"success": {
"en": "Done successfully",
"ar": "تم بنجاح"
@ -439,10 +429,7 @@
"en": "Optional",
"ar": "خياري"
},
"search": {
"en": "Search",
"ar": "إبحث"
},
"advanced-search": {
"en": "Advanced Search",
"ar": "بحث متقدم"
@ -807,14 +794,6 @@
"en": "Delete",
"ar": "حذف"
},
"cancel":{
"en": "Cancel",
"ar": "إلغاء"
},
"next":{
"en": "Next",
"ar":"التالي"
},
"save": {
"en": "Save",
"ar": "حفظ"
@ -835,14 +814,6 @@
"en": "Search",
"ar": "بحث"
},
"submit":{
"en":"Submit",
"ar":"ارسال"
},
"success":{
"en":"Success",
"ar":"تم بنجاح"
},
"noResult": {
"en": "No results found",
"ar": "لاتوجد نتائج"
@ -859,10 +830,6 @@
"en": "Confirmation",
"ar": "تأكيد"
},
"attemptDel":{
"en":"You are attempting to delete a row that has already been deleted.",
"ar":"أنت تحاول حذف صف تم حذفه بالفعل."
},
"required": {
"en": "Please fill the required fields",
"ar": "الرجاء ملء جميع الحقول المطلوبة"
@ -904,7 +871,6 @@
"pending-request": {
"en": "Penading Request",
"ar": "طلبات قيد الانتظار"
},
"missing-swipes": {
"en": "Missing Swipes",
@ -1300,7 +1266,6 @@
"en": "Please select a replacement ",
"ar": "يرجى إختيار بديل"
},
"fill-vacation-type": {
"en": "Please select a Vacation Type",
"ar": "يرجى إختيار نوع العطلة"
@ -1368,12 +1333,10 @@
"confirm-msg-success": {
"en": "Are you sure, you want to Apply for Vacation Rule?",
"ar": " تريد التقديم على قواعد الاجازات ؟, هل انت متأكد"
},
"update-msg-success": {
"en": "Are you sure, you want to Update this Vacation Rule?",
"ar": "تريد تحديث قواعد الاجازات ؟, هل انت متأكد"
}
},
"absenceList": {
@ -1642,12 +1605,10 @@
"absenceStatus": {
"en": "Absence Status:",
"ar": "حالة الإجازة:"
},
"absenceType": {
"en": "Absence Type",
"ar": "نوع الإجازة"
},
"duration": {
"en": "Duration:",
@ -1660,7 +1621,6 @@
"startTime": {
"en": "Start Time",
"ar": "وقت البداية"
},
"endDate": {
"en": "End Date",
@ -1784,7 +1744,6 @@
"en": "Location services must be enabled to use this service",
"ar": "يجب تمكين خدمات تحديد الموقع لاستخدام هذه الخدمة"
}
},
"actionHis": {
"name": {
@ -1832,7 +1791,6 @@
"attachUpdate": {
"en": "Attachment updated successfully",
"ar": "تم تحديث المرفق بنجاح"
},
"deleteAttach": {
"en": "Attachment deleted successfully",
@ -1980,7 +1938,6 @@
"en": "More",
"ar": "المزيد"
},
"approve": {
"en": "Approve",
"ar": "موافق"
@ -1993,7 +1950,6 @@
"en": "Request",
"ar": "طلب"
},
"title": {
"en": "Details",
"ar": "التفاصيل"
@ -2095,7 +2051,6 @@
"ar": "العناصر المطلوبة"
},
"approveMsg": {
"en": "<p class=\"boldP\"> Are you sure to <span class=\"boldText\"> Approve </span>this request ?</p>",
"ar": "العناصر المطلوبة"
},
@ -2307,7 +2262,6 @@
"en": "Purchase Price",
"ar": "Purchase Price"
},
"discount": {
"en": "Discount %",
"ar": "Discount %"
@ -2380,6 +2334,10 @@
"en": "Request Number",
"ar": "Request Number"
},
"ITEM_AMU": {
"en": "AMU (Last 3 months)",
"ar": "AMU (Last 3 months)"
},
"Tran_Succ":{
"en": "Transaction Successful",
"ar":"عملية ناجحه"
@ -2491,7 +2449,6 @@
"en": "Total",
"ar": "المجموع "
}
},
"attendance-tracking": {
"title": {
@ -2585,9 +2542,4 @@
"ar": "واتس اب"
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Loading…
Cancel
Save