-
Notifications
You must be signed in to change notification settings - Fork 83
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: extend requisition model to show requisition list
- Loading branch information
Silke Grueber
authored and
Silke Grueber
committed
Jul 31, 2020
1 parent
88bd4d6
commit e7f9ae5
Showing
25 changed files
with
307 additions
and
52 deletions.
There are no files selected for viewing
92 changes: 84 additions & 8 deletions
92
...uisition-management/src/app/components/requisitions-list/requisitions-list.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 |
---|---|---|
@@ -1,8 +1,84 @@ | ||
<div class="list-body" data-testing-id="requisition-list"> | ||
<ng-container *ngFor="let requisition of requisitions"> | ||
<div> | ||
<!-- TODO: routing must work for standalone usage, needs to be more relative without the 'account' part --> | ||
<a [routerLink]="['/account/requisitions', requisition.id]">{{ requisition | json }}</a> | ||
</div> | ||
</ng-container> | ||
</div> | ||
<ng-container *ngIf="requisitions?.length > 0; else emptyList"> | ||
<div class="list-body" data-testing-id="requisition-list"> | ||
|
||
<div class="list-header d-md-flex"> | ||
<div class="list-header-item col-sm-2 list-header-item-descr"> | ||
{{ 'account.approvallist.table.id_of_order' | translate }} | ||
</div> | ||
<div *ngIf="requisitionStatus === 'approved'" class="list-header-item col-sm-2 list-header-item-descr"> | ||
{{ 'account.approvallist.table.no_of_order' | translate }} | ||
</div> | ||
<div class="list-header-item col-sm-2 list-header-item-descr"> | ||
{{ 'account.approvallist.table.date_of_order' | translate }} | ||
</div> | ||
<div *ngIf="view === 'buyer' && requisitionStatus !== 'pending'" class="list-header-item col-sm-2 list-header-item-descr"> | ||
{{ 'account.approvallist.table.approver' | translate }} | ||
</div> | ||
<div *ngIf="view === 'approver'" class="list-header-item col-sm-2 list-header-item-descr"> | ||
{{ 'account.approvallist.table.purchaser' | translate }} | ||
</div> | ||
<div *ngIf="requisitionStatus !== 'pending'" class="list-header-item col-sm-2 list-header-item-descr"> | ||
<ng-container *ngIf="requisitionStatus === 'approved'; else tableHeaderItemRejected"> | ||
{{ 'account.approvallist.table.approval_date' | translate }} | ||
</ng-container> | ||
<ng-template #tableHeaderItemRejected> {{ 'account.approvallist.table.reject_date' | translate }}</ng-template> | ||
</div> | ||
<div *ngIf="requisitionStatus !== 'approved'" class="list-header-item col-sm-2 list-header-item-descr"> | ||
{{ 'account.approvallist.table.line_items' | translate }} | ||
</div> | ||
<div class="list-header-item col-sm-2 list-header-item-descr text-right"> | ||
{{ 'account.approvallist.table.line_item_total' | translate }} | ||
</div> | ||
</div> | ||
<div class="list-body"> | ||
<ng-container *ngFor="let requisition of requisitions"> | ||
<div class="list-item-row-big list-item-row d-flex flex-row flex-wrap"> | ||
<!--Requisition No --> | ||
<div class="col-12 col-md-2 list-item"> | ||
<label class="d-xl-none d-lg-none d-md-none control-label"> | ||
{{ 'account.approvallist.table.id_of_order' | translate }}</label | ||
> | ||
<!-- TODO: routing must work for standalone usage, needs to be more relative without the 'account' part --> | ||
<a [routerLink]="['/account/requisitions', requisition.id]">{{ requisition.requisitionNo }}</a> | ||
</div> | ||
|
||
<!--Order No --> | ||
<div *ngIf="requisitionStatus === 'approved'" class="col-12 col-md-2 list-item"> | ||
{{ requisition.orderNo }} | ||
</div> | ||
|
||
<!-- Creation Date --> | ||
<div class="col-7 col-md-2 list-item">{{ requisition.creationDate | ishDate }}</div> | ||
|
||
<!-- Approver --> | ||
<div *ngIf="view === 'buyer' && requisitionStatus !== 'pending'" class="col-7 col-md-2 list-item"> | ||
{{ requisition.approval?.approver?.firstName }} {{ requisition.approval?.approver?.lastName }} | ||
</div> | ||
|
||
<!-- Buyer --> | ||
<div *ngIf="view === 'approver'" class="col-7 col-md-2 list-item"> | ||
{{ requisition.user.firstName }} {{ requisition.user.lastName }} | ||
</div> | ||
|
||
<!-- Approval/Rejection Date --> | ||
<div *ngIf="requisitionStatus !== 'pending'" class="col-7 col-md-2 list-item"> | ||
{{ requisition.approval.approvalDate | ishDate }} | ||
</div> | ||
|
||
<!-- Items count --> | ||
<div *ngIf="requisitionStatus !== 'approved'" class="col-7 col-md-2 list-item"> | ||
{{ requisition.lineItemCount }} | ||
</div> | ||
|
||
<!-- Total --> | ||
<div class="col-7 col-md-2 list-item text-right">{{ requisition.totals.total | ishPrice: 'gross' }}</div> | ||
</div> | ||
</ng-container> | ||
</div> | ||
|
||
</div> | ||
</ng-container> | ||
<ng-template #emptyList> | ||
<p data-testing-id="emptyList">{{ 'account.approvallist.no_items_message' | translate }}</p> | ||
</ng-template> | ||
|
22 changes: 13 additions & 9 deletions
22
...ition-management/src/app/components/requisitions-list/requisitions-list.component.spec.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
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
19 changes: 17 additions & 2 deletions
19
projects/requisition-management/src/app/models/requisition/requisition.interface.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,6 +1,21 @@ | ||
import { User } from '@sentry/browser'; | ||
|
||
import { BasketTotalData } from 'ish-core/models/basket-total/basket-total.interface'; | ||
import { PriceData } from 'ish-core/models/price/price.interface'; | ||
|
||
import { RequisitionApproval } from './requisition.model'; | ||
|
||
export interface RequisitionData { | ||
id: string; | ||
requisitionNo: string; | ||
user: string; | ||
approvalStatus: { status: string }; | ||
orderNo?: string; | ||
creationDate: number; | ||
lineItemCount: number; | ||
totals?: BasketTotalData; | ||
totalGross: PriceData; | ||
totalNet: PriceData; | ||
|
||
userInformation: User; | ||
|
||
approvalStatus: RequisitionApproval; | ||
} |
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
19 changes: 17 additions & 2 deletions
19
projects/requisition-management/src/app/models/requisition/requisition.model.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,6 +1,21 @@ | ||
import { User } from '@sentry/browser'; | ||
|
||
import { BasketTotal } from 'ish-core/models/basket-total/basket-total.model'; | ||
|
||
export interface RequisitionApproval { | ||
status: string; | ||
approvalDate?: number; | ||
approver?: { firstName: string; lastName: string }; | ||
} | ||
|
||
export interface Requisition { | ||
id: string; | ||
requisitionNo: string; | ||
user: string; | ||
approvalStatus: string; | ||
orderNo?: string; | ||
creationDate: number; | ||
lineItemCount: number; | ||
totals: BasketTotal; | ||
|
||
user: User; | ||
approval: RequisitionApproval; | ||
} |
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
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
Oops, something went wrong.
e7f9ae5
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Azure Demo Servers are available: