diff --git a/waltz-ng/client/app-groups/directives/app-group-summary.html b/waltz-ng/client/app-groups/directives/app-group-summary.html
index d3b31cd075..b6cf1fde3a 100644
--- a/waltz-ng/client/app-groups/directives/app-group-summary.html
+++ b/waltz-ng/client/app-groups/directives/app-group-summary.html
@@ -43,7 +43,7 @@
-
+
-
+
-
-
-
-
-
-
- #
-
-
-
-
- per app
-
-
-
-
diff --git a/waltz-ng/client/app-groups/directives/app-group-summary.js b/waltz-ng/client/app-groups/directives/app-group-summary.js
index 5726b73e97..6abf5a4dd9 100644
--- a/waltz-ng/client/app-groups/directives/app-group-summary.js
+++ b/waltz-ng/client/app-groups/directives/app-group-summary.js
@@ -16,9 +16,9 @@
*
*/
-import { enrichServerStats } from '../../server-info/services/server-utilities';
-import { calcPortfolioCost } from '../../asset-cost/services/asset-cost-utilities';
-import { calcComplexitySummary } from '../../complexity/services/complexity-utilities';
+import {enrichServerStats} from "../../server-info/services/server-utilities";
+import {calcPortfolioCost} from "../../asset-cost/services/asset-cost-utilities";
+import {calcComplexitySummary} from "../../complexity/services/complexity-utilities";
const BINDINGS = {
@@ -38,7 +38,7 @@ function controller($scope) {
$scope.$watch('ctrl.assetCosts', cs => vm.portfolioCostStr = calcPortfolioCost(cs));
$scope.$watch('ctrl.complexity', cs => vm.complexitySummary = calcComplexitySummary(cs));
- $scope.$watch('ctrl.serverStats', enrichServerStats);
+ $scope.$watch('ctrl.serverStats', stats => vm.enrichedServerStats = enrichServerStats(stats));
}
diff --git a/waltz-ng/client/capabilities/directives/capability-scorecard.html b/waltz-ng/client/capabilities/directives/capability-scorecard.html
index 8d866623fc..20e8940d0c 100644
--- a/waltz-ng/client/capabilities/directives/capability-scorecard.html
+++ b/waltz-ng/client/capabilities/directives/capability-scorecard.html
@@ -117,10 +117,14 @@
icon="server">
- # {{ ctrl.serverStats.total }}
+ #
+
+
- {{ ctrl.serverStats.virtualPercentage }}% virtual
+
+
+ % virtual
diff --git a/waltz-ng/client/capabilities/directives/capability-scorecard.js b/waltz-ng/client/capabilities/directives/capability-scorecard.js
index 90b98bb63e..024ba081dd 100644
--- a/waltz-ng/client/capabilities/directives/capability-scorecard.js
+++ b/waltz-ng/client/capabilities/directives/capability-scorecard.js
@@ -39,7 +39,7 @@ function controller($scope, $state) {
$scope.$watch('ctrl.assetCosts', cs => vm.portfolioCostStr = calcPortfolioCost(cs));
$scope.$watch('ctrl.complexity', cs => vm.complexitySummary = calcComplexitySummary(cs));
- $scope.$watch('ctrl.serverStats', enrichServerStats);
+ $scope.$watch('ctrl.serverStats', stats => vm.enrichedServerStats = enrichServerStats(stats));
vm.subCapabilitySelected = () => $state.go('main.capability.view', { id: vm.selectedSubCapability} );
}
diff --git a/waltz-ng/client/person/directives/person-summary.html b/waltz-ng/client/person/directives/person-summary.html
index b4081bab37..e3677db06b 100644
--- a/waltz-ng/client/person/directives/person-summary.html
+++ b/waltz-ng/client/person/directives/person-summary.html
@@ -109,11 +109,11 @@
#
-
+
-
+
% virtual
diff --git a/waltz-ng/client/person/directives/person-summary.js b/waltz-ng/client/person/directives/person-summary.js
index 788789b856..238336f1fb 100644
--- a/waltz-ng/client/person/directives/person-summary.js
+++ b/waltz-ng/client/person/directives/person-summary.js
@@ -16,10 +16,9 @@
*
*/
-import { numberFormatter } from '../../common';
-import { enrichServerStats } from '../../server-info/services/server-utilities';
-import { calcPortfolioCost } from '../../asset-cost/services/asset-cost-utilities';
-import { calcComplexitySummary } from '../../complexity/services/complexity-utilities';
+import {enrichServerStats} from "../../server-info/services/server-utilities";
+import {calcPortfolioCost} from "../../asset-cost/services/asset-cost-utilities";
+import {calcComplexitySummary} from "../../complexity/services/complexity-utilities";
const BINDINGS = {
@@ -40,7 +39,7 @@ function controller($scope) {
$scope.$watch('ctrl.assetCosts', cs => vm.portfolioCostStr = calcPortfolioCost(cs));
$scope.$watch('ctrl.complexity', cs => vm.complexitySummary = calcComplexitySummary(cs));
- $scope.$watch('ctrl.serverStats', (stats) => enrichServerStats(stats));
+ $scope.$watch('ctrl.serverStats', stats => vm.enrichedServerStats = enrichServerStats(stats));
}