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

#3759 Bearbeiten deaktivieren

Browse Source
This commit is contained in:
Lorenz Hilpert
2023-03-01 17:56:31 +01:00
parent e95828a514
commit 59cf407c26
11 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/shared/components/goods-in-out/src/lib/goods-in-out-order-details/goods-in-out-order-details-header/goods-in-out-order-details-header.component.html
View File

@@ -6,8 +6,9 @@
{{ feature?.description }}
</div>
</div>
<button
[disabled]="changeStatusLoader$ | async"
[disabled]="editButtonDisabled$ | async"
class="goods-in-out-header-edit-cta"
*ngIf="editClick.observers.length"
(click)="editClick.emit(orderItem)"
@@ -53,10 +54,10 @@
<ui-icon class="status-icon" *ngIf="orderItem?.processingStatus | processingStatus: 'icon'; let icon" [icon]="icon" size="12px">
</ui-icon>
<span *ngIf="!(statusActions$ | async)?.length">
<span *ngIf="!(canEditStatus$ | async)">
{{ orderItem?.processingStatus | processingStatus }}
</span>
<ng-container *ngIf="!!(statusActions$ | async)?.length">
<ng-container *ngIf="canEditStatus$ | async">
<button
class="cta-status-dropdown"
[uiOverlayTrigger]="statusDropdown"

2
apps/shared/components/goods-in-out/src/lib/goods-in-out-order-details/goods-in-out-order-details-header/goods-in-out-order-details-header.component.scss
View File

