Add overwriteActivityTime checkbox to device wizard. Update rule node ui.
This commit is contained in:
parent
90334db157
commit
4e3a7ed897
File diff suppressed because one or more lines are too long
@ -108,9 +108,15 @@
|
||||
</tb-queue-type-list>
|
||||
</div>
|
||||
</div>
|
||||
<mat-checkbox formControlName="gateway" style="padding-bottom: 16px;">
|
||||
{{ 'device.is-gateway' | translate }}
|
||||
</mat-checkbox>
|
||||
<div fxLayout="row" fxLayoutGap="16px" style="padding-bottom: 16px;">
|
||||
<mat-checkbox formControlName="gateway">
|
||||
{{ 'device.is-gateway' | translate }}
|
||||
</mat-checkbox>
|
||||
<mat-checkbox *ngIf="deviceWizardFormGroup.get('gateway').value"
|
||||
formControlName="overwriteActivityTime">
|
||||
{{ 'device.overwrite-activity-time' | translate }}
|
||||
</mat-checkbox>
|
||||
</div>
|
||||
<mat-form-field class="mat-block">
|
||||
<mat-label translate>device.description</mat-label>
|
||||
<textarea matInput formControlName="description" rows="2"></textarea>
|
||||
|
||||
@ -108,6 +108,7 @@ export class DeviceWizardDialogComponent extends
|
||||
name: ['', Validators.required],
|
||||
label: [''],
|
||||
gateway: [false],
|
||||
overwriteActivityTime: [false],
|
||||
transportType: [DeviceTransportType.DEFAULT, Validators.required],
|
||||
addProfileType: [0],
|
||||
deviceProfileId: [null, Validators.required],
|
||||
@ -314,6 +315,7 @@ export class DeviceWizardDialogComponent extends
|
||||
deviceProfileId: profileId,
|
||||
additionalInfo: {
|
||||
gateway: this.deviceWizardFormGroup.get('gateway').value,
|
||||
overwriteActivityTime: this.deviceWizardFormGroup.get('overwriteActivityTime').value,
|
||||
description: this.deviceWizardFormGroup.get('description').value
|
||||
},
|
||||
customerId: null
|
||||
|
||||
@ -84,7 +84,7 @@ export class DeviceComponent extends EntityComponent<DeviceInfo> {
|
||||
additionalInfo: this.fb.group(
|
||||
{
|
||||
gateway: [entity && entity.additionalInfo ? entity.additionalInfo.gateway : false],
|
||||
overwriteActivityTime: [entity && entity.additionalInfo ? entity.additionalInfo.overwriteActivityTime: false],
|
||||
overwriteActivityTime: [entity && entity.additionalInfo ? entity.additionalInfo.overwriteActivityTime : false],
|
||||
description: [entity && entity.additionalInfo ? entity.additionalInfo.description : ''],
|
||||
}
|
||||
)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user