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 1007: #2122 Patch Request - CTA Positioning

Browse Source 
#2122 Patch Request - CTA Positioning
This commit is contained in:
Nino Righi
2021-12-08 13:11:27 +00:00
committed by Lorenz Hilpert
parent 8d75d2e9c9
commit 85b6439d5f
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/shared/goods-in-out/src/lib/goods-in-out-order-edit/goods-in-out-order-edit.component.ts
View File

@@ -181,6 +181,12 @@ export class SharedGoodsInOutOrderEditComponent implements OnChanges, OnDestroy
}
}
async patchNotifications() {
const control = this.control.getRawValue();
const orderId = control.orderId;
await this.omsService.updateNotifications(orderId, this.notificationsGroup.getRawValue()).toPromise();
}
changeEstimatedDeliveryDate(date: Date, item: OrderItemListItemDTO) {
if (!date) {
return;
@@ -209,6 +215,7 @@ export class SharedGoodsInOutOrderEditComponent implements OnChanges, OnDestroy
this.notificationChannelLoading$.next(true);
try {
await this.patchNotifications();
await this.omsService
.generateNotifications({
orderId: this.items[0].orderId,
@@ -243,7 +250,7 @@ export class SharedGoodsInOutOrderEditComponent implements OnChanges, OnDestroy
if (this.notificationsGroup.dirty) {
try {
await this.omsService.updateNotifications(orderId, this.notificationsGroup.getRawValue()).toPromise();
await this.patchNotifications();
} catch (error) {
this._modal.open({ content: UiErrorModalComponent, data: error, title: 'Fehler beim Aktualisieren der Benachrichtigung' });
throw error;

15
apps/shared/notification-channel-control/src/lib/notification-channel-control.component.html
View File

@@ -10,6 +10,11 @@
<ui-checkbox [value]="1" design="filled">E-Mail</ui-checkbox>
<ui-checkbox [value]="2" design="filled">SMS</ui-checkbox>
</ui-checkbox-group>
<div class="nc-generate">
<button [disabled]="channelActionLoading" type="button" (click)="channelActionEvent.emit(notificationChannels)">
{{ channelActionName }}
</button>
</div>
<div class="expand"></div>
<button *ngIf="displayToggle" type="button" class="more-toggle" (click)="toggle()" [class.open]="open$ | async">
<ui-icon icon="arrow_head" size="16px"></ui-icon>
@@ -25,11 +30,6 @@
<span class="error" *ngIf="errors.pattern">Keine gültige E-Mail Adresse</span>
</ng-container>
</div>
<div class="nc-generate" *ngIf="channelActionName && notificationChannels.length !== 2">
<button [disabled]="channelActionLoading" type="button" (click)="channelActionEvent.emit(notificationChannels)">
{{ channelActionName }}
</button>
</div>
</div>
<div class="nc-control-wrapper" *ngIf="displayMobile && open$ | async">
@@ -41,10 +41,5 @@
<span class="error" *ngIf="errors.pattern">Keine gültige Mobilnummer</span>
</ng-container>
</div>
<div class="nc-generate" *ngIf="channelActionName">
<button [disabled]="channelActionLoading" type="button" (click)="channelActionEvent.emit(notificationChannels)">
{{ channelActionName }}
</button>
</div>
</div>
</div>

5
apps/shared/notification-channel-control/src/lib/notification-channel-control.component.scss
View File

@@ -15,6 +15,7 @@
.more-toggle {
@apply bg-transparent outline-none border-none;
margin-top: 2px;
ui-icon {
@apply transition-all transform rotate-90;
@@ -66,8 +67,10 @@
}
.nc-generate {
@apply absolute right-16;
button {
@apply text-base font-bold text-brand outline-none border-none bg-transparent mr-4 absolute right-0;
@apply text-base font-bold text-brand outline-none border-none bg-transparent;
}
}