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

Minor code cleaning

Browse Source
This commit is contained in:
deaflynx 2020-07-21 08:44:49 +03:00
parent c989c31f1f
commit 8c9aa0c8df
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/src/app/event/event-row-edge-event.tpl.html
View File

@ -15,11 +15,11 @@
limitations under the License. limitations under the License.
--> -->
<div class="tb-cell" flex="20">{{event.createdTime | date : 'yyyy-MM-dd HH:mm:ss'}}</div> <div class="tb-cell" flex="20">{{ event.createdTime | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
<div class="tb-cell" flex="20">{{event.edgeEventType}}</div> <div class="tb-cell" flex="20">{{ event.edgeEventType }}</div>
<div class="tb-cell" flex="40">{{event.edgeEventAction}}</div> <div class="tb-cell" flex="40">{{ event.edgeEventAction }}</div>
<div class="tb-cell" flex="20">{{event.entityId}}</div> <div class="tb-cell" flex="20">{{ event.entityId }}</div>
<div class="tb-cell" flex="15" ng-style="isPending ? {'color': 'rgba(0, 0, 0, 0.38)'} : {'color': '#000'}">{{updateStatus(event.createdTime)}}</div> <div class="tb-cell" flex="15" ng-style="isPending ? {'color': 'rgba(0, 0, 0, .38)'} : {'color': '#000'}">{{ updateStatus(event.createdTime) | translate }}</div>
<div class="tb-cell" flex="10"> <div class="tb-cell" flex="10">
<md-button class="md-icon-button md-primary" <md-button class="md-icon-button md-primary"
ng-click="showEdgeEntityContent($event, 'edge.entity-info', 'JSON')" ng-click="showEdgeEntityContent($event, 'edge.entity-info', 'JSON')"

6
ui/src/app/event/event-row.directive.js
View File

@ -149,13 +149,13 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $
if (scope.queueStartTs) { if (scope.queueStartTs) {
var status; var status;
if (eventCreatedTime < scope.queueStartTs) { if (eventCreatedTime < scope.queueStartTs) {
status = 'edge.success'; status = $translate.instant('edge.success');
scope.isPending = false; scope.isPending = false;
} else { } else {
status = 'edge.failed'; status = $translate.instant('edge.failed');
scope.isPending = true; scope.isPending = true;
} }
return $translate.instant(status); return status;
} }
} }
} }

6
ui/src/app/event/event-table.directive.js
View File

@ -22,8 +22,8 @@ import eventTableTemplate from './event-table.tpl.html';
/* eslint-enable import/no-unresolved, import/default */ /* eslint-enable import/no-unresolved, import/default */
/*@ngInject*/ /*@ngInject*/
export default function EventTableDirective($compile, $templateCache, $rootScope, types, eventService, edgeService, export default function EventTableDirective($compile, $templateCache, $rootScope, types,
attributeService, $log) { eventService, edgeService, attributeService) {
var linker = function (scope, element, attrs) { var linker = function (scope, element, attrs) {
@ -68,8 +68,6 @@ export default function EventTableDirective($compile, $templateCache, $rootScope
} }
} }
$log.info("scope.entityType", scope.entityType);
scope.eventType = attrs.defaultEventType; scope.eventType = attrs.defaultEventType;
var pageSize = 20; var pageSize = 20;