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

Merge branch 'release/2.3' into develop

Browse Source
This commit is contained in:
Lorenz Hilpert
2023-07-24 01:12:38 +02:00
parent d4a3a4bc06 8416028113
commit b3e4ca90ee
6 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/shared/components/goods-in-out/src/lib/goods-in-out-order-edit/goods-in-out-order-edit.component.html
View File

@@ -154,7 +154,7 @@
</div>
<ui-form-control label="Vormerker" variant="inline">
<ui-select formControlName="isPrebooked">
<ui-select formControlName="isPrebooked" readonly="true">
<ui-select-option label="Ja" [value]="true"></ui-select-option>
<ui-select-option label="Nein" [value]="false"></ui-select-option>
</ui-select>

6
apps/shared/modals/purchase-options-modal/src/lib/purchase-options-list-item/purchase-options-list-item.component.html
View File

@@ -169,6 +169,12 @@
/>
</div>
<ng-container *ngIf="canAddResult$ | async; let canAddResult">
<span *ngIf="!canAddResult.canAdd" class="inline-block font-bold text-[#BE8100] mt-[14px] max-w-[19rem]">
{{ canAddResult.message }}
</span>
</ng-container>
<span *ngIf="showMaxAvailableQuantity$ | async" class="font-bold text-[#BE8100] mt-[14px]">
{{ (availability$ | async)?.inStock }} Exemplare sofort lieferbar
</span>

2
apps/shared/modals/purchase-options-modal/src/lib/store/purchase-options.selectors.ts
View File

@@ -82,7 +82,7 @@ export function getCanAddForItemWithPurchaseOption(
): (state: PurchaseOptionsState) => CanAdd {
return (state: PurchaseOptionsState) => {
const canAddResults = getCanAddResults(state);
return canAddResults.find((ca) => ca.itemId === itemId && ca.purchaseOption === purchaseOption);
return canAddResults.find((ca) => ca.canAdd && ca.itemId === itemId && ca.purchaseOption === purchaseOption);
};
}

4
apps/ui/form-control/src/lib/ui-form-control.component.scss
View File

@@ -7,10 +7,10 @@ button.clear {
}
.hint {
@apply text-brand text-p4 font-bold;
@apply text-brand font-bold;
&.readonly-hint {
@apply text-inactive-branch font-normal;
@apply text-ucla-blue font-normal;
}
}

10
apps/ui/form-control/src/lib/ui-form-control.directive.ts
View File

@@ -13,13 +13,15 @@ export abstract class UiFormControlDirective<T> {
private _readonly = false;
@Input()
@HostBinding('readonly')
@Input('readonly')
_isReadonly: BooleanInput = false;
get readonly(): boolean {
return this._readonly;
return coerceBooleanProperty(this._isReadonly);
}
set readonly(value: BooleanInput) {
this._readonly = coerceBooleanProperty(value);
set readonly(value: boolean) {
this._isReadonly = coerceBooleanProperty(value);
}
focused = new EventEmitter<boolean>();

2
apps/ui/select/src/lib/ui-select.component.html
View File

@@ -1,7 +1,7 @@
<button class="backdrop" [class.display-backdrop]="toggled" (click)="toggled = !toggled"></button>
<div class="ui-input-wrapper">
<div class="ui-select-value">{{ label }}</div>
<button type="button" class="ui-select-toggle" [disabled]="disabled" (click)="toggle()">
<button *ngIf="!readonly" type="button" class="ui-select-toggle" [disabled]="disabled || readonly" (click)="toggle()">
<ui-icon icon="arrow_head"></ui-icon>
</button>
</div>