Showing
3 changed files
with
10 additions
and
12 deletions
@@ -15,11 +15,11 @@ | @@ -15,11 +15,11 @@ | ||
15 | limitations under the License. | 15 | limitations under the License. |
16 | 16 | ||
17 | --> | 17 | --> |
18 | -<div class="tb-cell" flex="20">{{event.createdTime | date : 'yyyy-MM-dd HH:mm:ss'}}</div> | ||
19 | -<div class="tb-cell" flex="20">{{event.edgeEventType}}</div> | ||
20 | -<div class="tb-cell" flex="40">{{event.edgeEventAction}}</div> | ||
21 | -<div class="tb-cell" flex="20">{{event.entityId}}</div> | ||
22 | -<div class="tb-cell" flex="15" ng-style="isPending ? {'color': 'rgba(0, 0, 0, 0.38)'} : {'color': '#000'}">{{updateStatus(event.createdTime)}}</div> | 18 | +<div class="tb-cell" flex="20">{{ event.createdTime | date : 'yyyy-MM-dd HH:mm:ss' }}</div> |
19 | +<div class="tb-cell" flex="20">{{ event.edgeEventType }}</div> | ||
20 | +<div class="tb-cell" flex="40">{{ event.edgeEventAction }}</div> | ||
21 | +<div class="tb-cell" flex="20">{{ event.entityId }}</div> | ||
22 | +<div class="tb-cell" flex="15" ng-style="isPending ? {'color': 'rgba(0, 0, 0, .38)'} : {'color': '#000'}">{{ updateStatus(event.createdTime) | translate }}</div> | ||
23 | <div class="tb-cell" flex="10"> | 23 | <div class="tb-cell" flex="10"> |
24 | <md-button class="md-icon-button md-primary" | 24 | <md-button class="md-icon-button md-primary" |
25 | ng-click="showEdgeEntityContent($event, 'edge.entity-info', 'JSON')" | 25 | ng-click="showEdgeEntityContent($event, 'edge.entity-info', 'JSON')" |
@@ -149,13 +149,13 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $ | @@ -149,13 +149,13 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $ | ||
149 | if (scope.queueStartTs) { | 149 | if (scope.queueStartTs) { |
150 | var status; | 150 | var status; |
151 | if (eventCreatedTime < scope.queueStartTs) { | 151 | if (eventCreatedTime < scope.queueStartTs) { |
152 | - status = 'edge.success'; | 152 | + status = $translate.instant('edge.success'); |
153 | scope.isPending = false; | 153 | scope.isPending = false; |
154 | } else { | 154 | } else { |
155 | - status = 'edge.failed'; | 155 | + status = $translate.instant('edge.failed'); |
156 | scope.isPending = true; | 156 | scope.isPending = true; |
157 | } | 157 | } |
158 | - return $translate.instant(status); | 158 | + return status; |
159 | } | 159 | } |
160 | } | 160 | } |
161 | } | 161 | } |
@@ -22,8 +22,8 @@ import eventTableTemplate from './event-table.tpl.html'; | @@ -22,8 +22,8 @@ import eventTableTemplate from './event-table.tpl.html'; | ||
22 | /* eslint-enable import/no-unresolved, import/default */ | 22 | /* eslint-enable import/no-unresolved, import/default */ |
23 | 23 | ||
24 | /*@ngInject*/ | 24 | /*@ngInject*/ |
25 | -export default function EventTableDirective($compile, $templateCache, $rootScope, types, eventService, edgeService, | ||
26 | - attributeService, $log) { | 25 | +export default function EventTableDirective($compile, $templateCache, $rootScope, types, |
26 | + eventService, edgeService, attributeService) { | ||
27 | 27 | ||
28 | var linker = function (scope, element, attrs) { | 28 | var linker = function (scope, element, attrs) { |
29 | 29 | ||
@@ -68,8 +68,6 @@ export default function EventTableDirective($compile, $templateCache, $rootScope | @@ -68,8 +68,6 @@ export default function EventTableDirective($compile, $templateCache, $rootScope | ||
68 | } | 68 | } |
69 | } | 69 | } |
70 | 70 | ||
71 | - $log.info("scope.entityType", scope.entityType); | ||
72 | - | ||
73 | scope.eventType = attrs.defaultEventType; | 71 | scope.eventType = attrs.defaultEventType; |
74 | 72 | ||
75 | var pageSize = 20; | 73 | var pageSize = 20; |