Browse Source
Merge pull request #9288 from ArtemDzhereleiko/AD/bug-fix/notification-template-dialog
Fixed notifications dialog
pull/9295/head
Igor Kulikov
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
2 additions and
10 deletions
-
ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
-
ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
-
ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.html
-
ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts
|
|
|
@ -29,7 +29,7 @@ |
|
|
|
</mat-progress-bar> |
|
|
|
<div mat-dialog-content> |
|
|
|
<mat-horizontal-stepper linear #createNotification |
|
|
|
[labelPosition]="(stepperLabelPosition | async)" |
|
|
|
labelPosition="bottom" |
|
|
|
[orientation]="(stepperOrientation | async)" |
|
|
|
(selectionChange)="changeStep($event)"> |
|
|
|
<ng-template matStepperIcon="edit"> |
|
|
|
|
|
|
|
@ -63,7 +63,6 @@ export class SentNotificationDialogComponent extends |
|
|
|
|
|
|
|
@ViewChild('createNotification', {static: true}) createNotification: MatStepper; |
|
|
|
stepperOrientation: Observable<StepperOrientation>; |
|
|
|
stepperLabelPosition: Observable<'bottom' | 'end'>; |
|
|
|
|
|
|
|
isAdd = true; |
|
|
|
entityType = EntityType; |
|
|
|
@ -102,9 +101,6 @@ export class SentNotificationDialogComponent extends |
|
|
|
this.stepperOrientation = this.breakpointObserver.observe(MediaBreakpoints['gt-sm']) |
|
|
|
.pipe(map(({matches}) => matches ? 'horizontal' : 'vertical')); |
|
|
|
|
|
|
|
this.stepperLabelPosition = this.breakpointObserver.observe(MediaBreakpoints['gt-md']) |
|
|
|
.pipe(map(({matches}) => matches ? 'end' : 'bottom')); |
|
|
|
|
|
|
|
this.notificationRequestForm = this.fb.group({ |
|
|
|
useTemplate: [false], |
|
|
|
templateId: [{value: null, disabled: true}, Validators.required], |
|
|
|
|
|
|
|
@ -29,7 +29,7 @@ |
|
|
|
</mat-progress-bar> |
|
|
|
<div mat-dialog-content> |
|
|
|
<mat-horizontal-stepper linear #notificationTemplateStepper |
|
|
|
[labelPosition]="(stepperLabelPosition | async)" |
|
|
|
labelPosition="bottom" |
|
|
|
[orientation]="(stepperOrientation | async)" |
|
|
|
(selectionChange)="changeStep($event)"> |
|
|
|
<ng-template matStepperIcon="edit"> |
|
|
|
|
|
|
|
@ -54,7 +54,6 @@ export class TemplateNotificationDialogComponent |
|
|
|
@ViewChild('notificationTemplateStepper', {static: true}) notificationTemplateStepper: MatStepper; |
|
|
|
|
|
|
|
stepperOrientation: Observable<StepperOrientation>; |
|
|
|
stepperLabelPosition: Observable<'bottom' | 'end'>; |
|
|
|
|
|
|
|
dialogTitle = 'notification.edit-notification-template'; |
|
|
|
|
|
|
|
@ -82,9 +81,6 @@ export class TemplateNotificationDialogComponent |
|
|
|
this.stepperOrientation = this.breakpointObserver.observe(MediaBreakpoints['gt-sm']) |
|
|
|
.pipe(map(({matches}) => matches ? 'horizontal' : 'vertical')); |
|
|
|
|
|
|
|
this.stepperLabelPosition = this.breakpointObserver.observe(MediaBreakpoints['gt-md']) |
|
|
|
.pipe(map(({matches}) => matches ? 'end' : 'bottom')); |
|
|
|
|
|
|
|
if (isDefinedAndNotNull(this.data?.predefinedType)) { |
|
|
|
this.hideSelectType = true; |
|
|
|
this.templateNotificationForm.get('notificationType').setValue(this.data.predefinedType, {emitEvent: false}); |
|
|
|
|