diff --git a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss index bdae8c76..269ef263 100644 --- a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss +++ b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss @@ -88,9 +88,9 @@ button.item-button.button.button-md.button-clear.button-clear-md { // padding-left: 10px !important; border: solid var(--gray) 1px; border-radius: 21px; - padding-left: 145px !important; + // padding-left: 145px !important; margin-left: 86px; - padding-right: 129px; + // padding-right: 129px; margin-right: -143px; } // {padding-left: unset; diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 1065792b..79b27c34 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -56,10 +56,7 @@
- - -
@@ -71,7 +68,7 @@
- + @@ -81,7 +78,7 @@
- + @@ -92,7 +89,7 @@
- + diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index 28c65f00..0cbd6a21 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -213,6 +213,7 @@ margin-top: -13px; margin-top: 0px; } + .red-label{ font-size: 12px; margin-top: -13px; @@ -224,16 +225,20 @@ margin-top: -13px; margin-top: 0px; } + + .orng-label{ font-size: 12px; margin-top: -13px; } + .orng-amount{ font-size: 15px; font-family: WorkSans-Bold; margin-top: 0px; } + .contentEit:before { position: absolute; content: ""; @@ -247,17 +252,18 @@ margin-top: -13px; .div-green{ position: relative; left: 82%; - bottom: 128px; + bottom: 141px; color: black; background-color: #1FA269; width: 11%; height: 6px; } - .div-green-ar{ + .div-orng-ar{ position: relative; bottom: 59px; color: black; - background-color: #1FA269; + background-color: #DDB017; + // background-color: #1FA269; width: 11%; height: 6px; right: 9px; @@ -270,12 +276,12 @@ margin-top: -13px; background-color: #CB3232; width: 11%; height: 6px; - right: 102px; + right: 92px; } .div-red{ position: relative; left: 59%; - bottom: 131px; + bottom: 146px; color: black; background-color: #CB3232; // background-color: #094875; @@ -293,12 +299,12 @@ margin-top: -13px; width: 11%; height: 6px; } - .div-orng-ar{ + .div-green-ar{ position: relative; - bottom: 139px; + bottom: 124px; color: black; - // background-color: #CB3232; - background-color: #DDB017; + // background-color: #DDB017; + background-color: #1FA269; width: 11%; height: 6px; right: 10px; diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index 0ca580f6..66ddd847 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -251,6 +251,7 @@ createAbsence() { }); } } + handleAccrualResult(result) { if (this.common.validResponse(result)) { this.balance = result.GetAccrualBalancesList; diff --git a/Mohem/src/app/accrual-balances/home/home.component.html b/Mohem/src/app/accrual-balances/home/home.component.html index c2304685..25354335 100644 --- a/Mohem/src/app/accrual-balances/home/home.component.html +++ b/Mohem/src/app/accrual-balances/home/home.component.html @@ -12,7 +12,7 @@ {{ts.trPK('accrualBalances','selectDate')}} - +
    diff --git a/Mohem/src/app/accrual-balances/home/home.component.ts b/Mohem/src/app/accrual-balances/home/home.component.ts index 1171adb0..7739075c 100644 --- a/Mohem/src/app/accrual-balances/home/home.component.ts +++ b/Mohem/src/app/accrual-balances/home/home.component.ts @@ -9,6 +9,7 @@ import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/mo templateUrl: './home.component.html', styleUrls: ['./home.component.scss'] }) + export class HomeComponent implements OnInit { Sdate: any; emp_no: any; @@ -57,4 +58,5 @@ export class HomeComponent implements OnInit { this.balance=result.GetAccrualBalancesList; } } + } diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 1cd935c5..7c227762 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -155,7 +155,7 @@
