Skip to content

Commit

Permalink
Merge pull request #682 from davidwatkins73/waltz-676-flow-popup
Browse files Browse the repository at this point in the history 
Gui panel enhancements
  • Loading branch information
@davidwatkins73
davidwatkins73 authored Oct 7, 2016
2 parents 5cc0d94 + 9cab5d5 commit 3f3786a
Show file tree
Hide file tree
Showing 7 changed files with 99 additions and 19 deletions.
2 changes: 2 additions & 0 deletions waltz-model/src/main/java/com/khartec/waltz/model/physical_data_flow/FrequencyKind.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ public enum FrequencyKind {
DAILY,
WEEKLY,
MONTHLY,
QUARTERLY,
BIANUALLY,
YEARLY
}
2 changes: 1 addition & 1 deletion waltz-ng/client/data-flow/components/source-and-target-graph/source-and-target.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ function drawLabels(section, items = [], scale, anchor = 'start', tweakers) {
.attr({ opacity: 0 })
.on('mouseenter.highlight', d => { highlighted = d.id; redraw(); })
.on('mouseleave.highlight', d => { highlighted = null; redraw(); })
.on('click.tweaker', tweakers.onSelect)
.on('click.tweaker', (d) => tweakers.onSelect(d, d3.event))
.on('mouseenter.tweaker', tweakers.onEnter)
.on('mouseleave.tweaker', tweakers.onLeave);

Expand Down
4 changes: 2 additions & 2 deletions waltz-ng/client/data-flow/components/source-and-target-panel/source-and-target-panel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@

<div ng-if="$ctrl.selected"
ng-style="{
top: ($ctrl.selected.y - 140) + 'px',
right: $ctrl.selected.type == 'source' ? '100px' : null,
left: $ctrl.selected.type == 'target' ? '100px' : null
}"
class="wsatp-popup">

<h4>
<span ng-bind="$ctrl.selected.app.name"></span>
<a class="clickable pull-right small"
style="color: blue"
ng-click="$ctrl.selected = null">
Dismiss
<waltz-icon name="close"></waltz-icon>
Close
</a>
</h4>

Expand Down
13 changes: 7 additions & 6 deletions waltz-ng/client/data-flow/components/source-and-target-panel/source-and-target-panel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function controller($scope) {
vm.entityRef,
vm.logicalFlows);

function select(app, type, flowId) {
function select(app, type, flowId, evt) {
const typeInfoByFlowId = mkTypeInfo(vm.decorators);
const physicalFlowsByLogicalFlowId = mkPhysicalFlowInfo(vm.physicalArticles, vm.physicalFlows);
const types = typeInfoByFlowId[flowId] || [];
Expand All @@ -26,21 +26,22 @@ function controller($scope) {
type,
types,
physicalFlows,
app
app,
y: evt.pageY
};
}

const baseTweakers = {
source: {
onSelect: app => $scope.$applyAsync(() => {
onSelect: (app, evt) => $scope.$applyAsync(() => {
const flowId = keyedLogicalFlows.sourceFlowsByAppId[app.id];
vm.selected = select(app, 'source', flowId);
vm.selected = select(app, 'source', flowId, evt);
})
},
target: {
onSelect: app => $scope.$applyAsync(() => {
onSelect: (app, evt) => $scope.$applyAsync(() => {
const flowId = keyedLogicalFlows.targetFlowsByAppId[app.id];
vm.selected = select(app, 'target', flowId);
vm.selected = select(app, 'target', flowId, evt);
})
}
};
Expand Down
7 changes: 4 additions & 3 deletions waltz-ng/client/data-flow/components/source-and-target-panel/source-and-target-panel.scss
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
.waltz-source-and-target-panel {
.wsatp-popup {
border: 2px solid #ddd;
border: 3px solid #ddd;
border-radius: 1.5px;
padding: 12px;
opacity: 0.93;
position: absolute;
background-color: white;
z-index: 10000;
background: #fafafa;
z-index: 100;
width: 60%;
display: inline-block;
@include waltz-box-shadow();
}

Expand Down
89 changes: 83 additions & 6 deletions waltz-ng/client/playpen/1/playpen1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,92 @@
</ol>
</waltz-page-header>

<waltz-section name="foo">
<ul>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
</ul>
</waltz-section>
<waltz-section name="foo">
<ul>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
</ul>
</waltz-section>
<waltz-section name="foo">
<ul>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
</ul>
</waltz-section>
<waltz-section name="foo">
<ul>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
</ul>
</waltz-section>
<waltz-section name="foo">
<ul>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
<li><span>foo</span></li>
</ul>
</waltz-section>

<waltz-section name="foo">

<div width="100%">
<waltz-source-and-target-panel entity-ref="ctrl.entityRef"
logical-flows="ctrl.logicalFlows"
decorators="ctrl.dataFlowDecorators"
physical-flows="ctrl.physicalFlows"
physical-articles="ctrl.articles">
</waltz-source-and-target-panel>
<uib-tabset active="active">
<uib-tab index="0"
heading="Summary">

<waltz-source-and-target-panel entity-ref="ctrl.entityRef"
logical-flows="ctrl.logicalFlows"
decorators="ctrl.dataFlowDecorators"
physical-flows="ctrl.physicalFlows"
physical-articles="ctrl.articles">
</waltz-source-and-target-panel>
</uib-tab>
</uib-tabset>

</div>

Expand Down
1 change: 0 additions & 1 deletion waltz-ng/client/widgets/overlay-panel.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.waltz-overlay-panel {
position: absolute;
xxwidth: 45%;
top:-20px;
right: 8px;
background: #fafafa;
Expand Down

0 comments on commit 3f3786a

Please sign in to comment.