Browse Source

UI: Custom translate for alarm type

pull/8578/head
Artem Dzhereleiko 3 years ago
parent
commit
733a2a03e4
  1. 4
      ui-ngx/src/app/modules/home/components/alarm/alarm-details-dialog.component.ts
  2. 3
      ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts
  3. 2
      ui-ngx/src/app/shared/components/notification/notification.component.html
  4. 2
      ui-ngx/src/app/shared/components/notification/notification.component.ts

4
ui-ngx/src/app/modules/home/components/alarm/alarm-details-dialog.component.ts

@ -35,6 +35,7 @@ import { DatePipe } from '@angular/common';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { AlarmCommentComponent } from '@home/components/alarm/alarm-comment.component'; import { AlarmCommentComponent } from '@home/components/alarm/alarm-comment.component';
import { MillisecondsToTimeStringPipe } from '@shared/pipe/milliseconds-to-time-string.pipe'; import { MillisecondsToTimeStringPipe } from '@shared/pipe/milliseconds-to-time-string.pipe';
import { UtilsService } from '@core/services/utils.service';
export interface AlarmDetailsDialogData { export interface AlarmDetailsDialogData {
alarmId?: string; alarmId?: string;
@ -79,6 +80,7 @@ export class AlarmDetailsDialogComponent extends DialogComponent<AlarmDetailsDia
private translate: TranslateService, private translate: TranslateService,
@Inject(MAT_DIALOG_DATA) public data: AlarmDetailsDialogData, @Inject(MAT_DIALOG_DATA) public data: AlarmDetailsDialogData,
private alarmService: AlarmService, private alarmService: AlarmService,
private utils: UtilsService,
public dialogRef: MatDialogRef<AlarmDetailsDialogComponent, boolean>, public dialogRef: MatDialogRef<AlarmDetailsDialogComponent, boolean>,
public fb: UntypedFormBuilder) { public fb: UntypedFormBuilder) {
super(store, router, dialogRef); super(store, router, dialogRef);
@ -136,7 +138,7 @@ export class AlarmDetailsDialogComponent extends DialogComponent<AlarmDetailsDia
} }
this.alarmFormGroup.get('duration').patchValue(duration); this.alarmFormGroup.get('duration').patchValue(duration);
} }
this.alarmFormGroup.get('type').patchValue(alarm.type); this.alarmFormGroup.get('type').patchValue(this.utils.customTranslation(alarm.type, alarm.type));
this.alarmFormGroup.get('alarmStatus') this.alarmFormGroup.get('alarmStatus')
.patchValue(this.translate.instant(alarmStatusTranslations.get(alarm.status))); .patchValue(this.translate.instant(alarmStatusTranslations.get(alarm.status)));
this.alarmFormGroup.get('alarmDetails').patchValue(alarm.details); this.alarmFormGroup.get('alarmDetails').patchValue(alarm.details);

3
ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts

@ -116,7 +116,8 @@ export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink>
new EntityTableColumn<AlarmInfo>('originatorName', 'alarm.originator', '25%', new EntityTableColumn<AlarmInfo>('originatorName', 'alarm.originator', '25%',
(entity) => entity.originatorName, entity => ({}), false)); (entity) => entity.originatorName, entity => ({}), false));
this.columns.push( this.columns.push(
new EntityTableColumn<AlarmInfo>('type', 'alarm.type', '25%')); new EntityTableColumn<AlarmInfo>('type', 'alarm.type', '25%',
entity => this.utilsService.customTranslation(entity.type, entity.type)));
this.columns.push( this.columns.push(
new EntityTableColumn<AlarmInfo>('severity', 'alarm.severity', '25%', new EntityTableColumn<AlarmInfo>('severity', 'alarm.severity', '25%',
(entity) => this.translate.instant(alarmSeverityTranslations.get(entity.severity)), (entity) => this.translate.instant(alarmSeverityTranslations.get(entity.severity)),

2
ui-ngx/src/app/shared/components/notification/notification.component.html

@ -28,7 +28,7 @@
</mat-icon> </mat-icon>
</ng-template> </ng-template>
<div class="content" fxFlex> <div class="content" fxFlex>
<div class="title" [innerHTML]="(notification.subject | safe: 'html' )"></div> <div class="title" [innerHTML]="(utils.customTranslation(notification.subject, notification.subject) | safe: 'html' )"></div>
<div class="message" [innerHTML]="(notification.text | safe: 'html' )"></div> <div class="message" [innerHTML]="(notification.text | safe: 'html' )"></div>
<button *ngIf="showButton" mat-stroked-button class="button" color="primary" <button *ngIf="showButton" mat-stroked-button class="button" color="primary"
(click)="navigate($event)"> (click)="navigate($event)">

2
ui-ngx/src/app/shared/components/notification/notification.component.ts

@ -63,7 +63,7 @@ export class NotificationComponent implements OnInit {
currentDate = Date.now(); currentDate = Date.now();
constructor( constructor(
private utils: UtilsService, public utils: UtilsService,
private router: Router private router: Router
) { ) {
} }

Loading…
Cancel
Save