diff --git a/Mohem/config.xml b/Mohem/config.xml index 866ace59..a4ed058e 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -23,6 +23,7 @@ + diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 86fd1dcc..07feaeaf 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -13,7 +13,7 @@ - +
@@ -148,7 +148,7 @@
- + 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 b442044d..36b2b14c 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -5,7 +5,7 @@ - +
@@ -157,7 +157,7 @@ *ngIf="!getResEITTransactionList || getResEITTransactionList[0]?.Collection_Transaction.length <= 0"> - +

{{'general, noData' | translate}}

@@ -228,12 +228,12 @@
- -
+ -
+ \ No newline at end of file diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 64d54133..a817b1f6 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -546,7 +546,7 @@ export class HomePage implements OnInit { (result: OpenMissingSwipesResponse) => { if (this.common.validResponse(result)) { const key = "GetOpenMissingSwipesList"; - this.statsButtons[1].statsValue = result[key].P_OPEN_MISSING_SWIPES; + this.statsButtons[1].statsValue = Math.floor(result[key].P_OPEN_MISSING_SWIPES); } } ); @@ -617,7 +617,7 @@ openPeriodDateDashbored() { ITGCountAllNotification() { this.workListService.getITGDetails().subscribe((result: any) => { this.statsButtons[0].statsValue = - this.countAllNotification + result.TotalCount; + Math.floor(this.countAllNotification + result.TotalCount); }); } @@ -697,7 +697,7 @@ getSubordinatesAttStatus() { "HMG Annual Vacation Accrual Plan" ) { this.statsButtons[2].statsValue = - accrualBalance.ACCRUAL_NET_ENTITLEMENT; + Math.floor(accrualBalance.ACCRUAL_NET_ENTITLEMENT); this.common.sharedService.setSharedData( accrualBalance, "leaveAccrualBalance" @@ -715,7 +715,7 @@ getSubordinatesAttStatus() { totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT; } } - this.statsButtons[3].statsValue = totalTicketsLeft; + this.statsButtons[3].statsValue = Math.floor(totalTicketsLeft); } }); } diff --git a/Mohem/src/assets/imgs/box.png b/Mohem/src/assets/imgs/box.png new file mode 100644 index 00000000..a34ee59d Binary files /dev/null and b/Mohem/src/assets/imgs/box.png differ diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 532df045..33d6dac0 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -767,7 +767,7 @@ "ar": "أنت تحاول حذف صف تم حذفه بالفعل." }, "noData": { - "en": "There are no requests", + "en": "No request found", "ar": "لا توجد طلبات" }, "noFileSelect": { diff --git a/Mohem/src/imgs/box.png b/Mohem/src/imgs/box.png new file mode 100644 index 00000000..a34ee59d Binary files /dev/null and b/Mohem/src/imgs/box.png differ diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index b2768650..2358be6a 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -868,9 +868,9 @@ div.no-dataDiv{ border-color:var(--cusgray); } h4 { -font-size: 2.2rem; +font-size: 140%; text-align: center; -color: var(--dark); +color: #888888; } .empty-data {