+
-
+
+
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/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 54c270ce..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": {
@@ -2525,7 +2525,7 @@
"attendance-tracking": {
"title": {
"en": "Mark Attendance",
- "ar": "علامة الحضور "
+ "ar": "تسجيل الحضور والانصراف"
},
"check-in": {
"en": "Check In",
@@ -2573,7 +2573,7 @@
},
"today-time-left": {
"en": "TODAY'S TIME LEFT",
- "ar": "TODAY'S TIME LEFT"
+ "ar": "الوقت المتبقي"
},
"shortage-hours": {
"en": "Shortage Hours",
@@ -2597,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/package-lock.json b/package-lock.json
deleted file mode 100644
index 48e341a0..00000000
--- a/package-lock.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "lockfileVersion": 1
-}