@@ -21,7 +21,7 @@
.goods-in-out-header-edit-cta {
@apply bg-transparent text-brand text-base font-bold border-none px-1 -mr-1;
&::disabled {
&:disabled {
@apply text-inactive-customer;
}
}

10
apps/shared/components/goods-in-out/src/lib/goods-in-out-order-details/goods-in-out-order-details-header/goods-in-out-order-details-header.component.ts
View File

@@ -72,6 +72,16 @@ export class SharedGoodsInOutOrderDetailsHeaderComponent implements OnChanges {
map(([orderItems, fetchPartial, multiSelect]) => multiSelect && fetchPartial && orderItems?.length > 1)
);
crudaUpdate$ = this.orderItem$.pipe(map((orederItem) => !!(orederItem?.cruda & 4)));
editButtonDisabled$ = combineLatest([this.changeStatusLoader$, this.crudaUpdate$]).pipe(
map(([changeStatusLoader, crudaUpdate]) => changeStatusLoader || !crudaUpdate)
);
canEditStatus$ = combineLatest([this.statusActions$, this.crudaUpdate$]).pipe(
map(([statusActions, crudaUpdate]) => statusActions?.length > 0 && crudaUpdate)
);
constructor(
@Host() private host: SharedGoodsInOutOrderDetailsComponent,
private customerService: CrmCustomerService,

4
apps/shared/components/goods-in-out/src/lib/goods-in-out-order-group/goods-in-out-order-group-item.component.ts
View File

@@ -80,6 +80,10 @@ export class GoodsInOutOrderGroupItemComponent extends ComponentStore<GoodsInOut
@Input()
showInStock: StockInfoDTO[];
get cruda() {
return (this.item as any)?.cruda;
}
constructor() {
super({
selected: false,

5
apps/swagger/oms/src/lib/models.ts
View File

@@ -19,6 +19,7 @@ export { AutocompleteTokenDTO } from './models/autocomplete-token-dto';
export { ListResponseArgsOfOrderItemListItemDTO } from './models/list-response-args-of-order-item-list-item-dto';
export { ResponseArgsOfIEnumerableOfOrderItemListItemDTO } from './models/response-args-of-ienumerable-of-order-item-list-item-dto';
export { OrderItemListItemDTO } from './models/order-item-list-item-dto';
export { CRUDA } from './models/cruda';
export { EnvironmentChannel } from './models/environment-channel';
export { OrderType } from './models/order-type';
export { OrderItemProcessingStatusValue } from './models/order-item-processing-status-value';
@@ -44,7 +45,6 @@ export { EntityDTOBaseOfLabelDTOAndILabel } from './models/entity-dtobase-of-lab
export { EntityDTOBase } from './models/entity-dtobase';
export { EntityDTO } from './models/entity-dto';
export { EntityStatus } from './models/entity-status';
export { CRUDA } from './models/cruda';
export { EntityDTOReferenceContainer } from './models/entity-dtoreference-container';
export { ExternalReferenceDTO } from './models/external-reference-dto';
export { EntityDTOContainerOfBranchDTO } from './models/entity-dtocontainer-of-branch-dto';
@@ -194,9 +194,6 @@ export { ResponseArgsOfOrderDTO } from './models/response-args-of-order-dto';
export { ListResponseArgsOfOrderListItemDTO } from './models/list-response-args-of-order-list-item-dto';
export { ResponseArgsOfIEnumerableOfOrderListItemDTO } from './models/response-args-of-ienumerable-of-order-list-item-dto';
export { OrderListItemDTO } from './models/order-list-item-dto';
export { ListResponseArgsOfDBHOrderItemListItemDTO } from './models/list-response-args-of-dbhorder-item-list-item-dto';
export { ResponseArgsOfIEnumerableOfDBHOrderItemListItemDTO } from './models/response-args-of-ienumerable-of-dbhorder-item-list-item-dto';
export { DBHOrderItemListItemDTO } from './models/dbhorder-item-list-item-dto';
export { ResponseArgsOfBoolean } from './models/response-args-of-boolean';
export { ResponseArgsOfOrderItemDTO } from './models/response-args-of-order-item-dto';
export { ResponseArgsOfIEnumerableOfOrderItemDTO } from './models/response-args-of-ienumerable-of-order-item-dto';

13
apps/swagger/oms/src/lib/models/dbhorder-item-list-item-dto.ts
View File

@@ -1,13 +0,0 @@
/* tslint:disable */
import { OrderItemListItemDTO } from './order-item-list-item-dto';
import { CRUDA } from './cruda';
export interface DBHOrderItemListItemDTO extends OrderItemListItemDTO{
billingZipCode?: string;
cruda?: CRUDA;
externalRepositories?: string;
fetchOnDeliveryNote?: boolean;
orderedAtSupplier?: string;
payerId?: number;
paymentReferenceNumber?: string;
shippingNoteId?: number;
}

8
apps/swagger/oms/src/lib/models/list-response-args-of-dbhorder-item-list-item-dto.ts
View File

@@ -1,8 +0,0 @@
/* tslint:disable */
import { ResponseArgsOfIEnumerableOfDBHOrderItemListItemDTO } from './response-args-of-ienumerable-of-dbhorder-item-list-item-dto';
export interface ListResponseArgsOfDBHOrderItemListItemDTO extends ResponseArgsOfIEnumerableOfDBHOrderItemListItemDTO{
completed?: boolean;
hits?: number;
skip?: number;
take?: number;
}

5
apps/swagger/oms/src/lib/models/order-item-list-item-dto.ts
View File

@@ -1,6 +1,7 @@
/* tslint:disable */
import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-string';
import { EnvironmentChannel } from './environment-channel';
import { CRUDA } from './cruda';
import { Gender } from './gender';
import { OrderType } from './order-type';
import { PaymentStatus } from './payment-status';
@@ -15,6 +16,7 @@ export interface OrderItemListItemDTO {
clientChannel?: EnvironmentChannel;
compartmentCode?: string;
compartmentInfo?: string;
cruda?: CRUDA;
currency?: string;
department?: string;
estimatedShippingDate?: string;
@@ -33,9 +35,12 @@ export interface OrderItemListItemDTO {
orderItemPId?: string;
orderItemSubsetId?: number;
orderItemSubsetPId?: string;
orderItemSubsetUId?: string;
orderItemUId?: string;
orderNumber?: string;
orderPId?: string;
orderType?: OrderType;
orderUId?: string;
organisation?: string;
overallQuantity?: number;
paymentProcessing?: string;

6
apps/swagger/oms/src/lib/models/response-args-of-ienumerable-of-dbhorder-item-list-item-dto.ts
View File

@@ -1,6 +0,0 @@
/* tslint:disable */
import { ResponseArgs } from './response-args';
import { DBHOrderItemListItemDTO } from './dbhorder-item-list-item-dto';
export interface ResponseArgsOfIEnumerableOfDBHOrderItemListItemDTO extends ResponseArgs{
result?: Array<DBHOrderItemListItemDTO>;
}

9
apps/swagger/oms/src/lib/services/order.service.ts
View File

@@ -19,7 +19,6 @@ import { QueryTokenDTO } from '../models/query-token-dto';
import { ResponseArgsOfQuerySettingsDTO } from '../models/response-args-of-query-settings-dto';
import { ResponseArgsOfIEnumerableOfAutocompleteDTO } from '../models/response-args-of-ienumerable-of-autocomplete-dto';
import { AutocompleteTokenDTO } from '../models/autocomplete-token-dto';
import { ListResponseArgsOfDBHOrderItemListItemDTO } from '../models/list-response-args-of-dbhorder-item-list-item-dto';
import { ListResponseArgsOfOrderItemListItemDTO } from '../models/list-response-args-of-order-item-list-item-dto';
import { ResponseArgsOfIEnumerableOfOrderItemDTO } from '../models/response-args-of-ienumerable-of-order-item-dto';
import { OrderItemDTO } from '../models/order-item-dto';
@@ -543,7 +542,7 @@ class OrderService extends __BaseService {
* Suche nach Bestellposten
* @param queryToken Suchkriterien
*/
OrderKundenbestellungenResponse(queryToken: QueryTokenDTO): __Observable<__StrictHttpResponse<ListResponseArgsOfDBHOrderItemListItemDTO>> {
OrderKundenbestellungenResponse(queryToken: QueryTokenDTO): __Observable<__StrictHttpResponse<ListResponseArgsOfOrderItemListItemDTO>> {
let __params = this.newParams();
let __headers = new HttpHeaders();
let __body: any = null;
@@ -561,7 +560,7 @@ class OrderService extends __BaseService {
return this.http.request<any>(req).pipe(
__filter(_r => _r instanceof HttpResponse),
__map((_r) => {
return _r as __StrictHttpResponse<ListResponseArgsOfDBHOrderItemListItemDTO>;
return _r as __StrictHttpResponse<ListResponseArgsOfOrderItemListItemDTO>;
})
);
}
@@ -569,9 +568,9 @@ class OrderService extends __BaseService {
* Suche nach Bestellposten
* @param queryToken Suchkriterien
*/
OrderKundenbestellungen(queryToken: QueryTokenDTO): __Observable<ListResponseArgsOfDBHOrderItemListItemDTO> {
OrderKundenbestellungen(queryToken: QueryTokenDTO): __Observable<ListResponseArgsOfOrderItemListItemDTO> {
return this.OrderKundenbestellungenResponse(queryToken).pipe(
__map(_r => _r.body as ListResponseArgsOfDBHOrderItemListItemDTO)
__map(_r => _r.body as ListResponseArgsOfOrderItemListItemDTO)
);
}

3
tsconfig.json
View File

@@ -105,6 +105,9 @@
"@shared/directives/*": [
"apps/shared/directives/*/src/public-api.ts"
],
"@shared/pipes/*": [
"apps/shared/pipes/*/src/public-api.ts"
],
"@shell/breadcrumb": [
"apps/shell/breadcrumb/src/public-api.ts"
],