diff options
| author | Jarkko Pöyry <jpoyry@google.com> | 2015-04-29 20:31:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-29 20:31:53 +0000 |
| commit | 309eaca5eec2743a9f591e14cf3b10c9e3e7d2f0 (patch) | |
| tree | 068cddd1f88bc2605a9660aa0007f935bd6c6fd4 | |
| parent | b638071e4fed076171f4ac68e5196312383155a2 (diff) | |
| parent | d9f4887cb855f608ce96c83e74240b84ae35c1e5 (diff) | |
| download | cherry-309eaca5eec2743a9f591e14cf3b10c9e3e7d2f0.tar.gz | |
Merge "Show import progress in results view."
| -rw-r--r-- | client/partials/results.html | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/client/partials/results.html b/client/partials/results.html index 9b9a17e..9a20750 100644 --- a/client/partials/results.html +++ b/client/partials/results.html @@ -45,17 +45,25 @@ limitations under the License. <button class="btn btn-danger btn-xs" type="button" ng-click="stopExecution();" ng-disabled="!isStoppable">Stop</button> </span> </h4> - </div> - <div class="progress" ng-controller="TreeGroupCtrl" ng-init="init(batchResultHeader.id + '/')"> - <div class="de-progress-bar de-progress-bar-success" ng-style="{width:(getResultTypePercentage('numSuccess') + '%')}"></div> - <div class="de-progress-bar de-progress-bar-fail" ng-style="{width:(getResultTypePercentage('numFailure') + '%')}"></div> - <div class="de-progress-bar de-progress-bar-crash-timeout" ng-style="{width:(getResultTypePercentage('numCrash', 'numTimeout') + '%')}"></div> - <div class="de-progress-bar de-progress-bar-warning" ng-style="{width:(getResultTypePercentage('numQualityWarning', 'numCompatibilityWarning') + '%')}"></div> - <div class="de-progress-bar de-progress-bar-not-supported" ng-style="{width:(getResultTypePercentage('numNotSupported') + '%')}"></div> - <div class="de-progress-bar de-progress-bar-resource-internal-error" ng-style="{width:(getResultTypePercentage('numResourceError', 'numInternalError') + '%')}"></div> - <!-- \todo [petri] what text to display for groups? --> - <div class="de-progress-bar-text">{{ getNumResults(value) }} / {{ value.numTotalCases }}</div> + <div ng-controller="BatchResultCtrl"> + <div ng-if="batchResult.status === 'BSCImporting'" class="progress"> + <div class="de-progress-bar" ng-style="{width:batchResult.initProgress*100+'%'}"></div> + <div class="de-progress-bar-text">Importing {{ batchResult.initProgress | percent }}</div> + </div> + </div> + <div ng-controller="BatchResultCtrl"> + <div ng-if="batchResult.status !== 'BSCImporting'" class="progress" ng-controller="TreeGroupCtrl" ng-init="init(batchResultHeader.id + '/')"> + <div class="de-progress-bar de-progress-bar-success" ng-style="{width:(getResultTypePercentage('numSuccess') + '%')}"></div> + <div class="de-progress-bar de-progress-bar-fail" ng-style="{width:(getResultTypePercentage('numFailure') + '%')}"></div> + <div class="de-progress-bar de-progress-bar-crash-timeout" ng-style="{width:(getResultTypePercentage('numCrash', 'numTimeout') + '%')}"></div> + <div class="de-progress-bar de-progress-bar-warning" ng-style="{width:(getResultTypePercentage('numQualityWarning', 'numCompatibilityWarning') + '%')}"></div> + <div class="de-progress-bar de-progress-bar-not-supported" ng-style="{width:(getResultTypePercentage('numNotSupported') + '%')}"></div> + <div class="de-progress-bar de-progress-bar-resource-internal-error" ng-style="{width:(getResultTypePercentage('numResourceError', 'numInternalError') + '%')}"></div> + <!-- \todo [petri] what text to display for groups? --> + <div class="de-progress-bar-text">{{ getNumResults(value) }} / {{ value.numTotalCases }}</div> + </div> + </div> </div> </a> </div> |