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:26 UTC
svn commit: r1618803 - in
/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp:
js/app/controllers/controllers-jvm.js partials/jvm.html
Author: olamy
Date: Tue Aug 19 06:08:25 2014
New Revision: 1618803
URL: http://svn.apache.org/r1618803
Log:
fix label
Modified:
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/partials/jvm.html
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=1618803&r1=1618802&r2=1618803&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:25 2014
@@ -31,16 +31,31 @@ define(['angular','services','morris','u
console.log("JvmHomeCtrl");
$scope.startDate = new Date();
-
$scope.startDate.setTime($scope.startDate.getTime() - dayDuration);
+
$scope.endDate = new Date();
- $scope.endDateStr = $scope.endDate.toString();
+
+
+ $scope.format = 'dd/MM/yyyy HH:mm:ss';
+
+ $scope.startDateOpen = function($event) {
+ $event.preventDefault();
+ $event.stopPropagation();
+ $scope.startDateOpened=!$scope.startDateOpened;
+
+ };
+
+ $scope.endDateOpen = function($event) {
+ $event.preventDefault();
+ $event.stopPropagation();
+ $scope.endDateOpened=!$scope.endDateOpened;
+
+ };
var drawCpu = function()
{
- console.log("$scope.endDate:"+$scope.endDate+",str:"+$scope.endDateStr);
- new Date();
+ console.log("$scope.endDate:"+$scope.endDate);
jvmCpu.query( {
start: $scope.startDate.getTime(),
end: $scope.endDate.getTime()
@@ -52,10 +67,12 @@ define(['angular','services','morris','u
data: $scope.cpuResults,
xkey: 'x',
ykeys: 'y',
- labels: [$scope.cpuResults.label],
+ labels: [results.label],
xLabelFormat: function ( ret )
{
- return new Date( $scope.cpuResults[ret.x].x ).toString();
+ var date = new Date();
+ date.setTime($scope.cpuResults[ret.x].x);
+ return date.toLocaleString();
},
parseTime: false,
hideHover: 'auto'
@@ -76,7 +93,9 @@ define(['angular','services','morris','u
ykeys: 'y',
labels: [memoryResults.label],
xLabelFormat:function(ret){
- return new Date(morrisDatas[ret.x].x).toString();
+ var date = new Date();
+ date.setTime(morrisDatas[ret.x].x);
+ return date.toLocaleString();
},
parseTime: false,
hideHover: 'auto'
@@ -94,7 +113,9 @@ define(['angular','services','morris','u
ykeys: 'y',
labels: [memoryResults.label],
xLabelFormat:function(ret){
- return new Date(morrisDatas[ret.x].x).toString();
+ var date = new Date();
+ date.setTime(morrisDatas[ret.x].x);
+ return date.toLocaleString();
},
parseTime: false,
hideHover: 'auto'
@@ -129,22 +150,6 @@ define(['angular','services','morris','u
$scope.memory=result;
});
- $scope.format = 'dd/MM/yyyy HH:mm:ss';
-
- $scope.startDateOpen = function($event) {
- $event.preventDefault();
- $event.stopPropagation();
- $scope.startDateOpened=!$scope.startDateOpened;
-
- };
-
- $scope.endDateOpen = function($event) {
- $event.preventDefault();
- $event.stopPropagation();
- $scope.endDateOpened=!$scope.endDateOpened;
-
- };
-
$scope.updateGraphs = function(){
console.log("updateGraphs");
drawCpu();
@@ -161,7 +166,6 @@ define(['angular','services','morris','u
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/partials/jvm.html
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html?rev=1618803&r1=1618802&r2=1618803&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/jvm.html Tue Aug 19 06:08:25 2014
@@ -29,7 +29,7 @@
<div class="form-group" role="form">
<label for="icpu-datetimepicker-end">To</label>
<button type="button" class="btn btn-default" ng-click="endDateOpen($event)"><i class="glyphicon glyphicon-calendar"></i></button>
- <input type="text" class="form-control" datepicker-popup="{{format}}" ng-model="endDateStr" is-open="endDateOpened"
+ <input type="text" class="form-control" datepicker-popup="{{format}}" ng-model="endDate" is-open="endDateOpened"
min-date="minDate" datepicker-options="dateOptions" ng-required="true" close-text="Close" id="icpu-datetimepicker-end" />
</div>
</div>
@@ -61,10 +61,10 @@
<div class="panel-body">
<table id="cpu-table" class="table table-bordered table-striped table-hover">
<tbody>
- <tr><td>OS Name</td><td>{{os.name}}</td></tr>
- <tr><td>Version</td><td>{{os.version}}</td></tr>
- <tr><td>Architecture</td><td>{{os.arch}}</td></tr>
- <tr><td>Number of processors</td><td>{{os.numberProcessor}}</td></tr>
+ <tr><td>OS Name</td><td>{{::os.name}}</td></tr>
+ <tr><td>Version</td><td>{{::os.version}}</td></tr>
+ <tr><td>Architecture</td><td>{{::os.arch}}</td></tr>
+ <tr><td>Number of processors</td><td>{{::os.numberProcessor}}</td></tr>
</tbody>
</table>
</div>