Kouhei Sutou
null+****@clear*****
Fri Nov 7 17:38:49 JST 2014
Kouhei Sutou 2014-11-07 17:38:49 +0900 (Fri, 07 Nov 2014) New Revision: d037a8159252d005559ba7ddaa301a1d4197c9e2 https://github.com/groonga/groonga-admin/commit/d037a8159252d005559ba7ddaa301a1d4197c9e2 Message: Group response related data by $scope.response Modified files: app/scripts/controllers/table-search-controller.js app/views/tables/search.html Modified: app/scripts/controllers/table-search-controller.js (+18 -15) =================================================================== --- app/scripts/controllers/table-search-controller.js 2014-11-07 17:32:32 +0900 (95cc70c) +++ app/scripts/controllers/table-search-controller.js 2014-11-07 17:38:49 +0900 (a8c4e95) @@ -18,17 +18,19 @@ angular.module('groongaAdminApp') function initialize() { $scope.table = $routeParams.table; $scope.style = 'table'; - $scope.rawData = []; - $scope.columns = []; - $scope.records = []; - $scope.drilldowns = []; + $scope.response = { + rawData: [], + columns: [], + records: [], + drilldowns: [], + elapsedTimeInMilliseconds: 0, + nTotalRecords: 0 + }; $scope.indexedColumns = []; $scope.outputColumns = []; $scope.commandLine = ''; $scope.message = ''; - $scope.elapsedTimeInMilliseconds = 0; $scope.currentPage = 1; - $scope.nTotalRecords = 0; $scope.nRecordsInPage = 10; $scope.maxNPages = 10; $scope.parameters = angular.copy($location.search()); @@ -206,19 +208,20 @@ angular.module('groongaAdminApp') }); var request = client.execute('select', parameters); request.success(function(response) { - $scope.rawData = response.rawData(); + $scope.response.rawData = response.rawData(); $scope.commandLine = request.commandLine(); - $scope.elapsedTimeInMilliseconds = response.elapsedTime() * 1000; + $scope.response.elapsedTimeInMilliseconds = + response.elapsedTime() * 1000; if (!response.isSuccess()) { $scope.message = 'Failed to call "select" command: ' + response.errorMessage(); - $scope.nTotalRecords = 0; + $scope.response.nTotalRecords = 0; return; } $scope.currentPage = computeCurrentPage(parameters.offset || 0); - $scope.nTotalRecords = response.nTotalRecords(); + $scope.response.nTotalRecords = response.nTotalRecords(); var sortKeys = ($scope.parameters.sortby || '').split(/\s*,\s*/); - $scope.columns = response.columns().map(function(column) { + $scope.response.columns = response.columns().map(function(column) { var sort = null; if (sortKeys.indexOf(column.name) !== -1) { sort = 'ascending'; @@ -228,22 +231,22 @@ angular.module('groongaAdminApp') setColumnSort(column, sort); return column; }); - $scope.records = response.records().map(function(record) { + $scope.response.records = response.records().map(function(record) { return record.map(function(value, index) { return { value: value, - column: $scope.columns[index] + column: $scope.response.columns[index] }; }); }); - $scope.drilldowns = response.drilldowns(); + $scope.response.drilldowns = response.drilldowns(); ($scope.parameters.drilldown || '') .split(/\s*,\s*/) .filter(function(drilldown) { return drilldown.length > 0; }) .forEach(function(drilldown, i) { - $scope.drilldowns[i].key = drilldown; + $scope.response.drilldowns[i].key = drilldown; }); }); } Modified: app/views/tables/search.html (+11 -9) =================================================================== --- app/views/tables/search.html 2014-11-07 17:32:32 +0900 (24781d6) +++ app/views/tables/search.html 2014-11-07 17:38:49 +0900 (5162152) @@ -42,7 +42,7 @@ </div> <div class="panel panel-default" - ng-repeat="drilldown in drilldowns track by $index"> + ng-repeat="drilldown in response.drilldowns track by $index"> <div class="panel-heading"> <h2 class="panel-title"> {{drilldown.key}}({{drilldown.nTotalRecords}}) @@ -91,11 +91,13 @@ <code id="groonga-command-line">{{commandLine}}</code> </p> <p class="statistics"> - <span id="n-total-records">{{nTotalRecords}} records</span> - <span id="elapsed-time">({{elapsedTimeInMilliseconds | number : 3}}ms)</span> + <span id="n-total-records">{{response.nTotalRecords}} records</span> + <span id="elapsed-time"> + ({{response.elapsedTimeInMilliseconds | number : 3}}ms) + </span> </p> - <pagination total-items="nTotalRecords" + <pagination total-items="response.nTotalRecords" items-per-page="nRecordsInPage" max-size="maxNPages" rotate="false" @@ -119,7 +121,7 @@ <table> <thead> <tr> - <th ng-repeat="column in columns track by $index"> + <th ng-repeat="column in response.columns track by $index"> {{column.name}} <div> <button type="button" @@ -132,7 +134,7 @@ </tr> </thead> <tbody> - <tr ng-repeat="record in records track by $index"> + <tr ng-repeat="record in response.records track by $index"> <td ng-repeat="element in record track by $index"> {{element.value}} </td> @@ -142,7 +144,7 @@ </div> <div class="list-search-result" ng-show="style == 'list'"> - <div class="row" ng-repeat="record in records track by $index"> + <div class="row" ng-repeat="record in response.records track by $index"> <div class="col-md12"> <div class="table-responsive"> <table> @@ -158,9 +160,9 @@ </div> </div> - <pre ng-show="style == 'json'">{{rawData | json}}</pre> + <pre ng-show="style == 'json'">{{response.rawData | json}}</pre> - <pagination total-items="nTotalRecords" + <pagination total-items="response.nTotalRecords" items-per-page="nRecordsInPage" max-size="maxNPages" rotate="false" -------------- next part -------------- HTML����������������������������...Download
