diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index c953957f..86fd1dcc 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -1,20 +1,21 @@ - - --> - + - + + +
- + + +
@@ -39,7 +42,7 @@
-
+
- - -

{{accrualNet + accrualUsed + accrualYearly}}

+ +

{{totalnumber}}

+ + + {{ts.trPK('absenceList','totalNumber')}} @@ -139,7 +144,7 @@ - +
@@ -245,7 +250,7 @@ - +
- +

{{ts.trPK('absenceList','tickets-balance')}}

@@ -224,6 +225,7 @@ +
@@ -233,4 +235,5 @@
+ \ No newline at end of file diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.scss b/Mohem/src/app/eit/eit-list/eit-list.component.scss index ed9b1079..c2b03032 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.scss +++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss @@ -85,6 +85,17 @@ h4 { } //////////////////////////////// +.content:before { + position: absolute; +content: ""; +background: #22c6b3; +height: 140px; +width: 100%; +left: 0; +top: 0px; +z-index: 1; +} + .colorBG{ --background: #f0efef; @@ -99,7 +110,7 @@ h4 { .title{ text-align: center; color: black; - margin-top: -10px; + margin-top: 5px; font-size: 17px; } .today-graph{ @@ -111,22 +122,37 @@ h4 { } .headerGrid{ + // background-color: white !important; + // border: 1px solid #cac8c8 !important; + // border-radius: 20px !important; + // padding-top: 28px; + // padding-bottom: 53px; + // margin-left: 9px; + // margin-right: 13px; + // margin-top: -94px; + // margin-bottom: 10px; background-color: white !important; border: 1px solid #cac8c8 !important; - border-radius: 20px !important; - padding-top: 28px; + /* padding-top: 28px; */ padding-bottom: 53px; - margin-left: 9px; + padding-top: -30px; + margin-left: 13px; margin-right: 13px; - margin-top: -94px; + /* margin-top: -86px; */ margin-bottom: 10px; - + position: relative; + z-index: 1; + border-radius: 20px; + margin-top: 17px; } .result-graph{ font-size: 14px; margin-left: -48px; margin-right: 3px; margin-bottom: -30px; + + + } .green-label{ 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 db00c923..cf6bbe83 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -44,7 +44,6 @@ export class EitListComponent implements OnInit { accrualNetInfants: any; accrualUNetChild: any; accrualNetAdult: any; - public options = { cutoutPercentage: 80, @@ -81,6 +80,7 @@ export class EitListComponent implements OnInit { 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/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index 8a72c56a..142a36a5 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -1,7 +1,6 @@ - + + + + + {{ts.trPK('payslip','monthly-payslip')}} + + +
- +
diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 7dde3934..11086df0 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -58,19 +58,20 @@ color: var(--red); } - +.header-toolbar-new{ + --background: #22c6b3; +} .colorBG{ --background: #f0efef; } .header-div { - - background-color: #22C6B3; - text-transform: capitalize; - height: 180px; - position: relative; - display: block; - margin-bottom: -28px; + background-color: #22C6B3; + text-transform: capitalize; + height: 119px; + position: relative; + display: block; + margin-bottom: -28px; } .Title{ text-align: center; @@ -142,8 +143,8 @@ border-radius: 20px !important; padding-top: 13px; padding-bottom: 14px; - margin-left: 30px; - margin-right: 32px; + margin-left: 26px; + margin-right: 28px; margin-top: -2px; margin-bottom: 10px; padding-right: 21px; @@ -214,7 +215,7 @@ margin-top: -13px; .header{ - margin-top: -126px; + margin-top: -119px; } .bgcolor {