mekawy-issues
Fatimah.Alshammari 6 years ago
parent d4fdf76d18
commit bd0208919c

@ -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;

@ -56,10 +56,7 @@
<div class="result-text-container">
<!-- <h2>{{totalnumber}}</h2> -->
<!-- <h2>{{accrualNet + accrualUsed + accrualYearly}}</h2> -->
<!-- <span>{{ts.trPK('absenceList','totalNumber')}}</span> -->
</div>
@ -71,7 +68,7 @@
<div [ngClass]=" direction == 'ltr' ? 'div-green' : 'div-green-ar'">
<ion-col>
<ion-row>
<label class="green-label">{{ts.trPK('absenceList','accrualNet')}}</label>
<label class="green-label">{{ts.trPK('absenceList','currentBalance')}}</label>
</ion-row>
<ion-row>
<label class="green-amount">{{accrualNet}}</label>
@ -81,7 +78,7 @@
<div [ngClass]=" direction == 'ltr' ? 'div-red' : 'div-red-ar'">
<ion-col>
<ion-row>
<label class="red-label">{{ts.trPK('absenceList','accrualUsed')}}</label>
<label class="red-label">{{ts.trPK('absenceList','usedBalance')}}</label>
</ion-row>
<ion-row>
@ -92,7 +89,7 @@
<div [ngClass]=" direction == 'ltr' ? 'div-orng' : 'div-orng-ar'">
<ion-col>
<ion-row>
<label class="orng-label">{{ts.trPK('absenceList','accrualYearly')}}</label>
<label class="orng-label">{{ts.trPK('absenceList','annualBalance')}}</label>
</ion-row>
<ion-row>

@ -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;

@ -251,6 +251,7 @@ createAbsence() {
});
}
}
handleAccrualResult(result) {
if (this.common.validResponse(result)) {
this.balance = result.GetAccrualBalancesList;

@ -12,7 +12,7 @@
<ion-label>{{ts.trPK('accrualBalances','selectDate')}}</ion-label>
<ion-datetime [(ngModel)]="Sdate" min="1900" max="2100" displayFormat="MMM/DD/YYYY " placeholder="MM/DD/YYYY"
(ionChange)="getAccrualBalance()"></ion-datetime>
</ion-item>
<ul>

@ -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;
}
}
}

@ -155,7 +155,7 @@
</div>
<div class="menuFooter">
<!-- <div> <img src="../assets/imgs/CS.png" class="CompanyImg"></div> -->
<p class="companyTxt">{{companyDesc}}</p>
<!-- <p class="companyTxt">{{companyDesc}}</p> -->
</div>
</ion-content>
</ion-menu>
@ -313,7 +313,7 @@
</div>
<div class="menuFooter">
<!-- <div> <img src="../assets/imgs/CS.png" class="CompanyImg"></div> -->
<p class="companyTxt">{{companyDesc}}</p>
<!-- <p class="companyTxt">{{companyDesc}}</p> -->
</div>
</ion-content>
</ion-menu>

@ -14,8 +14,6 @@
</ion-toolbar>
</ion-header>
<ion-content>
<div class="">
<!-- class="colorBG" -->
@ -27,6 +25,17 @@
<div style="color: black;">
<div class="result-graph">
<div >
<ion-datetime [(ngModel)]="Sdate" class="datetime" displayFormat="DD MMMM YYYY" placeholder="DD MMMM YYYY"
(ionChange)="getAccrualBalance()"></ion-datetime>
<ion-icon class="iconCalendar" ios="ios-calendar" md="md-calendar"></ion-icon>
</div>
<div style=" border-bottom: 1px solid #a7a4a4; margin-bottom: 12px;
margin-top: -10px; margin-right: -9px;"></div>
<!-- <div class="result-text-container">
</div> -->
<p-chart #chart class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>

@ -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;

@ -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

@ -2,7 +2,6 @@
<div class="circle pulse"></div>
<div class="circle">
<ion-fab class="fab-i ">
<ion-fab-button [ngClass]="type === 'add' ? 'addnon' : 'cbookApointmentBtn' " (click)="onClick()" >
<!-- <img style="width: 39%; margin-top: -29%;" src="assets/icon/booking.png" /> -->
<div *ngIf="type != 'add' ">
@ -14,7 +13,6 @@
<!-- <ion-icon name="add-outline"></ion-icon> -->
</div>
</ion-fab-button>
</ion-fab>
</div>
</div>

@ -26,7 +26,6 @@
</ion-row>
<ion-row *ngFor="let menuItem of menuEntries; let i=index">
<ion-row class="attendance-module" *ngIf="i == 1">
<ion-col [size]="8">
<h3>{{'home,monthly-attendance' | translate}}</h3>

@ -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;

@ -72,7 +72,8 @@
</button>
</ion-col>
<ion-col>
<p class="label"><b style="font-family: WorkSans-Bold;">{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(15,23) }}</b></p>
<p class="label" *ngIf="direction==='en'"><b style="font-family: WorkSans-Bold;">{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(15,23) }}</b></p>
<p class="label" *ngIf="direction==='ar'"><b style="font-family: WorkSans-Bold;">{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(23,17) }}</b></p>
</ion-col>
<ion-col>
<button ion-button icon-end class="slidbtn" (click)="slideNext(sliderOne,slideWithNav)">
@ -89,7 +90,7 @@
</ion-icon>
<!-- <ion-icon [ngClass]="{'disabledArrow' : payslipIndex === 0 , 'activeArrow' : payslipIndex != 0 , 'disabledArrow-ar' : direction != 'en' ,'disabledArrow' : direction == 'en'}" ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle">
</ion-icon> -->
</button>
</ion-col>
@ -144,7 +145,7 @@
<!-- <span>TOTAL <br> OPEN REQUEST</span> -->
<span>{{ts.trPK('payslip','total')}} <br> {{ts.trPK('payslip','salary')}}</span>
</div>
<p-chart #chart class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
<p-chart #chart [ngClass]="direction == 'en'? 'today-graph':'today-graph-ar'" type="doughnut" [data]="data" [options]="options"></p-chart>
</div>
<div [ngClass]=" direction == 'en' ? 'div-green':'div-green-ar'">

@ -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;
}

@ -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";

@ -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{

@ -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;
}

@ -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",

Loading…
Cancel
Save