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/19 08:08:03 UTC
svn commit: r1618797 [1/3] - in
/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp:
index.html js/app/controllers/controllers-jvm.js js/main.js
js/ui-bootstrap-tpls-0.11.0.js partials/jvm.html
Author: olamy
Date: Tue Aug 19 06:08:02 2014
New Revision: 1618797
URL: http://svn.apache.org/r1618797
Log:
datetimepicker
Added:
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/ui-bootstrap-tpls-0.11.0.js (with props)
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-jvm.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/main.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.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=1618797&r1=1618796&r2=1618797&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 Tue Aug 19 06:08:02 2014
@@ -36,6 +36,7 @@
<!-- Custom Fonts -->
<link href="font-awesome-4.1.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
+
</head>
<body>
@@ -62,7 +63,7 @@
</li>
<li class="active">
<li>
- <a href="#jvm">jvm</a>
+ <a href="#jvm">JVM</a>
</li>
</ul>
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js?rev=1618797&r1=1618796&r2=1618797&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js Tue Aug 19 06:08:02 2014
@@ -17,12 +17,12 @@
'use strict';
/* Controllers */
-define(['angular','services','morris'], function (){
+define(['angular','services','morris','ui-bootstrap'], function (){
var dayDuration = 24 * 3600 * 1000;
- var jvmControllers = angular.module('jvmControllers', ['sironaJvmServices']);
+ var jvmControllers = angular.module('jvmControllers', ['sironaJvmServices','ui.bootstrap']);
jvmControllers.controller( 'JvmHomeCtrl', ['$scope','jvmCpu','jvmMemory','nonHeapMemory','activeThreads',
'osInfo','memoryInfo',
@@ -99,7 +99,7 @@ define(['angular','services','morris'],
ykeys: 'y',
labels: [results.label],
xLabelFormat:function(ret){
- return new Date(morrisDatas[ret.x].x).toString();
+ return "";// new Date(morrisDatas[ret.x].x).toString();
},
parseTime: false,
hideHover: 'auto'
@@ -116,6 +116,18 @@ define(['angular','services','morris'],
$scope.memory=result;
});
+
+ $scope.initDate = new Date('2016-15-20');
+ $scope.formats = ['dd/MM/yy'];// 'dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy',
+ $scope.format = $scope.formats[0];
+
+ $scope.open = function($event) {
+ $event.preventDefault();
+ $event.stopPropagation();
+
+ $scope.opened = true;
+ };
+
}]);
@@ -127,6 +139,7 @@ define(['angular','services','morris'],
var values = [];
angular.forEach(reportResult, function(key,value) {
this.push({x:value,y: key});
+ console.log(value+":"+new Date(value ));
}, 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=1618797&r1=1618796&r2=1618797&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 Tue Aug 19 06:08:02 2014
@@ -39,14 +39,16 @@ require.config({
'services': 'app/services/services',
'sirona': 'sirona',
'morris': 'plugins/morris/morris-0.5.0.min',
- 'raphael': 'plugins/morris/raphael-2.1.2.min'
+ 'raphael': 'plugins/morris/raphael-2.1.2.min',
+ 'ui-bootstrap': 'ui-bootstrap-tpls-0.11.0'
},
shim: {
'angular': ['jquery'],
'angular-route': ['angular'],
'angular-resource': ['angular'],
- 'morris': ['raphael']
+ 'morris': ['raphael'],
+ 'ui-bootstrap': ['angular','bootstrap']
},
deps: ['sirona']