sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-28 22:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged PR 1641: #4370 Only show compartment code if available, never display orderNumber

Browse Source 
#4370 Only show compartment code if available, never display orderNumber
This commit is contained in:
Nino Righi
2023-10-16 15:39:46 +00:00
committed by Lorenz Hilpert
parent ade3800568
commit f5d90f97e8
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/page/pickup-shelf/src/lib/shared/pickup-shelf-list-item/pickup-shelf-list-item.component.html
View File

@@ -62,13 +62,10 @@
<div class="page-pickup-shelf-list-item__item-order-number-processing-status-paid flex flex-col">
<div
*ngIf="showCompartmentOrOrderNumber"
*ngIf="showCompartmentCode"
class="page-pickup-shelf-list-item__item-order-number text-h3 mb-[0.375rem] self-end font-bold break-all text-right"
>
<ng-container *ngIf="item?.compartmentCode; else orderNumber"
>{{ item?.compartmentCode }}{{ item?.compartmentInfo && '_' + item?.compartmentInfo }}</ng-container
>
<ng-template #orderNumber>{{ item?.orderNumber }}</ng-template>
{{ item?.compartmentCode }}{{ item?.compartmentInfo && '_' + item?.compartmentInfo }}
</div>
<div class="page-pickup-shelf-list-item__item-processing-paid-status flex flex-col font-bold self-end text-p2 mb-[0.375rem]">

10
apps/page/pickup-shelf/src/lib/shared/pickup-shelf-list-item/pickup-shelf-list-item.component.ts
View File

@@ -66,13 +66,9 @@ export class PickUpShelfListItemComponent {
return [256, 512, 1024, 2048, 4069].includes(this.item?.processingStatus);
}
// Zeige weder CompartmentCode noch OrderNumber an bei Status "bestellt" (16) und "nachbestellt" (8192)
get showCompartmentOrOrderNumber() {
return (
this.item.processingStatus !== 16 &&
this.item.processingStatus !== 8192 &&
(this.isTablet || this.isDesktopSmall || this.primaryOutletActive)
);
// Zeige nur CompartmentCode an wenn verfügbar
get showCompartmentCode() {
return !!this.item?.compartmentCode && (this.isTablet || this.isDesktopSmall || this.primaryOutletActive);
}
get processingStatusColor() {