You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2014/08/22 09:06:53 UTC
svn commit: r1619689 - in
/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp:
index.html js/app/controllers/controllers-report.js partials/report.html
Author: olamy
Date: Fri Aug 22 07:06:52 2014
New Revision: 1619689
URL: http://svn.apache.org/r1619689
Log:
counters grid start working
Modified:
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-report.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/report.html
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html?rev=1619689&r1=1619688&r2=1619689&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html Fri Aug 22 07:06:52 2014
@@ -64,13 +64,14 @@
<a href="#home">Home</a>
</li>
<li>
- <a href="#jvm">JVM</a>
+ <a href="#report">Report</a>
</li>
+
<li>
- <a href="#threads">Threads</a>
+ <a href="#jvm">JVM</a>
</li>
<li>
- <a href="#report">Report</a>
+ <a href="#threads">Threads</a>
</li>
</ul>
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-report.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-report.js?rev=1619689&r1=1619688&r2=1619689&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-report.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-report.js Fri Aug 22 07:06:52 2014
@@ -22,19 +22,20 @@ define(['jquery','angular','bootstrap','
var dayDuration = 24 * 3600 * 1000;
- var reportControllers = angular.module('countersControllers', ['sironaJvmServices','ui.bootstrap','ui.bootstrap.datetimepicker']);
+ var reportControllers = angular.module('countersControllers', ['sironaJvmServices','ngGrid']);
- reportControllers.controller( 'countersHomeCtrl', ['$scope','$routeParams','counters',
- function ( $scope,$routeParams,counters){
+ reportControllers.controller( 'countersHomeCtrl', ['$scope','$routeParams','$http','counters',
+ function ( $scope,$routeParams,$http,counters){
- $scope.data={};
+ $scope.gridOptions={};
- console.log("countersHomeCtrl");
+ $http.get('restServices/sironaServices/counters')
+ .success(function(data) {
- counters.query().$promise.then(function(result){
- $scope.data.counters=result;
+ $scope.counters = data;
+ });
- });
+ $scope.gridOptions.data='counters';
}]);
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/report.html
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/report.html?rev=1619689&r1=1619688&r2=1619689&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/report.html (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/report.html Fri Aug 22 07:06:52 2014
@@ -14,8 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<div class="row">
- <div class="col-lg-12">
- report
- </div>
-</div>
\ No newline at end of file
+
+<div class="gridStyle" ng-grid="gridOptions">
+</div>