-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
implemented view-employee-payrolls page
- Loading branch information
Showing
11 changed files
with
327 additions
and
27 deletions.
There are no files selected for viewing
5 changes: 5 additions & 0 deletions
5
src/Client/Logistics.OfficeApp/src/app/core/models/payroll/getPayrollsQuery.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| import {SearchableQuery} from '../searchableQuery'; | ||
|
|
||
| export interface GetPayrollsQuery extends SearchableQuery { | ||
| employeeId?: string; | ||
| } |
1 change: 1 addition & 0 deletions
1
src/Client/Logistics.OfficeApp/src/app/core/models/payroll/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| export * from './payroll'; | ||
| export * from './updatePayroll'; | ||
| export * from './createPayroll'; | ||
| export * from './getPayrollsQuery'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
131 changes: 131 additions & 0 deletions
131
...App/src/app/pages/accounting/view-employee-payrolls/view-employee-payrolls.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| <div class="d-flex align-items-center"> | ||
| <h1>Employee Payrolls</h1> | ||
| <p-button | ||
| styleClass="text-black ms-2" | ||
| icon="bi bi-plus-square-fill" | ||
| size="large" | ||
| [rounded]="true" | ||
| [text]="true" | ||
| pTooltip="Add a new payroll" | ||
| [routerLink]="['/accounting/payrolls/add']"> | ||
| </p-button> | ||
| </div> | ||
| <hr class="w-100"> | ||
|
|
||
| @if (isLoadingEmployee || !employee) { | ||
| <div class="d-flex align-items-center"> | ||
| <p-progressSpinner></p-progressSpinner> | ||
| <div class="ms-2">Loading employee data</div> | ||
| </div> | ||
| } | ||
| @else { | ||
| <p-card styleClass="mb-3"> | ||
| <ng-template pTemplate="header"> | ||
| <h4 class="ps-3 py-2">Payroll details</h4> | ||
| <hr class="w-100 m-0" /> | ||
| </ng-template> | ||
|
|
||
| <div class="col-12 col-md-5"> | ||
| <div class="row mb-3"> | ||
| <div class="col-4"> | ||
| <h6>Employee:</h6> | ||
| </div> | ||
| <div class="col-8"> | ||
| {{employee.fullName}} | ||
| </div> | ||
| </div> | ||
| <div class="row mb-3"> | ||
| <div class="col-4"> | ||
| <h6>Position:</h6> | ||
| </div> | ||
| <div class="col-8"> | ||
| {{employee.roles[0].displayName}} | ||
| </div> | ||
| </div> | ||
| <div class="row mb-3"> | ||
| <div class="col-4"> | ||
| <h6>Salary type:</h6> | ||
| </div> | ||
| <div class="col-8"> | ||
| {{getSalaryTypeDesc(employee.salaryType)}} | ||
| </div> | ||
| </div> | ||
| <div class="row mb-3"> | ||
| <div class="col-4"> | ||
| <h6>Salary:</h6> | ||
| </div> | ||
| <div class="col-8"> | ||
| @if (employee.salaryType === salaryType.ShareOfGross) { | ||
| {{employee.salary | percent}} | ||
| } | ||
| @else { | ||
| {{employee.salary | currency}} | ||
| } | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </p-card> | ||
| } | ||
|
|
||
| <p-card> | ||
| <div class="row"> | ||
| <div class="col-12"> | ||
| <p-table [value]="payrolls" responsiveLayout="scroll" [lazy]="true" | ||
| [paginator]="true" [showCurrentPageReport]="true" | ||
| (onLazyLoad)="load($event)" [rows]="10" [(first)]="first" | ||
| [totalRecords]="totalRecords" [loading]="isLoadingPayrolls" | ||
| [rowsPerPageOptions]="[10,25,50]"> | ||
|
|
||
| <ng-template pTemplate="header"> | ||
| <tr> | ||
| <th> | ||
| Period | ||
| </th> | ||
| <th pSortableColumn="paymentAmount"> | ||
| Payment Amount | ||
| <p-sortIcon field="paymentAmount"></p-sortIcon> | ||
| </th> | ||
| <th pSortableColumn="paymentStatus"> | ||
| Payment Status | ||
| <p-sortIcon field="paymentStatus"></p-sortIcon> | ||
| </th> | ||
| <th pSortableColumn="paymentMethod"> | ||
| Payment Method | ||
| <p-sortIcon field="paymentMethod"></p-sortIcon> | ||
| </th> | ||
| <th>Action</th> | ||
| </tr> | ||
| </ng-template> | ||
|
|
||
| <ng-template pTemplate="body" let-payroll> | ||
| <tr> | ||
| <td>{{payroll.startDate | date:'MMM d'}} - {{payroll.endDate | date:'mediumDate'}}</td> | ||
| <td>{{payroll.payment.amount | currency}}</td> | ||
| <td> | ||
| <app-payment-status-tag [paymentStatus]="payroll.payment.status"></app-payment-status-tag> | ||
| </td> | ||
| <td>{{getPaymentMethodDesc(payroll.payment.method)}}</td> | ||
| <td class="overflow-visible"> | ||
| @if (payroll.payment.status === paymentStatus.Pending) { | ||
| <p-button | ||
| icon="bi bi-credit-card" | ||
| pTooltip="Make payment" | ||
| tooltipPosition="bottom" | ||
| [routerLink]="['/payment/payroll', payroll.id]"> | ||
| </p-button> | ||
| } | ||
|
|
||
| <p-button class="ms-2" | ||
| icon="bi bi-pencil" | ||
| pTooltip="Edit payroll" | ||
| tooltipPosition="bottom" | ||
| [routerLink]="['/accounting/payrolls/edit', payroll.id]"> | ||
| </p-button> | ||
| </td> | ||
| </tr> | ||
| </ng-template> | ||
| </p-table> | ||
| </div> | ||
| </div> | ||
| </p-card> |
107 changes: 107 additions & 0 deletions
107
...ceApp/src/app/pages/accounting/view-employee-payrolls/view-employee-payrolls.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| import {Component, OnInit} from '@angular/core'; | ||
| import {CommonModule} from '@angular/common'; | ||
| import {ActivatedRoute, RouterModule} from '@angular/router'; | ||
| import {TableLazyLoadEvent, TableModule} from 'primeng/table'; | ||
| import {TooltipModule} from 'primeng/tooltip'; | ||
| import {CardModule} from 'primeng/card'; | ||
| import {ButtonModule} from 'primeng/button'; | ||
| import {ProgressSpinnerModule} from 'primeng/progressspinner'; | ||
| import { | ||
| SalaryType, | ||
| PaymentStatus, | ||
| PaymentMethod, | ||
| PaymentMethodEnum, | ||
| SalaryTypeEnum, | ||
| } from '@core/enums'; | ||
| import {Employee, Payroll} from '@core/models'; | ||
| import {ApiService, ToastService} from '@core/services'; | ||
| import {PaymentStatusTagComponent} from '@shared/components'; | ||
|
|
||
|
|
||
| @Component({ | ||
| selector: 'app-view-employee-payrolls', | ||
| standalone: true, | ||
| templateUrl: './view-employee-payrolls.component.html', | ||
| imports: [ | ||
| CommonModule, | ||
| CardModule, | ||
| TooltipModule, | ||
| TableModule, | ||
| ButtonModule, | ||
| RouterModule, | ||
| PaymentStatusTagComponent, | ||
| ProgressSpinnerModule, | ||
| ], | ||
| }) | ||
| export class ViewEmployeePayrollsComponent implements OnInit { | ||
| private employeeId!: string; | ||
| public salaryType = SalaryType; | ||
| public paymentStatus = PaymentStatus; | ||
| public payrolls: Payroll[] = []; | ||
| public employee?: Employee; | ||
| public isLoadingEmployee = false; | ||
| public isLoadingPayrolls = false; | ||
| public totalRecords = 0; | ||
| public first = 0; | ||
|
|
||
| constructor( | ||
| private readonly apiService: ApiService, | ||
| private readonly route: ActivatedRoute, | ||
| private readonly toastService: ToastService) | ||
| { | ||
| } | ||
|
|
||
| ngOnInit(): void { | ||
| this.route.params.subscribe((params) => { | ||
| this.employeeId = params['employeeId']; | ||
| }); | ||
|
|
||
| this.fetchEmployee(); | ||
| } | ||
|
|
||
| load(event: TableLazyLoadEvent) { | ||
| this.isLoadingPayrolls = true; | ||
| const first = event.first ?? 1; | ||
| const rows = event.rows ?? 10; | ||
| const page = first / rows + 1; | ||
| const sortField = this.apiService.parseSortProperty(event.sortField as string, event.sortOrder); | ||
|
|
||
| this.apiService.getPayrolls({ | ||
| orderBy: sortField, | ||
| page: page, | ||
| pageSize: rows, | ||
| employeeId: this.employeeId, | ||
| }).subscribe((result) => { | ||
| if (result.isSuccess && result.data) { | ||
| this.payrolls = result.data; | ||
| this.totalRecords = result.totalItems; | ||
| } | ||
|
|
||
| this.isLoadingPayrolls = false; | ||
| }); | ||
| } | ||
|
|
||
| getPaymentMethodDesc(enumValue?: PaymentMethod): string { | ||
| if (enumValue == null) { | ||
| return 'N/A'; | ||
| } | ||
|
|
||
| return PaymentMethodEnum.getValue(enumValue).description; | ||
| } | ||
|
|
||
| getSalaryTypeDesc(enumValue: SalaryType): string { | ||
| return SalaryTypeEnum.getValue(enumValue).description; | ||
| } | ||
|
|
||
| private fetchEmployee() { | ||
| this.isLoadingEmployee = true; | ||
|
|
||
| this.apiService.getEmployee(this.employeeId).subscribe((result) => { | ||
| if (result.data) { | ||
| this.employee = result.data; | ||
| } | ||
|
|
||
| this.isLoadingEmployee = false; | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.