From 58edb1c76789966f9cb60e898ffb1cda395259bd Mon Sep 17 00:00:00 2001 From: umasoodch Date: Thu, 2 Apr 2020 16:40:16 +0300 Subject: [PATCH 01/13] MM 330 FIXED --- Mohem/src/theme/styles.scss | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index f9d46c41..e468a642 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1373,13 +1373,21 @@ border:0px --border-radius: 0.4cm; } - .monthview-datetable { - *{ - font-size: 11px !important; - font-weight: normal !important; + @media screen and (min-width: 300px) and (max-width:360px) { + *{ + font-size: 9px !important; + font-weight: normal !important; + } } + @media screen and (min-width: 361px) { + *{ + font-size: 11px !important; + font-weight: normal !important; + } + } + thead th { border:none !important; color:#888; From 7e9e1209eafedd0e3c00feafb305e7406f2aa7c5 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Sun, 5 Apr 2020 17:54:43 +0300 Subject: [PATCH 02/13] fixed shift details --- .../date-info-modal.component.html | 25 +++++++++++++++---- .../date-info-modal.component.ts | 8 +++--- Mohem/src/assets/localization/i18n.json | 20 +++++++++++++++ 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html index 26f5e38c..2973dc20 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html @@ -47,23 +47,38 @@

{{scheduled}}

-

{{ts.trPK('attendance-tracking','regular')}}

+

{{ts.trPK('attendance-tracking','shift-type')}}

-

{{startDate}}

+

{{actualCheckIn}}

-

{{ts.trPK('attendance-tracking','check-in')}}

+

{{ts.trPK('attendance-tracking','actual-check-in')}}

-

{{endDate}}

+

{{actualCheckOut}}

-

{{ts.trPK('attendance-tracking','check-out')}}

+

{{ts.trPK('attendance-tracking','actual-check-out')}}

+
+
+ + +

{{approvedCheckIn}}

+ +

{{ts.trPK('attendance-tracking','approved-check-in')}}

+
+
+ + + +

{{approvedCheckOut}}

+ +

{{ts.trPK('attendance-tracking','approved-check-out')}}

diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts index dbed1746..ecf0bdef 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts @@ -63,16 +63,18 @@ export class DateInfoModalComponent implements OnInit { this.excess = this.TODAYDATE.EXCESS_HRS; this.lateIn = this.TODAYDATE.LATE_IN_HRS; this.shortage = this.TODAYDATE.SHORTAGE_HRS; - this.scheduled = this.TODAYDATE.SCHEDULED_HRS; this.earlyOut = this.TODAYDATE.EARLY_OUT_HRS ; this.scheduleDate = this.TODAYDATE.SCHEDULE_DATE; this.assignData(this.SHIFTDETAILS.GetScheduleShiftsDetailsList[0]); } assignData(shiftDetails) { + this.scheduled = shiftDetails.SHT_TYPE_DESC; this.shiftTime = shiftDetails.SHT_NAME; - this.startDate = shiftDetails.SHT_ACTUAL_START_TIME; - this.endDate = shiftDetails.SHT_ACTUAL_END_TIME; + this.actualCheckIn = shiftDetails.SHT_ACTUAL_START_TIME; + this.actualCheckOut = shiftDetails.SHT_ACTUAL_END_TIME; + this.approvedCheckIn = shiftDetails.APPROVED_START_TIME; + this.approvedCheckOut = shiftDetails.APPROVED_END_TIME; this.percentage = shiftDetails.PERCENTAGE; this.percChart = this.percentage.substring(0, this.percentage.indexOf('%')); // const test = this.scheduleDate; diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 08576fb4..7daf4137 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -2506,6 +2506,22 @@ "en": "Check Out", "ar":"وقت الخروج" }, + "actual-check-in":{ + "en": "Actual Check In", + "ar":"وقت الدخول" + }, + "actual-check-out":{ + "en": "Actual Check Out", + "ar":"وقت الخروج" + }, + "approved-check-in":{ + "en": "Approved Check In", + "ar":"اعتماد وقت الدخول" + }, + "approved-check-out":{ + "en": "Approved Check Out", + "ar":"اعتماد وقت الخروج" + }, "regular":{ "en": "Regular", "ar":"المنتظم" @@ -2565,6 +2581,10 @@ "shift-time":{ "en":"Shift Time", "ar":"وقت التناوب" + }, + "shift-type":{ + "en":"Shift Type", + "ar":"وقت التناوب" } }, "sms": { From 3d707310f94801abed7236f2a6c704a9154ab27a Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 6 Apr 2020 11:24:35 +0300 Subject: [PATCH 03/13] fixed small screen my-attendance issue --- .../my-team/details/details.component.scss | 21 +++++++++++++++---- .../time-card-details.component.scss | 21 +++++++++++++++---- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/Mohem/src/app/my-team/details/details.component.scss b/Mohem/src/app/my-team/details/details.component.scss index 08556352..f60e443a 100644 --- a/Mohem/src/app/my-team/details/details.component.scss +++ b/Mohem/src/app/my-team/details/details.component.scss @@ -360,13 +360,26 @@ ion-title{ background: white; border-radius: 20px; padding: 10px; - h2{ + @media screen and (min-width: 300px) and (max-width:359px) { + h2{ + padding: 0; + margin: 0; + font-size: 14px; + } + span{ + font-size: 9px; + } + } + + @media screen and (min-width: 360px) { + h2{ padding: 0; margin: 0; font-size: 18px; - } - span{ - font-size: 11px; + } + span{ + font-size: 11px; + } } } diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss index 6eb7fc02..f52bd47c 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss @@ -834,13 +834,26 @@ $actionBtnSize : 36px; background: white; border-radius: 20px; padding: 10px; - h2{ + @media screen and (min-width: 300px) and (max-width:359px) { + h2{ + padding: 0; + margin: 0; + font-size: 14px; + } + span{ + font-size: 9px; + } + } + + @media screen and (min-width: 360px) { + h2{ padding: 0; margin: 0; font-size: 18px; - } - span{ - font-size: 11px; + } + span{ + font-size: 11px; + } } } From 921df2548782b2daf91a5abb8d5fd22e0e07ac5c Mon Sep 17 00:00:00 2001 From: ashwaq Date: Mon, 6 Apr 2020 14:20:17 +0300 Subject: [PATCH 04/13] fix submit in replacment , reset info with skip option --- .../authentication/login/login.component.ts | 5 +++ .../sms-page/sms-page.page.html | 10 +++++- .../authentication/sms-page/sms-page.page.ts | 3 +- .../work-list-replacement-roll.component.html | 20 +++++++++-- .../work-list-replacement-roll.component.ts | 8 ++--- .../worklist-main-mr.component.ts | 14 ++++---- .../worklist-main-po.component.ts | 20 ++++++----- .../worklist-main-pr.component.ts | 13 +++---- .../worklist-main.component.html | 11 ++++-- .../worklist-main/worklist-main.component.ts | 36 +++++++++++++------ 10 files changed, 98 insertions(+), 42 deletions(-) diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index 08179d5e..751360df 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, @@ -127,6 +128,10 @@ export class LoginComponent implements OnInit, OnDestroy { }); this.deviceToken = localStorage.getItem('devicyeToken'); + this.deviceToken1 =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 { 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..9208b5fd 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,15 @@

{{'verificationcode,verificationcode' | translate}}


-

{{'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}} + whatsapp + + {{'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..50e558de 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( @@ -124,7 +125,7 @@ export class SmsPageComponent implements OnInit { this.loginData= this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); console.log("loginData : "+ this.loginData); - + // this.loginType=this.loginTypeData.loginType; this.deviceToken= this.common.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); if(this.deviceToken == undefined){ diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index ce745423..628eb276 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -1,7 +1,10 @@ - {{ 'replacementRoll, title' | translate}} + {{ 'replacementRoll, title' | translate}} + + + @@ -52,7 +55,18 @@ --> - +
+ {{"replacementRoll, question" | translate}} : + {{pQuestion}} ? + {{"replacementRoll, answer" | translate}} + + {{"replacementRoll, enterNote" | translate}} + + + + +
+
@@ -133,7 +147,7 @@ -
+
{{"replacementRoll, question" | translate}} : {{pQuestion}} ? {{"replacementRoll, answer" | translate}} diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts index e456a8b8..a86f32cd 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts @@ -270,10 +270,10 @@ export class WorkListReplacementRollComponent implements OnInit { // here must send response attr // this.modalCtrl.dismiss(); - // this.workListMainService.actionButton(this.WorkListActionObj). - // subscribe((result: any) => { - // this.handleApplayActionResult(result); - // }); + this.workListMainService.actionButton(this.WorkListActionObj). + subscribe((result: any) => { + this.handleApplayActionResult(result); + }); } else { let msg: string = this.ts.trPK("replacementRoll", "enterNote"); this.cs.showErrorMessageDialog(() => { diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts index d293d77d..437939a0 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts @@ -127,7 +127,7 @@ export class WorklistMainMRComponent implements OnInit { this.direction = TranslatorService.getCurrentLanguageName() //this.getPassNotificationDetails = this.common.sharedService.getSharedData('passNotificationInfo'); this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; // this.WorkListActionHistoryObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; } @@ -167,7 +167,7 @@ export class WorklistMainMRComponent implements OnInit { this.WorkListBodyObj.P_TRANSACTION_ID = this.TransactionID; this.WorkListBodyObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; - this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM;; + this.WorkListBodyObj.P_PAGE_NUM = 1; this.WorkListBodyObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.WorkListButtonsObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; @@ -178,7 +178,7 @@ export class WorklistMainMRComponent implements OnInit { this.WorkListActionObj.P_COMMENTS = ''; this.WorkListActionObj.P_APPROVER_INDEX = null; - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.WorkListActionHistoryObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; @@ -260,6 +260,7 @@ export class WorklistMainMRComponent implements OnInit { getNotificationButtons(notificationButtonsObj) { + this.notificationButtonRes=[]; this.worklistMainService .getNotificationButtons(notificationButtonsObj) .subscribe((result: NotificatonButtonResponse) => { @@ -368,7 +369,7 @@ export class WorklistMainMRComponent implements OnInit { this.common.openWorklistMainPRPage(); } else - if(this.notificationArray[index].REQUEST_TYPE == "MR" ){ + if(this.notificationArray[index].REQUEST_TYPE == "MO" ){ this.intializeNotificationDetail(); }else{ @@ -611,7 +612,7 @@ export class WorklistMainMRComponent implements OnInit { getNotificationResAttr(notificationButtonsObj) { console.log("getNotificationResAttr"); - + this.NotRespondAttributeList=[]; this.worklistMainService .notificationResponseAttr(notificationButtonsObj) .subscribe((result: NotificatonButtonResponse) => { @@ -708,7 +709,7 @@ export class WorklistMainMRComponent implements OnInit { getAttachmentNotification(WorkListAttachObj) { - + this.attachmentRes=[]; this.worklistAttachService.getAttach(WorkListAttachObj). subscribe((result: NotificationGetAttachResponse) => { this.handleWorkListAttachResult(result); @@ -726,6 +727,7 @@ export class WorklistMainMRComponent implements OnInit { getActionHistory(WorkListActionHistoryObj) { this.IsReachEnd = true; + this.actionHistoryRes=[]; this.worklistService.getActionHistory(WorkListActionHistoryObj). subscribe((result: WorkListActionHistoryResponse) => { this.handleWorkListActionHistoryResult(result); diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts index 2cd68a18..874a4bd0 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts @@ -62,8 +62,8 @@ export class WorklistMainPoComponent implements OnInit { getPassNotificationDetails: any; public static PASS_RES_ATTR = "passResAttr"; TransactionID: number = -999; - notificationBodyRes: any; - actionHistoryRes: any; + notificationBodyRes : any =[]; + actionHistoryRes: any =[]; notificationButtonRes: any; actionMode: any; pInformation: string = ""; @@ -138,7 +138,7 @@ export class WorklistMainPoComponent implements OnInit { ) { this.direction = TranslatorService.getCurrentLanguageName() this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; } @@ -172,7 +172,7 @@ export class WorklistMainPoComponent implements OnInit { this.WorkListBodyObj.P_TRANSACTION_ID = this.TransactionID; this.WorkListBodyObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; - this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM;; + this.WorkListBodyObj.P_PAGE_NUM = 1; this.WorkListBodyObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.WorkListButtonsObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; @@ -183,7 +183,7 @@ export class WorklistMainPoComponent implements OnInit { this.WorkListActionObj.P_COMMENTS = ""; this.WorkListActionObj.P_APPROVER_INDEX = null; - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.WorkListActionHistoryObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; @@ -215,7 +215,7 @@ export class WorklistMainPoComponent implements OnInit { } handleWorkListBodyResult(result, Type) { - this.notificationBodyRes = {}; + this.notificationBodyRes = []; if (this.common.validResponse(result)) { this.pInformation = result.P_INFORMATION; this.pQuestion = result.P_QUESTION; @@ -399,7 +399,7 @@ export class WorklistMainPoComponent implements OnInit { this.common.openWorklistMainPRPage() } else - if(this.notificationArray[index].REQUEST_TYPE == "MR" ){ + if(this.notificationArray[index].REQUEST_TYPE == "MO" ){ this.common.openWorklistMainMRPage() }else{ this.common.openWorklistMainPage(); @@ -480,7 +480,7 @@ export class WorklistMainPoComponent implements OnInit { this.common.confirmAlertDialogAction( () => { - // this.applyAction(this.WorkListActionObj); + this.applyAction(this.WorkListActionObj); }, this.ts.trPK('general', 'ok'), () => { }, this.ts.trPK('general', 'cancel'), this.ts.trPK('vacation-rule', 'confirmation'), @@ -651,6 +651,7 @@ export class WorklistMainPoComponent implements OnInit { getNotificationResAttr(notificationButtonsObj) { console.log("getNotificationResAttr"); + this.NotRespondAttributeList = []; this.worklistMainService .notificationResponseAttr(notificationButtonsObj) @@ -748,7 +749,7 @@ export class WorklistMainPoComponent implements OnInit { getAttachmentNotification(WorkListAttachObj) { - + this.attachmentRes =[]; this.worklistAttachService.getAttach(WorkListAttachObj). subscribe((result: NotificationGetAttachResponse) => { this.handleWorkListAttachResult(result); @@ -766,6 +767,7 @@ export class WorklistMainPoComponent implements OnInit { getActionHistory(WorkListActionHistoryObj) { this.IsReachEnd = true; + this.actionHistoryRes=[]; this.worklistService.getActionHistory(WorkListActionHistoryObj). subscribe((result: WorkListActionHistoryResponse) => { this.handleWorkListActionHistoryResult(result); diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts index d581b7e7..c3f1febd 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts @@ -124,7 +124,7 @@ export class WorklistMainPRComponent implements OnInit { this.direction = TranslatorService.getCurrentLanguageName() //this.getPassNotificationDetails = this.common.sharedService.getSharedData('passNotificationInfo'); this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; // this.WorkListActionHistoryObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; } @@ -164,7 +164,7 @@ export class WorklistMainPRComponent implements OnInit { this.WorkListBodyObj.P_TRANSACTION_ID = this.TransactionID; this.WorkListBodyObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; - this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM;; + this.WorkListBodyObj.P_PAGE_NUM = 1; this.WorkListBodyObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.WorkListButtonsObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; @@ -175,7 +175,7 @@ export class WorklistMainPRComponent implements OnInit { this.WorkListActionObj.P_COMMENTS = ''; this.WorkListActionObj.P_APPROVER_INDEX = null; - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.WorkListActionHistoryObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; @@ -245,7 +245,7 @@ export class WorklistMainPRComponent implements OnInit { } handleWorkListBodyResult(result, Type) { - this.notificationBodyRes = {}; + this.notificationBodyRes = []; if (this.common.validResponse(result)) { this.pInformation = result.P_INFORMATION; this.pQuestion = result.P_QUESTION; @@ -396,7 +396,7 @@ export class WorklistMainPRComponent implements OnInit { this.intializeNotificationDetail(); } else - if(this.notificationArray[index].REQUEST_TYPE == "MR" ){ + if(this.notificationArray[index].REQUEST_TYPE == "MO" ){ this.common.openWorklistMainMRPage() }else{ this.common.openWorklistMainPage(); @@ -740,7 +740,7 @@ export class WorklistMainPRComponent implements OnInit { getAttachmentNotification(WorkListAttachObj) { - + this.attachmentRes = []; this.worklistAttachService.getAttach(WorkListAttachObj). subscribe((result: NotificationGetAttachResponse) => { this.handleWorkListAttachResult(result); @@ -758,6 +758,7 @@ export class WorklistMainPRComponent implements OnInit { getActionHistory(WorkListActionHistoryObj) { this.IsReachEnd = true; + this.actionHistoryRes = []; this.worklistService.getActionHistory(WorkListActionHistoryObj). subscribe((result: WorkListActionHistoryResponse) => { this.handleWorkListActionHistoryResult(result); 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 fd34b96c..aeea095b 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -38,7 +38,6 @@
{{pInformation}}
-
@@ -47,11 +46,18 @@ --> + +
+

{{ 'general, empty' | translate}}

+
+
+ + @@ -66,7 +72,8 @@
-
Employee will also on leave
+
+ Employee will also on leave
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index 44c227a5..e083c6be 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -53,8 +53,8 @@ export class WorklistMainComponent implements OnInit { getPassNotificationDetails: any; public static PASS_RES_ATTR = "passResAttr"; TransactionID: number = -999; - notificationBodyRes: any; - actionHistoryRes: any; + notificationBodyRes: any =[]; + actionHistoryRes: any =[]; notificationButtonRes: any; actionMode: any; pInformation: string = ""; @@ -70,7 +70,7 @@ export class WorklistMainComponent implements OnInit { P_RESPOND_ATTRIBUTES_TBL: any; selEmployeeID: any; actionType: string = ""; - notificationArray: any; + notificationArray: any =[]; notificationDynamicAttributeArr: any; private textInput: TextInput; private textArea: TextAreaInput; @@ -80,7 +80,7 @@ export class WorklistMainComponent implements OnInit { notificationCount: any; activeSegment: any = "item-req"; lines_note_limit: any = 24; - attachmentRes: any; + attachmentRes: any =[]; private WorkListActionHistoryObj: WorkListActionHistoryRequest; IsReachEnd: boolean = true; notiActionBtnMore: any = []; @@ -88,7 +88,7 @@ export class WorklistMainComponent implements OnInit { confirmMsg: string; newArr: any = []; selEmp: any; - subordinatesleaveList: any; + subordinatesleaveList: any =[]; private WorkListSubmitterInfoObj: WorkListSubmitterInfoRequest; submitterInfoRes: any; approveDis: boolean = false; @@ -119,7 +119,7 @@ export class WorklistMainComponent implements OnInit { ) { this.direction = TranslatorService.getCurrentLanguageName() this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; } @@ -168,6 +168,8 @@ export class WorklistMainComponent implements OnInit { ); console.log("for next()"+ this.getPassNotificationDetails.ROW_NUM); + this.notificationArray=[] + this.subordinatesleaveList=[]; this.notificationArray = this.common.sharedService.getSharedData( HomeComponent.NOTIFICATION_ARR, false @@ -192,7 +194,7 @@ export class WorklistMainComponent implements OnInit { this.WorkListActionObj.P_COMMENTS = ""; this.WorkListActionObj.P_APPROVER_INDEX = null; - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.WorkListActionHistoryObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; this.WorkListAttachObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; @@ -253,6 +255,7 @@ export class WorklistMainComponent implements OnInit { } getEITNotificationDetails(notificationBodyObj) { + this.notificationBodyRes = [] this.worklistMainService .getEITNotificationBody(notificationBodyObj) .subscribe((result: EITNotificatonBodyResponse) => { @@ -261,6 +264,7 @@ export class WorklistMainComponent implements OnInit { } getAbsenceNotificationDetails(notificationBodyObj) { + this.notificationBodyRes = []; this.worklistMainService .getAbsencesNotificationBody(notificationBodyObj) .subscribe((result: AbsenceNotificatonBodyResponse) => { @@ -269,7 +273,7 @@ export class WorklistMainComponent implements OnInit { } handleWorkListBodyResult(result, Type) { - this.notificationBodyRes = {}; + if (this.common.validResponse(result)) { this.pInformation = result.P_INFORMATION; this.pQuestion = result.P_QUESTION; @@ -277,11 +281,17 @@ export class WorklistMainComponent implements OnInit { if (result.GetEITCollectionNotificationBodyList) { this.notificationBodyRes = result.GetEITCollectionNotificationBodyList; + if(this.notificationBodyRes[0].Collection_Notification){ + console.log(this.notificationBodyRes[0].Collection_Notification); + } } } else if (Type == "ABSENCE") { if (result.GetAbsenceCollectionNotificationBodyList) { this.notificationBodyRes = - result.GetAbsenceCollectionNotificationBodyList; + result.GetAbsenceCollectionNotificationBodyList ; + if(this.notificationBodyRes[0].Collection_Notification){ + console.log(this.notificationBodyRes[0].Collection_Notification); + } // getDimensions(this.notificationBodyRes) { let obj = (this.notificationBodyRes[0].Collection_Notification).filter(function (list) { @@ -304,6 +314,7 @@ export class WorklistMainComponent implements OnInit { getNotificationButtons(notificationButtonsObj) { + this.notificationButtonRes=[]; this.worklistMainService .getNotificationButtons(notificationButtonsObj) .subscribe((result: NotificatonButtonResponse) => { @@ -422,7 +433,7 @@ export class WorklistMainComponent implements OnInit { this.common.openWorklistMainPRPage() } else - if(this.notificationArray[index].REQUEST_TYPE == "MR" ){ + if(this.notificationArray[index].REQUEST_TYPE == "MO" ){ this.common.openWorklistMainMRPage() }else{ @@ -773,6 +784,8 @@ export class WorklistMainComponent implements OnInit { // } getAttachmentNotification(WorkListAttachObj) { + this.attachmentRes = [] + console.log(" this.P_PAGE_NUM: "+ this.P_PAGE_NUM); this.worklistAttachService.getAttach(WorkListAttachObj). subscribe((result: NotificationGetAttachResponse) => { @@ -791,6 +804,8 @@ export class WorklistMainComponent implements OnInit { getActionHistory(WorkListActionHistoryObj) { this.IsReachEnd = true; + this.actionHistoryRes =[]; + console.log(" this.P_PAGE_NUM: "+ this.P_PAGE_NUM); this.worklistService.getActionHistory(WorkListActionHistoryObj). subscribe((result: WorkListActionHistoryResponse) => { this.handleWorkListActionHistoryResult(result); @@ -944,6 +959,7 @@ export class WorklistMainComponent implements OnInit { } getsubmitterInfo(notificationSubmitterInfoObj) { + this.submitterInfoRes=[]; this.worklistMainService.getSubmitterInfo(notificationSubmitterInfoObj). subscribe((result: WorklistsubmitterInfoResponse) => { this.handleSubmitterInfoResult(result); From a500e054aa7e3731eac9596722be2331850433f0 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Tue, 7 Apr 2020 14:09:15 +0300 Subject: [PATCH 05/13] fixed loader issue --- .../services/authentication/authentication.service.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts index 42a403b3..d418cfc5 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -637,6 +637,7 @@ export class AuthenticationService { } private sessionTimeOutDialog() { + this.cs.stopLoading(); this.cs.presentAcceptDialog( this.ts.trPK("general", "idle-relogin"), () => { @@ -657,7 +658,7 @@ export class AuthenticationService { this.clearUserSession(); this.publishUserChangeEvent(); this.sessionTimeOutDialog(); - this.cs.openHome(); + // this.cs.openHome(); } }, AuthenticationService.monitorInterval_M); } From 4719af3b8957db2928a435c15a371508b706fc30 Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Tue, 7 Apr 2020 14:11:53 +0300 Subject: [PATCH 06/13] fix bugs --- .../absence-confirm.component.html | 6 +- .../absence-confirm.component.scss | 12 +++ .../absence-replacement-list.component.scss | 7 +- .../src/app/absence/home/home.component.html | 7 +- .../src/app/absence/home/home.component.scss | 55 +++++------ Mohem/src/app/absence/home/home.component.ts | 2 - .../submit-absence.component.html | 8 +- Mohem/src/app/app.component.html | 14 +-- Mohem/src/app/app.component.scss | 95 +++++++++++++++---- .../confirm-add-eit.component.html | 6 +- .../confirm-add-eit.component.scss | 14 ++- .../app/eit/eit-list/eit-list.component.html | 19 +++- .../src/app/my-team/home/home.component.html | 1 + .../work-list-replacement-roll.component.scss | 10 +- .../worklist-advanced-search.component.html | 2 +- .../worklist-advanced-search.component.scss | 4 + .../worklist-advanced-search.component.ts | 5 +- .../src/app/payslip/home/home.component.scss | 3 +- .../replacement-list.component.html | 21 +++- .../replacement-list.component.scss | 15 +-- Mohem/src/assets/localization/i18n.json | 20 ++-- 21 files changed, 226 insertions(+), 100 deletions(-) diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html index cd05247d..3b38814c 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html @@ -10,7 +10,7 @@ -
{{'general, addAttach' | translate}}
+
{{'general, addAttach' | translate}}
@@ -86,7 +86,7 @@ -
{{'confirmAddEit, comment' | translate}}
+
{{'confirmAddEit, comment' | translate}}
@@ -94,7 +94,7 @@
-
{{'confirmAddEit, approverList' | translate}}
+
{{'confirmAddEit, approverList' | translate}}

{{ 'general, empty' | translate}}

diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss index fb652af8..7a1fc2ce 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss @@ -270,4 +270,16 @@ ion-card-content.confirm-details{ width: 80% !important; color: white!important; border-radius: 16px !important; + } + + .approvalTitle-ar{ + font-weight: bold; + font-size: 16px; + text-align: right; + + } + .approvalTitle{ + font-weight: bold; + font-size: 16px; + text-align: left; } \ No newline at end of file diff --git a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss index 269ef263..b9478dfa 100644 --- a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss +++ b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss @@ -89,9 +89,10 @@ button.item-button.button.button-md.button-clear.button-clear-md { border: solid var(--gray) 1px; border-radius: 21px; // padding-left: 145px !important; - margin-left: 86px; + margin-left: 115px; // padding-right: 129px; - margin-right: -143px; + // margin-right: -143px; + margin-right: -136px; } // {padding-left: unset; // padding-right: unset; @@ -123,7 +124,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { height: 60px; width: 60px; margin-left: -181px; - margin-right: 269px; + margin-right: 259px; } diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 19cd5470..8447e812 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -50,8 +50,11 @@
- + +
diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index 0cbd6a21..1f026374 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -152,7 +152,7 @@ width: 320px; padding-left: 51px; font-size: 14px; - margin-right: 116px; + margin-right: 75px; margin-bottom: -30px; } @@ -258,44 +258,45 @@ margin-top: -13px; width: 11%; height: 6px; } - .div-orng-ar{ - position: relative; - bottom: 59px; - color: black; - background-color: #DDB017; - // background-color: #1FA269; - width: 11%; - height: 6px; - right: 9px; - } .div-red-ar{ position: relative; - bottom: 131px; - color: black; - background-color: #CB3232; - width: 11%; - height: 6px; - right: 92px; - } - .div-red{ - position: relative; - left: 59%; - bottom: 146px; + bottom: 59px; color: black; + // background-color: #DDB017; background-color: #CB3232; - // background-color: #094875; width: 11%; height: 6px; + right: 16px; + } +// .div-red-ar{ +// position: relative; +// bottom: 131px; +// color: black; +// background-color: #CB3232; +// width: 11%; +// height: 6px; +// right: 92px; +// } +// .div-red{ +// position: relative; +// left: 59%; +// bottom: 146px; +// color: black; +// background-color: #CB3232; +// // background-color: #094875; +// width: 11%; +// height: 6px; +// } - .div-orng{ + .div-red{ position: relative; left: 82%; bottom: 80px; color: black; - // background-color: #CB3232; - background-color: #DDB017; + background-color: #CB3232; + // background-color: #DDB017; width: 11%; height: 6px; } @@ -307,5 +308,5 @@ margin-top: -13px; background-color: #1FA269; width: 11%; height: 6px; - right: 10px; + right: 16px; } diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index 760b1f1f..fd50e4ef 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -114,7 +114,6 @@ export class HomeComponent implements OnInit { data: [this.accrualNet,this.accrualUsed], backgroundColor: [ '#1FA269', - '#DDB017', '#CB3232',], borderWidth: 2 } @@ -272,7 +271,6 @@ createAbsence() { { data: [this.accrualNet,this.accrualUsed], backgroundColor: [ '#1FA269', - '#DDB017', '#CB3232',], borderWidth: 2 } diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.html b/Mohem/src/app/absence/submit-absence/submit-absence.component.html index 25cba6c1..682c66b4 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.html +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.html @@ -15,7 +15,9 @@ {{ts.trPK('submitAbsence','startDate')}} - + {{ts.trPK('submitAbsence','startTime')}} @@ -23,7 +25,9 @@ {{ts.trPK('submitAbsence','endDate')}} - + diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 3a2dbe2b..fc438362 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -15,7 +15,7 @@
- +

{{User_name_Emp}}

{{User_Job_name}}

@@ -26,7 +26,7 @@

- + @@ -58,13 +58,13 @@ - +
-
- + @@ -155,7 +155,7 @@
diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index 5b3cf302..1579bf40 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -61,8 +61,7 @@ header border-radius: 50% !important; position: relative; color: #7f8c8d; - - + } .changeImgBtn{ @@ -236,6 +235,38 @@ padding: 6px 24px; margin-bottom: -28px; } +.list-en{ + margin-left: 0; + margin-right: 0; + margin-top: -19px; + margin-bottom: 0; + padding-left: 0; + padding-right: 0; + padding-top: 0px; + padding-bottom: 8px; + +} + + +.list-ar{ + margin-left: 0; + margin-right: 0; + margin-top: -19px; + margin-bottom: 0; + padding-left: 0; + padding-right: 0; + padding-top: 0px; + padding-bottom: 8px; + +} +// .sidebar-menu .header-div { + +// text-transform: capitalize; +// height: 100px; +// position: relative; +// display: block; +// margin-bottom: -28px; +// } .list-md .item-block .item-inner, .list-ios .item-block .item-inner { border-color: var(--primary); @@ -279,6 +310,7 @@ button.menu-item.item.item-block.item-ios { width: 100%; } + .menuFooter div { width: 80px; // height: 80px; @@ -286,16 +318,28 @@ button.menu-item.item.item-block.item-ios { } -.menuFooter .CompanyImg { - width: 100%; - height: 100%; +// .menuFooter .CompanyImg { +// width: 100%; +// height: 100%; +// } + + +.menuFooter .CompanyImg{ + width: 80%; + height: 80%; + margin-bottom: -21px; } +// .logoImg{ +// width: 120px; +// position: relative; +// } + .logoImg{ - width: 120px; - position: relative; + width: 77px; + position: relative; + margin-top: -1px; } - .companyTxt { font-size: 12px; color: var(--customnavy); @@ -316,16 +360,31 @@ font-weight: bolder !important; font-weight: bolder !important; } +.profileDiv-ar{ + margin: 5px auto !important; +} -.profileImg{ - width: 160px; - height: 160px; - display: -webkit-inline-box; - display: inline-flex; - overflow: hidden; - background: transparent; - border-radius: 70% !important; - position: relative; - top: 7px; +// .profileImg{ +// width: 160px; +// height: 160px; +// display: -webkit-inline-box; +// display: inline-flex; +// overflow: hidden; +// background: transparent; +// border-radius: 70% !important; +// position: relative; +// top: 7px; +// } + +.profileImg{ + width: 140px; + height: 140px; + display: -webkit-inline-box; + display: inline-flex; + overflow: hidden; + background: transparent; + border-radius: 70% !important; + position: relative; + top: 3px; } \ No newline at end of file diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html index 05b56ff0..0b8b64df 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html @@ -10,7 +10,7 @@ -
{{'general, addAttach' | translate}}
+
{{'general, addAttach' | translate}}
@@ -86,7 +86,7 @@ -
{{'confirmAddEit, comment' | translate}}
+
{{'confirmAddEit, comment' | translate}}
@@ -94,7 +94,7 @@
-
{{'confirmAddEit, approverList' | translate}}
+
{{'confirmAddEit, approverList' | translate}}

{{ 'general, empty' | translate}}

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 908f7d32..70247b93 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 @@ -240,4 +240,16 @@ width: 80% !important; color: white!important; border-radius: 16px !important; -} \ No newline at end of file +} + +.approvalTitle-ar{ + font-weight: bold; + font-size: 16px; + text-align: right; + +} +.approvalTitle{ + font-weight: bold; + font-size: 16px; + text-align: left; +} diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index 64c9c34f..5e2466b4 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -14,15 +14,26 @@
-
- + + +
- + diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 8304f3dd..fa1450e9 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -14,6 +14,7 @@

{{totalEmployees}}

{{ts.trPK('myTeam','total')}}
{{ts.trPK('myTeam','team-members')}}
+
diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss index 8266747c..5fbd6377 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss @@ -88,9 +88,9 @@ button.item-button.button.button-md.button-clear.button-clear-md { border: solid var(--gray) 1px; border-radius: 21px; // padding-left: 145px !important; - margin-left: 86px; - padding-right: 129px; - margin-right: -143px; + margin-left: 123px; + // padding-right: 129px; + margin-right: -136px; } .filterBtn{ @@ -111,8 +111,8 @@ button.item-button.button.button-md.button-clear.button-clear-md { border-radius: 50%; height: 60px; width: 60px; - margin-left: -181px; - margin-right: 269px; + margin-left: -183px; + margin-right: 260px; } diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html index 030fd170..33b67cfb 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html @@ -1,7 +1,7 @@

{{ts.trPK('general','advanced-search')}}

- +
diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss index f842613c..bef3801b 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss @@ -26,6 +26,10 @@ margin-bottom: 20px; } } + +.cancel-ar{ + margin-right: 239px; +} .search-button{ background: #3dcab3; height: 50px; diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts index 5f393e89..8b9db09f 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts @@ -16,11 +16,14 @@ export class WorklistAdvancedSearchComponent implements OnInit { public selectedValue = ''; public notificationType = ''; public itemType = ''; + public direction: string; constructor( public modalController: ModalController, public ts: TranslatorService - ) { } + ) { + this.direction = TranslatorService.getCurrentLanguageName(); + } ngOnInit() {} diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 4d072688..e99ebbd6 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -12,7 +12,7 @@ border-bottom-left-radius: -10px !important; padding-top: 8px; padding-bottom: 8px; - margin-left: 18px; + margin-left: 8px; font-size: 12px !important; } .colPayslips{ @@ -34,6 +34,7 @@ font-size: 13px !important; // font-weight: bold !important; font-family: WorkSans-Bold; + margin-left: 8px; } .earingTotH{ text-align: right; diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html index f92e9ad2..692a683a 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html @@ -23,11 +23,24 @@ - - - + + + + - + + + + diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss index 602cf3e7..b8e5d124 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss @@ -41,6 +41,10 @@ button.item-button.button.button-md.button-clear.button-clear-md { // margin-right: 7%; // width: 100%; // } +.ion-item-ar{ + margin-top: 5%; + margin-right: -6%; +} .ionItem{ border: #e4e4e4 solid; /* margin: 6px; */ @@ -108,13 +112,12 @@ button.item-button.button.button-md.button-clear.button-clear-md { border-radius: 21px; padding-left: 10px !important; } + .filterInput-ar{ border: solid var(--gray) 1px; border-radius: 21px; - // padding-left: 100px !important; - margin-left: 86px; - // padding-right: 129px; - margin-right: -139px; + margin-left: 115px; + margin-right: -132px; } .filterBtn{ @@ -131,8 +134,8 @@ button.item-button.button.button-md.button-clear.button-clear-md { border-radius: 50%; height: 60px; width: 60px; - margin-left: -167px; - margin-right: 247px; + margin-left: -201px; + margin-right: 282px; } *{ diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 8977dc37..8e54d034 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -15,7 +15,7 @@ }, "login": { "en": "Login", - "ar": "الدخول" + "ar": "تسجيل الدخول" }, "username": { "en": "User Name", @@ -52,7 +52,7 @@ }, "changepassword": { "en": "Change Password", - "ar": "غير كلمة السر" + "ar": "تغيير كلمة المرور" }, "announcement":{ "en":"Announcement", @@ -899,7 +899,7 @@ }, "worklist": { "en": "Work List", - "ar": "قائمة العمل" + "ar": "الطلبات المعلقة" }, "pending-request":{ "en":"Penading Request", @@ -908,7 +908,7 @@ }, "missing-swipes":{ "en":"Missing Swipes", - "ar":"البصمات المفقوده" + "ar":"فقدان البصمة" }, "leave-balance":{ "en":"Leave Balance", @@ -1036,7 +1036,7 @@ }, "busG": { "en": "Business Group", - "ar": "مجموعة العمل" + "ar": "الإدارة" }, "phone-no": { "en": "Phone Number", @@ -1060,7 +1060,7 @@ }, "payrol": { "en": "Payroll", - "ar": "كشف الرواتب" + "ar": "المشروع" }, "orgEmail": { "en": "Organization Email Address", @@ -1155,7 +1155,7 @@ "en": "Monthly Attendance" }, "monthly-attendance-calendar": { - "ar": "تقويم الحضور الشهري", + "ar": "سجل الحضور الشهري", "en": "Monthly Attendance Calendar" }, "completed": { @@ -1515,15 +1515,15 @@ }, "myTeam-header": { "en": "My Team", - "ar": "فريقى" + "ar": "فريقي" }, "total": { "en": "TOTAL", - "ar": "المجموع" + "ar": "عدد" }, "team-members": { "en": "TEAM MEMBERS", - "ar": "اعضاء الفريق" + "ar": " اعضاء الفريق" }, "team-stats": { "en": "Team Statistics", From 5d978fa1757e16a8a562e456dc2c342a44ffa6fc Mon Sep 17 00:00:00 2001 From: ashwaq Date: Tue, 7 Apr 2020 15:07:23 +0300 Subject: [PATCH 07/13] 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,verificationcode' | translate}}


-

{{'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 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 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 08/13] 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": "الرجاء ملء جميع الحقول المطلوبة" From 5e0d1b9b8782fb2adea3d41a42b1478749882e4d Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Tue, 7 Apr 2020 15:52:02 +0300 Subject: [PATCH 09/13] edit replacment issue & eit arabic text --- .../absence-replacement-list.component.ts | 5 +++-- .../app/absence/submit-absence/submit-absence.component.ts | 1 + Mohem/src/app/authentication/login/login.component.html | 4 ++-- Mohem/src/app/authentication/login/login.component.ts | 2 +- Mohem/src/app/eit/add-eit/add-eit.component.ts | 2 +- Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts | 2 +- Mohem/src/app/uI-elements/text.input.ts | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts index cee6305f..0fcacdb7 100644 --- a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts +++ b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts @@ -22,6 +22,7 @@ export class AbsenceReplacementListComponent implements OnInit { selectedValue: any; inputSearch: any; selEmpName: any; + selectedReplacedEmp: any; selectedUserInf: any; userNote: any; getPassNotificationDetails: any; @@ -63,7 +64,7 @@ export class AbsenceReplacementListComponent implements OnInit { } ngOnInit() { - + this.selectedReplacedEmp = this.cs.sharedService.getSharedData('selectedReplacedEmp'); this.demoeAttach = [{ USER_NAME: '18888', EMPLOYEE_DISPLAY_NAME: "AAA fgfhfhfhf hyutyututut ", @@ -147,7 +148,7 @@ export class AbsenceReplacementListComponent implements OnInit { // this.WorkListReplacmentEmployeeObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME=""; // this.WorkListReplacmentEmployeeObj.P_SEARCH_EMAIL_ADDRESS=this.inputSearch; // } - + this.WorkListReplacmentEmployeeObj.P_SELECTED_EMPLOYEE_NUMBER =this.selectedReplacedEmp; this.worklistService.getReplacmentEmployeeList(this.WorkListReplacmentEmployeeObj). subscribe((result: WorKListReplacmentEmployeeResponse) => { this.handleWorkListReplacmentEmployeeResult(result); diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts index cd965432..1d16e33a 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -247,6 +247,7 @@ export class SubmitAbsenceComponent implements OnInit { } async SearchReplacment() { + this.common.sharedService.setSharedData(this.selEmp, 'selectedReplacedEmp'); const modal = await this.modalCtrl.create({ component: AbsenceReplacementListComponent, backdropDismiss: false diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index 6fb821df..2d7c2a05 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -53,10 +53,10 @@
- +
{{ts.trPK('login','signup')}} diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index 5d486395..646557e9 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -71,7 +71,7 @@ export class LoginComponent implements OnInit, OnDestroy { public password: string; private language: string; public username: string; - public remeberMe: boolean; + public remeberMe = true; private iosLink: string; private androidLink: string; public currentLang = 1; 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..d1b4ac7f 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -323,7 +323,7 @@ export class AddEitComponent implements OnInit { feildsList[i].APPLICATION_COLUMN_NAME, defaultVal, containerId, - defaultVal, + defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG diff --git a/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts b/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts index 3cbbc80c..828f62a6 100644 --- a/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts +++ b/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts @@ -7,5 +7,5 @@ public P_PAGE_LIMIT : Number; public P_SEARCH_USER_NAME:String; public P_SEARCH_EMPLOYEE_DISPLAY_NAME:String; public P_SEARCH_EMAIL_ADDRESS:String; - +public P_SELECTED_EMPLOYEE_NUMBER:any; } \ No newline at end of file diff --git a/Mohem/src/app/uI-elements/text.input.ts b/Mohem/src/app/uI-elements/text.input.ts index 9a8632fe..985563b4 100644 --- a/Mohem/src/app/uI-elements/text.input.ts +++ b/Mohem/src/app/uI-elements/text.input.ts @@ -26,7 +26,7 @@ export class TextInput extends UiElement { // "
" + "" + " " + this.label + "" + - " " + + " " + " "; return template; From 3284ab16be21243e85cf7575b8231d75d2592751 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Tue, 7 Apr 2020 15:58:39 +0300 Subject: [PATCH 10/13] add skip --- .../worklist-main-mr/worklist-main-mr.component.html | 4 +--- .../notification/worklist-main/worklist-main.component.html | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html index 7c7095f6..c3c2233d 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html @@ -196,9 +196,7 @@
{{ts.trPK('worklistMain','info')}}
--> -
-

{{ 'general, empty' | translate}}

-
+ 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 aeea095b..f87f27f3 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -47,9 +47,7 @@ -
-

{{ 'general, empty' | translate}}

-
+
From caae8a95379c6dd6d2b8ff6896c79c41e41cc320 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Tue, 7 Apr 2020 17:39:57 +0300 Subject: [PATCH 11/13] fixed loader issue --- .../authentication/sms-page/sms-page.page.ts | 456 ++++-------------- .../authentication/authentication.service.ts | 10 +- 2 files changed, 94 insertions(+), 372 deletions(-) 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..84f03120 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -1,508 +1,235 @@ -import { Component, OnInit } from "@angular/core"; - -import { ElementRef } from "@angular/core"; - -import { NavController, Platform } from "@ionic/angular"; - -import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; - -import { CommonService } from "src/app/hmg-common/services/common/common.service"; - -import { SharedDataService } from "src/app/hmg-common/services/shared-data-service/shared-data.service"; - -import { SMSCheckRequest } from "src/app/hmg-common/services/authentication/models/smscheck.request"; - -import { LoginModel } from "../models/LoginModel"; - -import { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service"; - -import { SMSCheckResponse } from "src/app/hmg-common/services/authentication/models/smscheck.response"; - -import { Password } from "../models/password"; - +import { Component, OnInit } from '@angular/core'; +import { ElementRef } from '@angular/core'; +import { NavController, Platform } from '@ionic/angular'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; +import { CommonService } from 'src/app/hmg-common/services/common/common.service'; +import { SharedDataService } from 'src/app/hmg-common/services/shared-data-service/shared-data.service'; +import { SMSCheckRequest } from 'src/app/hmg-common/services/authentication/models/smscheck.request'; +import { LoginModel } from '../models/LoginModel'; +import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; +import { SMSCheckResponse } from 'src/app/hmg-common/services/authentication/models/smscheck.response'; +import { Password } from '../models/password'; import { GetLoginInfoRequest } from 'src/app/hmg-common/services/authentication/models/get-login-info.request'; -import * as moment from "moment"; - - +import * as moment from 'moment'; @Component({ - - selector: "app-sms-page", - - templateUrl: "./sms-page.page.html", - - styleUrls: ["./sms-page.page.scss"] - + selector: 'app-sms-page', + templateUrl: './sms-page.page.html', + styleUrls: ['./sms-page.page.scss'] }) export class SmsPageComponent implements OnInit { - - public static LOGIN_DATA = "LOGIN_DATA"; - - Channel: number = 0; - + public static LOGIN_DATA = 'LOGIN_DATA'; + Channel = 0; activationCode: string; - P_SESSION_ID: number; - P_USER_NAME: string; - timeInSeconds: any; - time: any; - runTimer: any; - hasStarted: any; - hasFinished: any; - remainingTime: any; - displayTime: any; - loginTokenID: string; - - public isForgetPwd: boolean = false; - - public isExpiredPwd: boolean = false; - - public count: number = 0; - + public isForgetPwd = false; + public isExpiredPwd = false; + public count = 0; private loginData = new LoginModel(); - - public deviceToken:any; - - public loginTypeData:any; - - public logo = "assets/icon/login/password.png"; - + public deviceToken: any; + public loginTypeData: any; + public logo = 'assets/icon/login/password.png'; + // tslint:disable-next-line: variable-name public smc_code: any = []; code: any; + // tslint:disable-next-line: variable-name user_name: string; - + public isPostNoLoad = true; constructor( - public navCtrl: NavController, - public translate: TranslatorService, - public common: CommonService, - private elementRef: ElementRef, - public authService: AuthenticationService, - public sharedData: SharedDataService, - public platform: Platform, - - - ) {} - - ngOnInit() { - this.count = 0; - this.initTimer(); - this.startTimer(); - - this.isForgetPwd = - - this.sharedData.getSharedData(Password.IS_FORGET_PSW) || false; - - this.isExpiredPwd = - - this.sharedData.getSharedData(Password.IS_EXPIRED_PSW) || false; - - this.loginData= this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); - - console.log("loginData : "+ this.loginData); - - this.deviceToken= this.common.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); - - if(this.deviceToken == undefined){ - - this.deviceToken = localStorage.getItem("deviceToken"); - - - - } - - console.log("deviceToken :"+this.deviceToken); - - this.loginTypeData= this.common.sharedService.getSharedData(SMSCheckRequest.SHARED_DATA, false); - - // console.log("loginType :"+this.loginTypeData.loginType); - - - - - + this.isForgetPwd = this.sharedData.getSharedData(Password.IS_FORGET_PSW) || false; + this.isExpiredPwd = this.sharedData.getSharedData(Password.IS_EXPIRED_PSW) || false; + this.loginData = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); + console.log('loginData : ' + this.loginData); + this.deviceToken = this.common.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); + // tslint:disable-next-line: triple-equals + if (this.deviceToken == undefined) { + this.deviceToken = localStorage.getItem('deviceToken'); + } + this.loginTypeData = this.common.sharedService.getSharedData(SMSCheckRequest.SHARED_DATA, false); } initTimer() { - - // Pomodoro is usually for 25 minutes - if (!this.timeInSeconds) { - this.timeInSeconds = 600; - } - - - this.time = this.timeInSeconds; - this.runTimer = false; - this.hasStarted = false; - this.hasFinished = false; - this.remainingTime = this.timeInSeconds; - - - this.displayTime = this.common.getSecondsAsDigitalClock(this.remainingTime); - } - - startTimer() { - this.runTimer = true; - this.hasStarted = true; - this.timerTick(); - } - - pauseTimer() { - this.runTimer = false; - } - - resumeTimer() { - this.startTimer(); - } - - timerTick() { - setTimeout(() => { - if (!this.runTimer) { - return; - } - this.remainingTime--; - - this.displayTime = this.common.getSecondsAsDigitalClock( - - this.remainingTime - - ); - + this.displayTime = this.common.getSecondsAsDigitalClock(this.remainingTime); if (this.remainingTime > 0) { - this.timerTick(); - } else { - this.hasFinished = true; - this.pauseTimer(); - this.navCtrl.pop(); - } - }, 1000); - } - - ionViewWillLeave() { - this.pauseTimer(); - } - - - checkOTPLength(){ - - console.log(this.activationCode.length); - - if(this.activationCode.length==4){ - + checkOTPLength() { + // tslint:disable-next-line: triple-equals + if (this.activationCode.length == 4){ this.checkVerificationCode(); - } - } checkVerificationCode() { - this.code=this.smc_code.join(''); - + this.code = this.smc_code.join(''); if (this.count < 3) { - - if ( - - this.code == undefined || - - this.code == null || - - this.code == "" - - ) { - + // tslint:disable-next-line: triple-equals + if (this.code == undefined || this.code == null || this.code == '') { // this.common.showAlert(this.translate.translate('verificationcode.emptyCode')); - } else { - this.count = this.count + 1; - if (this.isForgetPwd || this.isExpiredPwd) { - this.checkForgetPwdSMS(); - } else { - console.log("checkSMS"); this.checkSMS(); - } - } - } else { - - let msg: string = this.translate.trPK("general", "noOfTriesLogin"); - - this.common.JustAlertDialog(this.translate.trPK("general", "ok"), msg); - + const msg: string = this.translate.trPK('general', 'noOfTriesLogin'); + this.common.JustAlertDialog(this.translate.trPK('general', 'ok'), msg); } - } - - public checkSMS() { - - // alert("checkSMS in page") - console.log("code" + this.code); - const data = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); - - const request = new SMSCheckRequest(); - - - - request.LogInTokenID = data.LogInTokenID; - - request.activationCode = this.code; //code;this.activationCode; - - request.P_USER_NAME = data.P_USER_NAME; - - request.MobileNumber = data.MobileNumber; - - - - this.authService - - .checkSMS(request, () => {}, this.translate.trPK("general", "ok")) - - .subscribe((result: SMSCheckResponse) => { - - console.log(result); - + const data = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); + const request = new SMSCheckRequest(); + request.LogInTokenID = data.LogInTokenID; + request.activationCode = this.code; // code;this.activationCode; + request.P_USER_NAME = data.P_USER_NAME; + request.MobileNumber = data.MobileNumber; + this.authService.checkSMS(request, () => {}, this.translate.trPK('general', 'ok')).subscribe((result: SMSCheckResponse) => { if (this.common.validResponse(result)) { - - AuthenticationService.servicePrivilage=result.Privilege_List; - + AuthenticationService.servicePrivilage = result.Privilege_List; this.authService.setAuthenticatedUser(result).subscribe(() => { - - //call insert Mobile Login - console.log("insert"); - localStorage.setItem("emp-name",result.MemberInformationList[0].EMPLOYEE_NAME); - console.log("empnmae: "+ localStorage.getItem("emp-name")); - // localStorage.setItem("login-at", new Date().toISOString()); - this.user_name=result.MemberInformationList[0].EMPLOYEE_NAME; - - //get date and time of last login - let currDateTime = moment().format('MMM DD , YYYY HH:mm') - localStorage.setItem("login-at",currDateTime); - - if (this.platform.is("cordova")) { - // localStorage.setItem("full-name", result.P_USER_NAME); - + localStorage.setItem('emp-name', result.MemberInformationList[0].EMPLOYEE_NAME); + this.user_name = result.MemberInformationList[0].EMPLOYEE_NAME; + const currDateTime = moment().format('MMM DD , YYYY HH:mm') + localStorage.setItem('login-at', currDateTime); + if (this.platform.is('cordova')) { this.insertMobileLogin(); - } - this.common.openHome(); - - - }); - } - }); - } - - public insertMobileLogin(){ - - console.log("loginData" + this.loginData); - - let request = new GetLoginInfoRequest(); - + const request = new GetLoginInfoRequest(); this.authService.setPublicFields(request); - request.MobileNumber = this.loginData.MobileNumber; - - request.P_USER_NAME=this.loginData.P_USER_NAME; - - request.UserName=this.loginData.P_USER_NAME; - - request.LogInTokenID =this.loginData.LogInTokenID; - - request.CompanyID =1;//CompanyID - - request.DeviceType= this.common.getDeviceType(); - - request.DeviceToken=this.deviceToken;//"5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36";//this.deviceToken; - - request.LoginType=this.loginTypeData.loginType; - - request.EmployeeName=this.user_name; - - this.authService - - .insertMobileLoginInfo( - - request, - - () => { }, - - this.translate.trPK("general", "ok") - - ) - - .subscribe((result: any) => { - - - -console.log("successful insertMobileLogin" ); - - }); - + request.P_USER_NAME = this.loginData.P_USER_NAME; + request.UserName = this.loginData.P_USER_NAME; + request.LogInTokenID = this.loginData.LogInTokenID; + request.CompanyID = 1; // CompanyID + request.DeviceType = this.common.getDeviceType(); + request.DeviceToken = this.deviceToken; // "5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36";//this.deviceToken; + request.LoginType = this.loginTypeData.loginType; + request.EmployeeName = this.user_name; + this.authService.insertMobileLoginInfo(request, () => { }, this.translate.trPK('general', 'ok'), this.isPostNoLoad) + .subscribe((result: any) => { + console.log('successful insertMobileLogin' ); + }); } - - public checkForgetPwdSMS() { - const data = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); - const request = new SMSCheckRequest(); - - - request.LogInTokenID = data.LogInTokenID; - - request.activationCode =this.code;// this.activationCode; - + request.activationCode = this.code; // this.activationCode; request.P_USER_NAME = data.P_USER_NAME; - - console.log(data.LogInTokenID); - - console.log(data.P_USER_NAME); - - - - this.authService - - .checkForgetSMS(request, () => {}, this.translate.trPK("general", "ok")) - - .subscribe((result: SMSCheckResponse) => { - - console.log(result); - + this.authService.checkForgetSMS(request, () => {}, this.translate.trPK('general', 'ok')).subscribe((result: SMSCheckResponse) => { if (this.common.validResponse(result)) { - - console.log(result); - if (this.isForgetPwd) { - this.common.openForgotPassword(); - - } - - if(this.isExpiredPwd) { - - this.sharedData.setSharedData(true,Password.IS_EXPIRED_PSW); - + } + if (this.isExpiredPwd) { + this.sharedData.setSharedData(true, Password.IS_EXPIRED_PSW); this.common.openChangePassword(); - } - } - }); - } + onChange() { - const filtered = this.smc_code.filter(function (el) { + // tslint:disable-next-line: only-arrow-functions + const filtered = this.smc_code.filter(function(el) { if (el) { return el; } }); if (filtered.length === 4) { - //this.validate(); - console.log("validate"); this.checkVerificationCode(); } } goToNextInput(e) { - // let value = e.target.value; - // if (value.length === 1) { const key = e.which; const t = e.target; - let sib = t.nextElementSibling; - let sibPre =t.previousElementSibling; + const sib = t.nextElementSibling; + const sibPre = t.previousElementSibling; if (key !== 9 && (key < 48 || key > 57)) { if (key === 8 || key === 46) { - - - return true; } else { e.preventDefault(); @@ -513,22 +240,13 @@ console.log("successful insertMobileLogin" ); if (key === 9) { return true; } + if (sib) { - //sib = document.querySelector('input'); - if (e.target.value ==="") { - sibPre.setFocus()} - else{ + if (e.target.value === '') { + sibPre.setFocus(); + } else { sib.setFocus(); - } } } - // } else { - // e.target.value = value.substring(0, value.length - 1); - // } - - - - - - -} \ No newline at end of file + } +} diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts index d418cfc5..9c2bcca4 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -555,10 +555,14 @@ export class AuthenticationService { - public insertMobileLoginInfo(request: GetLoginInfoRequest,onError: any, errorLabel: string): Observable { + // tslint:disable-next-line: max-line-length + public insertMobileLoginInfo(request: GetLoginInfoRequest, onError: any, errorLabel: string, isPostNoLoad = false): Observable { this.authenticateRequest(request); - - return this.con.post(AuthenticationService.insertMobileLoginInfo,request,onError,errorLabel); + if (isPostNoLoad) { + return this.con.postNoLoad(AuthenticationService.insertMobileLoginInfo, request, onError, errorLabel); + } else { + return this.con.post(AuthenticationService.insertMobileLoginInfo, request, onError, errorLabel); + } } From 04a1007301206d79fbcd1a6cce3ab34ed4c1a26a Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Tue, 7 Apr 2020 17:40:27 +0300 Subject: [PATCH 12/13] handle prod build --- .../work-list-replacement-roll.component.html | 12 ++++++------ .../work-list-replacement-roll.component.ts | 2 +- .../work-list-rfc/work-list-rfc.component.ts | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index 628eb276..74d460f2 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -56,11 +56,11 @@
- {{"replacementRoll, question" | translate}} : + {{"replacementRoll, question" | translate}} : {{pQuestion}} ? - {{"replacementRoll, answer" | translate}} + {{"replacementRoll, answer" | translate}} - {{"replacementRoll, enterNote" | translate}} + {{"replacementRoll, enterNote" | translate}} @@ -148,11 +148,11 @@
- {{"replacementRoll, question" | translate}} : + {{"replacementRoll, question" | translate}} : {{pQuestion}} ? - {{"replacementRoll, answer" | translate}} + {{"replacementRoll, answer" | translate}} - {{"replacementRoll, enterNote" | translate}} + {{"replacementRoll, enterNote" | translate}} diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts index a86f32cd..5cd1e9e5 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts @@ -43,7 +43,7 @@ export class WorkListReplacementRollComponent implements OnInit { messageSuccess: boolean =false; public direction: string; P_RESPOND_ATTRIBUTES_TBL: any[]; - constructor(public worklistService: WorklistService, private cs: CommonService, private ts: TranslatorService, public workListMainService: WorklistMainService, public modalCtrl: ModalController) { + constructor(public worklistService: WorklistService, private cs: CommonService, public ts: TranslatorService, public workListMainService: WorklistMainService, public modalCtrl: ModalController) { this.P_PAGE_NUM = 1; this.P_PAGE_LIMIT = 50; this.getPassActionMode = this.cs.sharedService.getSharedData('passActionMode', false); diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts index bf04ab9d..1bacb0b4 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts @@ -36,7 +36,7 @@ export class WorkListRfcComponent implements OnInit { constructor( public worklistService: WorklistService, private cs: CommonService, - private ts: TranslatorService, + public ts: TranslatorService, public workListMainService: WorklistMainService, public modalCtrl: ModalController ) { From 45f20fdd591defeaf5f50ad573663c6c076cabbc Mon Sep 17 00:00:00 2001 From: ashwaq Date: Tue, 7 Apr 2020 18:56:09 +0300 Subject: [PATCH 13/13] fix --- .../work-list-replacement-roll.component.html | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index 74d460f2..2a655824 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -56,12 +56,11 @@
- {{"replacementRoll, question" | translate}} : - {{pQuestion}} ? - {{"replacementRoll, answer" | translate}} - - {{"replacementRoll, enterNote" | translate}} - + {{"replacementRoll, question" | translate}} : + {{pQuestion}} ? + {{"replacementRoll, answer" | translate}} + + @@ -147,13 +146,10 @@ -
- {{"replacementRoll, question" | translate}} : - {{pQuestion}} ? - {{"replacementRoll, answer" | translate}} - - {{"replacementRoll, enterNote" | translate}} - +
+ + {{"replacementRoll, enterNote" | translate}} +