Skip to content

Commit 23d71b0

Browse files
davidwatkins73davidwatkins73
authored
Merge pull request #207 from davidwatkins73/master
Adding involvment kind and improving source data ratings
2 parents bac0509 + d54b0ef commit 23d71b0

25 files changed

Lines changed: 202 additions & 89 deletions

File tree

‎waltz-model/src/main/java/com/khartec/waltz/model/EntityKind.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public enum EntityKind {
3636
AUTHORITATIVE_SOURCE,
3737
CHANGE_INITIATIVE,
3838
PERFORMANCE_METRIC_PACK,
39-
PROCESS
39+
PROCESS,
40+
INVOLVEMENT
4041

4142
}

‎waltz-ng/client/app-capabilities/directives/app-capability-section.html‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,17 @@
88
class="btn btn-xs btn-primary">
99
Edit
1010
</a>
11+
<button class="btn btn-xs waltz-btn-transparent"
12+
ng-click="ctrl.visibility.overlay = ! ctrl.visibility.overlay">
13+
<waltz-icon name="map-signs"></waltz-icon>
14+
</button>
1115
</waltz-section-actions>
1216

17+
<waltz-source-data-overlay visible="ctrl.visibility.overlay"
18+
ratings="ctrl.sourceDataRatings"
19+
entities="['APP_CAPABILITY']">
20+
</waltz-source-data-overlay>
21+
1322
<div class="row">
1423
<div class="col-sm-12" style="border-left: 1px solid #eee">
1524

‎waltz-ng/client/app-capabilities/directives/app-capability-section.js‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,20 @@ const BINDINGS = {
1414
appCapabilities: '=',
1515
capabilities: '=',
1616
selfId: '@',
17+
sourceDataRatings: '=',
1718
traits: '='
1819
};
1920

2021

21-
function controller() {
22-
}
22+
const directive = {
23+
restrict: 'E',
24+
replace: true,
25+
template: require('./app-capability-section.html'),
26+
controller: () => {},
27+
controllerAs: 'ctrl',
28+
scope: {},
29+
bindToController: BINDINGS
30+
};
2331

2432

25-
export default [
26-
() => ({
27-
restrict: 'E',
28-
replace: true,
29-
template: require('./app-capability-section.html'),
30-
controller,
31-
controllerAs: 'ctrl',
32-
scope: {},
33-
bindToController: BINDINGS
34-
})
35-
]
36-
;
33+
export default () => directive;

‎waltz-ng/client/applications/app-view.html‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
<waltz-app-capability-section app-capabilities="ctrl.appCapabilities"
2323
traits="ctrl.explicitTraits"
2424
capabilities="ctrl.capabilities"
25-
self-id="{{ctrl.app.id}}">
25+
self-id="{{ctrl.app.id}}"
26+
source-data-ratings="ctrl.sourceDataRatings">
2627
</waltz-app-capability-section>
2728

2829

@@ -36,8 +37,17 @@
3637
class="btn btn-xs btn-primary">
3738
Edit
3839
</a>
40+
<button class="btn btn-xs waltz-btn-transparent"
41+
ng-click="ctrl.visibility.appCapabilitiesOverlay = ! ctrl.visibility.appCapabilitiesOverlay">
42+
<waltz-icon name="map-signs"></waltz-icon>
43+
</button>
3944
</waltz-section-actions>
4045

46+
<waltz-source-data-overlay visible="ctrl.visibility.appCapabilitiesOverlay"
47+
ratings="ctrl.sourceDataRatings"
48+
entities="['APP_CAPABILITY']">
49+
</waltz-source-data-overlay>
50+
4151
<waltz-rating-group-header measurables="ctrl.ratings.group.measurables"></waltz-rating-group-header>
4252

4353
<waltz-rating-group tweakers="ctrl.ratings.tweakers"
@@ -54,13 +64,14 @@
5464

5565

5666
<!-- PROCESSES -->
57-
<waltz-process-section processes="ctrl.processes">
58-
67+
<waltz-process-section processes="ctrl.processes"
68+
source-data-ratings="ctrl.sourceDataRatings">
5969
</waltz-process-section>
6070

6171

6272
<!-- INVOLVED PEOPLE -->
63-
<waltz-involved-people-section involvements="ctrl.peopleInvolvements">
73+
<waltz-involved-people-section involvements="ctrl.peopleInvolvements"
74+
source-data-ratings="ctrl.sourceDataRatings">
6475
</waltz-involved-people-section>
6576

6677

@@ -73,8 +84,18 @@
7384
class="btn btn-xs btn-primary">
7485
Edit
7586
</a>
87+
<button class="btn btn-xs waltz-btn-transparent"
88+
ng-click="ctrl.visibility.logicalFlows = ! ctrl.visibility.logicalFlows">
89+
<waltz-icon name="map-signs"></waltz-icon>
90+
</button>
7691
</waltz-section-actions>
7792

93+
<waltz-source-data-overlay visible="ctrl.visibility.logicalFlows"
94+
ratings="ctrl.sourceDataRatings"
95+
entities="['LOGICAL_DATA_FLOW']">
96+
</waltz-source-data-overlay>
97+
98+
7899
<div class="alert alert-warning" ng-if="ctrl.flows.length == 0">
79100
<strong>
80101
No Data Flows
@@ -178,6 +199,10 @@ <h4>
178199

