diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index 0221f3ab..ba5b928a 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -61,7 +61,7 @@
{{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 0056da73..65e126aa 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -16,6 +16,8 @@ import { Password } from '../models/password'; import { CheckUserAuthenticationRequest } from 'src/app/hmg-common/services/authentication/models/check-user-auth.request'; import { CheckAppVersionResponse } from 'src/app/hmg-common/services/authentication/models/check-app-version.response'; import { PushService } from 'src/app/hmg-common/services/push/push.service'; +import { KeyboardService } from 'src/app/hmg-common/services/keyboard/keyboard.service'; +import { KeyboardStatusModel } from 'src/app/hmg-common/services/keyboard/keyboard-status.model'; @Component({ selector: 'login', @@ -24,6 +26,7 @@ import { PushService } from 'src/app/hmg-common/services/push/push.service'; }) export class LoginComponent implements OnInit, OnDestroy { deviceToken1: any; + constructor( public cs: CommonService, @@ -39,8 +42,10 @@ export class LoginComponent implements OnInit, OnDestroy { public splash: SplashScreen, public sharedData: SharedDataService, public plt: Platform, - public pushService: PushService + public pushService: PushService, + public keyboardService: KeyboardService ) { + this.events.subscribe('logoutFlage', logoutFlage => { console.log('login compont logoutFlage: ' + logoutFlage); // tslint:disable-next-line: triple-equals @@ -93,6 +98,7 @@ export class LoginComponent implements OnInit, OnDestroy { logoutFlage: boolean ; getuser: any = ''; getlastlogin: any; + public keyboardOpened = false; private checkUserResult: CheckUserAuthenticationResponse; @@ -104,6 +110,7 @@ export class LoginComponent implements OnInit, OnDestroy { // ); // console.log("this.getlastlogin"+ this.getlastlogin); // } + this.monitorKeyboardChange(); this.currentLang = TranslatorService.getCurrentLanguageCode(); console.log(TranslatorService.CURRENT_LANGUAGE) console.log(TranslatorService.EN) @@ -418,6 +425,10 @@ export class LoginComponent implements OnInit, OnDestroy { }); } - + private monitorKeyboardChange() { + this.events.subscribe ( KeyboardService.KEYBOARD_STATUS , ( status: KeyboardStatusModel) => { + this.keyboardOpened = status.opened; + }); + } } diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.scss b/Mohem/src/app/authentication/sms-page/sms-page.page.scss index 78c9db1f..986beeb9 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.scss +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.scss @@ -50,7 +50,7 @@ ion-input { line-height: 0; font-size: 32px; //border: solid 1px #ccc; - border: solid 0.01cm #000000; + border: 1px solid #ccc !important; //box-shadow: 0 0 5px #ccc inset; outline: none; width: 20%; diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.ts b/Mohem/src/app/eit/eit-list/eit-list.component.ts index 346c46ab..18ec9631 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -89,10 +89,11 @@ export class EitListComponent implements OnInit { // accrualNetInfants // accrualUNetChild // accrualNetAdult - this.accrualNetAdult = this.accrualBalancesList[1].ACCRUAL_NET_ENTITLEMENT; - this.accrualUNetChild = this.accrualBalancesList[2].ACCRUAL_NET_ENTITLEMENT; - this. accrualNetInfants = this.accrualBalancesList[3].ACCRUAL_NET_ENTITLEMENT; - + if(this.accrualBalancesList){ + this.accrualNetAdult = this.accrualBalancesList[1].ACCRUAL_NET_ENTITLEMENT; + this.accrualUNetChild = this.accrualBalancesList[2].ACCRUAL_NET_ENTITLEMENT; + this. accrualNetInfants = this.accrualBalancesList[3].ACCRUAL_NET_ENTITLEMENT; + } this.data = { // labels: ['earingTotal', 'deductionTotal'], datasets: [ 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 9f9bd8d9..91f681f5 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -125,8 +125,8 @@ export class AuthenticationService { } public setPublicFields(request: Request): Request { - request.VersionID = 2.0;//2.0,1.4 - request.Channel = 33; + request.VersionID = 2.1;//2.0,1.4 + request.Channel = 31; request.LanguageID = TranslatorService.getCurrentLanguageCode(); //request.IPAdress = '10.10.10.10'; //request.SessionID = "any thing"; // ??? required for not authorized login funny 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 ecf0bdef..1b25ee4e 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 @@ -84,7 +84,7 @@ export class DateInfoModalComponent implements OnInit { this.day = localDate[1]; this.year = localDate[2]; // tslint:disable-next-line: radix - this.month = parseInt(localDate[0]) + 1; + this.month = parseInt(localDate[0]); this.nameMonth = this.direction === 'ltr' ? this.common.getMonthName(this.month) : this.common.getMonthNameAr(this.month); this.nameDay = this.getHeaderDay(new Date(date)); const d = new Date(date); diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html index 3bb77db7..3f9be5a5 100644 --- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html +++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html @@ -1,13 +1,12 @@
- + - - +

{{title}}

-
\ No newline at end of file +
diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html index 9f4f7175..71a76dd0 100644 --- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html +++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html @@ -1,9 +1,12 @@ -
-
+
+
-
+
+ +
+
{{statsValue}} -

{{title}}

+

{{title}}

\ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss index b0f2c44f..554643f1 100644 --- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss @@ -45,3 +45,10 @@ text-align: left; display: block; } + +.iconFab{ + margin-left: -20px; + margin-top: 10px; + width: 100px; + height: 70px; +} diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.ts b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.ts index 65bc8ecc..b9161f22 100644 --- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.ts +++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.ts @@ -13,6 +13,7 @@ export class StatsButtonComponent implements OnInit { @Input() icon: string; @Input() title: string; @Input() statsValue: string; + @Input() link: string; @Output() trigger = new EventEmitter(); @Input() focusicon: string; @Input() disabled = false; diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 5587119a..d79d925b 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -15,6 +15,7 @@ [statsValue]="button.statsValue" [icon]="button.icon" [show]="button.show" + [link]="button.link" (click)="openStatsButton(button.link)"> @@ -22,18 +23,6 @@ - - -

{{'home,monthly-attendance' | translate}}

- {{'home,monthly-time-sheet-view' | translate}} - - {{'home,view-detail' | translate}} - -
- - - -
{{menuItem.PROMPT}} @@ -54,6 +43,19 @@ + + + +

{{'home,monthly-attendance' | translate}}

+ {{'home,monthly-time-sheet-view' | translate}} + + {{'home,view-detail' | translate}} + +
+ + + +
@@ -83,7 +85,9 @@ [renderOnClick]="false">
-
+ + diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss index 849965c9..b0af3af9 100644 --- a/Mohem/src/app/home/home.page.scss +++ b/Mohem/src/app/home/home.page.scss @@ -70,6 +70,8 @@ ion-label{ padding: 10px; color: white; width: 100%; + margin-top: 25px; + margin-bottom: 0px; h3{ font-size: 18px; font-weight: bold; diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 5a84eeae..a2b6cdfd 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -62,6 +62,11 @@ export class HomePage implements OnInit { public isShow = false; public showVcationRule = false; public statsButtons = [ + { + title: this.ts.trPK('attendance-tracking', 'title'), + link: '0', + show: true + }, { title: this.ts.trPK('home','worklist'), statsValue: 0, @@ -69,12 +74,6 @@ export class HomePage implements OnInit { link: '1', show: true }, - // { - // title: 'Pending Request', - // statsValue: 13, - // icon: 'assets/icon/new-design/pending_request.png', - // link: '' - // }, { title: this.ts.trPK('home','missing-swipes'), statsValue: 0, @@ -281,8 +280,8 @@ export class HomePage implements OnInit { for (const servicePrivilage of AuthenticationService.servicePrivilage) { if (servicePrivilage.Previlege === false) { if(servicePrivilage.ServiceName === 'accrualBalance'){ - this.statsButtons[2].show = false; this.statsButtons[3].show = false; + this.statsButtons[4].show = false; } if(servicePrivilage.ServiceName === 'vacationRule'){ this.showVcationRule = false; @@ -293,8 +292,8 @@ export class HomePage implements OnInit { // document.getElementById(servicePrivilage.ServiceName).style.filter = // 'grayscale(1)'; }else{ - this.statsButtons[2].show = true; this.statsButtons[3].show = true; + this.statsButtons[4].show = true; this.showVcationRule = true; } } @@ -555,7 +554,7 @@ export class HomePage implements OnInit { (result: OpenMissingSwipesResponse) => { if (this.common.validResponse(result)) { const key = 'GetOpenMissingSwipesList'; - this.statsButtons[1].statsValue = Math.floor(result[key].P_OPEN_MISSING_SWIPES); + this.statsButtons[2].statsValue = Math.floor(result[key].P_OPEN_MISSING_SWIPES); } } ); @@ -623,7 +622,7 @@ openPeriodDateDashbored() { ITGCountAllNotification() { this.workListService.getITGDetails('', '', this.isPostNoLoad).subscribe((result: any) => { - this.statsButtons[0].statsValue = + this.statsButtons[1].statsValue = Math.floor(this.countAllNotification + result.TotalCount); this.common.stopLoading(); }); @@ -701,7 +700,7 @@ getSubordinatesAttStatus() { this.accrualBalancesList = result.GetAccrualBalancesList; for (const accrualBalance of result.GetAccrualBalancesList) { if (accrualBalance.ACCURAL_PLAN_NAME === 'HMG Annual Vacation Accrual Plan') { - this.statsButtons[2].statsValue = + this.statsButtons[3].statsValue = Math.floor(accrualBalance.ACCRUAL_NET_ENTITLEMENT); this.common.sharedService.setSharedData(accrualBalance, 'leaveAccrualBalance'); this.common.sharedService.setSharedData(request, 'leaveAccrualBalanceDate'); @@ -710,7 +709,7 @@ getSubordinatesAttStatus() { totalTicketsLeft = totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT; } } - this.statsButtons[3].statsValue = Math.floor(totalTicketsLeft); + this.statsButtons[4].statsValue = Math.floor(totalTicketsLeft); } }); } @@ -721,7 +720,10 @@ openattentracking() { openStatsButton(link: any) { // tslint:disable-next-line: triple-equals - if (link == '1') { + if (link == '0') { + this.getDeviceLocation(); + // tslint:disable-next-line: triple-equals + } else if (link == '1') { this.common.startLoading(); this.common.openNotificationPage(); // tslint:disable-next-line: triple-equals diff --git a/Mohem/src/app/notification/item-history/item-history.component.html b/Mohem/src/app/notification/item-history/item-history.component.html index 494a5c0c..27fe6f67 100644 --- a/Mohem/src/app/notification/item-history/item-history.component.html +++ b/Mohem/src/app/notification/item-history/item-history.component.html @@ -43,7 +43,7 @@ - +
@@ -65,7 +65,7 @@
- +
- +
@@ -64,7 +64,7 @@
- +
- +
- +
- +
- +
- +
- +
@@ -224,7 +226,7 @@ - +
@@ -249,7 +251,7 @@ - +
- +
+ + + + {{close_label}} + + - {{'worklistMain, reject' | translate}} + {{reject_label}} + - {{'worklistMain, request' | translate}} + {{reqInfo_label}} + + 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 76ecc147..a00287ea 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 @@ -110,6 +110,11 @@ export class WorklistMainMRComponent implements OnInit { public isPostNoLoad = true; public worklistNotifications: any; public totalRequestCount = 0; + approve_label: any =""; + reject_label: any=""; + reqInfo_label: any=""; + close_label: any; + closeDis: boolean = false; constructor( @@ -147,6 +152,13 @@ export class WorklistMainMRComponent implements OnInit { } intializeNotificationDetail() { + + this.approveDis = false; + this.rejectDis = false; + this.requestDis = false; + this.closeDis = false; + this.moreDisabled = true; + if (this.messageSuccess) { document.getElementById('notificationDynamicFieldsMR').innerHTML = ''; } @@ -277,16 +289,26 @@ export class WorklistMainMRComponent implements OnInit { console.log('test' + this.notificationButtonRes.length); for (let i = 0; i < this.notificationButtonRes.length; i++) { if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVED" ) { + this.approve_label=this.notificationButtonRes[i].BUTTON_LABEL; + this.approveDis = true; } else if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECTED" ) { + this.reject_label=this.notificationButtonRes[i].BUTTON_LABEL; this.rejectDis = true; } else if (this.notificationButtonRes[i].BUTTON_ACTION == 'REQUEST_INFO') { + this.reqInfo_label=this.notificationButtonRes[i].BUTTON_LABEL; + this.requestDis = true; } // if result == null + else if // if result == null + (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") { + this.close_label = this.notificationButtonRes[i].BUTTON_LABEL; + this.closeDis = true; + } else if( - this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") + this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE") { this.moreDisabled = false; diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html index 6b8a9fcf..1d129790 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html @@ -15,7 +15,7 @@ - {{ts.trPK('worklistMain','line_details')}} + {{'worklistMain,itemReq'| translate}} - {{'general, file' | translate}} + {{'worklistMain, attach-file' | translate}} + - {{ts.trPK('worklistMain','info')}} + {{'worklistMain, info'| translate}} @@ -49,7 +50,7 @@ - + @@ -70,7 +71,7 @@ - +
@@ -90,7 +91,7 @@
- +
@@ -132,7 +133,7 @@ - +
@@ -148,7 +149,7 @@
- +
@@ -164,7 +165,7 @@
- +
@@ -181,7 +182,7 @@
- +
@@ -199,7 +200,7 @@
- +
@@ -215,7 +216,7 @@
- +
@@ -232,7 +233,7 @@
- +
@@ -250,7 +251,7 @@
- +
@@ -266,7 +267,7 @@
- +
@@ -370,7 +371,7 @@ - +
@@ -387,7 +388,7 @@
- +
@@ -408,7 +409,7 @@
- +
@@ -429,7 +430,7 @@
- +
@@ -450,7 +451,7 @@
- +
@@ -472,7 +473,7 @@
- +
@@ -772,17 +773,31 @@ - {{'worklistMain, approve' | translate}} + + + + {{approve_label}} + + + + + + + {{close_label}} + - {{'worklistMain, reject' | translate}} + + {{reject_label}} - {{'worklistMain, request' | translate}} + {{reqInfo_label}} + + 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 839a795d..c459c4b0 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 @@ -122,6 +122,11 @@ export class WorklistMainPoComponent implements OnInit { moreDisabled: boolean = true; direction: string; defaultSegment = ''; + approve_label: any; + reject_label: any; + reqInfo_label: any; + closeDis: boolean = false;; + close_label: any; constructor( public common: CommonService, @@ -152,6 +157,12 @@ export class WorklistMainPoComponent implements OnInit { }//ngOn intializeNotificationDetail() { + this.approveDis = false; + this.rejectDis = false; + this.requestDis = false; + this.closeDis=false; + this.moreDisabled = true; + if (this.messageSuccess) { document.getElementById("notificationDynamicFieldsPO").innerHTML = ""; } @@ -306,16 +317,26 @@ export class WorklistMainPoComponent implements OnInit { console.log("test" + this.notificationButtonRes.length); for (let i = 0; i < this.notificationButtonRes.length; i++) { if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVE") { + this.approve_label=this.notificationButtonRes[i].BUTTON_LABEL; + this.approveDis = true; } else if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECT") { + this.reject_label=this.notificationButtonRes[i].BUTTON_LABEL; this.rejectDis = true; } else if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") { + this.reqInfo_label=this.notificationButtonRes[i].BUTTON_LABEL; + this.requestDis = true; } // if result == null + else if // if result == null + (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") { + this.close_label = this.notificationButtonRes[i].BUTTON_LABEL; + this.closeDis = true; + } else if ( - this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") + this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE") { this.moreDisabled = false; diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html index 16ed9cf8..da469ac2 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html @@ -15,7 +15,7 @@ - {{ts.trPK('worklistMain','itemReq')}} + {{'worklistMain, itemReq'| translate}} @@ -23,13 +23,14 @@ - {{'general, file' | translate}} + {{'worklistMain, attach-file' | translate}} + - {{ts.trPK('worklistMain','info')}} + {{'worklistMain, info'| translate}} @@ -46,7 +47,7 @@ - + @@ -68,7 +69,7 @@ - +
@@ -90,7 +91,7 @@
- +
@@ -206,7 +207,7 @@
--> - +
@@ -227,7 +228,7 @@
- +
@@ -244,7 +245,7 @@
- +
@@ -485,17 +486,30 @@ - {{'worklistMain, approve' | translate}} + + {{approve_label}} + + + + + + + + {{close_label}} + - {{'worklistMain, reject' | translate}} + + {{reject_label}} - {{'worklistMain, request' | translate}} + + {{reqInfo_label}} + 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 0c91d8b5..3cbbbcd4 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 @@ -107,6 +107,11 @@ export class WorklistMainPRComponent implements OnInit { moreDisabled: boolean = true; direction: string; defaultSegment = ''; + approve_label: any; + reject_label: any; + reqInfo_label: any; + close_label: any; + closeDis: boolean = false; constructor( @@ -143,6 +148,12 @@ export class WorklistMainPRComponent implements OnInit { intializeNotificationDetail() { + this.approveDis = false; + this.rejectDis = false; + this.requestDis = false; + this.closeDis =false; + this.moreDisabled = true; + if (this.messageSuccess) { document.getElementById('notificationDynamicFieldsPR').innerHTML = ''; } @@ -308,16 +319,25 @@ export class WorklistMainPRComponent implements OnInit { console.log('test' + this.notificationButtonRes.length); for (let i = 0; i < this.notificationButtonRes.length; i++) { if (this.notificationButtonRes[i].BUTTON_ACTION == 'APPROVE') { + this.approve_label=this.notificationButtonRes[i].BUTTON_LABEL; this.approveDis = true; } else if (this.notificationButtonRes[i].BUTTON_ACTION == 'REJECT') { + this.reject_label=this.notificationButtonRes[i].BUTTON_LABEL; this.rejectDis = true; } else if (this.notificationButtonRes[i].BUTTON_ACTION == 'REQUEST_INFO') { + this.reqInfo_label=this.notificationButtonRes[i].BUTTON_LABEL; + this.requestDis = true; } // if result == null + else if // if result == null + (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") { + this.close_label = this.notificationButtonRes[i].BUTTON_LABEL; + this.closeDis = true; + } else if ( - this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") + this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE") { this.moreDisabled = false; 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 50fb327b..2adc87d2 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -15,20 +15,20 @@ - {{ts.trPK('worklistMain','title')}} + {{'worklistMain, details-emp'| translate}} - {{'worklistMain, action' | translate}} + {{'worklistMain, action' | translate}} - {{'general, file' | translate}} + {{'worklistMain, attach-file' | translate}} - {{ts.trPK('worklistMain','info')}} + {{'worklistMain, info'| translate}} @@ -71,14 +71,18 @@
-
+
{{ts.trPK('worklistMain','employee-on-leave')}}
- + - -
+ +
@@ -87,7 +91,9 @@
- + @@ -96,11 +102,11 @@ - +
- +
@@ -131,7 +137,7 @@
- + @@ -154,7 +160,7 @@ - +
@@ -174,7 +180,7 @@
- +
@@ -260,7 +266,7 @@
- +
@@ -274,42 +280,42 @@
- +
- +
- +
- +
- + - +
@@ -317,7 +323,7 @@
- +
@@ -504,17 +510,29 @@ - {{'worklistMain, approve' | translate}} + + {{approve_label}} + + + + + + {{close_label}} + - {{'worklistMain, reject' | translate}} + + {{reject_label}} + - {{'worklistMain, request' | translate}} + + {{reqInfo_label}} + diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss index 6ecdd443..785d9226 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss @@ -242,6 +242,35 @@ color: white; margin-left: 55px; } +/////////////Subordinate-Arabic/////////////////// + +.subOrdinateList-Ar { + --background: transparent; + margin-left: -3px; + margin-right: -13px; + margin-bottom: 8px; +} +.gridSubordinates-Ar{ + border-top-right-radius: 28px; + border-bottom-right-radius: 40px; + background: var(--light); + border-top-left-radius: 16px; + border-bottom-left-radius: 16px; + margin-right: 42px; +} + +.subOrdinateRow-Ar { + margin-right: 55px; +} + +.subOrdinateDiv-Ar { + z-index: 4; + margin-right: -46px; + position: absolute; + top: -2px; +} +/////////////////////////////////////////////// + .label{ font-size: 14px; } 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 bb660db8..6b31e493 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; @@ -101,6 +101,11 @@ export class WorklistMainComponent implements OnInit { public isPostNoLoad = true; public worklistNotifications: any; public totalRequestCount = 0; + approve_label: any = ""; + reject_label: any = ""; + reqInfo_label: any = ""; + close_label: any; + closeDis: boolean = false; constructor( public worklistService: WorklistService, @@ -121,6 +126,7 @@ export class WorklistMainComponent implements OnInit { this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; + } ngOnInit() { @@ -139,13 +145,13 @@ export class WorklistMainComponent implements OnInit { } //name=document.getElementById('notificationDynamicFields').value; - //removeElement('parentDiv', name);" + //removeElement('parentDiv', name);" - //var navbar = document.getElementById("notificationDynamicFields").value; + //var navbar = document.getElementById("notificationDynamicFields").value; // document.querySelector('svg .gauge.chart > text').remove(); // var inputValue = (document.getElementById("notificationDynamicFields")).value; - + console.log(" this.selEmp" + this.selEmp); this.intializeNotificationDetail(); @@ -157,7 +163,15 @@ export class WorklistMainComponent implements OnInit { } intializeNotificationDetail() { - + this.approveDis = false; + this.rejectDis = false; + this.requestDis = false; + this.moreDisabled = true; + this.closeDis = false; + // this.approve_label=""; + // this.reject_label=""; + // this.reqInfo_label=""; + if (this.messageSuccess) { document.getElementById("notificationDynamicFields").innerHTML = ""; } @@ -166,10 +180,10 @@ export class WorklistMainComponent implements OnInit { HomeComponent.NOTIFICATION_DATA, false ); - - console.log("for next()"+ this.getPassNotificationDetails.ROW_NUM); - this.notificationArray=[] - this.subordinatesleaveList=[]; + + console.log("for next()" + this.getPassNotificationDetails.ROW_NUM); + this.notificationArray = [] + this.subordinatesleaveList = []; this.notificationArray = this.common.sharedService.getSharedData( HomeComponent.NOTIFICATION_ARR, false @@ -273,7 +287,7 @@ export class WorklistMainComponent implements OnInit { } handleWorkListBodyResult(result, Type) { - + if (this.common.validResponse(result)) { this.pInformation = result.P_INFORMATION; this.pQuestion = result.P_QUESTION; @@ -281,17 +295,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); - } + if (this.notificationBodyRes[0].Collection_Notification) { + console.log(this.notificationBodyRes[0].Collection_Notification); + } } } else if (Type == "ABSENCE") { if (result.GetAbsenceCollectionNotificationBodyList) { this.notificationBodyRes = - result.GetAbsenceCollectionNotificationBodyList ; - if(this.notificationBodyRes[0].Collection_Notification){ - console.log(this.notificationBodyRes[0].Collection_Notification); - } + 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) { @@ -314,7 +328,7 @@ export class WorklistMainComponent implements OnInit { getNotificationButtons(notificationButtonsObj) { - this.notificationButtonRes=[]; + this.notificationButtonRes = []; this.worklistMainService .getNotificationButtons(notificationButtonsObj) .subscribe((result: NotificatonButtonResponse) => { @@ -331,20 +345,26 @@ export class WorklistMainComponent implements OnInit { console.log("test" + this.notificationButtonRes.length); for (let i = 0; i < this.notificationButtonRes.length; i++) { if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVED") { + this.approve_label = this.notificationButtonRes[i].BUTTON_LABEL; this.approveDis = true; } else if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECTED") { + this.reject_label = this.notificationButtonRes[i].BUTTON_LABEL; this.rejectDis = true; } else if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") { + this.reqInfo_label = this.notificationButtonRes[i].BUTTON_LABEL; this.requestDis = true; - } // if result == null - else if( - this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") - { - this.moreDisabled = false; + } else if // if result == null + (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") { + this.close_label = this.notificationButtonRes[i].BUTTON_LABEL; + this.closeDis = true; + } else if - } + (this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE") { + this.moreDisabled = false; + + } } // valid it } } @@ -379,7 +399,7 @@ export class WorklistMainComponent implements OnInit { this.nextNotfification(); }, 5000); - + } } // valid it } @@ -390,7 +410,7 @@ export class WorklistMainComponent implements OnInit { // let itemNo = this.getPassNotificationDetails.ROW_NUM; // itemNo += 1; - + // if (itemNo > this.notificationArray.length) { // this.common.openNotificationPage(); // } else { @@ -411,36 +431,36 @@ export class WorklistMainComponent implements OnInit { public nextNotfification() { //let itemExist = false; - if( document.getElementById("notificationDynamicFields") != null){ - + if (document.getElementById("notificationDynamicFields") != null) { + document.getElementById("notificationDynamicFields").innerHTML = ""; - } + } let itemNo = this.getPassNotificationDetails.ROW_NUM; console.log(itemNo); let index = this.notificationArray.findIndex(x => x.ROW_NUM === itemNo); console.log(index); console.log(this.notificationArray); index += 1; - + if (index < this.notificationArray.length) { this.common.sharedService.setSharedData(this.notificationArray[index], HomeComponent.NOTIFICATION_DATA); - if(this.notificationArray[index].REQUEST_TYPE == "PO" ){ - this.common.openWorklistMainPOPage() - }else - if(this.notificationArray[index].REQUEST_TYPE == "PR" ){ - this.common.openWorklistMainPRPage() - } - else - if(this.notificationArray[index].REQUEST_TYPE == "MO" ){ - this.common.openWorklistMainMRPage() - }else{ - - this.intializeNotificationDetail(); - } + if (this.notificationArray[index].REQUEST_TYPE == "PO") { + this.common.openWorklistMainPOPage() + } else + if (this.notificationArray[index].REQUEST_TYPE == "PR") { + this.common.openWorklistMainPRPage() + } + else + if (this.notificationArray[index].REQUEST_TYPE == "MO") { + this.common.openWorklistMainMRPage() + } else { + + this.intializeNotificationDetail(); + } } - else{ + else { this.common.openNotificationPage(); } } @@ -448,7 +468,7 @@ export class WorklistMainComponent implements OnInit { sortArray(arrayToSort: any) { return arrayToSort.sort((a: any, b: any) => - new Date(b.BEGIN_DATE).getTime() - new Date(a.BEGIN_DATE).getTime() + new Date(b.BEGIN_DATE).getTime() - new Date(a.BEGIN_DATE).getTime() ); } @@ -471,7 +491,7 @@ export class WorklistMainComponent implements OnInit { } this.P_RESPOND_ATTRIBUTES_TBL.push(obj); } - console.log("a"+ this.P_RESPOND_ATTRIBUTES_TBL); + console.log("a" + this.P_RESPOND_ATTRIBUTES_TBL); let repUserName = this.selEmployeeID; if (this.hideForwordEmployee && this.hideForwordEmployee.ATTRIBUTE_NAME) { @@ -482,8 +502,8 @@ export class WorklistMainComponent implements OnInit { this.P_RESPOND_ATTRIBUTES_TBL.push(obj); } - console.log( "b"+ this.P_RESPOND_ATTRIBUTES_TBL); - + console.log("b" + this.P_RESPOND_ATTRIBUTES_TBL); + if ( ButtonAction == "APPROVED" || ButtonAction == "REJECTED" || @@ -503,7 +523,7 @@ export class WorklistMainComponent implements OnInit { ButtonAction, WorklistMainComponent.PASS_ACTION_MODE ); - + this.common.sharedService.setSharedData( this.P_RESPOND_ATTRIBUTES_TBL, WorklistMainComponent.PASS_RES_ATTR @@ -534,7 +554,7 @@ export class WorklistMainComponent implements OnInit { this.ts.trPK('vacation-rule', 'confirmation'), this.confirmMsg) - // this.openApplyModal(this.WorkListActionObj); + // this.openApplyModal(this.WorkListActionObj); } @@ -607,7 +627,7 @@ export class WorklistMainComponent implements OnInit { this.P_RESPOND_ATTRIBUTES_TBL, WorklistMainComponent.PASS_RES_ATTR ); - console.log("c"+ this.P_RESPOND_ATTRIBUTES_TBL); + console.log("c" + this.P_RESPOND_ATTRIBUTES_TBL); // this.common.openWorklistRollReplacement(); this.openRepRolModal(); @@ -640,13 +660,13 @@ export class WorklistMainComponent implements OnInit { // submitAbsObjList: this.notificationBodyRes[0].Collection_Notification // }); //this.common.openConfirmAbsece(); - this.dirfromNotificationPage=true, - this.common.sharedService.setSharedData( - this.dirfromNotificationPage, - "dirfromNotificationPage" - ); + this.dirfromNotificationPage = true, + this.common.sharedService.setSharedData( + this.dirfromNotificationPage, + "dirfromNotificationPage" + ); this.common.sharedService.setSharedData( - this.notificationBodyRes[0].Collection_Notification, + this.notificationBodyRes[0].Collection_Notification, "submitAbsObjList" ); @@ -706,7 +726,7 @@ export class WorklistMainComponent implements OnInit { // this.sharedData.setSharedData(result, WorKListResponse.SHARED_DATA); this.NotRespondAttributeList = []; - result.NotificationGetRespondAttributesList; + result.NotificationGetRespondAttributesList; if ( result.NotificationRespondRolesList != "" && result.NotificationRespondRolesList[0].ATTRIBUTE_NAME != null && @@ -730,7 +750,7 @@ export class WorklistMainComponent implements OnInit { for (let i = 0; i < notificationAttr.length; i++) { if (notificationAttr[i].ATTRIBUTE_TYPE == "VARCHAR2") { this.textArea = new TextAreaInput(notificationAttr[i].ATTRIBUTE_DISPLAY_NAME, notificationAttr[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); - console.log(this.textArea ); + console.log(this.textArea); } else if (notificationAttr[i].ATTRIBUTE_TYPE == "ROLE") { } else if (notificationAttr[i].ATTRIBUTE_TYPE == "DATE") { @@ -784,7 +804,7 @@ export class WorklistMainComponent implements OnInit { getAttachmentNotification(WorkListAttachObj) { this.attachmentRes = [] - console.log(" this.P_PAGE_NUM: "+ this.P_PAGE_NUM); + console.log(" this.P_PAGE_NUM: " + this.P_PAGE_NUM); this.worklistAttachService.getAttach(WorkListAttachObj). subscribe((result: NotificationGetAttachResponse) => { @@ -803,8 +823,8 @@ export class WorklistMainComponent implements OnInit { getActionHistory(WorkListActionHistoryObj) { this.IsReachEnd = true; - this.actionHistoryRes =[]; - console.log(" this.P_PAGE_NUM: "+ this.P_PAGE_NUM); + this.actionHistoryRes = []; + console.log(" this.P_PAGE_NUM: " + this.P_PAGE_NUM); this.worklistService.getActionHistory(WorkListActionHistoryObj). subscribe((result: WorkListActionHistoryResponse) => { this.handleWorkListActionHistoryResult(result); @@ -813,7 +833,7 @@ export class WorklistMainComponent implements OnInit { } handleWorkListActionHistoryResult(result) { - console.log( "1"+ this.IsReachEnd); + console.log("1" + this.IsReachEnd); if (this.common.validResponse(result)) { if (this.common.hasData(result.GetActionHistoryList)) { this.actionHistoryRes = result.GetActionHistoryList; @@ -824,11 +844,11 @@ export class WorklistMainComponent implements OnInit { let lastitem = result.GetActionHistoryList[lastItemIndex]; if (lastitem.NO_OF_ROWS == lastitem.ROW_NUM) { this.IsReachEnd = true; - console.log( "2"+ this.IsReachEnd); + console.log("2" + this.IsReachEnd); } else { this.IsReachEnd = false; - console.log( "3"+ this.IsReachEnd); + console.log("3" + this.IsReachEnd); } } @@ -933,8 +953,8 @@ export class WorklistMainComponent implements OnInit { const request = new GetSubordinatesLeavesRequest(); - request.P_DATE_FROM = "/Date(" + Date.parse(from) + '+0300'+ ")/";//new Date(from); - request.P_DATE_TO = "/Date(" + Date.parse(to) + '+0300'+ ")/" //new Date(to); + request.P_DATE_FROM = "/Date(" + Date.parse(from) + '+0300' + ")/";//new Date(from); + request.P_DATE_TO = "/Date(" + Date.parse(to) + '+0300' + ")/" //new Date(to); request.P_SELECTED_EMPLOYEE_NUMBER = this.selEmp; // ="'/Date(" + Date.parse(from) + ")'" @@ -958,7 +978,7 @@ export class WorklistMainComponent implements OnInit { } getsubmitterInfo(notificationSubmitterInfoObj) { - this.submitterInfoRes=[]; + this.submitterInfoRes = []; this.worklistMainService.getSubmitterInfo(notificationSubmitterInfoObj). subscribe((result: WorklistsubmitterInfoResponse) => { this.handleSubmitterInfoResult(result); diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index d32e9a56..400a9859 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -159,10 +159,10 @@
{{ts.trPK('payslip','summary-payment')}}
- + - + @@ -171,12 +171,12 @@ - + - + @@ -186,11 +186,11 @@ - + - + @@ -200,11 +200,11 @@ - + - + @@ -219,7 +219,7 @@
{{ts.trPK('payslip','earnings')}}
- + @@ -228,7 +228,7 @@ - + @@ -242,7 +242,7 @@
{{ts.trPK('payslip','deductions')}}
- + @@ -251,7 +251,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -301,7 +301,7 @@ - + diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index e99ebbd6..4357dffe 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -15,6 +15,15 @@ margin-left: 8px; font-size: 12px !important; } +.colPayslip-ar{ + border-left: 1px solid #cac8c8; + border-bottom-left-radius: -10px !important; + padding-top: 8px; + padding-bottom: 8px; + margin-left: 8px; + font-size: 12px !important; +} + .colPayslips{ border-bottom-left-radius: -10px !important; padding-top: 8px; diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts index 18765a80..2395bafd 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts @@ -102,6 +102,7 @@ export class TimeCardDetailsComponent implements OnInit { this.selMenu = this.common.sharedService.getSharedData(MenuResponse.SHARED_DATA, false); this.menuType = this.selMenu.List_Menu.MENU_TYPE; + dayAndHoursReqObj.P_SELECTED_EMPLOYEE_NUMBER = this.selEmp; dayAndHoursReqObj.P_MENU_TYPE = this.menuType; dayAndHoursReqObj.P_SELECTED_RESP_ID = this.respID; diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 7d008191..add5c3f0 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -959,7 +959,7 @@ }, "time-left": { "en": "Time Left Today", - "ar": "باقي الوقت لليوم" + "ar": "الوقت المتبقي" } }, "work-list": { @@ -1165,7 +1165,7 @@ "vacation-rule": { "vacationRule": { "en": "Vacation Rule", - "ar": "قواعد الإجازات" + "ar": "الإنابة بالإجازات" }, "apply-for-vacation-rule": { "en": "Apply for vacation Rule", @@ -1969,15 +1969,15 @@ }, "approve": { "en": "Approve", - "ar": "موافق" + "ar": "إعتماد" }, "reject": { "en": "Reject", "ar": "رفض" }, "request": { - "en": "Request", - "ar": "طلب" + "en": "Request info", + "ar": "طلب معلومات" }, "title": { "en": "Details", @@ -2005,7 +2005,7 @@ }, "info": { "en": "Info", - "ar": "تفاصيل" + "ar": "تفاصيل الطلب" }, "notfDetails": { "en": "Notification Details", @@ -2041,7 +2041,7 @@ }, "action": { "en": "Action", - "ar": "الحركة" + "ar": "تاريخ الإجراءات" }, "actionRequird": { "en": "Action is required", @@ -2373,9 +2373,48 @@ }, "Tran_Succ":{ "en": "Transaction Successful", - "ar":"عملية ناجحه" - } - + "ar":"عملية ناجحة" + }, + "req_detail":{ + "en": "ٌRequest Details", + "ar":"تفاصيل الطلب" + }, + "job_cate":{ + "en": "Job category", + "ar":"الفئة الوظيفية" + }, + "category":{ + "en": "Category", + "ar":"نوع العقد" + }, + "job-name":{ + "en": "Job Title", + "ar":"المسمى الوظيفي" + }, + "emp-email": { + "en": "Employee Email Address", + "ar": "البريد الإلكتروني للموظف" + }, + "org-name": { + "en": "Adminstration Name", + "ar": "إسم الإدارة" + }, + "loc-name": { + "en": "Company Name", + "ar": "إسم الشركة" + }, + "branch-payrol": { + "en": "Payroll Branch", + "ar": "فرع الرواتب" + }, + "attach-file": { + "en": "Files", + "ar": "المرفقات" + }, + "details-emp": { + "en": "Details", + "ar": "تفاصيل الموظف" + } }, "payslip": { "title": { @@ -2486,7 +2525,7 @@ "attendance-tracking": { "title": { "en": "Mark Attendance", - "ar": "علامة الحضور " + "ar": "تسجيل الحضور والانصراف" }, "check-in": { "en": "Check In", @@ -2534,7 +2573,7 @@ }, "today-time-left": { "en": "TODAY'S TIME LEFT", - "ar": "TODAY'S TIME LEFT" + "ar": "الوقت المتبقي" }, "shortage-hours": { "en": "Shortage Hours", @@ -2558,15 +2597,15 @@ }, "confirm-alert1": { "en": "Are you sure, you want to", - "ar": "Are you sure, you want to" + "ar": "هل انت متأكد تريد لإنصراف من العمل؟" }, "confirm-alert2": { "en": " check out", - "ar": " check out" + "ar": "" }, "confirm-alert3": { "en": "You didn't complete today shift", - "ar": "You didn't complete today shift" + "ar": "وقت العمل لم ينتهي بعد" }, "shift-time": { "en": "Shift Time", diff --git a/Mohem/src/theme/worklist.scss b/Mohem/src/theme/worklist.scss index 424b3686..a97d89c7 100644 --- a/Mohem/src/theme/worklist.scss +++ b/Mohem/src/theme/worklist.scss @@ -467,6 +467,10 @@ left: 66px; .colBorder{ border-right: solid 0.02cm var(--grayBG); +} +.colBorder-ar{ + border-left: solid 0.02cm var(--grayBG); + } .dateActionHistory{