Commit f8db4939 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '11-service-intentory-list-does-not-display-category' into 'develop' 

Resolve "Service Intentory list does not display category"

See merge request !6
parents 114f03d0 a09a17eb

src/app/p_services/admin/inventoryManagement/list-service-inventory/list-service-inventory.component.html

+2 −3
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ 
                        <ng-container matColumnDef="category">

                            <th mat-header-cell *matHeaderCellDef mat-sort-header> Category </th>

                            <td mat-cell *matCellDef="let element">

                                <span *ngIf="element.category === 'ResourceFacingServiceSpecification' ">RFSS</span>

                                <span *ngIf="element.category === 'CustomerFacingServiceSpecification' ">CFSS</span> 

                                <span>{{element.category}}</span> 

                            </td>

                        </ng-container>

src/app/p_services/admin/inventoryManagement/list-service-inventory/list-service-inventory.component.ts

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ export class ListServiceInventoryComponent implements OnInit { 
        this.dataSource.sortingDataAccessor = (item, property): string | number => {

          switch (property) {

            case 'serviceDate': return new Date(item.serviceDate).getTime();

            case 'category': return item[property] === 'CustomerFacingServiceSpecification' ? 'CFSS': 'RFSS';

            // case 'category': return item[property] === 'CustomerFacingServiceSpecification' ? 'CFSS': 'RFSS';

            default: return item[property];

          }

        }