179200
<!-- COSTS -->
180201
<waltz-section name="Costs">
202+
<waltz-source-data-section-addon ratings="ctrl.sourceDataRatings"
203+
entities="['ASSET_COST']">
204+
</waltz-source-data-section-addon>
205+
181206
<div ng-if="ctrl.costs.length == 0">
182207
<div class="alert alert-warning">
183208
<strong>

‎waltz-ng/client/applications/app-view.js‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
*
1111
*/
1212
import {
13-
loadDataFlows,
13+
loadAuthSources,
1414
loadChangeLog,
15+
loadDatabases,
16+
loadDataFlows,
1517
loadInvolvements,
16-
loadAuthSources,
1718
loadServers,
1819
loadSoftwareCatalog,
19-
loadDatabases
20+
loadSourceDataRatings
2021
} from "./data-load";
2122
import {prepareSlopeGraph} from "../data-flow/directives/slope-graph/slope-graph-utils";
2223
import {mkAppRatingsGroup, calculateHighestRatingCount} from "../ratings/directives/common";
@@ -37,6 +38,7 @@ function controller($q,
3738
ratingStore,
3839
serverInfoStore,
3940
softwareCatalogStore,
41+
sourceDataRatingStore,
4042
displayNameService ) {
4143

4244
const { id, organisationalUnitId } = appView.app;
@@ -71,27 +73,29 @@ function controller($q,
7173

7274
const promises = [
7375
loadDataFlows(dataFlowStore, id, vm),
74-
loadChangeLog(changeLogStore, id, vm),
7576
loadInvolvements($q, involvementStore, id, vm),
7677
loadAuthSources(authSourcesStore, orgUnitStore, id, organisationalUnitId, vm),
7778
loadServers(serverInfoStore, id, vm),
7879
loadSoftwareCatalog(softwareCatalogStore, id, vm),
7980
loadDatabases(databaseStore, id, vm)
8081
];
8182

82-
$q.all(promises).then(() => {
83+
$q.all(promises)
84+
.then(() => {
85+
const graphData = prepareSlopeGraph(
86+
id,
87+
vm.flows,
88+
vm.dataTypes,
89+
vm.appAuthSources,
90+
vm.ouAuthSources,
91+
displayNameService,
92+
$state);
8393

84-
const graphData = prepareSlopeGraph(
85-
id,
86-
vm.flows,
87-
vm.dataTypes,
88-
vm.appAuthSources,
89-
vm.ouAuthSources,
90-
displayNameService,
91-
$state);
94+
vm.flow = graphData;
95+
})
96+
.then(() => loadChangeLog(changeLogStore, id, vm))
97+
.then(() => loadSourceDataRatings(sourceDataRatingStore, vm))
9298

93-
vm.flow = graphData;
94-
});
9599

96100

97101
complexityStore
@@ -121,6 +125,7 @@ controller.$inject = [
121125
'RatingStore',
122126
'ServerInfoStore',
123127
'SoftwareCatalogStore',
128+
'SourceDataRatingStore',
124129
'WaltzDisplayNameService'
125130
];
126131

‎waltz-ng/client/applications/data-load.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ export function loadChangeLog(changeLogStore, id, vm) {
5151
}
5252

5353

54+
export function loadSourceDataRatings(sourceDataRatingStore, vm) {
55+
sourceDataRatingStore
56+
.findAll()
57+
.then(sdrs => vm.sourceDataRatings = sdrs);
58+
}
59+
60+
5461
export function loadServers(serverInfoStore, appId, vm) {
5562
serverInfoStore
5663
.findByAppId(appId)

‎waltz-ng/client/capabilities/capability-view.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757

5858

5959
<!-- PROCESSES -->
60-
<waltz-process-section processes="ctrl.processes">
61-
60+
<waltz-process-section processes="ctrl.processes"
61+
source-data-ratings="ctrl.sourceDataRatings">
6262
</waltz-process-section>
6363

6464

‎waltz-ng/client/common/services/display_names.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ export const entityNames = {
107107
CHANGE_INITIATIVE: 'Change Initiative',
108108
DATABASE: 'Database',
109109
END_USER_APPLICATION: 'End User App',
110+
INVOLVEMENT: 'Involvement',
110111
LOGICAL_DATA_FLOW: "Logical Data Flow",
111112
ORG_UNIT: 'Org Unit',
112113
PERSON: 'Person',

‎waltz-ng/client/common/services/icon_names.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export const entityIconNames = {
3333
CHANGE_INITIATIVE: 'paper-plane-o',
3434
DATABASE: 'database',
3535
END_USER_APPLICATION: 'table',
36+
INVOLVEMENT: 'share-alt-square',
3637
LOGICAL_DATA_FLOW: "random",
3738
ORG_UNIT: 'sitemap',
3839
PERSON: 'user',

‎waltz-ng/client/involvement/directives/involved-people-section.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<div>
22
<waltz-section name="People" icon="users" small="( {{ctrl.involvements.length}} )">
33

4+
<waltz-source-data-section-addon ratings="ctrl.sourceDataRatings"
5+
entities="['INVOLVEMENT']">
6+
</waltz-source-data-section-addon>
47

58
<div ng-if="ctrl.involvements.length > 0">
69
<div style="font-size: smaller; height: 300px"

0 commit comments

Comments
 (0)