From 2e3b3064f2892c93fc3d1521a9671d0ec9103192 Mon Sep 17 00:00:00 2001
From: Nino <n.righi@paragon-data.de>
Date: Wed, 27 Dec 2023 15:46:24 +0100
Subject: [PATCH] #4516 Fix Also Show Details Items Group in Pick Up Shelf In

---
 .../pickup-shelf-in-details.component.html    | 28 ++++++++++++-------
 .../pickup-shelf-in-details.component.ts      |  4 +++
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.html b/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.html
index 2f811925e..649ded503 100644
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.html
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.html
@@ -17,17 +17,25 @@
         (updateDate)="updateDate($event)"
         (editClick)="navigateToEditPage($event)"
       ></page-pickup-shelf-details-header>
-      <page-pickup-shelf-details-item
-        *ngIf="selectedItem$ | async; let item"
-        class="mb-px-2"
-        [orderItem]="item"
-        [selected]="true"
-        (historyClick)="navigateToHistoryPage($event)"
-        [order]="order$ | async"
-        (specialCommentChanged)="updateSpecialComment(item, $event)"
-        (sharedOnInit)="fetchNotifications(item)"
-      ></page-pickup-shelf-details-item>
+
+      <ng-container *ngIf="selectedItem$ | async; let item">
+        <page-pickup-shelf-details-items-group
+          [orderType]="selectedItemOrderType$ | async"
+          [groupedItems]="[item]"
+        ></page-pickup-shelf-details-items-group>
+        <page-pickup-shelf-details-item
+          class="mb-px-2"
+          [orderItem]="item"
+          [selected]="true"
+          (historyClick)="navigateToHistoryPage($event)"
+          [order]="order$ | async"
+          (specialCommentChanged)="updateSpecialComment(item, $event)"
+          (sharedOnInit)="fetchNotifications(item)"
+        ></page-pickup-shelf-details-item>
+      </ng-container>
+
       <page-pickup-shelf-details-tags class="mb-px-2" *ngIf="showTagsComponent$ | async"></page-pickup-shelf-details-tags>
+
       <page-pickup-shelf-details-covers
         *ngIf="(coverOrderItems$ | async)?.length > 0"
         [coverItems]="coverOrderItems$ | async"
diff --git a/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.ts b/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.ts
index 1a69f0030..96195d43b 100644
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.ts
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.ts
@@ -16,6 +16,7 @@ import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString } from '@swagger/
 import { UiErrorModalComponent, UiModalService } from '@ui/modal';
 import { ActivatedRoute } from '@angular/router';
 import { RunCheckTrigger } from '../../trigger';
+import { PickUpShelfDetailsItemsGroupComponent } from '../../shared/pickup-shelf-details-items-group/pickup-shelf-details-items-group.component';
 
 @Component({
   selector: 'page-pickup-shelf-in-details',
@@ -32,6 +33,7 @@ import { RunCheckTrigger } from '../../trigger';
     PickUpShelfDetailsItemComponent,
     PickUpShelfDetailsTagsComponent,
     PickUpShelfDetailsCoversComponent,
+    PickUpShelfDetailsItemsGroupComponent,
     PickupShelfAddToPreviousCompartmentCodeLabelPipe,
     UiSpinnerModule,
     OnInitDirective,
@@ -74,6 +76,8 @@ export class PickupShelfInDetailsComponent extends PickupShelfDetailsBaseCompone
 
   selectedItem$ = this.store.selectedOrderItem$;
 
+  selectedItemOrderType$ = this.selectedItem$.pipe(map((item) => item?.features?.orderType));
+
   coverOrderItems$ = this.store.coverOrderItems$;
 
   displayedCompartmentInfo$ = this.store.compartmentInfo$;