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

fixed bug#3682

Browse Source
This commit is contained in:
dharapatel1596@gmail.com 2021-06-27 13:42:30 +02:00
parent e08d1b2c07
commit e179227967
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-ngx/src/app/modules/home/components/entity/entity-filter.component.html
View File

@ -53,6 +53,8 @@
</tb-entity-type-select> </tb-entity-type-select>
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>entity.name-starts-with</mat-label> <mat-label translate>entity.name-starts-with</mat-label>
<mat-icon class="mat-primary" aria-hidden="false" aria-label="help-icon" matSuffix style="cursor:pointer;"
matTooltip="{{'entity.help-text' | translate }}">help</mat-icon>
<input matInput formControlName="entityNameFilter" required> <input matInput formControlName="entityNameFilter" required>
<mat-error *ngIf="filterFormGroup.get('entityNameFilter').hasError('required')"> <mat-error *ngIf="filterFormGroup.get('entityNameFilter').hasError('required')">
{{ 'entity.entity-name-filter-required' | translate }} {{ 'entity.entity-name-filter-required' | translate }}
@ -87,6 +89,8 @@
</tb-entity-subtype-autocomplete> </tb-entity-subtype-autocomplete>
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>asset.name-starts-with</mat-label> <mat-label translate>asset.name-starts-with</mat-label>
<mat-icon class="mat-primary" aria-hidden="false" aria-label="help-icon" matSuffix style="cursor:pointer;"
matTooltip="{{'asset.help-text' | translate }}">help</mat-icon>
<input matInput formControlName="assetNameFilter"> <input matInput formControlName="assetNameFilter">
</mat-form-field> </mat-form-field>
</ng-template> </ng-template>
@ -97,6 +101,8 @@
</tb-entity-subtype-autocomplete> </tb-entity-subtype-autocomplete>
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>device.name-starts-with</mat-label> <mat-label translate>device.name-starts-with</mat-label>
<mat-icon class="mat-primary" aria-hidden="false" aria-label="help-icon" matSuffix style="cursor:pointer;"
matTooltip="{{'device.help-text' | translate }}">help</mat-icon>
<input matInput formControlName="deviceNameFilter"> <input matInput formControlName="deviceNameFilter">
</mat-form-field> </mat-form-field>
</ng-template> </ng-template>
@ -107,6 +113,8 @@
</tb-entity-subtype-autocomplete> </tb-entity-subtype-autocomplete>
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>entity-view.name-starts-with</mat-label> <mat-label translate>entity-view.name-starts-with</mat-label>
<mat-icon class="mat-primary" aria-hidden="false" aria-label="help-icon" matSuffix style="cursor:pointer;"
matTooltip="{{'entity-view.help-text' | translate }}">help</mat-icon>
<input matInput formControlName="entityViewNameFilter"> <input matInput formControlName="entityViewNameFilter">
</mat-form-field> </mat-form-field>
</ng-template> </ng-template>

12
ui-ngx/src/assets/locale/locale.constant-en_US.json
View File

@ -408,7 +408,8 @@
"select-asset": "Select asset", "select-asset": "Select asset",
"no-assets-matching": "No assets matching '{{entity}}' were found.", "no-assets-matching": "No assets matching '{{entity}}' were found.",
"asset-required": "Asset is required", "asset-required": "Asset is required",
"name-starts-with": "Asset name starts with", "name-starts-with": "Asset name expression",
"help-text": "Use '%' according to need: '%asset_name_contains%', '%asset_name_ends', 'asset_starts_with'.",
"import": "Import assets", "import": "Import assets",
"asset-file": "Asset file", "asset-file": "Asset file",
"label": "Label", "label": "Label",
@ -862,7 +863,8 @@
"alias-required": "Device alias is required.", "alias-required": "Device alias is required.",
"remove-alias": "Remove device alias", "remove-alias": "Remove device alias",
"add-alias": "Add device alias", "add-alias": "Add device alias",
"name-starts-with": "Device name starts with", "name-starts-with": "Device name expression",
"help-text": "Use '%' according to need: '%device_name_contains%', '%device_name_ends', 'device_starts_with'.",
"device-list": "Device list", "device-list": "Device list",
"use-device-name-filter": "Use filter", "use-device-name-filter": "Use filter",
"device-list-empty": "No devices selected.", "device-list-empty": "No devices selected.",
@ -1396,7 +1398,8 @@
"enter-entity-type": "Enter entity type", "enter-entity-type": "Enter entity type",
"no-entities-matching": "No entities matching '{{entity}}' were found.", "no-entities-matching": "No entities matching '{{entity}}' were found.",
"no-entity-types-matching": "No entity types matching '{{entityType}}' were found.", "no-entity-types-matching": "No entity types matching '{{entityType}}' were found.",
"name-starts-with": "Name starts with", "name-starts-with": "Name expression",
"help-text": "Use '%' according to need: '%entity_name_contains%', '%entity_name_ends', 'entity_starts_with'.",
"use-entity-name-filter": "Use filter", "use-entity-name-filter": "Use filter",
"entity-list-empty": "No entities selected.", "entity-list-empty": "No entities selected.",
"entity-type-list-empty": "No entity types selected.", "entity-type-list-empty": "No entity types selected.",
@ -1527,7 +1530,8 @@
"alias-required": "Entity View alias is required.", "alias-required": "Entity View alias is required.",
"remove-alias": "Remove entity view alias", "remove-alias": "Remove entity view alias",
"add-alias": "Add entity view alias", "add-alias": "Add entity view alias",
"name-starts-with": "Entity View name starts with", "name-starts-with": "Entity View name expression",
"help-text": "Use '%' according to need: '%entity-view_name_contains%', '%entity-view_name_ends', 'entity-view_starts_with'.",
"entity-view-list": "Entity View list", "entity-view-list": "Entity View list",
"use-entity-view-name-filter": "Use filter", "use-entity-view-name-filter": "Use filter",
"entity-view-list-empty": "No entity views selected.", "entity-view-list-empty": "No entity views selected.",