dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Minor change in notification

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2023-03-22 13:11:16 +02:00
parent fa1a5f086f
commit 8cf1cc3112
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-notification-dialog.componet.scss
View File

@ -42,12 +42,8 @@
.mat-mdc-radio-button { .mat-mdc-radio-button {
flex: 1 1 100%; flex: 1 1 100%;
padding: 4px; padding: 4px;
border: 1px solid rgba(0, 0, 0, 0.1); border: 1px solid rgba(0, 0, 0, 0.12);
border-radius: 6px; border-radius: 6px;
&.mat-mdc-radio-checked {
border-color: map_get($tb-accent, 500);
}
} }
} }

2
ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
View File

@ -112,7 +112,7 @@
<mat-form-field> <mat-form-field>
<mat-label translate>notification.time</mat-label> <mat-label translate>notification.time</mat-label>
<mat-datetimepicker-toggle [for]="startTimePicker" matPrefix></mat-datetimepicker-toggle> <mat-datetimepicker-toggle [for]="startTimePicker" matPrefix></mat-datetimepicker-toggle>
<mat-datetimepicker #startTimePicker type="datetime" openOnFocus="true" timeInterval="1"></mat-datetimepicker> <mat-datetimepicker #startTimePicker type="datetime" openOnFocus="true" [timeInterval]="1"></mat-datetimepicker>
<input required matInput fxFlex formControlName="time" [min]="minDate()" [max]="maxDate()" [matDatetimepicker]="startTimePicker"> <input required matInput fxFlex formControlName="time" [min]="minDate()" [max]="maxDate()" [matDatetimepicker]="startTimePicker">
</mat-form-field> </mat-form-field>
</div> </div>

6
ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
View File

@ -129,7 +129,13 @@ export class SentNotificationDialogComponent extends
this.dialogTitle = 'notification.new-notification'; this.dialogTitle = 'notification.new-notification';
} }
if (data.request) { if (data.request) {
this.notificationRequestForm.reset({}, {emitEvent: false});
this.notificationRequestForm.patchValue(this.data.request, {emitEvent: false}); this.notificationRequestForm.patchValue(this.data.request, {emitEvent: false});
// eslint-disable-next-line guard-for-in
for (const method in this.data.request.template.configuration.deliveryMethodsTemplates) {
this.deliveryMethodFormsMap.get(NotificationDeliveryMethod[method])
.patchValue(this.data.request.template.configuration.deliveryMethodsTemplates[method]);
}
} }
} }

5
ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-config.resolver.ts
View File

@ -173,7 +173,7 @@ export class SentTableConfigResolver implements Resolve<EntityTableConfig<Notifi
if (countError === 0) { if (countError === 0) {
return ''; return '';
} }
return `<div style="border-radius: 12px; height: 24px; line-height: 24px; padding: 0 10px; width: max-content; return `<div style="border-radius: 12px; height: 24px; line-height: 24px; padding: 0 10px; width: max-content; cursor: pointer;
background-color: #D12730; color: #fff; font-weight: 500; margin-left: 8px" class="stats"> background-color: #D12730; color: #fff; font-weight: 500; margin-left: 8px" class="stats">
${countError} ${this.translate.instant('notification.fails')} > ${countError} ${this.translate.instant('notification.fails')} >
</div>`; </div>`;
@ -182,8 +182,7 @@ export class SentTableConfigResolver implements Resolve<EntityTableConfig<Notifi
private requestStatusStyle(status: NotificationRequestStatus): object { private requestStatusStyle(status: NotificationRequestStatus): object {
const styleObj = { const styleObj = {
fontSize: '14px', fontSize: '14px',
color: '#198038', color: '#198038'
cursor: 'pointer'
}; };
switch (status) { switch (status) {
case NotificationRequestStatus.SCHEDULED: case NotificationRequestStatus.SCHEDULED: