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

Merge pull request #3889 from vvlladd28/improvement/show-many/alarm0rules

Browse Source 
UI: Improvement time rendering profiles seated too many parameters
This commit is contained in:
Igor Kulikov 2020-12-23 17:42:35 +02:00 committed by GitHub
commit 0117330be1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 113 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@
</button> </button>
</div> </div>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<ng-template matExpansionPanelContent>
<div fxLayout="column" fxLayoutGap="0.5em"> <div fxLayout="column" fxLayoutGap="0.5em">
<mat-divider></mat-divider> <mat-divider></mat-divider>
<mat-form-field fxFlex floatLabel="always"> <mat-form-field fxFlex floatLabel="always">
@ -54,6 +55,7 @@
</div> </div>
</mat-panel-title> </mat-panel-title>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<ng-template matExpansionPanelContent>
<mat-checkbox formControlName="propagate" style="display: block; padding-bottom: 16px;"> <mat-checkbox formControlName="propagate" style="display: block; padding-bottom: 16px;">
{{ 'device-profile.propagate-alarm' | translate }} {{ 'device-profile.propagate-alarm' | translate }}
</mat-checkbox> </mat-checkbox>
@ -77,6 +79,7 @@
<mat-hint innerHTML="{{ 'device-profile.alarm-rule-relation-types-list-hint' | translate }}"></mat-hint> <mat-hint innerHTML="{{ 'device-profile.alarm-rule-relation-types-list-hint' | translate }}"></mat-hint>
</mat-form-field> </mat-form-field>
</section> </section>
</ng-template>
</mat-expansion-panel> </mat-expansion-panel>
<div fxFlex fxLayout="column"> <div fxFlex fxLayout="column">
<div translate class="tb-small" style="padding-bottom: 8px;">device-profile.create-alarm-rules</div> <div translate class="tb-small" style="padding-bottom: 8px;">device-profile.create-alarm-rules</div>
@ -116,4 +119,5 @@
</button> </button>
</div> </div>
</div> </div>
</ng-template>
</mat-expansion-panel> </mat-expansion-panel>

8
ui-ngx/src/app/modules/home/components/profile/device-profile.component.html
View File

@ -91,10 +91,12 @@
<div translate>device-profile.profile-configuration</div> <div translate>device-profile.profile-configuration</div>
</mat-panel-title> </mat-panel-title>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<ng-template matExpansionPanelContent>
<tb-device-profile-configuration <tb-device-profile-configuration
formControlName="configuration" formControlName="configuration"
required> required>
</tb-device-profile-configuration> </tb-device-profile-configuration>
</ng-template>
</mat-expansion-panel> </mat-expansion-panel>
<mat-expansion-panel *ngIf="displayTransportConfiguration" [expanded]="true"> <mat-expansion-panel *ngIf="displayTransportConfiguration" [expanded]="true">
<mat-expansion-panel-header> <mat-expansion-panel-header>
@ -102,10 +104,12 @@
<div translate>device-profile.transport-configuration</div> <div translate>device-profile.transport-configuration</div>
</mat-panel-title> </mat-panel-title>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<ng-template matExpansionPanelContent>
<tb-device-profile-transport-configuration <tb-device-profile-transport-configuration
formControlName="transportConfiguration" formControlName="transportConfiguration"
required> required>
</tb-device-profile-transport-configuration> </tb-device-profile-transport-configuration>
</ng-template>
</mat-expansion-panel> </mat-expansion-panel>
<mat-expansion-panel [expanded]="false"> <mat-expansion-panel [expanded]="false">
<mat-expansion-panel-header> <mat-expansion-panel-header>
@ -115,10 +119,12 @@
entityForm.get('profileData.alarms').value.length : 0} }}</div> entityForm.get('profileData.alarms').value.length : 0} }}</div>
</mat-panel-title> </mat-panel-title>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<ng-template matExpansionPanelContent>
<tb-device-profile-alarms <tb-device-profile-alarms
formControlName="alarms" formControlName="alarms"
[deviceProfileId]="deviceProfileId"> [deviceProfileId]="deviceProfileId">
</tb-device-profile-alarms> </tb-device-profile-alarms>
</ng-template>
</mat-expansion-panel> </mat-expansion-panel>
<mat-expansion-panel [expanded]="true"> <mat-expansion-panel [expanded]="true">
<mat-expansion-panel-header> <mat-expansion-panel-header>
@ -126,9 +132,11 @@
<div translate>device-profile.device-provisioning</div> <div translate>device-profile.device-provisioning</div>
</mat-panel-title> </mat-panel-title>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<ng-template matExpansionPanelContent>
<tb-device-profile-provision-configuration <tb-device-profile-provision-configuration
formControlName="provisionConfiguration"> formControlName="provisionConfiguration">
</tb-device-profile-provision-configuration> </tb-device-profile-provision-configuration>
</ng-template>
</mat-expansion-panel> </mat-expansion-panel>
</mat-accordion> </mat-accordion>
</div> </div>

2
ui-ngx/src/app/modules/home/components/profile/tenant-profile-data.component.html
View File

@ -22,9 +22,11 @@
<div translate>tenant-profile.profile-configuration</div> <div translate>tenant-profile.profile-configuration</div>
</mat-panel-title> </mat-panel-title>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<ng-template matExpansionPanelContent>
<tb-tenant-profile-configuration <tb-tenant-profile-configuration
formControlName="configuration" formControlName="configuration"
required> required>
</tb-tenant-profile-configuration> </tb-tenant-profile-configuration>
</ng-template>
</mat-expansion-panel> </mat-expansion-panel>
</form> </form>