merge master-newdesign

arabic-version
Mohamed Mekawy 6 years ago
commit 88e7f106bf

@ -23,6 +23,7 @@
<preference name="FadeSplashScreen" value="false" /> <preference name="FadeSplashScreen" value="false" />
<preference name="AutoHideSplashScreen" value="false" /> <preference name="AutoHideSplashScreen" value="false" />
<preference name="ShowSplashScreenSpinner" value="true" /> <preference name="ShowSplashScreenSpinner" value="true" />
<preference name="orientation" value="portrait" />
<platform name="android"> <platform name="android">
<edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application" xmlns:android="http://schemas.android.com/apk/res/android"> <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application" xmlns:android="http://schemas.android.com/apk/res/android">
<application android:networkSecurityConfig="@xml/network_security_config" /> <application android:networkSecurityConfig="@xml/network_security_config" />

@ -13,7 +13,7 @@
</ion-header> </ion-header>
<ion-content > <ion-content class="colorBG">
<!-- colorBG --> <!-- colorBG -->
<div class="contentEit" style="background: #f3f1f1;"> <div class="contentEit" style="background: #f3f1f1;">
<div class="header-div"> <div class="header-div">
@ -148,7 +148,7 @@
<div class="no-dataDiv" *ngIf="!GetAbsenceTransactionList || GetAbsenceTransactionList.length <= 0" > <div class="no-dataDiv" *ngIf="!GetAbsenceTransactionList || GetAbsenceTransactionList.length <= 0" >
<ion-row> <ion-row>
<img class="empty-data" src="../assets/imgs/noData.png"/> <img class="empty-data" src="../assets/imgs/box.png"/>
</ion-row> </ion-row>

@ -5,7 +5,7 @@
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content> <ion-content class="colorBG">
<div class=""> <div class="">
<!-- class="colorBG" --> <!-- class="colorBG" -->
<div class="content" [hidden]="functionName!='HMG_TKT_NEW_EIT_SS'"> <div class="content" [hidden]="functionName!='HMG_TKT_NEW_EIT_SS'">
@ -157,7 +157,7 @@
*ngIf="!getResEITTransactionList || getResEITTransactionList[0]?.Collection_Transaction.length <= 0"> *ngIf="!getResEITTransactionList || getResEITTransactionList[0]?.Collection_Transaction.length <= 0">
<!-- <div class="no-dataDiv"> --> <!-- <div class="no-dataDiv"> -->
<ion-row> <ion-row>
<img class="empty-data" src="../assets/imgs/noData.png" /> <img class="empty-data" src="../assets/imgs/box.png" />
</ion-row> </ion-row>
<h4> {{'general, noData' | translate}}</h4> <h4> {{'general, noData' | translate}}</h4>
</div> </div>
@ -228,12 +228,12 @@
</div> </div>
</ion-content> </ion-content>
<ion-footer> <!-- <ion-footer>
<div class="centerDiv"> <div class="centerDiv"> -->
<!-- <button *ngIf="getPassMnuEntryObj.ADD_BUTTON == 'Y'" ion-button (click)="addEITRrq()">{{'requestEit.add' <!-- <button *ngIf="getPassMnuEntryObj.ADD_BUTTON == 'Y'" ion-button (click)="addEITRrq()">{{'requestEit.add'
| translate}} </button> --> | translate}} </button> -->
<!-- <ion-button class="footer-button" color="customnavy" ion-button (click)="addEITRrq()"> <!-- <ion-button class="footer-button" color="customnavy" ion-button (click)="addEITRrq()">
{{'general, add' | translate}}</ion-button> --> {{'general, add' | translate}}</ion-button> -->
</div> <!-- </div>
</ion-footer> </ion-footer> -->

@ -546,7 +546,7 @@ export class HomePage implements OnInit {
(result: OpenMissingSwipesResponse) => { (result: OpenMissingSwipesResponse) => {
if (this.common.validResponse(result)) { if (this.common.validResponse(result)) {
const key = "GetOpenMissingSwipesList"; 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() { ITGCountAllNotification() {
this.workListService.getITGDetails().subscribe((result: any) => { this.workListService.getITGDetails().subscribe((result: any) => {
this.statsButtons[0].statsValue = this.statsButtons[0].statsValue =
this.countAllNotification + result.TotalCount; Math.floor(this.countAllNotification + result.TotalCount);
}); });
} }
@ -697,7 +697,7 @@ getSubordinatesAttStatus() {
"HMG Annual Vacation Accrual Plan" "HMG Annual Vacation Accrual Plan"
) { ) {
this.statsButtons[2].statsValue = this.statsButtons[2].statsValue =
accrualBalance.ACCRUAL_NET_ENTITLEMENT; Math.floor(accrualBalance.ACCRUAL_NET_ENTITLEMENT);
this.common.sharedService.setSharedData( this.common.sharedService.setSharedData(
accrualBalance, accrualBalance,
"leaveAccrualBalance" "leaveAccrualBalance"
@ -715,7 +715,7 @@ getSubordinatesAttStatus() {
totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT; totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT;
} }
} }
this.statsButtons[3].statsValue = totalTicketsLeft; this.statsButtons[3].statsValue = Math.floor(totalTicketsLeft);
} }
}); });
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

@ -767,7 +767,7 @@
"ar": "أنت تحاول حذف صف تم حذفه بالفعل." "ar": "أنت تحاول حذف صف تم حذفه بالفعل."
}, },
"noData": { "noData": {
"en": "There are no requests", "en": "No request found",
"ar": "لا توجد طلبات" "ar": "لا توجد طلبات"
}, },
"noFileSelect": { "noFileSelect": {

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

@ -868,9 +868,9 @@ div.no-dataDiv{
border-color:var(--cusgray); border-color:var(--cusgray);
} }
h4 { h4 {
font-size: 2.2rem; font-size: 140%;
text-align: center; text-align: center;
color: var(--dark); color: #888888;
} }
.empty-data { .empty-data {

Loading…
Cancel
Save