tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Format & clear unnecessary

pull/2188/head
Chantsova Ekaterina 7 years ago
committed by Andrew Shvayka
parent
9e9b0d7595
commit
0e3a421fbb
2 changed files with 23 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      ui/src/app/widget/lib/multiple-input-widget.js
  2. 31
      ui/src/app/widget/lib/multiple-input-widget.tpl.html

6
ui/src/app/widget/lib/multiple-input-widget.js
View File

@ -249,7 +249,7 @@ function MultipleInputWidgetController($q, $scope, $translate, attributeService,
//For backward compatibility
if (angular.isUndefined(source.keys[j].settings.dataKeyType)) {
if (vm.settings.attributesShared === true) {
if (vm.settings.attributesShared) {
source.keys[j].settings.dataKeyType = 'shared';
} else {
source.keys[j].settings.dataKeyType = 'server';
@ -257,7 +257,7 @@ function MultipleInputWidgetController($q, $scope, $translate, attributeService,
}
if (angular.isUndefined(source.keys[j].settings.dataKeyValueType)) {
if (source.keys[j].settings.inputTypeNumber === true) {
if (source.keys[j].settings.inputTypeNumber) {
source.keys[j].settings.dataKeyValueType = 'double';
} else {
source.keys[j].settings.dataKeyValueType = 'string';
@ -265,7 +265,7 @@ function MultipleInputWidgetController($q, $scope, $translate, attributeService,
}
if (angular.isUndefined(source.keys[j].settings.isEditable)) {
if (source.keys[j].settings.readOnly === true) {
if (source.keys[j].settings.readOnly) {
source.keys[j].settings.isEditable = 'readonly';
} else {
source.keys[j].settings.isEditable = 'editable';

31
ui/src/app/widget/lib/multiple-input-widget.tpl.html
View File

@ -18,9 +18,12 @@
<form class="tb-multiple-input" name="multipleInputForm" ng-submit="vm.save()" novalidate autocomplete="off">
<div style="padding: 0 8px;" ng-if="vm.entityDetected && vm.isAllParametersValid">
<fieldset ng-repeat="source in vm.sources" ng-class="{'fields-group': vm.settings.showGroupTitle}">
<legend class="group-title" ng-if="vm.settings.showGroupTitle">{{ vm.getGroupTitle(source.datasource) }}</legend>
<div layout="row" layout-wrap ng-class="{'vertical-alignment': vm.isVerticalAlignment || vm.changeAlignment}">
<div ng-repeat="key in source.keys" ng-if="!key.settings.dataKeyHidden" ng-style="{'width': (vm.isVerticalAlignment || vm.changeAlignment) ? '100%' : vm.inputWidthSettings}">
<legend class="group-title" ng-if="vm.settings.showGroupTitle">{{ vm.getGroupTitle(source.datasource) }}
</legend>
<div layout="row" layout-wrap
ng-class="{'vertical-alignment': vm.isVerticalAlignment || vm.changeAlignment}">
<div ng-repeat="key in source.keys" ng-if="!key.settings.dataKeyHidden"
ng-style="{'width': (vm.isVerticalAlignment || vm.changeAlignment) ? '100%' : vm.inputWidthSettings}">
<div class="input-field" ng-if="(key.settings.dataKeyValueType === 'string')">
<md-input-container class="md-block">
<label>{{key.label}}</label>
@ -82,7 +85,7 @@
</div>
</md-input-container>
</div>
<div class="input-field" ng-if="(key.settings.dataKeyValueType === 'booleanCheckbox')" class="md-block">
<div class="input-field md-block" ng-if="(key.settings.dataKeyValueType === 'booleanCheckbox')">
<md-checkbox name="{{key.name}}"
ng-disabled="key.settings.isEditable === 'disabled' || key.settings.disabledOnCondition"
ng-model="key.data.currentValue"
@ -90,7 +93,7 @@
{{key.label}}
</md-checkbox>
</div>
<div class="input-field" ng-if="(key.settings.dataKeyValueType === 'booleanSwitch')" class="md-block">
<div class="input-field md-block" ng-if="(key.settings.dataKeyValueType === 'booleanSwitch')">
<md-switch name="{{key.name}}"
ng-disabled="key.settings.isEditable === 'disabled' || key.settings.disabledOnCondition"
ng-model="key.data.currentValue"
@ -132,21 +135,27 @@
</div>
</div>
</fieldset>
<div class="md-padding" layout="row" layout-align="end center" ng-if="vm.entityDetected && vm.settings.showActionButtons">
<md-button class="md-primary" ng-click="vm.discardAll()" style="max-height: 50px; margin-right:20px;" ng-disabled="!multipleInputForm.$dirty">
<div class="md-padding" layout="row" layout-align="end center"
ng-if="vm.entityDetected && vm.settings.showActionButtons">
<md-button class="md-primary" ng-click="vm.discardAll()" style="max-height: 50px; margin-right:20px;"
ng-disabled="!multipleInputForm.$dirty">
{{ 'action.undo' | translate }}
</md-button>
<md-button class="md-raised md-primary" type="submit" value="Submit" style="max-height: 50px; margin-right:20px;"
ng-disabled="!multipleInputForm.$dirty || multipleInputForm.$invalid" ng-click="vm.isFocused = false">
<md-button class="md-raised md-primary" type="submit" value="Submit"
style="max-height: 50px; margin-right:20px;"
ng-disabled="!multipleInputForm.$dirty || multipleInputForm.$invalid"
ng-click="vm.isFocused = false">
{{ 'action.save' | translate }}
</md-button>
</div>
</div>
<div class="tb-multiple-input__errors" layout="column" layout-align="center center" style="height: 100%;" ng-if="!vm.entityDetected || !vm.isAllParametersValid">
<div class="tb-multiple-input__errors" layout="column" layout-align="center center" style="height: 100%;"
ng-if="!vm.entityDetected || !vm.isAllParametersValid">
<div style="text-align: center; font-size: 18px; color: #a0a0a0;" ng-hide="vm.entityDetected">
{{ 'widgets.input-widgets.no-entity-selected' | translate }}
</div>
<div style="text-align: center; font-size: 18px; color: #a0a0a0;" ng-show="vm.entityDetected && !vm.isAllParametersValid">
<div style="text-align: center; font-size: 18px; color: #a0a0a0;"
ng-show="vm.entityDetected && !vm.isAllParametersValid">
{{ 'widgets.input-widgets.not-allowed-entity' | translate }}
</div>
</div>

Write Preview
Loading…
Cancel
Save