sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-31 09:37:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged PR 1268: #3157 AHF Routing und Item wählen anhand OrderItemSubsetId

Browse Source 
#3157 AHF Routing und Item wählen anhand OrderItemSubsetId

Related work items: #3157
This commit is contained in:
Andreas Schickinger
2022-06-09 08:53:45 +00:00
committed by Lorenz Hilpert
parent 055339956a
commit fa10bc9c30
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/page/goods-in/src/lib/goods-in-cleanup-list/goods-in-cleanup-list.component.ts
View File

@@ -177,7 +177,7 @@ export class GoodsInCleanupListComponent implements OnInit, OnDestroy {
const customerNumber = orderItem.buyerNumber;
const orderNumber = orderItem.orderNumber;
const processingStatus = orderItem.processingStatus;
const orderItemId = orderItem.orderItemId;
const orderItemId = orderItem.orderItemSubsetId;
this._router.navigate([
`/filiale/goods/in/details/customer/${encodeURIComponent(customerNumber)}/order/${encodeURIComponent(

10
apps/page/goods-in/src/lib/goods-in-details/goods-in-details.component.ts
View File

@@ -54,7 +54,7 @@ export class GoodsInDetailsComponent extends ComponentStore<GoodsInDetailsCompon
);
selectedItem$ = combineLatest([this.selectedOrderItemId$, this.itemsWithProcessingStatus$]).pipe(
map(([orderItemId, items]) => items.find((item) => item.orderItemId === orderItemId) || items[0])
map(([orderItemId, items]) => items.find((item) => item.orderItemSubsetId === orderItemId) || items[0])
);
fetchingCoverItems$ = this.select((s) => s.fetchingCoverItems);
@@ -125,7 +125,7 @@ export class GoodsInDetailsComponent extends ComponentStore<GoodsInDetailsCompon
name: item?.orderNumber,
path: `/filiale/goods/in/details/customer/${encodeURIComponent(item.buyerNumber)}/order/${encodeURIComponent(
item?.orderNumber
)}/item/${item?.orderItemId}/${item?.processingStatus}`,
)}/item/${item?.orderItemSubsetId}/${item?.processingStatus}`,
section: 'branch',
tags: ['goods-in', 'details', item?.orderNumber],
});
@@ -151,7 +151,7 @@ export class GoodsInDetailsComponent extends ComponentStore<GoodsInDetailsCompon
orderId: res.result[0].orderId,
});
this.updateBreadcrumb(
res.result.find((item) => item.orderItemId === selectedOrderItemId && item.processingStatus === processingStatus)
res.result.find((item) => item.orderItemSubsetId === selectedOrderItemId && item.processingStatus === processingStatus)
);
},
() => {},
@@ -202,7 +202,7 @@ export class GoodsInDetailsComponent extends ComponentStore<GoodsInDetailsCompon
this._router.navigate([
`/filiale/goods/in/details/customer/${encodeURIComponent(orderItem.buyerNumber)}/order/${encodeURIComponent(
orderItem?.orderNumber
)}/item/${orderItem?.orderItemId}/${orderItem?.processingStatus}/edit`,
)}/item/${orderItem?.orderItemSubsetId}/${orderItem?.processingStatus}/edit`,
]);
}
@@ -210,7 +210,7 @@ export class GoodsInDetailsComponent extends ComponentStore<GoodsInDetailsCompon
this._router.navigate([
`/filiale/goods/in/details/customer/${encodeURIComponent(orderItem?.buyerNumber)}/order/${encodeURIComponent(
orderItem?.orderNumber
)}/item/${orderItem?.orderItemId}/${orderItem?.processingStatus}`,
)}/item/${orderItem?.orderItemSubsetId}/${orderItem?.processingStatus}`,
]);
}

2
apps/page/goods-in/src/lib/goods-in-list/goods-in-list.component.ts
View File

@@ -138,7 +138,7 @@ export class GoodsInListComponent implements OnInit, AfterViewInit, OnDestroy {
const customerNumber = orderItem.buyerNumber;
const orderNumber = orderItem.orderNumber;
const processingStatus = orderItem.processingStatus;
const orderItemId = orderItem.orderItemId;
const orderItemId = orderItem.orderItemSubsetId;
this._router.navigate([
`/filiale/goods/in/details/customer/${encodeURIComponent(customerNumber)}/order/${encodeURIComponent(

2
apps/page/goods-in/src/lib/goods-in-remission-preview/goods-in-remission-preview.component.ts
View File

@@ -135,7 +135,7 @@ export class GoodsInRemissionPreviewComponent implements OnInit, OnDestroy {
const customerNumber = orderItem.buyerNumber;
const orderNumber = orderItem.orderNumber;
const processingStatus = orderItem.processingStatus;
const orderItemId = orderItem.orderItemId;
const orderItemId = orderItem.orderItemSubsetId;
this._router.navigate([
`/filiale/goods/in/details/customer/${encodeURIComponent(customerNumber)}/order/${encodeURIComponent(

2
apps/page/goods-in/src/lib/goods-in-reservation/goods-in-reservation.component.ts
View File

@@ -138,7 +138,7 @@ export class GoodsInReservationComponent implements OnInit, OnDestroy {
const customerNumber = orderItem.buyerNumber;
const orderNumber = orderItem.orderNumber;
const processingStatus = orderItem.processingStatus;
const orderItemId = orderItem.orderItemId;
const orderItemId = orderItem.orderItemSubsetId;
this._router.navigate([
`/filiale/goods/in/details/customer/${encodeURIComponent(customerNumber)}/order/${encodeURIComponent(

2
apps/page/goods-in/src/lib/goods-in-search/goods-in-search-filter/goods-in-search-filter.component.ts
View File

@@ -74,7 +74,7 @@ export class GoodsInSearchFilterComponent implements OnInit, OnDestroy {
this._router.navigate([
`/filiale/goods/in/details/customer/${encodeURIComponent(orderItem.buyerNumber)}/order/${encodeURIComponent(
orderItem.orderNumber
)}/item/${orderItem.orderItemId}/${orderItem.processingStatus}`,
)}/item/${orderItem.orderItemSubsetId}/${orderItem.processingStatus}`,
]);
} else {
this._router.navigate(['/filiale', 'goods', 'in', 'results'], {

2
apps/page/goods-in/src/lib/goods-in-search/search-main/goods-in-search-main.component.ts
View File

@@ -120,7 +120,7 @@ export class GoodsInSearchMainComponent implements OnInit, OnDestroy {
this._router.navigate([
`/filiale/goods/in/details/customer/${encodeURIComponent(orderItem.buyerNumber)}/order/${encodeURIComponent(
orderItem.orderNumber
)}/item/${orderItem.orderItemId}/${orderItem.processingStatus}`,
)}/item/${orderItem.orderItemSubsetId}/${orderItem.processingStatus}`,
]);
} else {
this._router.navigate(['/filiale', 'goods', 'in', 'results'], {

2
apps/page/goods-in/src/lib/goods-in-search/search-results/goods-in-search-results.component.ts
View File

@@ -158,7 +158,7 @@ export class GoodsInSearchResultsComponent implements OnInit, OnDestroy {
const customerNumber = orderItem.buyerNumber;
const orderNumber = orderItem.orderNumber;
const processingStatus = orderItem.processingStatus;
const orderItemId = orderItem.orderItemId;
const orderItemId = orderItem.orderItemSubsetId;
this._router.navigate([
`/filiale/goods/in/details/customer/${encodeURIComponent(customerNumber)}/order/${encodeURIComponent(