Skip to content

Commit

Permalink
Server count missing on App group, Function and People pages
Browse files Browse the repository at this point in the history 
#678
  • Loading branch information
@rovats
rovats committed Oct 7, 2016
1 parent b338d9d commit 0c7316c
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 37 deletions.
28 changes: 5 additions & 23 deletions waltz-ng/client/app-groups/directives/app-group-summary.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

</div>
<div class="row">
<div class="col-sm-3">
<div class="col-sm-4">
<waltz-basic-info-tile name="Portfolio Cost"
description="Cumulative value of infra and app dev costs"
waltz-jump-to="costs-section"
Expand All @@ -53,7 +53,7 @@
</span>
</waltz-basic-info-tile>
</div>
<div class="col-sm-3">
<div class="col-sm-4">
<waltz-basic-info-tile name="Complexity"
description="Derived from capabilities, connections and servers"
class="clickable"
Expand All @@ -70,7 +70,7 @@
</waltz-basic-info-tile>

</div>
<div class="col-sm-3">
<div class="col-sm-4">
<waltz-basic-info-tile name="Servers"
class="clickable"
description="Number of servers supporting this group"
Expand All @@ -79,34 +79,16 @@
<div>
<div style="font-size: x-large;">
#
<span ng-bind="ctrl.serverStats.total"></span>
<span ng-bind="ctrl.enrichedServerStats.total"></span>
</div>
<div class="small text-muted">
<span ng-bind="ctrl.serverStats.virtualPercentage"></span>
<span ng-bind="ctrl.enrichedServerStats.virtualPercentage"></span>
% virtual
</div>
</div>
</waltz-basic-info-tile>

</div>

<div class="col-sm-3">
<waltz-basic-info-tile name="Capabilities"
description="Capabilities performed within this OU"
waltz-jump-to="ratings-section"
icon="puzzle-piece">
<div>
<div style="font-size: x-large;">
#
<span ng-bing="ctrl.capabilityStats.total"></span>
</div>
<div class="small text-muted">
<span ng-bind="ctrl.capabilityStats.perApplication"></span>
per app
</div>
</div>
</waltz-basic-info-tile>
</div>
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions waltz-ng/client/app-groups/directives/app-group-summary.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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));

}

Expand Down
8 changes: 6 additions & 2 deletions waltz-ng/client/capabilities/directives/capability-scorecard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,14 @@
icon="server">
<div>
<div style="font-size: x-large;">
# {{ ctrl.serverStats.total }}
#
<span ng-bind="ctrl.enrichedServerStats.total">
</span>
</div>
<div class="small text-muted">
{{ ctrl.serverStats.virtualPercentage }}% virtual
<span ng-bind="ctrl.enrichedServerStats.virtualPercentage">
</span>
% virtual
</div>
</div>
</waltz-basic-info-tile>
Expand Down
2 changes: 1 addition & 1 deletion waltz-ng/client/capabilities/directives/capability-scorecard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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} );
}
Expand Down
4 changes: 2 additions & 2 deletions waltz-ng/client/person/directives/person-summary.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@
<div>
<div style="font-size: x-large;">
#
<span ng-bind="ctrl.serverStats.total">
<span ng-bind="ctrl.enrichedServerStats.total">
</span>
</div>
<div class="small text-muted">
<span ng-bind="ctrl.serverStats.virtualPercentage">
<span ng-bind="ctrl.enrichedServerStats.virtualPercentage">
</span>
% virtual
</div>
Expand Down
9 changes: 4 additions & 5 deletions waltz-ng/client/person/directives/person-summary.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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));

}

Expand Down

0 comments on commit 0c7316c

Please sign in to comment.