@@ -313,7 +313,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 a5e6e337..1e94bcc5 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -14,8 +14,6 @@ - -
@@ -27,6 +25,17 @@
+ +
+ + +
+
+ + 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 2dfdf5be..25220405 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.scss +++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss @@ -4,6 +4,26 @@ min-height: 45px; min-width: 200px; } + +.datetime{ + // text-align: center; + // font-family: WorkSans-Bold; + // margin-left: 111px; + text-align: center; + font-family: WorkSans-Bold; + margin-left: 47px; + margin-top: -19px; + + } +.iconCalendar{ + // margin-left: -241px; + // margin-top: 5px; + margin-left: 30px !important; + width: 22% !important; + height: 26px !important; + margin-top: -69px !important; + margin-bottom: 20px !important; + } h4 { font-size: 2.2rem; text-align: center; 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 5b43290c..144955aa 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -9,6 +9,9 @@ import { EitService } from '../services/eit.service'; import { EIT_ACTION } from '../models/submit.eit.action'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { AddEitResponse } from '../models/add.eit.response'; +import { AccrualService } from 'src/app/accrual-balances/services/accrual.service'; +import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; +import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/models/authenticated-user'; @Component({ selector: 'app-eit-list', @@ -16,7 +19,10 @@ import { AddEitResponse } from '../models/add.eit.response'; styleUrls: ['./eit-list.component.scss'], }) export class EitListComponent implements OnInit { - + Sdate: any; + emp_no: any; + balance:any; + //////////////up P_PAGE_NUM: number; P_PAGE_LIMIT: number; IsReachEnd = false; @@ -56,7 +62,8 @@ export class EitListComponent implements OnInit { // gaugeLabel = ""; // tslint:disable-next-line: max-line-length - constructor(private cs: CommonService, private EITService: EitService, public ts: TranslatorService, private modalCtrl: ModalController) { + constructor(private cs: CommonService, private EITService: EitService, public ts: TranslatorService, + private modalCtrl: ModalController, public accrualService: AccrualService, public authService:AuthenticationService,) { this.direction = TranslatorService.getCurrentLanguageName(); this.selMenu = this.cs.sharedService.getSharedData(MenuResponse.SHARED_DATA, false); this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false); @@ -72,6 +79,10 @@ export class EitListComponent implements OnInit { } ngOnInit() { + ///////////// + this.Sdate = new Date().toISOString(); + this.getUserDetails(); + ////////////////up this.getEITTransactions(); this.accrualBalancesList = this.cs.sharedService.getSharedData('tickitsbalance', false); @@ -96,8 +107,44 @@ export class EitListComponent implements OnInit { }; } + getUserDetails(){ + this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { + if (user) { + this.emp_no=user.EMPLOYEE_NUMBER; + + } + }); + } + public getAccrualBalance() { + if (this.Sdate) { + let today = new Date(this.Sdate); + let day = today.getDate(); + let month = today.getMonth() + 1; + let year = today.getFullYear(); + let todayDate = month + '/' + day + '/' + year; + let effectiveDate = todayDate; + const request = { + P_SELECTED_EMPLOYEE_NUMBER: this.emp_no, + P_EFFECTIVE_DATE: effectiveDate + }; + this.accrualService + .getAccrualBalances(request) + .subscribe((result: any) => { + this.handleAccrualResult(result); + }); + } + } + handleAccrualResult(result) { + if (this.cs.validResponse(result)) { + this.balance=result.GetAccrualBalancesList; + this.accrualNetAdult = this.balance[1].ACCRUAL_NET_ENTITLEMENT; + this.accrualUNetChild = this.balance[2].ACCRUAL_NET_ENTITLEMENT; + this. accrualNetInfants = this.balance[3].ACCRUAL_NET_ENTITLEMENT; + } + } + /////////////////////////////////// + getEITTransactions() { - console.log('jkfdjkdfsffjhfsdahffg'); this.IsReachEnd = false; this.EITTransactionsListObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM; @@ -520,5 +567,42 @@ export class EitListComponent implements OnInit { this.removeItems(item.Collection_Transaction[0].TRANSACTION_NUMBER); } - + +////////////////////////// +// getUserDetails(){ +// this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { +// if (user) { +// this.emp_no=user.EMPLOYEE_NUMBER; + +// } +// }); +// } +// public getAccrualBalance() { +// if (this.Sdate) { +// let today = new Date(this.Sdate); +// let day = today.getDate(); +// let month = today.getMonth() + 1; +// let year = today.getFullYear(); +// let todayDate = month + '/' + day + '/' + year; +// let effectiveDate = todayDate; +// const request = { +// P_SELECTED_EMPLOYEE_NUMBER: this.emp_no, +// P_EFFECTIVE_DATE: effectiveDate +// }; +// this.accrualService +// .getAccrualBalances(request) +// .subscribe((result: any) => { +// this.handleAccrualResult(result); +// }); +// } +// } +// handleAccrualResult(result) { +// if (this.cs.validResponse(result)) { +// this.balance=result.GetAccrualBalancesList; +// } +// } } +////////////////////////////////up + + + diff --git a/Mohem/src/app/hmg-common/ui/fab-button/fab-button.component.html b/Mohem/src/app/hmg-common/ui/fab-button/fab-button.component.html index 18d70a13..0cd4bf1f 100644 --- a/Mohem/src/app/hmg-common/ui/fab-button/fab-button.component.html +++ b/Mohem/src/app/hmg-common/ui/fab-button/fab-button.component.html @@ -2,7 +2,6 @@
-
@@ -14,7 +13,6 @@
-
\ No newline at end of file diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index dcb05139..f7753576 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -26,7 +26,6 @@ -

{{'home,monthly-attendance' | translate}}

diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss index 5bcfe464..8266747c 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss @@ -87,7 +87,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { // padding-left: 10px !important; border: solid var(--gray) 1px; border-radius: 21px; - padding-left: 145px !important; + // padding-left: 145px !important; margin-left: 86px; padding-right: 129px; margin-right: -143px; diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index f4930125..793ae144 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -72,7 +72,8 @@
-

{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(15,23) }}

+

{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(15,23) }}

