From 5d978fa1757e16a8a562e456dc2c342a44ffa6fc Mon Sep 17 00:00:00 2001
From: ashwaq
Date: Tue, 7 Apr 2020 15:07:23 +0300
Subject: [PATCH 1/2] fix bugs
---
.../confirm-login.component.html | 8 +-
.../authentication/login/login.component.ts | 27 +-
.../sms-page/sms-page.page.html | 11 +-
.../authentication/sms-page/sms-page.page.ts | 6 +-
.../app/eit/add-eit/add-eit.component.html | 16 +-
.../hmg-common/services/push/push.service.ts | 11 +-
.../generic-header.component.html | 18 +
.../generic-header.component.ts | 25 +-
.../work-list-rfc.component.html | 5 +-
.../cancel.png => assets/imgs/cancel-.png} | Bin
Mohem/src/assets/imgs/cancel.png | Bin 2396 -> 635 bytes
Mohem/src/assets/localization/i18n.json | 1289 ++++++++---------
Mohem/src/imgs/cancel-.png | Bin 0 -> 2396 bytes
13 files changed, 739 insertions(+), 677 deletions(-)
rename Mohem/src/{imgs/cancel.png => assets/imgs/cancel-.png} (100%)
create mode 100644 Mohem/src/imgs/cancel-.png
diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html
index 6141871e..9e1c419b 100644
--- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html
+++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html
@@ -30,15 +30,11 @@
{{empname}}
-->
- {{ts.trPK('login','verify-login-with')}}
-
-
+
+ {{ts.trPK('login','verify-login-with')}}
{{ts.trPK('login','verify-fingerprint')}}
{{ts.trPK('login','verify-faceId')}}
-
diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts
index 08179d5e..be12c513 100644
--- a/Mohem/src/app/authentication/login/login.component.ts
+++ b/Mohem/src/app/authentication/login/login.component.ts
@@ -23,6 +23,7 @@ import { PushService } from 'src/app/hmg-common/services/push/push.service';
styleUrls: ['./login.component.scss']
})
export class LoginComponent implements OnInit, OnDestroy {
+ deviceToken1: any;
constructor(
public cs: CommonService,
@@ -91,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)
@@ -126,7 +143,13 @@ export class LoginComponent implements OnInit, OnDestroy {
this.user = user;
});
- this.deviceToken = localStorage.getItem('devicyeToken');
+
+ 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);
+
if (this.deviceToken) {
console.log('login enabled first time: ' + this.deviceToken);
} else {
@@ -372,7 +395,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)) {
diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.html b/Mohem/src/app/authentication/sms-page/sms-page.page.html
index 654adc99..194c34c6 100644
--- a/Mohem/src/app/authentication/sms-page/sms-page.page.html
+++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html
@@ -18,7 +18,16 @@
- {{'verificationcode,title' | translate}}{{'verificationcode,verificationcode' | translate}} {{'verificationcode,by' | translate}}{{'verificationcode,sms' | translate}}{{'verificationcode,instruct' | translate}}{{'general,submit' | translate}}
+ {{'verificationcode,title' | translate}}
+ {{'verificationcode,verificationcode' | translate}}
+ {{'verificationcode,by' | 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 20a94df0..bb44a362 100644
--- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts
+++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts
@@ -81,6 +81,7 @@ export class SmsPageComponent implements OnInit {
public smc_code: any = [];
code: any;
user_name: string;
+ loginType: any;
constructor(
@@ -138,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);
@@ -418,7 +420,7 @@ export class SmsPageComponent implements OnInit {
-console.log("successful insertMobileLogin" );
+
});
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 a43e3501..57c528f6 100644
--- a/Mohem/src/app/eit/add-eit/add-eit.component.html
+++ b/Mohem/src/app/eit/add-eit/add-eit.component.html
@@ -1,6 +1,6 @@
+
+
+-->
+
+
-
-
+
diff --git a/Mohem/src/app/hmg-common/services/push/push.service.ts b/Mohem/src/app/hmg-common/services/push/push.service.ts
index eeb2a7a7..0df0af0b 100644
--- a/Mohem/src/app/hmg-common/services/push/push.service.ts
+++ b/Mohem/src/app/hmg-common/services/push/push.service.ts
@@ -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);
+ // }
}
diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html
index 3d7b8fa8..7d62b3c5 100644
--- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html
+++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html
@@ -12,6 +12,24 @@
+
+
+
+
+
![]()
+
+
+
+
\ No newline at end of file
diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts
index 737c6191..7c9f3c65 100644
--- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts
+++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts
@@ -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();
+ }
+
}
diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html
index 23292874..1b542584 100644
--- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html
+++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html
@@ -1,6 +1,9 @@
- {{ 'workListMain, rfc' | translate}}
+
+ {{ts.trPK('worklistMain','rfc')}}
+
+
diff --git a/Mohem/src/imgs/cancel.png b/Mohem/src/assets/imgs/cancel-.png
similarity index 100%
rename from Mohem/src/imgs/cancel.png
rename to Mohem/src/assets/imgs/cancel-.png
diff --git a/Mohem/src/assets/imgs/cancel.png b/Mohem/src/assets/imgs/cancel.png
index 0d419f292aa089ba1e2113338a1da9ce77e9eded..deaf45c2a22f762a32ba471217b71e9692af4a7d 100644
GIT binary patch
literal 635
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50
z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz
z5n0T@z;^_M8K-LVNdpDhOFVsD*`Khmb2BMM$9yPYU|{t0ba4#vI6igCPQN1t0uJpi
zDUmGNg(4rUYj|}RJ+sbmcqHVZu<`Uo9dBmtkQmXDDJ9Vk%`8IwO^QcO-jdwC$@p`e
zP_@k=CFWZ`9#0e!TlKgPX){bOyy?=7-)Lf?(lUywJgoX$XZ8ng+i)!N4qHNpM%}MMVI6}|KW4jFjOS4
zBGhr#^;dg2#RU_4^5Pz_TkTFg)iHhFqw+h3vW?*)j5Z&o_B}P8UwY-=)aeY@owH+#P8cWxsqu9(YOx#@ck9sKWobCts56U8%ixa{+SCKRsWto3*1
z)I9Mi!T!Rfnl7gW&$hH{WfWxTPwQ$@OaJxYP*}Dq>+f9_>35pCE&eW2-ot!hapqCk
zqq8@hY1nHKBf6U>;uoXfyguC;<|C_s;jCKX8c~vxSdwa$T$Bo=7>o>z40H`lbPdcy
z3=ORejI4}}wG9lc3=AH#rCmkQkei>9nO2Eg!=&hYnLrJaARB`7(@M${i&7cN%ggmL
f^RkPR6AM!H@{7`Ezq647Dq`?-^>bP0l+XkKH@)C;
literal 2396
zcmV-i38VIjP)Px;7D+@wRCod1n}2W=QJ7^X=qc+8oQ
zc!n@Tu+q_Kr&Rk#{wVa1cI=>)(BX$^FiMk}O4Bkhw2azmrqkF#TG8T2WP(Uhp(B-$
z+q>Pj-{-x&$NswH?s9uvvNJdD?d`j}@8|P8&%3*q3t#fer8-TRTN&ebFeWw+Ecd)`BsZP_SB_?81oU#>q9N7^2p%5`;$CfYZqR&$TXl3!C!De)@Nl5O%T92=&
zno<%L9Ug4qg6*~jG#PmoJ+`t+!n*{}2VXom(9F4TNkG!H9$!^GB_u35IMBklaKR(=
z(SNS0PQiN$NJ==0Ot6=O%mgM{-&j>s)DrGKc(eue?SjV~2lyHrd|CmtVPXFvWP-aK
zP&KV@e0xPvO1S$Ehg(qME_fkW^hE7S7yP&aXycvz{mn4vE(a!>-mIZCC)`yEi!d(Y?8&RSzcwFzIZ`~J8
z3!jky>U8@{-N*#D1c+%mS>Jd~B~%{hZUm?c9vAwCx9c1Cdj-|{*@PLOI^W*c*^K(~
z$OPVWa&`2YNT}@VMC64F9%F8Jd-X#T!V_D@0;uzCeLHcpp)uDf~T=&C4hFgt#^BbasE7ZOzn$V)-W{|d3Vj`f=Iaa#i#Dq1naSl
z0qKc*yoOWZ?_~_1lK|T3mfoL5aNBH`z?gwek$2aA-&YB@_Wb;QoM%7a12h&|l6R}3
z;dJ;1S;5o3sVLG)Hp?yhw;~gmOM=OHWO(i4zDQWmvkj3KE_fJdI30N+Yk1<#Spe-k
ze}6kN!Gr|dGL0?BLu7&$8GfKWuM!r#(2mHPfajLT3*6mm4QC?lIl@-b$F!hb3~rzoA7(>3De)KnJVn+7Q72U75g5NQmyrNjT7ci1H+WwJ
z&_U<^y5&2#HupLuAQNiOJ+$W#^+~rB5}wA8*AlQoc}YM8IBq|R}QitBJYHUf&2aw-SbE5ar}4>$%R=wB?uP7x3?IBJ@SQuC-Q;`
zpp$t@pbcXSrF|jc>9oGi0SZjD@*2)rt6F!qxQA>hMA}==TTlTv_H3HPOt#570NZ;Z
zHnN`ZOxtHZuN15V2tF_}dK7nfRpT>>fyB(x6(6qM@yYo8^0T!d8ITShx5uY(!8>b5
z;ngHcW{Z7;FKfOFNCyv^;W$rxodx;VoDwKY3MIkU5*QC&XYuL_4|d7u&+T6SSv)TN
z6&Iy>)-WSO292`P8b8ayHvtm-;Lb0+tfuX(U|dp9Eh7Ncc|x&s-DUupV&3
zrzGq~CTQ$ctS?ZXQH$q^L1UIb67nwK#%D0wm*|-7nSHhwY*;t+>I-ejw6_9U-Xhr9}q@Ik;c2RtS`-JBR+iI5UBNN{BWBqZ`HA#VaC
zJd3*{Pw+f|$nSJq?i8+fTi&s8UPu^j36u$}ByX9J7XcDp0NxpSO8a2;@Jfl4kbned
zIWS1z`H?Vb0dt;eygp=>{mE7H6nO*ik7XBm1+UujCy@z(G?`E`c?pveK=7rBvR82Z
zzDEt1T0GSa>r9(8ygH_oz{~**)-f@P!C1-2w=Qn(zNGqQ+vY4l!p8v59q^R)f&9TM
zASuCs1V=gGFT$^n&KOymtAv~cNcbxrktg^B;D0>1v{%s1w)`h3hoFZ91_?8BlaRH5
zIqi>JUmA+JBhLhC-amLHLrMrxIdEG!$V|{@EWOzNbXMh%l>iAJ1iZ861>m{=@HPp8
zGQlB%G9i(jgp379c;*p#f)5rB-Xr6K0GrA+3Npk6^YhO(62jd6P3_1mi^muk@EcigGAn?s5?9
z_0iGb(u+@fUmZLJ+_0r>_H}V~6bHA%Q{)Z6Z!eC>D|ppP2^Y<
ztw8j?d?S?uBsgxC@H?gxBZj!wDj_96!gG(v6MP)-yNfgJo$zX1O5pBHz=PU}5ph+5
z6d>UZ%^i74d!q#K+lykhS8$oOQi2&kIXIspAt7MOOyCke4tQtHQ{?&7g;$cwn^6uS
zNN_$%Qzn#{_iANV@c%UiYMy?1H}=90(WV7FNx0Cp^Q^8L)gr-$6(6<4Ty{mDpc{|9gukCcDE92>2@_?wQ8
ztOuA5@2?zx?SHc>ztYV$RteURlf0}q$+m1+kcGpkA0bZ%;Bgr&y#EJ?ud1~bZ__6L
O0000 Are you sure to Approve this request ?
",
- "ar":"العناصر المطلوبة"
+ "ar": "العناصر المطلوبة"
},
- "rejectMsg":{
+ "rejectMsg": {
"en": "Are you sure to Reject this request ?
",
- "ar":"العناصر المطلوبة"
+ "ar": "العناصر المطلوبة"
},
- "delMsg":{
+ "delMsg": {
"en": "Are you sure to Delete this request ?
",
- "ar":"العناصر المطلوبة"
+ "ar": "العناصر المطلوبة"
},
- "closeMsg":{
+ "closeMsg": {
"en": "Are you sure to Close this request ?
",
- "ar":"العناصر المطلوبة"
+ "ar": "العناصر المطلوبة"
},
- "Supplier":{
+ "Supplier": {
"en": "Supplier",
- "ar":"Supplier"
+ "ar": "Supplier"
},
- "Site":{
+ "Site": {
"en": "Site",
- "ar":"Site"
+ "ar": "Site"
},
- "Preparer":{
+ "Preparer": {
"en": "Preparer",
- "ar":"Preparer"
+ "ar": "Preparer"
},
- "Buyer":{
+ "Buyer": {
"en": "Buyer",
- "ar":"Buyer"
+ "ar": "Buyer"
},
- "CreationDate":{
+ "CreationDate": {
"en": "Creation Date",
- "ar":"Creation Date"
+ "ar": "Creation Date"
},
- "ShipToLocation":{
+ "ShipToLocation": {
"en": "Ship To Location",
- "ar":"Ship To Location "
+ "ar": "Ship To Location "
},
- "QuotationNumber":{
+ "QuotationNumber": {
"en": "Quotation Number",
- "ar":"Quotation Number"
+ "ar": "Quotation Number"
},
- "QuotationDate":{
+ "QuotationDate": {
"en": "Quotation Date",
- "ar":"Quotation Date"
+ "ar": "Quotation Date"
},
- "PaymentTerms":{
+ "PaymentTerms": {
"en": "Payment Terms",
- "ar":"Payment Terms "
+ "ar": "Payment Terms "
},
- "GrossAmount":{
+ "GrossAmount": {
"en": "Gross Amount",
- "ar":"Gross Amount"
+ "ar": "Gross Amount"
},
- "DiscountAmount":{
+ "DiscountAmount": {
"en": "Discount Amount",
- "ar":"Discount Amount"
+ "ar": "Discount Amount"
},
- "TotalPODiscount":{
+ "TotalPODiscount": {
"en": "Total PO Discount",
- "ar":"Total PO Discount"
+ "ar": "Total PO Discount"
},
- "VATAmount":{
+ "VATAmount": {
"en": "VAT Amount",
- "ar":"VAT Amount"
+ "ar": "VAT Amount"
},
- "CustomDuty":{
+ "CustomDuty": {
"en": "Custom Duty",
- "ar":"Custom Duty"
+ "ar": "Custom Duty"
},
- "ShipHandle":{
+ "ShipHandle": {
"en": "Ship Handle",
- "ar":"Ship Handle"
+ "ar": "Ship Handle"
},
- "OtherCharges":{
+ "OtherCharges": {
"en": "Other Charges",
- "ar":"Other Charges"
+ "ar": "Other Charges"
},
- "TotalPOAmountWithVAT":{
+ "TotalPOAmountWithVAT": {
"en": "Total PO Amount with VAT",
- "ar":"Total PO Amount with VAT"
+ "ar": "Total PO Amount with VAT"
},
- "TotalPOAmountInWords":{
+ "TotalPOAmountInWords": {
"en": "Total PO Amount in Words",
- "ar":"Total PO Amount in Words"
+ "ar": "Total PO Amount in Words"
},
- "Currency":{
+ "Currency": {
"en": "Currency",
- "ar":"Currency"
+ "ar": "Currency"
},
- "PONumber":{
+ "PONumber": {
"en": "PO NUMBER",
- "ar":"PO NUMBER"
+ "ar": "PO NUMBER"
},
- "des-PO":{
+ "des-PO": {
"en": "Standard Purchase Order",
- "ar":"Standard Purchase Order"
+ "ar": "Standard Purchase Order"
},
- "MFG":{
+ "MFG": {
"en": "MFG",
- "ar":"MFG"
+ "ar": "MFG"
},
- "LINE_TYPE":{
+ "LINE_TYPE": {
"en": "Line Type",
- "ar":"Line Type"
+ "ar": "Line Type"
},
- "LINE_DIS":{
+ "LINE_DIS": {
"en": "Line Discount %",
- "ar":"Line Discount %"
+ "ar": "Line Discount %"
},
- "LINE_AMOUNT":{
+ "LINE_AMOUNT": {
"en": "Line Amount",
- "ar":"Line Amount"
+ "ar": "Line Amount"
},
- "NEED_TO":{
+ "NEED_TO": {
"en": "Need By Date",
- "ar":"Need By Date"
- },
- "PROMISED_DATE":{
+ "ar": "Need By Date"
+ },
+ "PROMISED_DATE": {
"en": "Promised Date",
- "ar":"Promised Date"
+ "ar": "Promised Date"
},
- "DELIVER_TO":{
+ "DELIVER_TO": {
"en": "Deliver To Location",
- "ar":"Deliver To Location"
+ "ar": "Deliver To Location"
},
- "PR_NO":{
+ "PR_NO": {
"en": "Requisition Number",
- "ar":"Requisition Number"
+ "ar": "Requisition Number"
},
- "REQUEST":{
+ "REQUEST": {
"en": "Requestor",
- "ar":"Requestor"
+ "ar": "Requestor"
},
- "ITEM_HIS":{
+ "ITEM_HIS": {
"en": "Item History",
- "ar":"Item History"
- },
- "QUOTATION_ANALYSIS":{
+ "ar": "Item History"
+ },
+ "QUOTATION_ANALYSIS": {
"en": "Quotation Analysis",
- "ar":"Quotation Analysis"
+ "ar": "Quotation Analysis"
},
- "Date_Req":{
+ "Date_Req": {
"en": "Date Required",
- "ar":"Date Required"
+ "ar": "Date Required"
},
- "line_status":{
+ "line_status": {
"en": "Line Status",
- "ar":"Line Status"
+ "ar": "Line Status"
},
- "date_status":{
+ "date_status": {
"en": "Status Date",
- "ar":"Status Date"
+ "ar": "Status Date"
},
- "trans_type":{
+ "trans_type": {
"en": "Transaction Type",
- "ar":"Transaction Type"
+ "ar": "Transaction Type"
},
- "operating_unit":{
+ "operating_unit": {
"en": "Operating Unit",
- "ar":"Operating Unit"
+ "ar": "Operating Unit"
},
- "to_locator":{
+ "to_locator": {
"en": "To Locator",
- "ar":"To Locator"
+ "ar": "To Locator"
},
- "to_subinventory":{
+ "to_subinventory": {
"en": "To Subinventory",
- "ar":"To Subinventory"
+ "ar": "To Subinventory"
},
- "from_locator":{
+ "from_locator": {
"en": "From Locator",
- "ar":"From Locator"
+ "ar": "From Locator"
},
- "from_subinventory":{
+ "from_subinventory": {
"en": "From Subinventory",
- "ar":"From Subinventory"
+ "ar": "From Subinventory"
},
- "organization":{
+ "organization": {
"en": "Organization",
- "ar":"Organization"
+ "ar": "Organization"
},
- "organization_code":{
+ "organization_code": {
"en": "Organization Code",
- "ar":"Organization Code"
+ "ar": "Organization Code"
},
- "revision":{
+ "revision": {
"en": "Revision",
- "ar":"Revision "
+ "ar": "Revision "
},
- "uom":{
- "en": "UOM",
- "ar":"UOM"
+ "uom": {
+ "en": "UOM",
+ "ar": "UOM"
},
- "quantity_ordered":{
+ "quantity_ordered": {
"en": "Quantity Ordered",
- "ar":"Quantity Ordered"
+ "ar": "Quantity Ordered"
},
- "quantity_received":{
+ "quantity_received": {
"en": "Quantity Received",
- "ar":"Quantity Received"
+ "ar": "Quantity Received"
},
- "bonus_quantity":{
+ "bonus_quantity": {
"en": "Bonus Quantity",
- "ar":"Bonus Quantity"
+ "ar": "Bonus Quantity"
},
- "purchase_price":{
+ "purchase_price": {
"en": "Purchase Price",
- "ar":"Purchase Price"
+ "ar": "Purchase Price"
},
-
- "discount":{
+ "discount": {
"en": "Discount %",
- "ar":"Discount %"
+ "ar": "Discount %"
},
- "balance_quantity":{
+ "balance_quantity": {
"en": "Balance Quantity",
- "ar":"Balance Quantity"
+ "ar": "Balance Quantity"
},
- "net_price":{
+ "net_price": {
"en": "Net Price",
- "ar":"Net Price"
+ "ar": "Net Price"
},
- "closure_status":{
+ "closure_status": {
"en": "Closure Status",
- "ar":"Closure Status"
+ "ar": "Closure Status"
},
- "vendor_name":{
+ "vendor_name": {
"en": "Vendor Name",
- "ar":"Vendor Name"
+ "ar": "Vendor Name"
},
- "item_code":{
+ "item_code": {
"en": "Item Code",
- "ar":"Item Code"
+ "ar": "Item Code"
},
- "QUOTATION_QTY":{
+ "QUOTATION_QTY": {
"en": "Quotation Qty",
- "ar":"Quotation Qty"
+ "ar": "Quotation Qty"
},
- "quotation_uom":{
+ "quotation_uom": {
"en": "Quotation UOM",
- "ar":"Quotation UOM"
+ "ar": "Quotation UOM"
},
- "quotatio_net_price":{
+ "quotatio_net_price": {
"en": "Quotatio Net Price",
- "ar":"Quotatio Net Price"
+ "ar": "Quotatio Net Price"
},
- "quotatio_line_tot":{
+ "quotatio_line_tot": {
"en": "Quotation Line Total",
- "ar":"Quotation Line Total"
+ "ar": "Quotation Line Total"
},
- "quotatio_bonus_quantity":{
+ "quotatio_bonus_quantity": {
"en": "Quotation Bonus Quantity",
- "ar":"Quotation Bonus Quantity"
+ "ar": "Quotation Bonus Quantity"
},
- "quotation_delivery_date":{
+ "quotation_delivery_date": {
"en": "Quotation Delivery Date",
- "ar":"Quotation Delivery Date"
+ "ar": "Quotation Delivery Date"
},
- "MFG_part_number":{
+ "MFG_part_number": {
"en": "Quotation MFG Part Number",
- "ar":"Quotation MFG Part Number"
+ "ar": "Quotation MFG Part Number"
},
- "RFQ_number":{
+ "RFQ_number": {
"en": "RFQ Number",
- "ar":"RFQ Number"
+ "ar": "RFQ Number"
},
- "RFQ_qty":{
+ "RFQ_qty": {
"en": "RFQ Qty",
- "ar":"RFQ Qty"
+ "ar": "RFQ Qty"
},
- "RFQ_UOM":{
+ "RFQ_UOM": {
"en": "RFQ UOM",
- "ar":"RFQ UOM"
+ "ar": "RFQ UOM"
},
- "line_details":{
+ "line_details": {
"en": "Line Details",
- "ar":"Line Details"
+ "ar": "Line Details"
},
- "request_number":{
+ "request_number": {
"en": "Request Number",
- "ar":"Request Number"
+ "ar": "Request Number"
},
- "ITEM_AMU":{
+ "ITEM_AMU": {
"en": "AMU (Last 3 months)",
- "ar":"AMU (Last 3 months)"
- }
+ "ar": "AMU (Last 3 months)"
+ }
},
"payslip": {
- "title":{
+ "title": {
"en": "payslip",
- "ar":"كشف الراتب"
+ "ar": "كشف الراتب"
},
"monthly-payslip": {
"en": "Monthly Pay Slip",
"ar": "كشف الراتب الشهري"
},
- "end-date":{
+ "end-date": {
"en": "Peroid End Date",
- "ar":" تاريخ بداية الفترة"
+ "ar": " تاريخ بداية الفترة"
},
- "start-date":{
+ "start-date": {
"en": "Peroid Start Date",
- "ar":" تاريخ نهاية الفترة"
+ "ar": " تاريخ نهاية الفترة"
},
- "peroid-name":{
+ "peroid-name": {
"en": "Peroid Name",
- "ar":"اسم الفترة "
+ "ar": "اسم الفترة "
},
- "salary":{
+ "salary": {
"en": "Salary",
- "ar":"الراتب"
+ "ar": "الراتب"
},
- "deductions-Amount":{
+ "deductions-Amount": {
"en": "Total Deductions Amount",
- "ar":"قيمة الخصومات "
+ "ar": "قيمة الخصومات "
},
- "deductions-percentage":{
+ "deductions-percentage": {
"en": "Total Deductions Percentage",
- "ar":"نسبة الخصومات "
+ "ar": "نسبة الخصومات "
},
- "earings-Amount":{
+ "earings-Amount": {
"en": "Total Earings Amount",
- "ar":"قيمة الربح "
+ "ar": "قيمة الربح "
},
- "earings-percentage":{
+ "earings-percentage": {
"en": "Total Earings Percentage",
- "ar":"نسبة الربح "
+ "ar": "نسبة الربح "
},
- "pay-Amount":{
+ "pay-Amount": {
"en": "Total Pay Amount",
- "ar":"قيمة الأجر "
+ "ar": "قيمة الأجر "
},
- "pay-percentage":{
+ "pay-percentage": {
"en": "Total Pay Percentage",
- "ar":"نسبة الأجر "
+ "ar": "نسبة الأجر "
},
- "payment-method":{
+ "payment-method": {
"en": "Payment Method Name",
- "ar":"اسم عملية الدفع "
+ "ar": "اسم عملية الدفع "
},
- "bank-name":{
+ "bank-name": {
"en": "Bank Name",
- "ar":"اسم البنك "
+ "ar": "اسم البنك "
},
- "branch-name":{
+ "branch-name": {
"en": "Branch Name",
- "ar":"اسم الفرع "
+ "ar": "اسم الفرع "
},
- "account-no":{
+ "account-no": {
"en": "Account NO.",
- "ar":"رقم الحساب "
+ "ar": "رقم الحساب "
},
- "amount":{
+ "amount": {
"en": "Amount",
- "ar":" القيمة"
+ "ar": " القيمة"
},
- "earnings":{
+ "earnings": {
"en": "Earnings",
- "ar":"أرباح "
+ "ar": "أرباح "
},
- "deductions":{
+ "deductions": {
"en": "Deductions",
- "ar":"الخصومات "
+ "ar": "الخصومات "
},
- "deductions-key":{
+ "deductions-key": {
"en": "DED",
- "ar":" المستقطع"
+ "ar": " المستقطع"
},
- "earnings-key":{
+ "earnings-key": {
"en": "NET",
- "ar":"المكتسب "
+ "ar": "المكتسب "
},
- "particular":{
+ "particular": {
"en": "Particular",
- "ar":"الخصائص"
+ "ar": "الخصائص"
},
- "payment-information":{
+ "payment-information": {
"en": "Payment Information",
- "ar":"معلومات الدفع "
+ "ar": "معلومات الدفع "
},
- "summary-payment":{
+ "summary-payment": {
"en": "Summary of Payment",
- "ar":"ملخص الدفع "
+ "ar": "ملخص الدفع "
},
- "payroll-info":{
+ "payroll-info": {
"en": "Payroll Processing Information",
- "ar":"معلومات كشف الراتب "
+ "ar": "معلومات كشف الراتب "
},
- "total":{
+ "total": {
"en": "Total",
- "ar":"المجموع "
+ "ar": "المجموع "
}
-
},
"attendance-tracking": {
- "title":{
+ "title": {
"en": "Mark Attendance",
- "ar":"علامة الحضور "
+ "ar": "علامة الحضور "
},
- "check-in":{
+ "check-in": {
"en": "Check In",
- "ar":"وقت الدخول"
+ "ar": "وقت الدخول"
},
- "check-out":{
+ "check-out": {
"en": "Check Out",
- "ar":"وقت الخروج"
+ "ar": "وقت الخروج"
},
- "regular":{
+ "regular": {
"en": "Regular",
- "ar":"المنتظم"
+ "ar": "المنتظم"
},
- "late-in":{
+ "late-in": {
"en": "Late In",
- "ar":"القدوم المتأخر"
+ "ar": "القدوم المتأخر"
},
- "shortage":{
+ "shortage": {
"en": "Shortage",
- "ar":"ساعات التقصير"
+ "ar": "ساعات التقصير"
},
- "excess":{
+ "excess": {
"en": "Excess",
- "ar":"فائض"
+ "ar": "فائض"
},
- "early-out":{
+ "early-out": {
"en": "Early Out",
- "ar":"الخروج المبكر"
+ "ar": "الخروج المبكر"
},
- "today-time-left":{
+ "today-time-left": {
"en": "TODAY'S TIME LEFT",
- "ar":"TODAY'S TIME LEFT"
+ "ar": "TODAY'S TIME LEFT"
},
- "shortage-hours":{
+ "shortage-hours": {
"en": "Shortage Hours",
- "ar":"ساعات التقصير"
+ "ar": "ساعات التقصير"
},
- "schedule":{
+ "schedule": {
"en": "Schedule",
- "ar":"ايام العمل"
+ "ar": "ايام العمل"
},
- "off-days":{
+ "off-days": {
"en": "Off Days",
- "ar":"ايام الراحه"
+ "ar": "ايام الراحه"
},
- "non-analyzed":{
+ "non-analyzed": {
"en": "Non Analyzed",
- "ar":"لايوجد تحليل"
+ "ar": "لايوجد تحليل"
},
- "attendance-statistics":{
+ "attendance-statistics": {
"en": "Attendance Statistics",
- "ar":"احصائيات الحضور"
+ "ar": "احصائيات الحضور"
},
- "confirm-alert1":{
- "en": "Are you sure, you want to",
- "ar":"Are you sure, you want to"
- },
- "confirm-alert2":{
- "en":" check out",
- "ar":" check out"
- },
- "confirm-alert3":{
- "en":"You didn't complete today shift",
- "ar":"You didn't complete today shift"
+ "confirm-alert1": {
+ "en": "Are you sure, you want to",
+ "ar": "Are you sure, you want to"
+ },
+ "confirm-alert2": {
+ "en": " check out",
+ "ar": " check out"
+ },
+ "confirm-alert3": {
+ "en": "You didn't complete today shift",
+ "ar": "You didn't complete today shift"
+ },
+ "shift-time": {
+ "en": "Shift Time",
+ "ar": "وقت التناوب"
+ }
},
- "shift-time":{
- "en":"Shift Time",
- "ar":"وقت التناوب"
- }
-},
"sms": {
"title": {
"en": "SMS",
@@ -2576,9 +2564,4 @@
"ar": "واتس اب"
}
}
-
-
-
-
-
}
\ No newline at end of file
diff --git a/Mohem/src/imgs/cancel-.png b/Mohem/src/imgs/cancel-.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d419f292aa089ba1e2113338a1da9ce77e9eded
GIT binary patch
literal 2396
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
O0000
Date: Tue, 7 Apr 2020 15:42:27 +0300
Subject: [PATCH 2/2] fix conflict trnslate
---
Mohem/src/assets/localization/i18n.json | 43 +------------------------
1 file changed, 1 insertion(+), 42 deletions(-)
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json
index 75f39487..e9f3de7a 100644
--- a/Mohem/src/assets/localization/i18n.json
+++ b/Mohem/src/assets/localization/i18n.json
@@ -161,15 +161,9 @@
"en": "Verify its you",
"ar": "Verify its you"
},
-<<<<<<< HEAD
- "check-user-text1": {
- "en": "Please Enter your Employee ID, A ",
- "ar": "يرجى ادخال رقم الموظف "
-=======
"check-user-text1":{
"en":"Employee ID",
"ar":"رقم الموظف "
->>>>>>> d6e378c69904c2fe55904db983560b1858c9e431
},
"check-user-text2": {
"en": "login Code ",
@@ -227,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": "التفاصيل"
@@ -371,10 +361,6 @@
"en": "Year",
"ar": "سنة"
},
- "delete": {
- "en": "Delete",
- "ar": "إحذف"
- },
"add": {
"en": "Add",
"ar": "أضف"
@@ -391,10 +377,6 @@
"en": "Measure time",
"ar": "وقت القياس"
},
- "save": {
- "en": "Save",
- "ar": "إحفظ"
- },
"success": {
"en": "Done successfully",
"ar": "تم بنجاح"
@@ -447,10 +429,7 @@
"en": "Optional",
"ar": "خياري"
},
- "search": {
- "en": "Search",
- "ar": "إبحث"
- },
+
"advanced-search": {
"en": "Advanced Search",
"ar": "بحث متقدم"
@@ -815,14 +794,6 @@
"en": "Delete",
"ar": "حذف"
},
- "cancel": {
- "en": "Cancel",
- "ar": "إلغاء"
- },
- "next": {
- "en": "Next",
- "ar": "التالي"
- },
"save": {
"en": "Save",
"ar": "حفظ"
@@ -843,14 +814,6 @@
"en": "Search",
"ar": "بحث"
},
- "submit": {
- "en": "Submit",
- "ar": "ارسال"
- },
- "success": {
- "en": "Success",
- "ar": "تم بنجاح"
- },
"noResult": {
"en": "No results found",
"ar": "لاتوجد نتائج"
@@ -867,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": "الرجاء ملء جميع الحقول المطلوبة"