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:18 UTC
svn commit: r1618799 - 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:18 2014
New Revision: 1618799
URL: http://svn.apache.org/r1618799
Log:
fix layout
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=1618799&r1=1618798&r2=1618799&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:18 2014
@@ -30,30 +30,43 @@ define(['angular','services','morris','u
console.log("JvmHomeCtrl");
- var yesterday = new Date();
- yesterday.setTime(yesterday.getTime() - dayDuration);
+ $scope.startDate = new Date();
- var now = new Date();
+ $scope.startDate.setTime($scope.startDate.getTime() - dayDuration);
- 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'
- });
+ $scope.endDate = new Date();
+ $scope.endDateStr = $scope.endDate.toString();
- });
+ var drawCpu = function()
+ {
+ console.log("$scope.endDate:"+$scope.endDate+",str:"+$scope.endDateStr);
+ new Date();
+ jvmCpu.query( {
+ start: $scope.startDate.getTime(),
+ end: $scope.endDate.getTime()
+ } ).$promise.then( function ( results ){
+ $scope.cpuResults = toMorrisFormat( results.data );
+ $("#cpu").empty();
+ Morris.Line( {
+ element: 'cpu',
+ data: $scope.cpuResults,
+ xkey: 'x',
+ ykeys: 'y',
+ labels: [$scope.cpuResults.label],
+ xLabelFormat: function ( ret )
+ {
+ return new Date( $scope.cpuResults[ret.x].x ).toString();
+ },
+ parseTime: false,
+ hideHover: 'auto'
+ } );
+
+ } );
+ };
- jvmMemory.query({start:yesterday.getTime(),end:now.getTime()} ).$promise.then(function(memoryResults){
+ drawCpu();
+
+ jvmMemory.query({start:$scope.startDate.getTime(),end:$scope.endDate.getTime()} ).$promise.then(function(memoryResults){
var morrisDatas=toMorrisFormat(memoryResults.data);
$("#memory" ).empty();
Morris.Line({
@@ -71,7 +84,7 @@ define(['angular','services','morris','u
});
- nonHeapMemory.query({start:yesterday.getTime(),end:now.getTime()} ).$promise.then(function(memoryResults){
+ nonHeapMemory.query({start:$scope.startDate.getTime(),end:$scope.endDate.getTime()} ).$promise.then(function(memoryResults){
var morrisDatas=toMorrisFormat(memoryResults.data);
$("#nonheapmemory" ).empty();
Morris.Line({
@@ -89,7 +102,7 @@ define(['angular','services','morris','u
});
- activeThreads.query({start:yesterday.getTime(),end:now.getTime()} ).$promise.then(function(results){
+ activeThreads.query({start:$scope.startDate.getTime(),end:$scope.endDate.getTime()} ).$promise.then(function(results){
var morrisDatas=toMorrisFormat(results.data);
$("#activethreads" ).empty();
Morris.Line({
@@ -99,7 +112,7 @@ define(['angular','services','morris','u
ykeys: 'y',
labels: [results.label],
xLabelFormat:function(ret){
- return "";// new Date(morrisDatas[ret.x].x).toString();
+ return "";
},
parseTime: false,
hideHover: 'auto'
@@ -116,16 +129,25 @@ 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.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) {
+ $scope.endDateOpen = function($event) {
$event.preventDefault();
$event.stopPropagation();
+ $scope.endDateOpened=!$scope.endDateOpened;
+
+ };
- $scope.opened = true;
+ $scope.updateGraphs = function(){
+ console.log("updateGraphs");
+ drawCpu();
};
}]);
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=1618799&r1=1618798&r2=1618799&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:18 2014
@@ -16,6 +16,29 @@
-->
<div class="row">
<div class="col-lg-3">
+ </div>
+ <div class="col-lg-3">
+ <div class="form-group" role="form">
+ <label for="icpu-datetimepicker-start">From</label>
+ <button type="button" class="btn btn-default" ng-click="startDateOpen($event)"><i class="glyphicon glyphicon-calendar"></i></button>
+ <input type="text" class="form-control" datepicker-popup="{{format}}" ng-model="startDate" is-open="startDateOpened"
+ min-date="minDate" datepicker-options="dateOptions" ng-required="true" close-text="Close" id="icpu-datetimepicker-start" />
+ </div>
+ </div>
+ <div class="col-lg-3">
+ <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"
+ min-date="minDate" datepicker-options="dateOptions" ng-required="true" close-text="Close" id="icpu-datetimepicker-end" />
+ </div>
+ </div>
+ <div class="col-lg-3">
+ <button type="button" class="btn btn-primary" ng-click="updateGraphs()">Update</button>
+ </div>
+</div>
+<div class="row">
+ <div class="col-lg-3">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">
@@ -26,21 +49,6 @@
<div class="row">
<div id="cpu"><i class="fa fa-spinner fa-spin"></i></div>
</div>
- <div class="row">
- <p class="input-group">
- <input type="text" class="form-control" datepicker-popup="{{format}}" ng-model="dt" is-open="opened"
- min-date="minDate" datepicker-options="dateOptions" ng-required="true" close-text="Close" />
- <span class="input-group-btn">
- <button type="button" class="btn btn-default" ng-click="open($event)"><i class="glyphicon glyphicon-calendar"></i></button>
- </span>
-
- <input type="text" class="form-control" datepicker-popup="{{format}}" ng-model="dt" is-open="opened"
- min-date="minDate" datepicker-options="dateOptions" ng-required="true" close-text="Close" />
- <span class="input-group-btn">
- <button type="button" class="btn btn-default" ng-click="open($event)"><i class="glyphicon glyphicon-calendar"></i></button>
- </span>
- </p>
- </div>
</div>
</div>