+

{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(23,17) }}

@@ -144,7 +145,7 @@ {{ts.trPK('payslip','total')}}
{{ts.trPK('payslip','salary')}}
- +
diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 46a732d0..4d072688 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -159,6 +159,21 @@ -o-transform: scaleX(-1); transform: scaleX(-1); } + .today-graph{ + display: block !important; + height: 162px; + width: 335px; + /* padding-left: 51px; */ + margin-left: 3px !important; + } + + .today-graph-ar{ + display: block !important; + height: 162px; + width: 335px; + margin-right: 45px; + margin-left: -25px !important; +} .result-graph{ font-size: 14px; @@ -191,7 +206,8 @@ padding: 0; margin: 0; position: absolute; - left: 54%; + // left: 54%; + left: 45%; top: 50%; display: block; text-align: center; @@ -199,7 +215,7 @@ h2 { - font-size: 25px; + font-size: 23px; font-family: WorkSans-Bold; margin: 0 auto; line-height: 36px; @@ -211,7 +227,7 @@ width: 125px; display: block; margin: 0 auto; - font-size: 15px; + font-size: 14px; font-family: workSans-Regular; } } @@ -221,7 +237,7 @@ padding: 0; margin: 0; position: absolute; - left: 42%; + left: 40%; top: 50%; display: block; text-align: center; @@ -251,7 +267,7 @@ } .green-amount{ - font-size: 14px; + font-size: 13px; font-family: WorkSans-Bold; margin-top: -3px; } @@ -262,7 +278,7 @@ } .blue-amount{ - font-size: 14px; + font-size: 13px; font-family: WorkSans-Bold; margin-top: -4px; } diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts index b43a3bc6..9943440a 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -54,7 +54,7 @@ export class HomeComponent implements OnInit { @ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll; public options = { - cutoutPercentage: 80, + cutoutPercentage: 85, tooltips: { enabled: false }, legend: { display: false }}; gaugeType = "full"; diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss index 9edffc6c..202c73a9 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss @@ -147,11 +147,10 @@ } .labelvalue-ar{ - + // margin-right: 19px !important; font-size: 24px !important; font-weight: bold !important; - /* margin-top: 7px !important; */ - margin-right: 19px !important; + margin-right: 25px !important; } @@ -162,8 +161,9 @@ } .percentage-ar{ + // margin-right: -54px; font-size: 19px !important; - margin-right: -54px; + margin-right: -51px; } .gauge{ diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss index f24f0ebd..602cf3e7 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss @@ -111,9 +111,9 @@ button.item-button.button.button-md.button-clear.button-clear-md { .filterInput-ar{ border: solid var(--gray) 1px; border-radius: 21px; - padding-left: 100px !important; + // padding-left: 100px !important; margin-left: 86px; - padding-right: 129px; + // padding-right: 129px; margin-right: -139px; } diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 1affa515..dbf39b94 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1363,17 +1363,17 @@ "en": "Accrual Balances", "ar": "رصيد حساب المستحقات" }, - "accrualNet": { - "en": "Accrual Net", - "ar": "صافي الاستحقاق" + "currentBalance": { + "en": "Current Balance", + "ar": " الرصيد الحالي" }, - "accrualUsed": { - "en": "Accrual Used", - "ar": "الاستحقاق المستخدم" + "usedBalance": { + "en": "Used Balance", + "ar": "الرصيد المستخدم" }, - "accrualYearly": { - "en": "Accrual Yearly", - "ar": "الاستحقاق السنوي" + "annualBalance": { + "en": "Annual Balance", + "ar": "الرصيد السنوي" }, "totalNumber": { "en": "TOTAL NUMBERS",