add new design to payslip

missing-swipe
Fatimah.Alshammari 6 years ago
parent f7002f3eae
commit afc8c99639

@ -42,7 +42,7 @@
"input": "src/app/app.scss"
}
],
"scripts": [],
"scripts": ["node_modules/chart.js/dist/Chart.js"],
"es5BrowserSupport": true
},
"configurations": {

@ -98,7 +98,8 @@
</ion-label>
</ion-item>
<ion-item (click)="openChangePassword()">
<!-- <ion-item (click)="openChangePassword()"> -->
<ion-item (click)="openChangePassword()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/lock_icon.png" item-left>
</ion-thumbnail>

@ -140,6 +140,11 @@ export class AppComponent implements OnInit, AfterViewInit {
this.cs.openChangePassword();
this.menu.toggle();
}
// openPayslipPage(){
// this.cs.openPayslipPage();
// this.menu.toggle();
// }
private changeImage() {
this.cs.openChangeImagePage();

@ -101,6 +101,7 @@ import {FabButtonComponent} from './ui/fab-button/fab-button.component'
import { AttendScanService } from './services/attend-services/attend-scan.service';
import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx';
import { NgCircleProgressModule } from 'ng-circle-progress';
import { ChartModule } from 'primeng/chart';
@NgModule({
imports: [
CommonModule,
@ -111,7 +112,8 @@ import { NgCircleProgressModule } from 'ng-circle-progress';
NgxChartsModule,
ListboxModule,
PdfViewerModule,
NgCircleProgressModule.forRoot()
NgCircleProgressModule.forRoot(),
ChartModule
],
declarations: [
FabButtonComponent,
@ -230,7 +232,8 @@ import { NgCircleProgressModule } from 'ng-circle-progress';
StatsButtonComponent,
ServicesButtonComponent,
ConfirmLoginComponent,
NgCircleProgressModule
NgCircleProgressModule,
ChartModule
],
providers: [
AttendScanService,

@ -1,3 +1,6 @@
<!--
<ion-header>
<ion-toolbar class="header-toolbar">
<ion-buttons slot="start">
@ -5,388 +8,301 @@
</ion-buttons>
<ion-title color="light" >{{ts.trPK('payslip','title')}}</ion-title>
</ion-toolbar>
</ion-header>
</ion-header> -->
<ion-content class="colorBG">
<ion-item style="margin: 10px;border-radius: 5px;">
<ion-label>choose payslip</ion-label>
<ion-select (ionChange)="showInfo($event)" okText="{{ts.trPK('general','ok')}}" cancelText="{{ts.trPK('general','cancel')}}" [(ngModel)]="choosePayslip">
<ion-select-option value="{{i}}" selected="{{(i==0).toString()}}" *ngFor="let options of GetPayslipList; let i=index">{{options.PAYSLIP_CHOICE}} </ion-select-option>
</ion-select>
</ion-item>
<div class="header-div">
<ion-buttons slot="start">
<ion-back-button color="light" class="btnBack" defaultHref="/home"></ion-back-button>
</ion-buttons>
<p class="Title">{{ts.trPK('payslip','monthly-payslip')}}</p>
<div class="Imgdiv">
<img class="Imgsrc">
</div>
</div>
<!-- <ion-img class="profileImg" [src]="imageSrc"></ion-img> -->
<!-- <ion-list *ngIf="showPaySlip !=''" >
<ion-item>
<ion-row><ion-label>PERIOD NAME</ion-label><ion-label>{{showPaySlip.PERIOD_NAME}}</ion-label></ion-row>
<ion-row><ion-label>PERIOD START DATE</ion-label><ion-label>{{showPaySlip.PERIOD_START_DATE}}</ion-label> </ion-row>
<ion-row> <ion-label>PERIOD END DATE</ion-label><ion-label>{{showPaySlip.PERIOD_END_DATE}}</ion-label> </ion-row>
</ion-item>
</ion-list> -->
<div *ngIf="showPaySlip !=''">
<accordin-custom >
<accordin-tab-custom [header]="'payslip,payroll-info' | translate " >
<!-- special results -->
<!-- <ion-card >
<ion-card-header class="boxHdr">
<div class="hrTitle"> {{ts.trPK('payslip','payroll-info')}} </div>
</ion-card-header>
<ion-card-content> -->
<div *ngIf="showPaySlip !=''">
<ion-grid class="">
<ion-row class="">
<ion-col class="">
<label for=""> {{ts.trPK('payslip','peroid-name')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{showPaySlip.PERIOD_NAME}}</label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="">
<label for="">{{ts.trPK('payslip','start-date')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{showPaySlip.PERIOD_START_DATE}}</label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="">
<label for="">{{ts.trPK('payslip','end-date')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{showPaySlip.PERIOD_END_DATE}}</label>
</ion-col>
</ion-row>
</ion-grid>
</div>
<empty-data *ngIf="showPaySlip.length <= 0 "></empty-data>
<!-- </ion-card-content>
</ion-card> -->
</accordin-tab-custom>
</accordin-custom>
<!-- <ion-card *ngIf="showPaySlip !=''">
<ion-card-header class="boxHdr">
<div class="hrTitle"> {{ts.trPK('payslip','payroll-info')}} </div>
</ion-card-header>
<ion-card-content>
<div>
<ion-grid>
<ion-row>
<ion-col class="colBold">
<label for=""> {{ts.trPK('payslip','peroid-name')}}
</label>
</ion-col>
<ion-col>
<label for="">{{showPaySlip.PERIOD_NAME}}</label>
</ion-col>
</ion-row>
<div class="">
<div class="header">
<!-- <p style="position: absolute; left: 40%; bottom: 65%;">{{currentMonth}}</p> -->
<ion-row>
<ion-col class="colBold">
<label for="">{{ts.trPK('payslip','start-date')}}
</label>
</ion-col>
<ion-col>
<label for="">{{showPaySlip.PERIOD_START_DATE}}</label>
</ion-col>
</ion-row>
<div>
<ion-row>
<ion-col>
<button ion-button icon-start class="slidBtn" (click)="slidePrev(sliderOne,slideWithNav)">
<ion-icon [ngClass]=" payslipIndex === GetPayslipList.length-1 ? 'disabledArrow' : 'activeArrow'" ios="ios-arrow-dropleft-circle" md="md-arrow-dropleft-circle">
</ion-icon>
</button>
</ion-col>
<ion-col>
<p class="label"><b style="font-family: WorkSans-Bold;">{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(15,23) }}</b></p>
<!-- <label class="label" for="">{{showPaySlip.PAYSLIP_CHOICE}}</label> -->
<ion-row>
<ion-col class="colBold">
<label for="">{{ts.trPK('payslip','end-date')}}
</label>
</ion-col>
<ion-col>
<label for="">{{showPaySlip.PERIOD_END_DATE}}</label>
</ion-col>
</ion-row>
</ion-grid>
<!-- <label class="p" for="">{{showPaySlip.PERIOD_NAME}}</label> -->
<!-- <p style="position: absolute; left: 40%; bottom: 65%;">{{currentMonth}}</p> -->
</ion-col>
<ion-col>
<button ion-button icon-end class="slidbtn" (click)="slideNext(sliderOne,slideWithNav)">
<ion-icon [ngClass]=" payslipIndex === 0 ? 'disabledArrow' : 'activeArrow'" ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle">
</ion-icon>
</button>
</ion-col>
</ion-row>
</div>
</div>
</ion-card-content>
</ion-card> -->
<accordin-custom >
<accordin-tab-custom [header]="'payslip,summary-payment' | translate" >
<!-- <ion-card *ngIf="GetSummaryOfPaymentList !='' " >
<ion-card-header class="boxHdr">
<div class="hrTitle"> {{ts.trPK('payslip','summary-payment')}} </div>
</ion-card-header>
<ion-card-content> -->
<div *ngIf="GetSummaryOfPaymentList !=''">
<ion-grid>
<ion-slides [options]="slideOptsOne" #slideWithNav (ionSlideDidChange)="SlideDidChange(sliderOne,slideWithNav)">
<ion-slide >
<ion-grid class="headerGrid">
<ion-row >
<ion-col class="">
<label for=""> {{ts.trPK('payslip','deductions-Amount')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{GetSummaryOfPaymentList.TOTAL_DEDUCTIONS_AMOUNT}}</label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="">
<label for="">{{ts.trPK('payslip','deductions-percentage')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{GetSummaryOfPaymentList.TOTAL_DEDUCTIONS_PERCENTAGE}}</label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="">
<label for="">{{ts.trPK('payslip','earings-Amount')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{GetSummaryOfPaymentList.TOTAL_EARNINGS_AMOUNT}}</label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="">
<label for="">{{ts.trPK('payslip','earings-percentage')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{GetSummaryOfPaymentList.TOTAL_EARNINGS_PERCENTAGE}}</label>
</ion-col>
<label class="date" for="">{{showPaySlip.PERIOD_START_DATE}}</label>
<label class="label" for="">{{showPaySlip.PERIOD_END_DATE}}</label>
</ion-row>
<ion-row>
<ion-col class="">
<label for="">{{ts.trPK('payslip','pay-Amount')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{GetSummaryOfPaymentList.TOTAL_PAY_AMOUNT}}</label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="">
<label for="">{{ts.trPK('payslip','pay-percentage')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{GetSummaryOfPaymentList.TOTAL_PAY_PERCENTAGE}}</label>
</ion-col>
</ion-row>
</ion-grid>
<div style="color: black;">
<!-- <ngx-gauge
*ngFor="let s of showPaySlip"
[type]="gaugeType"
[value]="gaugeValue"
[label]="gaugeLabel">
</ngx-gauge> -->
<div class="result-graph">
<!-- <div class="request-heading">
<span>Open Request Analysis</span>
</div> -->
<div class="result-text-container">
<h2>{{GetSummaryOfPaymentList.TOTAL_PAY_AMOUNT}}</h2>
<!-- <span>TOTAL <br> OPEN REQUEST</span> -->
<span>{{ts.trPK('payslip','total')}} <br> {{ts.trPK('payslip','salary')}}</span>
</div>
<empty-data *ngIf="GetSummaryOfPaymentList.length <= 0 "></empty-data>
<!-- </ion-card-content>
</ion-card> -->
</accordin-tab-custom>
</accordin-custom >
<accordin-custom >
<accordin-tab-custom [header]="'payslip,earnings' | translate" [subHeadergreen]=true [subHeader]="earingTotal" >
<!-- <ion-card *ngIf="GetEarningsList !='' " >
<ion-card-header class="boxHdr">
<div class="hrTitle"> {{ts.trPK('payslip','total')}} </div>
</ion-card-header>
<ion-card-content> -->
<div *ngIf="GetEarningsList !=''">
<ion-grid>
<ion-row *ngFor="let list of GetEarningsList" >
<ion-col class="">
<label for="">{{list.ELEMENT_NAME}}</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{list.AMOUNT}}</label>
</ion-col>
<p-chart #chart class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
</div>
<div style="position: relative;
left: 77%;
bottom: 117px;
color: black;
background-color: #22c6b3;
width: 20%; height: 6px;">
<ion-col>
<ion-row>
<label class="green-label">{{ts.trPK('payslip','earnings-key')}}</label>
</ion-row>
<ion-row>
<label class="green-amount">{{GetSummaryOfPaymentList.TOTAL_EARNINGS_AMOUNT}}</label>
</ion-row>
</ion-col>
</div>
<div style="position: relative;
left: 77%;
bottom: 67px;
color: black;
background-color: #094875;
width: 20%; height: 6px;">
<ion-col>
<ion-row>
<label class="blue-label">{{ts.trPK('payslip','deductions-key')}}</label>
</ion-row>
<ion-row>
<ion-col col-6 class="earingTotH">
<label style="font-size: 20px !important" for="">{{ts.trPK('payslip','total')}}</label>
</ion-col>
<ion-col col-6 class="earingTotG">
<label style="font-size: 20px !important" for="">{{earingTotal}}</label>
</ion-col>
</ion-row>
</ion-grid>
<label class="blue-amount" for="">{{GetSummaryOfPaymentList.TOTAL_DEDUCTIONS_AMOUNT}}</label>
</ion-row>
</ion-col>
</div>
</div>
<empty-data *ngIf="GetEarningsList.length <= 0 "></empty-data>
<!-- </ion-card-content>
</ion-card> -->
</ion-grid>
</ion-slide>
</ion-slides>
</div>
</div>
<!-- <p>Summary of Payment</p> -->
<div class="hrTitle"> {{ts.trPK('payslip','summary-payment')}} </div>
<div *ngIf="GetSummaryOfPaymentList !=''">
<ion-grid class="grids">
<ion-row class="bgcolor">
<ion-col class="colPayslip">
<label class="label" for="">{{ts.trPK('payslip','particular')}} </label>
</ion-col>
<ion-col class="colPayslip">
<label class="label">%</label>
</ion-col>
<ion-col class="colPayslips">
<label class="label" for="">{{ts.trPK('payslip','amount')}}
</label>
</ion-col>
</ion-row>
<ion-row class="rowtable" >
<ion-col class="colPayslip">
<label class="label" for=""> {{ts.trPK('payslip','deductions')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label class="label" for="">{{GetSummaryOfPaymentList.TOTAL_DEDUCTIONS_PERCENTAGE}}</label>
</ion-col>
<ion-col class="colPayslips">
<label class="label" for="">{{GetSummaryOfPaymentList.TOTAL_DEDUCTIONS_AMOUNT}}</label>
</ion-col>
<!-- <ion-infinite-scroll (ionInfinite)="doInfiniteEarning($event)">
<ion-infinite-scroll-content></ion-infinite-scroll-content>
</ion-infinite-scroll> -->
</accordin-tab-custom>
</accordin-custom >
<!-- <accordin-custom *ngIf="GetDeductionsList !=''"> -->
<accordin-custom >
<accordin-tab-custom [header]="'payslip,deductions' | translate" [subHeadergreen]=false [subHeader]="deductionTotal" >
<!-- <ion-card *ngIf="GetDeductionsList !='' " >
<ion-card-header class="boxHdr">
<div class="hrTitle"> {{ts.trPK('payslip','deductions')}} </div>
</ion-card-header>
<ion-card-content>
colBold -->
<div *ngIf="GetDeductionsList !=''">
<ion-grid>
<ion-row *ngFor="let list of GetDeductionsList" >
<ion-col class="">
<label for="">{{list.ELEMENT_NAME}}</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{list.AMOUNT}}</label>
</ion-col>
</ion-row>
<ion-row>
<ion-col col-6 class="earingTotH">
<label style="font-size: 20px !important" for="">{{ts.trPK('payslip','total')}}</label>
</ion-col>
<ion-col col-6 class="earingTotR">
<label style="font-size: 20px !important" for="">{{deductionTotal}}</label>
</ion-col >
</ion-row>
</ion-grid>
</div>
<empty-data *ngIf="GetDeductionsList.length <= 0 "></empty-data>
<!-- </ion-card-content>
</ion-card> -->
<!-- <ion-infinite-scroll (ionInfinite)="doInfiniteDeduction($event)">
<ion-infinite-scroll-content></ion-infinite-scroll-content>
</ion-infinite-scroll> -->
</accordin-tab-custom>
</accordin-custom >
<accordin-custom >
<accordin-tab-custom [header]="'payslip,payment-information' | translate" >
<!-- <ion-card *ngIf="GetPaymentInformationList !='' " >
<ion-card-header class="boxHdr">
<div class="hrTitle"> {{ts.trPK('payslip','payment-information')}} </div>
</ion-card-header>
<ion-card-content> -->
<div *ngIf="GetPaymentInformationList !=''">
<ion-grid>
<ion-row >
<ion-col class="">
<label for=""> {{ts.trPK('payslip','payment-method')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{GetPaymentInformationList.PAYMENT_METHOD_NAME}}</label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="">
<label for="">{{ts.trPK('payslip','bank-name')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{GetPaymentInformationList.BANK_NAME}}</label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="">
<label for="">{{ts.trPK('payslip','branch-name')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{GetPaymentInformationList.BRANCH_NAME}}</label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="">
<label for="">{{ts.trPK('payslip','account-no')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{GetPaymentInformationList.ACCOUNT_NUMBER}}</label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="">
<label for="">{{ts.trPK('payslip','amount')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label for="">{{GetPaymentInformationList.AMOUNT}}</label>
</ion-col>
</ion-row>
</ion-grid>
</div>
<empty-data *ngIf="GetPaymentInformationList.length <= 0 "></empty-data>
<!-- </ion-card-content>
</ion-card> -->
</accordin-tab-custom>
</accordin-custom >
</ion-row>
<ion-row class="rowtable">
<ion-col class="colPayslip">
<label class="label" for="">{{ts.trPK('payslip','earnings')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label class="label" for="">{{GetSummaryOfPaymentList.TOTAL_EARNINGS_PERCENTAGE}}</label>
</ion-col>
<ion-col class="colPayslips" >
<label class="label" for="">{{GetSummaryOfPaymentList.TOTAL_EARNINGS_AMOUNT}}</label>
</ion-col>
</ion-row>
<ion-row class="rowtable">
<ion-col class="colPayslip">
<label class="label-bold" for="">{{ts.trPK('payslip','pay-Amount')}}
</label>
</ion-col>
<ion-col class="colPayslip">
<label class="label-bold" for="">{{GetSummaryOfPaymentList.TOTAL_PAY_PERCENTAGE}}</label>
</ion-col>
<ion-col class="colPayslips">
<label class="label-bold" for="">{{GetSummaryOfPaymentList.TOTAL_PAY_AMOUNT}}</label>
</ion-col>
</ion-row>
</ion-grid>
</div>
<!-- <ion-row *ngIf="showPaySlip !=''" style="text-align: center;">
<ion-col class="greenTxt" col-6>
<button ion-button block class="notColBtn" (click)="openEarings()">
<p>{{ts.trPK('payslip','earnings')}}</p>
<ion-img class="serviceItemImg" src="../assets/imgs/details.png"></ion-img>
</button>
</ion-col>
<ion-col class="greenTxt" col-6>
<button ion-button block class="notColBtn" (click)="openDeductions()">
<p>{{ts.trPK('payslip','deductions')}}</p>
<ion-img class="serviceItemImg" src="../assets/imgs/details.png"></ion-img>
</button>
</ion-col>
</ion-row> -->
<div class="hrTitle"> {{ts.trPK('payslip','earnings')}} </div>
<div *ngIf="GetEarningsList !=''">
<ion-grid class="grids">
<ion-row class="bgcolor">
<ion-col class="colPayslip">
<label class="label" for="">{{ts.trPK('payslip','particular')}} </label>
</ion-col>
<ion-col class="colPayslips">
<label class="label" for="">{{ts.trPK('payslip','amount')}}
</label>
</ion-col>
</ion-row>
<ion-row class="rowtable" *ngFor="let list of GetEarningsList" >
<ion-col class="colPayslip">
<label class="label" for="">{{list.ELEMENT_NAME}}</label>
</ion-col>
<ion-col class="colPayslips">
<label class="label" for="">{{list.AMOUNT}}</label>
</ion-col>
</ion-row>
</ion-grid>
</div>
<div class="hrTitle"> {{ts.trPK('payslip','deductions')}} </div>
<div *ngIf="GetDeductionsList !=''">
<ion-grid class="grids">
<ion-row class="bgcolor">
<ion-col class="colPayslip">
<label class="label" for="">{{ts.trPK('payslip','particular')}} </label>
</ion-col>
<ion-col class="colPayslips">
<label class="label" for="">{{ts.trPK('payslip','amount')}}
</label>
</ion-col>
</ion-row>
<ion-row class="rowtable" *ngFor="let list of GetDeductionsList" >
<ion-col class="colPayslip">
<label class="label" for="">{{list.ELEMENT_NAME}}</label>
</ion-col>
<ion-col class="colPayslips">
<label class="label" for="">{{list.AMOUNT}}</label>
</ion-col>
</ion-row>
</ion-grid>
</div>
<!-- ///////////////////////////////////// -->
<!-- <ion-item style="margin: 10px;border-radius: 5px;">
<ion-label>choose payslip</ion-label>
<ion-select (ionChange)="showInfo($event)" okText="{{ts.trPK('general','ok')}}" cancelText="{{ts.trPK('general','cancel')}}" [(ngModel)]="choosePayslip">
<ion-select-option value="{{i}}" selected="{{(i==0).toString()}}" *ngFor="let options of GetPayslipList; let i=index">{{options.PAYSLIP_CHOICE}} </ion-select-option>
</ion-select>
</ion-item> -->
<div class="hrTitle"> {{ts.trPK('payslip','payment-information')}} </div>
<div *ngIf="GetPaymentInformationList !=''">
<ion-grid class="grids" >
<ion-row class="rowtables">
<ion-col class="colPayslips">
<ion-row class="col">
<label class="label" for=""> {{ts.trPK('payslip','payment-method')}} </label>
</ion-row>
<ion-row>
<label class="label" for="">{{GetPaymentInformationList.PAYMENT_METHOD_NAME}}</label>
</ion-row>
</ion-col>
</ion-row>
<ion-row class="rowtable">
<ion-col class="colPayslip">
<ion-row class="col">
<label class="label" for="">{{ts.trPK('payslip','bank-name')}} </label>
</ion-row>
<ion-row >
<label class="label" for="">{{GetPaymentInformationList.BANK_NAME}}</label>
</ion-row>
</ion-col>
<ion-col class="colPayslips">
<ion-row class="col">
<label class="label" for="">{{ts.trPK('payslip','branch-name')}}
</label>
</ion-row>
<ion-row >
<label class="label" for="">{{GetPaymentInformationList.BRANCH_NAME}}</label>
</ion-row>
</ion-col>
</ion-row>
<ion-row class="rowtable">
<ion-col class="colPayslip">
<ion-row class="col">
<label class="label" for="">{{ts.trPK('payslip','account-no')}}
</label>
</ion-row>
<ion-row >
<label class="label" for="">{{GetPaymentInformationList.ACCOUNT_NUMBER}}</label>
</ion-row>
</ion-col>
<ion-col class="colPayslips">
<ion-row class="col">
<label class="label" for="">{{ts.trPK('payslip','amount')}}
</label>
</ion-row>
<ion-row >
<label class="label" for="">{{GetPaymentInformationList.AMOUNT}}</label>
</ion-row>
</ion-col>
</ion-row>
</ion-grid>
</div>
</ion-content>

@ -1,9 +1,6 @@
.rowAccordin{
border: none;
}
}
.gridAccordin{
margin: 10px;
background: #ffffff;
@ -11,9 +8,31 @@
}
.colPayslip{
text-align: center;
color: var(--labelColor);
border-right: 1px solid #cac8c8;
border-bottom-left-radius: -10px !important;
padding-top: 8px;
padding-bottom: 8px;
margin-left: 18px;
font-size: 12px !important;
}
.colPayslips{
border-bottom-left-radius: -10px !important;
padding-top: 8px;
padding-bottom: 8px;
margin-left: 18px;
font-size: 12px !important;
}
.label{
font-size: 15px !important;
text-align: center;
margin-bottom: 1px;
}
.label-bold{
font-size: 13px !important;
// font-weight: bold !important;
font-family: WorkSans-Bold;
}
.earingTotH{
text-align: right;
@ -39,3 +58,212 @@
color: var(--red);
}
.colorBG{
--background: #f0efef;
}
.header-div {
background-color: #22C6B3;
text-transform: capitalize;
height: 180px;
position: relative;
display: block;
margin-bottom: -28px;
}
.Title{
text-align: center;
color: white;
margin-top: -33px;
font-size: 17px;
}
.Imgdiv{
padding-top: -38px;
margin-top: -32px;
}
.Imgsrc{
width: 23px;
height: 24px;
/* display: -webkit-inline-box; */
/* display: inline-flex; */
overflow: hidden;
background: transparent;
border-radius: 70% !important;
/* position: relative; */
top: 7px;
margin-left: 344px !important;
margin-top: -46px;
}
.p{
font-weight: bold;
margin-top: -7px;
font-size: 14px;
}
.slidBtn{
margin-top: 8px;
margin-left: 10px;
background: transparent;
}
.activeArrow{
height: 26px;
width: 26px;
color: white;
background: transparent !important;
--background: transparent !important;
}
.slidbtn{
background: transparent;
margin-bottom: -59px;
margin-top: 8px;
margin-left: 65px;
}
.disabledArrow{
height: 26px;
width: 26px;
color: #908d8d;
background: transparent !important;
--background: transparent !important;
}
.result-graph{
font-size: 14px;
margin-left: -48px;
margin-right: 3px;
}
.headerGrid{
background-color: white !important;
border: 1px solid #cac8c8 !important;
border-radius: 20px !important;
padding-top: 13px;
padding-bottom: 14px;
margin-left: 30px;
margin-right: 32px;
margin-top: -2px;
margin-bottom: 10px;
padding-right: 21px;
}
.result-text-container {
padding: 0;
margin: 0;
position: absolute;
left: 42%;
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;
}
}
.green-label{
font-size: 12px;
margin-top: -13px;
}
.green-amount{
font-size: 17px;
font-family: WorkSans-Bold;
margin-top: -3px;
}
.blue-label{
font-size: 12px;
margin-top: -13px;
}
.blue-amount{
font-size: 17px;
font-family: WorkSans-Bold;
margin-top: -4px;
}
.grids{
border-radius: 20px !important;
background: white;
padding-left: 1px;
padding-right: 1px;
margin: 13px;
padding-top: 0px;
padding-bottom: 3px;
padding-left: 13px;
padding-right: 13px;
border: 1px solid #cac8c8;
}
.header{
margin-top: -126px;
}
.bgcolor {
color: white;
border-top-right-radius: 19px;
border-top-left-radius: 15px;
padding-top: 1;
padding-bottom: 0;
margin-top: 0;
margin-bottom: 0;
/* border-radius: 12px !important; */
background: #094875;
border-bottom: 1px solid #a7a4a4;
border-top: 1px solid #cac8c8;
margin-left: -13px;
margin-right: -13px;
}
.rowtable{
padding-top: 0;
padding-bottom: 0;
margin-top: 0;
margin-bottom: 0;
border-top: 1px solid #cac8c8;
margin-left: -13px;
margin-right: -13px;
}
.rowtables{
padding-top: 0;
padding-bottom: 0;
margin-top: 0;
margin-bottom: 0;
margin-left: -13px;
margin-right: -13px;
}
.col{
font-size: 15px;
font-family: WorkSans-Bold;
}
.hrTitle{
margin-left: 11px !important;
font-size: 15px !important;
}
.date{
font-size: 15px !important;
margin-left: 58px;
margin-bottom: 12px;
padding-right: 5px;
}

@ -1,11 +1,14 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Component, OnInit, ViewChild, SimpleChanges } from '@angular/core';
import {PayslipService} from '../service/payslip.service'
import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
import { CommonService } from 'src/app/hmg-common/services/common/common.service';
import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response';
import { SharedDataService } from 'src/app/hmg-common/services/shared-data-service/shared-data.service';
import { DeductionRequest } from '../model/deductionReq';
import { IonInfiniteScroll } from '@ionic/angular';
import { IonInfiniteScroll,IonSlides} from '@ionic/angular';
import { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service";
import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/models/authenticated-user";
import { UIChart } from 'primeng/components/chart/chart';
@Component({
selector: 'app-home',
@ -32,16 +35,44 @@ export class HomeComponent implements OnInit {
private deductionReq: DeductionRequest;
doinfiniteDedReq:any;
doinfinitEarReq:any;
personalInfo: any;
setImage:any;
imageSrc: any = "../assets/imgs/profile.png";
slideView: any;
sliderOne: any;
payslipIndex :any;
data:any;
@ViewChild('slides') slides: IonSlides;
@ViewChild('slideWithNav') slideWithNav: IonSlides;
@ViewChild('chart') chart: UIChart;
slideOptsOne = {
initialSlide: 0,
slidesPerView: 1,
autoplay:true
};
@ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll;
public options = {
cutoutPercentage: 80,
tooltips: { enabled: false },
legend: { display: false }};
gaugeType = "full";
// gaugeValue = 11.200;
// gaugeLabel = "";
constructor(
public payslipService:PayslipService,
public ts: TranslatorService,
public common: CommonService,
public sharedData: SharedDataService
public sharedData: SharedDataService,
public authService: AuthenticationService,
public cs: CommonService,
) {}
ngOnInit() {
// this.selEmp = this.common.sharedService.getSharedData(
// MenuResponse.SHARED_SEL_EMP,
@ -75,7 +106,63 @@ export class HomeComponent implements OnInit {
this.getPayslip();
// this.getProfile();
}
ngOnChanges(changes: SimpleChanges): void {
if (changes.inputData.currentValue) {
// update this.data here
// then chart is getting updated
setTimeout(() => {
this.chart.reinit();
}, 100);
}
}
slideNext(object, slideView) {
if(this.payslipIndex!=0){
this.payslipIndex=this.payslipIndex-1;
this.showInfo();
}
}
slidePrev(object, slideView) {
if(this.payslipIndex<this.GetPayslipList.length-1){
// console.log(this.payslipIndex);
this.payslipIndex=this.payslipIndex+1;
this.showInfo();
}
}
// getProfile() {
// this.authService
// .loadAuthenticatedUser()
// .subscribe((user: AuthenticatedUser) => {
// if (user) {
// this.personalInfo = user;
// if(this.cs.getUpdateImage().status){
// // this.imageSrc = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+this.cs.getUpdateImage().img);
// this.imageSrc = "data:image/png;base64,"+this.cs.getUpdateImage().img;
// // alert("this.imageSrc"+ this.imageSrc);
// }else{
// this.imageSrc = user.EMPLOYEE_IMAGE
// ? "data:image/png;base64," + user.EMPLOYEE_IMAGE
// : this.imageSrc;
// console.log("2-"+user);
// }
// }
// else {
// console.log("3-"+user);
// }
// });
// }
getPayslip(){
// this.selEmp ="13777";
@ -99,19 +186,21 @@ export class HomeComponent implements OnInit {
if (result.GetPayslipList != null) {
this.GetPayslipList = result.GetPayslipList;
alert(this.GetPayslipList.length);
this.firstPayslip= this.GetPayslipList[0]
this.defultSelected=this.firstPayslip.PAYSLIP_CHOICE
}
this.showPaySlip = this.GetPayslipList[0];
this.payslipIndex=0;
this.getAllPayslipData(this.GetPayslipList[0].ACTION_CONTEXT_ID);
}
// showPaymentInfo
showInfo(event){
console.log(event.detail.value);
const index = parseInt(event.detail.value);
this.showPaySlip =this.GetPayslipList[index];
this.ActionContextID=this.GetPayslipList[index].ACTION_CONTEXT_ID;
showInfo(){
//console.log(event.detail.value);
//const index = parseInt(event.detail.value);
this.showPaySlip =this.GetPayslipList[this.payslipIndex];
this.ActionContextID=this.GetPayslipList[this.payslipIndex].ACTION_CONTEXT_ID;
this.getAllPayslipData(this.ActionContextID);
}
@ -140,8 +229,18 @@ export class HomeComponent implements OnInit {
this.GetSummaryOfPaymentList = result.GetSummaryOfPaymentList[0];
this.earingTotal = this.GetSummaryOfPaymentList.TOTAL_EARNINGS_AMOUNT;
this.deductionTotal = this.GetSummaryOfPaymentList.TOTAL_DEDUCTIONS_AMOUNT;
}
this.data = {
labels: ['earingTotal', 'deductionTotal'],
datasets: [
{ data: [this.earingTotal,this.deductionTotal],
backgroundColor: [
'#22c6b3',
'#094875', ],
borderWidth: 2
}
]
}; }
}
@ -286,8 +385,6 @@ getDeduction(ActionContextID){
} else {
if (this.infiniteScroll) this.infiniteScroll.complete();
}
} //end infiniteScroll
}
}

@ -6,6 +6,7 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./payslip.page.scss'],
})
export class PayslipPage implements OnInit {
constructor() { }

@ -2049,6 +2049,10 @@
"en": "payslip",
"ar":"كشف الراتب"
},
"monthly-payslip": {
"en": "Monthly Pay Slip",
"ar": "كشف الراتب الشهري"
},
"end-date":{
"en": "Peroid End Date",
"ar":" تاريخ بداية الفترة"
@ -2061,6 +2065,10 @@
"en": "Peroid Name",
"ar":"اسم الفترة "
},
"salary":{
"en": "Salary",
"ar":"الراتب"
},
"deductions-Amount":{
"en": "Total Deductions Amount",
"ar":"قيمة الخصومات "
@ -2113,6 +2121,18 @@
"en": "Deductions",
"ar":"الخصومات "
},
"deductions-key":{
"en": "DED",
"ar":" "
},
"earnings-key":{
"en": "NET",
"ar":" "
},
"particular":{
"en": "Particular",
"ar":"الخصائص"
},
"payment-information":{
"en": "Payment Information",
"ar":"معلةمات الدفع "

@ -9,5 +9,11 @@
@import '~@ionic/angular/css/text-alignment.css';
@import '~@ionic/angular/css/text-transformation.css';
@import '~@ionic/angular/css/flex-utils.css';
@import '../node_modules/primeng/resources/themes/nova-light/theme.css';
@import "../node_modules/primeng/resources/primeng.min.css";
@import "../node_modules/primeicons/primeicons.css";
@import "theme/styles.scss";
@import "theme/worklist.scss";

Loading…
Cancel
Save