diff --git a/vitragedashboard/static/dashboard/project/alarmList/alarmList.html b/vitragedashboard/static/dashboard/project/alarmList/alarmList.html index 23d9170..effea39 100644 --- a/vitragedashboard/static/dashboard/project/alarmList/alarmList.html +++ b/vitragedashboard/static/dashboard/project/alarmList/alarmList.html @@ -22,7 +22,7 @@ - + {$alarm.update_timestamp | date:"h:mm a"$} {$alarm.name$} {$alarm.resource_type$} diff --git a/vitragedashboard/static/dashboard/project/components/alarms/alarms.html b/vitragedashboard/static/dashboard/project/components/alarms/alarms.html index 354fbc3..61957ec 100644 --- a/vitragedashboard/static/dashboard/project/components/alarms/alarms.html +++ b/vitragedashboard/static/dashboard/project/components/alarms/alarms.html @@ -5,7 +5,7 @@

{$ 'Alarms' | translate $}

  • {$alarm.name$}

    - + {$alarm.severity$} | {$alarm.update_timestamp | date:"h:mma"$}

    diff --git a/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js b/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js index 8f6e995..93ebf68 100644 --- a/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js +++ b/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js @@ -128,6 +128,7 @@ function hzRootCauseAnalysisGraph($filter) { break; case 'ACTIVE_WARNING': case 'ACTIVE_SEVER': + case 'ACTIVE_SEVERE': html += ''; break; case 'ACTIVE_DISABLED': @@ -137,6 +138,7 @@ function hzRootCauseAnalysisGraph($filter) { html += ''; break; case 'INACTIVE_WARNING': + case 'INACTIVE_SEVER': case 'INACTIVE_SEVER': html += ''; break; @@ -217,7 +219,6 @@ function hzRootCauseAnalysisGraph($filter) { } scope.$watch("data", function (newValue, oldValue) { - console.log('data watch'); if (scope.data) { createGraph(); } diff --git a/vitragedashboard/static/vendor/dagre-d3/dist/dagre-d3.core.js b/vitragedashboard/static/vendor/dagre-d3/dist/dagre-d3.core.js index 8da9cd1..11ab37f 100644 --- a/vitragedashboard/static/vendor/dagre-d3/dist/dagre-d3.core.js +++ b/vitragedashboard/static/vendor/dagre-d3/dist/dagre-d3.core.js @@ -226,7 +226,9 @@ function createLine(edge, points) { function getCoords(elem) { var bbox = elem.getBBox(), - matrix = elem.getTransformToElement(elem.ownerSVGElement) + matrix = elem.ownerSVGElement.getScreenCTM() + .inverse() + .multiply(elem.getScreenCTM()) .translate(bbox.width / 2, bbox.height / 2); return { x: matrix.e, y: matrix.f }; }