forked from finos/waltz
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
7 changed files
with
167 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 27 additions & 3 deletions
30
waltz-ng/client/report-grid/components/grid-view-section/report-grid-view-section.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
142 changes: 75 additions & 67 deletions
142
waltz-ng/client/report-grid/components/report-grid-view-panel/report-grid-view-panel.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,80 +1,88 @@ | ||
| <div> | ||
|
|
||
| <!-- NO SUMMARIES --> | ||
| <waltz-no-data class="small" | ||
| ng-if="$ctrl.chunkedSummaryData.length == 0"> | ||
| <message> | ||
| <strong>No summaries selected</strong> | ||
| <p> | ||
| There are no active summaries. To add one select the | ||
| 'Add to summary' option in the column drop down menu. | ||
| Once added you can select summary rows to quickly filter | ||
| the report. | ||
| </p> | ||
| </message> | ||
| </waltz-no-data> | ||
|
|
||
| <waltz-loading-notification show="$ctrl.loading" | ||
| name="Loading grid data"> | ||
| </waltz-loading-notification> | ||
|
|
||
| <!-- HELP --> | ||
| <p ng-if="$ctrl.chunkedSummaryData.length > 0" | ||
| class="help-block small"> | ||
| Select a value in the summary tables to quickly filter the data. | ||
| Select the row again to clear the filter. | ||
| You can add more summaries using the column menu ('Add to summary'). | ||
| </p> | ||
| <div ng-if="!$ctrl.loading"> | ||
|
|
||
| <!-- NO SUMMARIES --> | ||
| <waltz-no-data class="small" | ||
| ng-if="$ctrl.chunkedSummaryData.length == 0"> | ||
| <message> | ||
| <strong>No summaries selected</strong> | ||
| <p> | ||
| There are no active summaries. To add one select the | ||
| 'Add to summary' option in the column drop down menu. | ||
| Once added you can select summary rows to quickly filter | ||
| the report. | ||
| </p> | ||
| </message> | ||
| </waltz-no-data> | ||
|
|
||
| <!-- SUMMARIES --> | ||
| <div class="row small" | ||
| ng-repeat="row in $ctrl.chunkedSummaryData"> | ||
| <div ng-repeat="summary in row" class="col-sm-3"> | ||
| <h5 class="waltz-visibility-parent"> | ||
| <span ng-bind="summary.column.columnEntityReference.name"></span> | ||
| <a ng-click="$ctrl.onRemoveSummary(summary)" | ||
| class="waltz-visibility-child-30 clickable pull-right"> | ||
| <waltz-icon name="close"></waltz-icon> | ||
| </a> | ||
| </h5> | ||
| <table class="table table-condensed small"> | ||
| <tbody> | ||
| <tr ng-repeat="counter in summary.counters" | ||
| class="clickable" | ||
| ng-class="{ 'waltz-highlighted-row' : $ctrl.isSelectedCounter(counter.counterId) }" | ||
| ng-click="$ctrl.onToggleFilter(counter)"> | ||
| <td> | ||
| <div style="display: inline-block; height: 10px; width: 10px;" | ||
| ng-style="{ 'background-color': counter.rating.color }"> | ||
| </div> | ||
| <span ng-bind="counter.rating.name" | ||
| uib-popover="{{counter.rating.description}}" | ||
| popover-popup-delay="300" | ||
| popover-append-to-body="true" | ||
| popover-trigger="mouseenter"> | ||
|
|
||
| <!-- HELP --> | ||
| <p ng-if="$ctrl.chunkedSummaryData.length > 0" | ||
| class="help-block small"> | ||
| Select a value in the summary tables to quickly filter the data. | ||
| Select the row again to clear the filter. | ||
| You can add more summaries using the column menu ('Add to summary'). | ||
| </p> | ||
|
|
||
|
|
||
| <!-- SUMMARIES --> | ||
| <div class="row small" | ||
| ng-repeat="row in $ctrl.chunkedSummaryData"> | ||
| <div ng-repeat="summary in row" class="col-sm-3"> | ||
| <h5 class="waltz-visibility-parent"> | ||
| <span ng-bind="summary.column.columnEntityReference.name"></span> | ||
| <a ng-click="$ctrl.onRemoveSummary(summary)" | ||
| class="waltz-visibility-child-30 clickable pull-right"> | ||
| <waltz-icon name="close"></waltz-icon> | ||
| </a> | ||
| </h5> | ||
| <table class="table table-condensed small"> | ||
| <tbody> | ||
| <tr ng-repeat="counter in summary.counters" | ||
| class="clickable" | ||
| ng-class="{ 'waltz-highlighted-row' : $ctrl.isSelectedCounter(counter.counterId) }" | ||
| ng-click="$ctrl.onToggleFilter(counter)"> | ||
| <td> | ||
| <div style="display: inline-block; height: 10px; width: 10px;" | ||
| ng-style="{ 'background-color': counter.rating.color }"> | ||
| </div> | ||
| <span ng-bind="counter.rating.name" | ||
| uib-popover="{{counter.rating.description}}" | ||
| popover-popup-delay="300" | ||
| popover-append-to-body="true" | ||
| popover-trigger="mouseenter"> | ||
| </span> | ||
| </td> | ||
| <td class="text-right"><span ng-bind="counter.count"></span></td> | ||
| </tr> | ||
| </tbody> | ||
| <tbody> | ||
| <tr> | ||
| <td> | ||
| <b>Total</b> | ||
| </td> | ||
| <td class="text-right"> | ||
| <span ng-bind="summary.total"></span> | ||
| </td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </td> | ||
| <td class="text-right"><span ng-bind="counter.count"></span></td> | ||
| </tr> | ||
| </tbody> | ||
| <tbody> | ||
| <tr> | ||
| <td> | ||
| <b>Total</b> | ||
| </td> | ||
| <td class="text-right"> | ||
| <span ng-bind="summary.total"></span> | ||
| </td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
|
|
||
| <!-- GRID --> | ||
| <waltz-grid-with-search column-defs="$ctrl.columnDefs" | ||
| entries="$ctrl.tableData" | ||
| class="small"> | ||
| </waltz-grid-with-search> | ||
| <!-- GRID --> | ||
| <waltz-grid-with-search column-defs="$ctrl.columnDefs" | ||
| entries="$ctrl.tableData" | ||
| class="small"> | ||
| </waltz-grid-with-search> | ||
| </div> | ||
|
|
||
| </div> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters