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/08 15:17:06 UTC
svn commit: r1616747 - in
/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp:
index.html js/app/controllers/controllers-jvm.js
js/app/controllers/controllers.js js/main.js js/sirona.js
Author: olamy
Date: Fri Aug 8 13:17:06 2014
New Revision: 1616747
URL: http://svn.apache.org/r1616747
Log:
move jvm controllers to a separate js file
Added:
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js
- copied, changed from r1616746, incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js
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.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/main.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js
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=1616747&r1=1616746&r2=1616747&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 8 13:17:06 2014
@@ -58,7 +58,7 @@
<ul class="nav navbar-nav side-nav" id="plugins">
<li class="active">
<li>
- <a href="$mapping/">Home</a>
+ <a href="#home">Home</a>
</li>
<li class="active">
<li>
Copied: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js (from r1616746, incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js?p2=incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js&p1=incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js&r1=1616746&r2=1616747&rev=1616747&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js Fri Aug 8 13:17:06 2014
@@ -21,12 +21,6 @@ define(['angular','services','morris'],
var dayDuration = 24 * 3600 * 1000;
- var homeControllers = angular.module('homeControllers', ['sironaJvmServices']);
-
- homeControllers.controller( 'HomeCtrl', ['$scope', function ( $scope ){
- console.log("HomeCtrl");
- }]);
-
var jvmControllers = angular.module('jvmControllers', ['sironaJvmServices']);
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js?rev=1616747&r1=1616746&r2=1616747&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js Fri Aug 8 13:17:06 2014
@@ -17,118 +17,16 @@
'use strict';
/* Controllers */
-define(['angular','services','morris'], function (){
+define(['angular'], function (){
var dayDuration = 24 * 3600 * 1000;
- var homeControllers = angular.module('homeControllers', ['sironaJvmServices']);
+ var homeControllers = angular.module('homeControllers', []);
homeControllers.controller( 'HomeCtrl', ['$scope', function ( $scope ){
console.log("HomeCtrl");
}]);
-
- var jvmControllers = angular.module('jvmControllers', ['sironaJvmServices']);
-
- jvmControllers.controller( 'JvmHomeCtrl', ['$scope','jvmCpu','jvmMemory','nonHeapMemory','activeThreads',
- function ( $scope,jvmCpu,jvmMemory,nonHeapMemory,activeThreads ){
-
- console.log("JvmHomeCtrl");
-
- var yesterday = new Date();
- yesterday.setTime(yesterday.getTime() - dayDuration);
-
- var now = new Date();
-
- jvmCpu.query({start:yesterday.getTime(),end:now.getTime()} ).$promise.then(function(cpuResults){
- var morrisDatas=toMorrisFormat(cpuResults.data);
- $("#cpu" ).empty();
- Morris.Line({
- element: 'cpu',
- data: morrisDatas,
- xkey: 'x',
- ykeys: 'y',
- labels: [cpuResults.label],
- xLabelFormat:function(ret){
- return new Date(morrisDatas[ret.x].x).toString();
- },
- parseTime: false,
- hideHover: 'auto'
- });
-
- });
-
- jvmMemory.query({start:yesterday.getTime(),end:now.getTime()} ).$promise.then(function(memoryResults){
- var morrisDatas=toMorrisFormat(memoryResults.data);
- $("#memory" ).empty();
- Morris.Line({
- element: 'memory',
- data: morrisDatas,
- xkey: 'x',
- ykeys: 'y',
- labels: [memoryResults.label],
- xLabelFormat:function(ret){
- return new Date(morrisDatas[ret.x].x).toString();
- },
- parseTime: false,
- hideHover: 'auto'
- });
-
- });
-
- nonHeapMemory.query({start:yesterday.getTime(),end:now.getTime()} ).$promise.then(function(memoryResults){
- var morrisDatas=toMorrisFormat(memoryResults.data);
- $("#nonheapmemory" ).empty();
- Morris.Line({
- element: 'nonheapmemory',
- data: morrisDatas,
- xkey: 'x',
- ykeys: 'y',
- labels: [memoryResults.label],
- xLabelFormat:function(ret){
- return new Date(morrisDatas[ret.x].x).toString();
- },
- parseTime: false,
- hideHover: 'auto'
- });
-
- });
-
- activeThreads.query({start:yesterday.getTime(),end:now.getTime()} ).$promise.then(function(results){
- var morrisDatas=toMorrisFormat(results.data);
- $("#activethreads" ).empty();
- Morris.Line({
- element: 'activethreads',
- data: morrisDatas,
- xkey: 'x',
- ykeys: 'y',
- labels: [results.label],
- xLabelFormat:function(ret){
- return new Date(morrisDatas[ret.x].x).toString();
- },
- parseTime: false,
- hideHover: 'auto'
- });
-
- });
-
- }]);
-
-
- var toMorrisFormat=function(reportResult){
- if (reportResult==null){
- console.log("reportResult==null");
- return [];
- }
- var values = [];
- angular.forEach(reportResult, function(key,value) {
- this.push({x:value,y: key});
- }, values);
-
-
- return values;
- }
-
});
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/main.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/main.js?rev=1616747&r1=1616746&r2=1616747&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/main.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/main.js Fri Aug 8 13:17:06 2014
@@ -35,6 +35,7 @@ require.config({
'angular-resource': 'angular-resource-'+angularVersion+(useAngularMin?".min":""),
'bootstrap' : 'bootstrap.3.2.0.min',
'controllers': 'app/controllers/controllers',
+ 'controllers-jvm': 'app/controllers/controllers-jvm',
'services': 'app/services/services',
'sirona': 'sirona',
'morris': 'plugins/morris/morris-0.5.0.min',
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js?rev=1616747&r1=1616746&r2=1616747&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js Fri Aug 8 13:17:06 2014
@@ -17,7 +17,7 @@
'use strict';
-define(['jquery','controllers', 'angular-route', 'bootstrap'],
+define(['jquery','controllers','controllers-jvm', 'angular-route', 'bootstrap'],
function (jquery,controllers) {
var sirona = angular.module('sirona', [