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

Merge pull request #8359 from rusikv/develop/3.5

Browse Source 
Alarm assignee/comments style fixes, enhancements
This commit is contained in:
Andrew Shvayka 2023-04-13 16:03:01 +03:00 committed by GitHub
commit 0efd39317f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--> -->
<div style="min-width: 600px;"> <form style="width: 600px;">
<mat-toolbar color="primary"> <mat-toolbar color="primary">
<span fxFlex></span> <span fxFlex></span>
<button mat-icon-button (click)="close()" type="button"> <button mat-icon-button (click)="close()" type="button">
@ -30,4 +30,4 @@
[alarmActivityOnly]="true"> [alarmActivityOnly]="true">
</tb-alarm-comment> </tb-alarm-comment>
</div> </div>
</div> </form>

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

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--> -->
<form [formGroup]="alarmFormGroup" style="min-width: 600px;"> <form [formGroup]="alarmFormGroup" style="width: 600px;">
<mat-toolbar color="primary"> <mat-toolbar color="primary">
<h2>{{ 'alarm.alarm-details' | translate }}</h2> <h2>{{ 'alarm.alarm-details' | translate }}</h2>
<span fxFlex></span> <span fxFlex></span>

12
ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.html
View File

@ -91,14 +91,18 @@
{{ getUserInitials(alarm) }} {{ getUserInitials(alarm) }}
</span> </span>
<span [matTooltip]="getUserDisplayName(alarm)" <span [matTooltip]="getUserDisplayName(alarm)"
matTooltipPosition="above" matTooltipPosition="above">
style="text-overflow: ellipsis">
{{ getUserDisplayName(alarm) }} {{ getUserDisplayName(alarm) }}
</span> </span>
</span> </span>
<span *ngIf="!alarm.assigneeId" class="unassigned-container" fxLayout="row" fxLayoutAlign="start center"> <span *ngIf="!alarm.assigneeId" class="unassigned-container">
<mat-icon class="material-icons unassigned-icon">account_circle</mat-icon> <mat-icon class="material-icons unassigned-icon">account_circle</mat-icon>
<span translate>alarm.unassigned</span> <span matTooltip="{{ 'alarm.unassigned' | translate }}"
matTooltipPosition="above"
style="vertical-align: middle"
translate>
alarm.unassigned
</span>
</span> </span>
<button *ngIf="allowAssign" <button *ngIf="allowAssign"
mat-icon-button [disabled]="isLoading$ | async" mat-icon-button [disabled]="isLoading$ | async"

4
ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.scss
View File

@ -28,8 +28,8 @@
} }
.mat-mdc-cell { .mat-mdc-cell {
.assignee-cell { .assignee-cell {
.assigned-container {
white-space: nowrap; white-space: nowrap;
.assigned-container {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
.user-avatar { .user-avatar {
@ -48,7 +48,6 @@
} }
} }
.unassigned-container { .unassigned-container {
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
.material-icons.unassigned-icon { .material-icons.unassigned-icon {
@ -58,6 +57,7 @@
margin-right: 8px; margin-right: 8px;
color: rgba(0, 0, 0, 0.38); color: rgba(0, 0, 0, 0.38);
overflow: visible; overflow: visible;
vertical-align: middle;
} }
} }
} }