From 2903783e4142f0c91eba9d7049c00a9b8cdca91d Mon Sep 17 00:00:00 2001 From: ashwaq Date: Wed, 8 Apr 2020 15:33:05 +0300 Subject: [PATCH 01/14] fix forget password --- .../app/authentication/check-user/check-user.component.html | 2 +- .../confirm-login/confirm-login.component.html | 4 ++-- Mohem/src/app/authentication/sms-page/sms-page.page.ts | 6 +++++- Mohem/src/assets/localization/i18n.json | 6 +++++- 4 files changed, 13 insertions(+), 5 deletions(-) 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','check-user-text1')}} + {{ts.trPK('login','check-user-place-holder')}} 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 9e1c419b..95971d3d 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html @@ -32,8 +32,8 @@

{{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')}}

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 2d15e3e7..d2250468 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -139,9 +139,13 @@ export class SmsPageComponent implements OnInit { console.log("deviceToken :"+this.deviceToken); this.loginTypeData= this.common.sharedService.getSharedData(SMSCheckRequest.SHARED_DATA, false); + if( this.loginTypeData){ this.loginType=this.loginTypeData.loginType; - console.log("loginType :"+this.loginTypeData.loginType); + console.log("loginType :"+this.loginTypeData.loginType); + }else{ + this.loginType=1; + } diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 94277c80..1de50935 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -161,10 +161,14 @@ "en": "Verify its you", "ar": "Verify its you" }, - "check-user-text1":{ + "check-user-place-holder":{ "en":"Employee ID", "ar":"رقم الموظف " }, + "check-user-text1": { + "en": "Please Enter your Employee ID, A ", + "ar": "يرجى ادخال رقم الموظف " + }, "check-user-text2": { "en": "login Code ", "ar": "رمز تسجيل الدخول" From 579b7bd18f1b0084864470d75c66ade0e945750f Mon Sep 17 00:00:00 2001 From: ashwaq Date: Wed, 8 Apr 2020 16:57:34 +0300 Subject: [PATCH 02/14] fix back of update the form --- Mohem/src/app/eit/add-eit/add-eit.component.html | 11 ++++++----- Mohem/src/app/eit/add-eit/add-eit.component.ts | 3 ++- .../eit-update-list/eit-update-list.component.ts | 13 +++++++++---- 3 files changed, 17 insertions(+), 10 deletions(-) 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()" + > + - - + -->
diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index 48ab9c4d..38259c00 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -417,7 +417,8 @@ export class AddEitComponent implements OnInit { } } - closemodal() { + closeModal() { + console.log("closeModal"); this.updatedValues = []; this.modalController.dismiss(); } diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts index 6a8681bf..98431cd3 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts @@ -46,12 +46,17 @@ export class EitUpdateListComponent implements OnInit { modal.onDidDismiss() .then((data: any) => { - console.log("data" + data); - console.log("data" + data.data.updated); - console.log("data" + data.data.eitRequest.EITTransactionTBL); + // console.log("data" + data); + // console.log("data" + data.data.updated); + // console.log("data" + data.data.eitRequest.EITTransactionTBL); - if (data) { + + if(data.data == undefined) + { + return; + } + else if (data.data) { this.updatedData = this.updatedData ? this.updatedData.concat(data.data.updated) : data.data.updated; this.notificationBodyRes[index].Collection_Notification = data.data.updated; this.updateTransactionList(data.data.eitRequest.EITTransactionTBL); From 0f84f35d5a04338e780d6cf37c6c09529dda2f92 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Thu, 9 Apr 2020 11:53:52 +0300 Subject: [PATCH 03/14] fix sms text, RFC Empty,Notifi-P_information --- .../confirm-login/confirm-login.component.ts | 14 ++++++++++++-- .../app/authentication/sms-page/sms-page.page.html | 6 +++--- .../app/authentication/sms-page/sms-page.page.ts | 4 +++- .../hmg-common/services/common/common.service.ts | 10 +++++++++- .../work-list-rfc/work-list-rfc.component.html | 8 +++++--- .../worklist-main/worklist-main.component.html | 3 ++- .../worklist-main/worklist-main.component.scss | 9 +-------- Mohem/src/assets/localization/i18n.json | 4 ++++ Mohem/src/theme/worklist.scss | 11 +++++++++++ 9 files changed, 50 insertions(+), 19 deletions(-) diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts index 6cc023cc..d2c073bd 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -318,6 +318,12 @@ export class ConfirmLoginComponent implements OnInit { console.log(el.value); localStorage.setItem("login-type",el.value); 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); break; @@ -339,7 +345,7 @@ export class ConfirmLoginComponent implements OnInit { console.log(el.value); - + this.faceReconization(el); break; @@ -349,8 +355,12 @@ export class ConfirmLoginComponent implements OnInit { console.log(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); break; 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 194c34c6..c9d9d569 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.html +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html @@ -21,9 +21,9 @@

{{'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 d2250468..f3ef1889 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -82,6 +82,7 @@ export class SmsPageComponent implements OnInit { code: any; user_name: string; loginType: any; + activeType: any; constructor( @@ -107,7 +108,8 @@ export class SmsPageComponent implements OnInit { ngOnInit() { - + this.activeType=this.common.getActiveTypeLogin(); + console.log("activeType :"+this.activeType); this.count = 0; this.initTimer(); diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 42d94901..557390a6 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -81,6 +81,7 @@ export class CommonService { public updateImage:boolean=false; public setUpdateImg:any; DT: any; + activeType: any; constructor( public nav: NavController, public router: Router, @@ -1430,5 +1431,12 @@ public getMonthNameAr(value: number): string { return this.DT; } - + setActiveTypeLogin(activeType){ + this.activeType=activeType; + } + + getActiveTypeLogin(){ + return this.activeType; + } + } 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 1b542584..b0ec7d39 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 @@ -10,9 +10,9 @@
-
+ diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss index 70247b93..dcfa8ed2 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss @@ -229,7 +229,14 @@ .header-toolbar-new{ --background: #22c6b3; } - +.title{ + margin-top: -37px; + margin-left: 85px; +} +.title-ar{ + margin-top: -37px; + margin-right: 101px; +} .confirmEitOkButton{ white-space: normal !important; text-transform: capitalize !important; diff --git a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.ts b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.ts index 7f393498..105d71a1 100644 --- a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.ts +++ b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.ts @@ -75,7 +75,8 @@ export class FileUploderProfileComponent implements OnInit { async openFile() { const actionSheet = await this.actionSheetCtrl.create({ - header: 'Change Profile Photo', + // header: 'Change Profile Photo', + header: this.ts.trPK('userProfile', 'changeImg'), buttons: [{ // text: 'Delete Current Image', // role: 'destructive', @@ -85,7 +86,8 @@ export class FileUploderProfileComponent implements OnInit { // this.deleteCurrent(); // } // },{ - text: 'Take Photo', + // text: 'Take Photo', + text: this.ts.trPK('general', 'takePhoto'), icon: 'camera', handler: () => { console.log('Take Photo'); @@ -94,7 +96,8 @@ export class FileUploderProfileComponent implements OnInit { } }, { - text: 'Choose from Library', + // text: 'Choose from Library', + text: this.ts.trPK('general', 'Choose-from-Library'), icon: 'images', handler: () => { console.log('Favorite clicked'); @@ -102,7 +105,8 @@ export class FileUploderProfileComponent implements OnInit { } }, { - text: 'Cancel', + // text: 'Cancel', + text: this.ts.trPK('general', 'cancel'), icon: 'close', role: 'cancel', handler: () => { diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index fa1450e9..5af1f667 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -45,7 +45,7 @@ - + diff --git a/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html index da57e57b..8aac3734 100644 --- a/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html +++ b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html @@ -13,7 +13,7 @@ style="margin-right: -22px;margin-top: -10px;"> -

More Action

+

{{ts.trPK('general','moreAction')}}

diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.html b/Mohem/src/app/notification/worklist-main/worklist-main.component.html index f87f27f3..6235a216 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -71,7 +71,7 @@
- Employee will also on leave
+ {{ts.trPK('worklistMain','employee-on-leave')}}
@@ -102,12 +102,12 @@ -
+
-
+
@@ -240,7 +240,7 @@ --> -
Employee Detail
+
{{'userProfile, emp-detail' | translate}}
diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.html b/Mohem/src/app/profile/profile-image/profile-image.component.html index 59845218..3e914c50 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.html +++ b/Mohem/src/app/profile/profile-image/profile-image.component.html @@ -3,6 +3,7 @@ + {{ts.trPK('userProfile','changepicture')}} diff --git a/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.html b/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.html index e7dc61b3..997f0b79 100644 --- a/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.html +++ b/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.html @@ -41,13 +41,15 @@ {{'vacation-rule, start-date' | translate}} - + {{'vacation-rule, end-date' | translate}} - + {{'vacation-rule, message-label' | translate}} diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html index a216c9cc..f4fa3715 100644 --- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html +++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html @@ -118,12 +118,14 @@ {{'vacation-rule, start-date' | translate}} + placeholder="MM/DD/YYYY hh:mm:ss A" required cancelText="{{ts.trPK('general','cancel')}}" + doneText="{{ts.trPK('general','done')}}"> {{'vacation-rule, end-date' | translate}} + placeholder="MM/DD/YYYY hh:mm:ss A" required cancelText="{{ts.trPK('general','cancel')}}" + doneText="{{ts.trPK('general','done')}}"> {{'vacation-rule, message-label' | translate}} diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 94277c80..0f337db3 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -249,10 +249,22 @@ "en": "Cancel", "ar": "إلغاء" }, + "takePhoto": { + "en": "Take Photo", + "ar": "أخذ صورة" + }, + "Choose-from-Library": { + "en": "Choose from Library", + "ar": " الإختيار من قائمة الصور" + }, "done": { "en": "Done", "ar": "تم" }, + "moreAction": { + "en": "More Action", + "ar": "المزيد" + }, "close": { "en": "Close", "ar": "إغلق" @@ -994,7 +1006,7 @@ }, "changepicture": { "en": "Change Picture", - "ar": "تغيير الصوره" + "ar": "تغيير الصورة" }, "empNo": { "en": "Employee Number", @@ -1970,6 +1982,10 @@ "en": "Employee Information", "ar": "معلومات الموظف" }, + "employee-on-leave": { + "en": "Employee will also on leave", + "ar": "الموظف سوف يكون في اجازة ايضا" + }, "info": { "en": "Info", "ar": "تفاصيل" From b183e6ed942395d77eacb2ceeed7ceb6ef5c584c Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Sun, 12 Apr 2020 14:00:46 +0300 Subject: [PATCH 13/14] edit default value null --- Mohem/src/app/eit/add-eit/add-eit.component.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index 8cf70232..9e06cc57 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -664,6 +664,8 @@ export class AddEitComponent implements OnInit { let obj = this.handleDefaultValueResult(result); let val = obj.value; let text = obj.text; + if (val==null){val="";} + if (text==null){text="";} if (isStandardDate) { console.log("isStandardDate"); elem.value = this.cs.reverseFormatDate(val); @@ -1230,11 +1232,11 @@ export class AddEitComponent implements OnInit { } else { elem.classList.remove("requiredClassElm"); } - if (elemVal != 'null'){ + // if (elemVal != 'null'){ varcharValue = elemVal; - } else{ - elemVal = null; - } + //} else{ + // elemVal = null; + // } valuseArr.push({ TRANSACTION_NUMBER: transNo, NAME: this.eitResponse[i].APPLICATION_COLUMN_NAME, From 1a5ed615d31ac279702cbe68c556305247431d0d Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Sun, 12 Apr 2020 14:47:14 +0300 Subject: [PATCH 14/14] edit worklistrfc --- .../app/notification/work-list-rfc/work-list-rfc.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b0ec7d39..d856fe4d 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 @@ -23,7 +23,7 @@ -
+

{{ 'worklistMain, no-employee-available' | translate}}