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

Added trim spaces for alarm comments

Browse Source
This commit is contained in:
mpetrov 2024-10-30 16:10:09 +02:00
parent 394103a43d
commit bd680efe81
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.html
View File

@ -173,7 +173,7 @@
<button mat-icon-button <button mat-icon-button
type="button" type="button"
matSuffix matSuffix
*ngIf="getAlarmCommentFormControl().value" *ngIf="getAlarmCommentValue()"
(click)="saveComment()"> (click)="saveComment()">
<mat-icon color="primary"> <mat-icon color="primary">
send send

12
ui-ngx/src/app/modules/home/components/alarm/alarm-comment.component.ts
View File

@ -156,7 +156,7 @@ export class AlarmCommentComponent implements OnInit {
} }
saveComment(): void { saveComment(): void {
const commentInputValue: string = this.getAlarmCommentFormControl().value; const commentInputValue: string = this.getAlarmCommentValue();
if (commentInputValue) { if (commentInputValue) {
const comment: AlarmComment = { const comment: AlarmComment = {
alarmId: { alarmId: {
@ -174,7 +174,7 @@ export class AlarmCommentComponent implements OnInit {
} }
saveEditedComment(commentId: string): void { saveEditedComment(commentId: string): void {
const commentEditInputValue: string = this.getAlarmCommentEditFormControl().value; const commentEditInputValue: string = this.getAlarmCommentEditValue();
if (commentEditInputValue) { if (commentEditInputValue) {
const editedComment: AlarmComment = this.getAlarmCommentById(commentId); const editedComment: AlarmComment = this.getAlarmCommentById(commentId);
editedComment.comment.text = commentEditInputValue; editedComment.comment.text = commentEditInputValue;
@ -277,6 +277,14 @@ export class AlarmCommentComponent implements OnInit {
return this.alarmCommentFormGroup.get('alarmCommentEdit'); return this.alarmCommentFormGroup.get('alarmCommentEdit');
} }
getAlarmCommentValue(): string {
return this.alarmCommentFormGroup.get('alarmComment').value.trim();
}
private getAlarmCommentEditValue(): string {
return this.alarmCommentFormGroup.get('alarmCommentEdit').value.trim();
}
private clearCommentInput(): void { private clearCommentInput(): void {
this.getAlarmCommentFormControl().patchValue(''); this.getAlarmCommentFormControl().patchValue('');
} }