Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(orders): more match detail #732

Merged
merged 2 commits into from
Aug 8, 2024
Merged

feat(orders): more match detail #732

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e9f158
feat(orders): more match detail
LarsSelbekk Jul 19, 2024
a98b762
feat(order-item-detail-list): display customerItem for match-deliver
AdrianAndersen Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 38 additions & 27 deletions ...order/order-detail/order-item-detail-list-item/order-item-detail-list-item.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,39 +76,35 @@
</small>
</div>
</div>
<div class="row" *ngIf="orderItem.type === 'match-receive'">
<div class="col text-secondary">
<small>
<fa-icon [icon]="'people-arrows'" class="mr-2"></fa-icon>
<fa-icon [icon]="'chevron-left'" class="mr-2"></fa-icon>
<span>mottatt fra elev</span>
</small>
</div>
</div>
<div class="row" *ngIf="orderItem.type === 'match-deliver'">
<div class="col text-secondary">
<small>
<fa-icon [icon]="'people-arrows'" class="mr-2"></fa-icon>
<fa-icon [icon]="'chevron-right'" class="mr-2"></fa-icon>
<span>overlevert til elev</span>
</small>
</div>
</div>
<div
class="row justify-content-between text-secondary"
*ngIf="
orderItem.type === 'rent' ||
orderItem.type === 'extend' ||
orderItem.type === 'partly-payment'
orderItem.type === 'partly-payment' ||
orderItem.type === 'match-receive' ||
orderItem.type === 'match-deliver'
"
>
<div
class="col-auto"
*ngIf="orderItem.type === 'rent' || orderItem.type === 'extend'"
*ngIf="
orderItem.type === 'rent' ||
orderItem.type === 'extend' ||
orderItem.type === 'match-receive' ||
orderItem.type === 'match-deliver'
"
>
<small>
<span
><fa-icon [icon]="'calendar-alt'" class="mr-2"></fa-icon>
><fa-icon
*ngIf="
orderItem.type !== 'match-receive' &&
orderItem.type !== 'match-deliver'
"
[icon]="'calendar-alt'"
class="mr-2"
></fa-icon>
<span
i18n="@@orderItemDetailListRent"
*ngIf="orderItem.type === 'rent'"
Expand All @@ -119,8 +115,27 @@
*ngIf="orderItem.type === 'extend'"
>extend</span
>
<span *ngIf="orderItem.type === 'match-receive'">
<fa-icon
[icon]="'people-arrows'"
class="mr-2"
></fa-icon>
<fa-icon [icon]="'chevron-left'" class="mr-2"></fa-icon>
<span>mottatt fra elev</span>
</span>
<span *ngIf="orderItem.type === 'match-deliver'">
<fa-icon
[icon]="'people-arrows'"
class="mr-2"
></fa-icon>
<fa-icon
[icon]="'chevron-right'"
class="mr-2"
></fa-icon>
<span>overlevert til elev</span>
</span>
</span>
<span class="ml-2"
<span class="ml-2" *ngIf="orderItem.info"
><fa-icon [icon]="'arrow-right'" class="mr-1"></fa-icon>
{{ orderItem.info["to"] | blDate }}</span
>
Expand Down Expand Up @@ -170,11 +185,7 @@
</small>
<small
class="bl-link-black mr-2 text-success"
*ngIf="
orderItem.customerItem &&
!orderItem.info &&
!orderItem.info.customerItem
"
*ngIf="orderItem.customerItem && !orderItem.info?.customerItem"
routerLink="{{
'/customerItem/' + orderItem.customerItem + '/detail'
}}"
Expand Down
Loading