diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index e7bbf93b..3207faed 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -638,7 +638,7 @@ getSubordinatesAttStatus() { } openPage(subMenu) { - console.log("openPage"); + console.log(subMenu); let selMenu: MenuResponse = new MenuResponse(); selMenu = this.common.sharedService.getSharedData( MenuResponse.SHARED_DATA, diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index 142a36a5..d0789b91 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -78,7 +78,7 @@ [value]="gaugeValue" [label]="gaugeLabel"> --> -
+
-
+

{{GetSummaryOfPaymentList.TOTAL_PAY_AMOUNT}}

@@ -138,9 +138,9 @@ -
{{ts.trPK('payslip','summary-payment')}}
- -
+ +
+
{{ts.trPK('payslip','summary-payment')}}
@@ -201,8 +201,8 @@
-
{{ts.trPK('payslip','earnings')}}
+
{{ts.trPK('payslip','earnings')}}
@@ -224,8 +224,8 @@
-
{{ts.trPK('payslip','deductions')}}
+
{{ts.trPK('payslip','deductions')}}
@@ -255,8 +255,8 @@ --> +
{{ts.trPK('payslip','payment-information')}}
-
diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 11086df0..4105874b 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -137,6 +137,12 @@ margin-left: -48px; margin-right: 3px; } + + .result-graph-ar{ + font-size: 14px; + margin-right: -48px; + margin-left: 3px; + } .headerGrid{ background-color: white !important; border: 1px solid #cac8c8 !important; @@ -150,6 +156,37 @@ padding-right: 21px; } + + .result-text-container-ar { + padding: 0; + margin: 0; + position: absolute; + left: 54%; + top: 50%; + display: block; + text-align: center; + transform: translate(-50%, -50%); + + h2 { + + font-size: 25px; + font-family: WorkSans-Bold; + margin: 0 auto; + line-height: 36px; + + } + + span { + + width: 125px; + display: block; + margin: 0 auto; + font-size: 15px; + font-family: workSans-Regular; + } + } + + .result-text-container { padding: 0; margin: 0; diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts index 7fd9b363..e3f0fe82 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -57,6 +57,7 @@ export class HomeComponent implements OnInit { tooltips: { enabled: false }, legend: { display: false }}; gaugeType = "full"; + direction: string; // gaugeValue = 11.200; // gaugeLabel = ""; @@ -74,6 +75,7 @@ export class HomeComponent implements OnInit { ngOnInit() { + this.direction = TranslatorService.getCurrentLanguageName() // this.selEmp = this.common.sharedService.getSharedData( // MenuResponse.SHARED_SEL_EMP, // false