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

Entity view fixes

Browse Source
This commit is contained in:
Volodymyr Babak 2018-09-10 15:31:36 +03:00
parent 5139299fd1
commit 33fc8f0ba5
6 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/app/api/entity-view.service.js
View File

@ -157,7 +157,7 @@ function EntityViewService($http, $q, $window, userService, attributeService, cu
var url = '/api/entityView';
entityView.keys = {};
entityView.keys.timeseries = ['a', 'b'];
entityView.keys.timeseries = ['temp'];
$http.post(url, entityView).then(function success(response) {
deferred.resolve(response.data);

17
ui/src/app/api/entity.service.js
View File

@ -20,8 +20,9 @@ export default angular.module('thingsboard.api.entity', [thingsboardTypes])
.name;
/*@ngInject*/
function EntityService($http, $q, $filter, $translate, $log, userService, deviceService,
assetService, tenantService, customerService, ruleChainService, dashboardService, entityRelationService, attributeService, types, utils) {
function EntityService($http, $q, $filter, $translate, $log, userService, deviceService, assetService, tenantService,
customerService, ruleChainService, dashboardService, entityRelationService, attributeService,
entityViewService, types, utils) {
var service = {
getEntity: getEntity,
getEntities: getEntities,
@ -54,6 +55,9 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
case types.entityType.asset:
promise = assetService.getAsset(entityId, true, config);
break;
case types.entityType.entityView:
promise = entityViewService.getEntityView(entityId, true, config);
break;
case types.entityType.tenant:
promise = tenantService.getTenant(entityId, config);
break;
@ -239,6 +243,13 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
promise = assetService.getTenantAssets(pageLink, false, config, subType);
}
break;
case types.entityType.entityView:
if (user.authority === 'CUSTOMER_USER') {
promise = entityViewService.getCustomerEntityViews(customerId, pageLink, false, config, subType);
} else {
promise = entityViewService.getTenantEntityViews(pageLink, false, config, subType);
}
break;
case types.entityType.tenant:
if (user.authority === 'TENANT_ADMIN') {
promise = getSingleTenantByPageLinkPromise(pageLink, config);
@ -725,6 +736,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
case 'TENANT_ADMIN':
entityTypes.device = types.entityType.device;
entityTypes.asset = types.entityType.asset;
entityTypes.entityView = types.entityType.entityView;
entityTypes.tenant = types.entityType.tenant;
entityTypes.customer = types.entityType.customer;
entityTypes.dashboard = types.entityType.dashboard;
@ -735,6 +747,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
case 'CUSTOMER_USER':
entityTypes.device = types.entityType.device;
entityTypes.asset = types.entityType.asset;
entityTypes.entityView = types.entityType.entityView;
entityTypes.customer = types.entityType.customer;
entityTypes.dashboard = types.entityType.dashboard;
if (useAliasEntityTypes) {

6
ui/src/app/common/types.constant.js
View File

@ -346,6 +346,12 @@ export default angular.module('thingsboard.types', [])
list: 'entity.list-of-assets',
nameStartsWith: 'entity.asset-name-starts-with'
},
"ENTITY_VIEW": {
type: 'entity.type-entity-view',
typePlural: 'entity.type-entity-views',
list: 'entity.list-of-entity-views',
nameStartsWith: 'entity.entity-view-name-starts-with'
},
"TENANT": {
type: 'entity.type-tenant',
typePlural: 'entity.type-tenants',

4
ui/src/app/entity-view/entity-view.directive.js
View File

@ -47,8 +47,8 @@ export default function EntityViewDirective($compile, $templateCache, $filter, t
scope.isPublic = false;
scope.assignedCustomer = null;
}
scope.startTs = $filter('date')(scope.entityView.endTs, 'yyyy-MM-dd HH:mm:ss');
scope.endTs = $filter('date')(scope.entityView.startTs, 'yyyy-MM-dd HH:mm:ss');
scope.startTs = new Date(scope.entityView.startTs);
scope.endTs = new Date(scope.entityView.endTs);
}
});

6
ui/src/app/entity/entity-autocomplete.directive.js
View File

@ -131,6 +131,12 @@ export default function EntityAutocomplete($compile, $templateCache, $q, $filter
scope.noEntitiesMatchingText = 'device.no-devices-matching';
scope.entityRequiredText = 'device.device-required';
break;
case types.entityType.entityView:
scope.selectEntityText = 'entity-view.select-entity-view';
scope.entityText = 'entity-view.entity-view';
scope.noEntitiesMatchingText = 'entity-view.no-entity-views-matching';
scope.entityRequiredText = 'entity-view.entity-view-required';
break;
case types.entityType.rulechain:
scope.selectEntityText = 'rulechain.select-rulechain';
scope.entityText = 'rulechain.rulechain';

4
ui/src/app/locale/locale.constant-en_US.json
View File

@ -708,6 +708,10 @@
"type-assets": "Assets",
"list-of-assets": "{ count, plural, 1 {One asset} other {List of # assets} }",
"asset-name-starts-with": "Assets whose names start with '{{prefix}}'",
"type-entity-view": "Entity View",
"type-entity-views": "Entity Views",
"list-of-entity-views": "{ count, plural, 1 {One entity view} other {List of # entity views} }",
"entity-view-name-starts-with": "Entity Views whose names start with '{{prefix}}'",
"type-rule": "Rule",
"type-rules": "Rules",
"list-of-rules": "{ count, plural, 1 {One rule} other {List of # rules} }",