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

renamed selected into displayed for displaying items and added compartment info

Browse Source
This commit is contained in:
Lorenz Hilpert
2023-10-06 14:15:38 +02:00
parent 3ebd50a8c1
commit 6b71a544fe
3 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/page/pickup-shelf/src/lib/store/pickup-shelf-details.selectors.ts
View File

@@ -10,20 +10,29 @@ export const selectOrderItemsRaw = (s: PickupShelfDetailsState) => s.orderItems;
export const selectFetchingOrderItems = (s: PickupShelfDetailsState) => s.fetchingOrderItems;
export const selectSelectedOrderItemProcessingStatus = (s: PickupShelfDetailsState) => s.selectedOrderItemProcessingStatus;
export const selectDisplayedOrderItemProcessingStatus = (s: PickupShelfDetailsState) => s.displayedOrderItemProcessingStatus;
export const selectSelectedCompartmentCode = (s: PickupShelfDetailsState) => s.selectedCompartmentCode;
export const selectDisplayedCompartmentCode = (s: PickupShelfDetailsState) => s.displayedCompartmentCode;
export const selectDisplayedCompartmentInfo = (s: PickupShelfDetailsState) => s.displayedCompartmentInfo;
export const selectOrderItemsByCompartmentCode = (s: PickupShelfDetailsState) => {
const compartmentCode = selectDisplayedCompartmentCode(s);
const items = selectOrderItemsRaw(s);
return items?.filter((oi) => oi.compartmentCode === compartmentCode);
};
export const selectOrderItems = (s: PickupShelfDetailsState): DBHOrderItemListItemDTO[] => {
const compartmentCode = selectSelectedCompartmentCode(s);
const compartmentCode = selectDisplayedCompartmentCode(s);
const items = selectOrderItemsRaw(s);
if (compartmentCode) {
const compartmentInfo = selectSelectedCompartmentInfo(s);
const compartmentInfo = selectCompartmentInfo(s);
return items?.filter((oi) => oi.compartmentCode === compartmentCode && oi.compartmentInfo === compartmentInfo);
}
const processingStatus = selectSelectedOrderItemProcessingStatus(s);
const processingStatus = selectDisplayedOrderItemProcessingStatus(s);
if (processingStatus) {
return items?.filter((oi) => oi.processingStatus === processingStatus);
@@ -62,7 +71,7 @@ export const selectCompartmentCode = (s: PickupShelfDetailsState) => {
};
export const selectCompartmentInfo = (s: PickupShelfDetailsState) => {
const items = selectOrderItems(s);
const items = selectOrderItemsByCompartmentCode(s);
const compartmentInfos = uniq(items?.filter((oi) => oi.compartmentInfo)?.map((oi) => oi.compartmentInfo));
if (compartmentInfos.length > 1) {

5
apps/page/pickup-shelf/src/lib/store/pickup-shelf-details.state.ts
View File

@@ -17,8 +17,9 @@ export interface PickupShelfDetailsState {
receipts?: ReceiptDTO[];
fetchingReceipts?: boolean;
selectedOrderItemProcessingStatus?: OrderItemProcessingStatusValue;
selectedCompartmentCode?: string;
displayedOrderItemProcessingStatus?: OrderItemProcessingStatusValue;
displayedCompartmentCode?: string;
displayedCompartmentInfo?: string;
fetchingCustomer?: boolean;
customer?: CustomerInfoDTO;

12
apps/page/pickup-shelf/src/lib/store/pickup-shelf-details.store.ts
View File

@@ -66,10 +66,10 @@ export class PickupShelfDetailsStore extends ComponentStore<PickupShelfDetailsSt
return this.get(Selectors.selectFetchingOrderItems);
}
processingStatus$ = this.select(Selectors.selectSelectedOrderItemProcessingStatus);
processingStatus$ = this.select(Selectors.selectDisplayedOrderItemProcessingStatus);
get processingStatus() {
return this.get(Selectors.selectSelectedOrderItemProcessingStatus);
return this.get(Selectors.selectDisplayedOrderItemProcessingStatus);
}
customer$ = this.select(Selectors.selectCustomer);
@@ -143,10 +143,10 @@ export class PickupShelfDetailsStore extends ComponentStore<PickupShelfDetailsSt
}
}
selectedCompartmentCode$ = this.select(Selectors.selectSelectedCompartmentCode);
selectedCompartmentCode$ = this.select(Selectors.selectDisplayedCompartmentCode);
get selectedCompartmentCode() {
return this.get(Selectors.selectSelectedCompartmentCode);
return this.get(Selectors.selectDisplayedCompartmentCode);
}
latestCompartmentCodeForOrder$ = this.select(Selectors.selectLatestCompartmentCodeForOrder);
@@ -235,7 +235,7 @@ export class PickupShelfDetailsStore extends ComponentStore<PickupShelfDetailsSt
}
setSelectedOrderItemProcessingStatus(status?: OrderItemProcessingStatusValue) {
this.patchState({ selectedOrderItemProcessingStatus: status });
this.patchState({ displayedOrderItemProcessingStatus: status });
}
setPreviousSelectedOrderItemSubsetId(previousSelectedOrderItemSubsetId: number) {
@@ -362,7 +362,7 @@ export class PickupShelfDetailsStore extends ComponentStore<PickupShelfDetailsSt
this.patchState({
fetchingOrderItems: true,
orderItems,
selectedCompartmentCode: compartmentCode,
displayedCompartmentCode: compartmentCode,
selectedOrderItemIds: [],
orderItemSubsetTasks: {},
fetchingOrderItemSubsetTasks: {},