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:51 UTC
svn commit: r1618805 - 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:51 2014
New Revision: 1618805
URL: http://svn.apache.org/r1618805
Log:
fix ui for start/end date
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=1618805&r1=1618804&r2=1618805&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:51 2014
@@ -30,33 +30,21 @@ define(['jquery','angular','bootstrap','
console.log("JvmHomeCtrl");
- $scope.startDate = new Date();
- $scope.startDate.setTime($scope.startDate.getTime() - dayDuration);
+ $scope.data.startDate = new Date();
+ $scope.data.startDate.setTime($scope.startDate.getTime() - dayDuration);
- $scope.endDate = new Date();
+ $scope.data.endDate = new Date();
+ $scope.data.format = 'dd/MM/yyyy HH:mm:ss';
- $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;
-
- };
+ jQuery("#dropdown-enddate").dropdown();
+ jQuery("#dropdown-startdate").dropdown();
var drawCpu = function()
{
console.log("$scope.endDate:"+$scope.endDate);
- jvmCpu.query({start: $scope.startDate.getTime(),end: $scope.endDate.getTime()} ).$promise.then( function ( results ){
+ jvmCpu.query({start: $scope.data.startDate.getTime(),end: $scope.endDate.getTime()} ).$promise.then( function ( results ){
$scope.cpuResults = toMorrisFormat( results.data );
$("#cpu").empty();
Morris.Line({
@@ -78,7 +66,7 @@ define(['jquery','angular','bootstrap','
drawCpu();
- jvmMemory.query({start:$scope.startDate.getTime(),end:$scope.endDate.getTime()} ).$promise.then(function(memoryResults){
+ jvmMemory.query({start:$scope.data.startDate.getTime(),end:$scope.endDate.getTime()} ).$promise.then(function(memoryResults){
var morrisDatas=toMorrisFormat(memoryResults.data);
$("#memory" ).empty();
Morris.Line({
@@ -98,7 +86,7 @@ define(['jquery','angular','bootstrap','
});
- nonHeapMemory.query({start:$scope.startDate.getTime(),end:$scope.endDate.getTime()} ).$promise.then(function(memoryResults){
+ nonHeapMemory.query({start:$scope.data.startDate.getTime(),end:$scope.endDate.getTime()} ).$promise.then(function(memoryResults){
var morrisDatas=toMorrisFormat(memoryResults.data);
$("#nonheapmemory" ).empty();
Morris.Line({
@@ -118,7 +106,7 @@ define(['jquery','angular','bootstrap','
});
- activeThreads.query({start:$scope.startDate.getTime(),end:$scope.endDate.getTime()} ).$promise.then(function(results){
+ activeThreads.query({start:$scope.data.startDate.getTime(),end:$scope.data.endDate.getTime()} ).$promise.then(function(results){
var morrisDatas=toMorrisFormat(results.data);
$("#activethreads" ).empty();
Morris.Line({
@@ -146,12 +134,10 @@ define(['jquery','angular','bootstrap','
});
$scope.updateGraphs = function(){
- console.log("updateGraphs:"+$scope.endDate.toLocaleString());
+ console.log("updateGraphs:"+$scope.data.endDate.toLocaleString());
drawCpu();
};
- jQuery("#dropdown-enddate").dropdown();// 'toggle'
- //jQuery(".dropdown-toggle" ).dropdown();//'toggle'
}]);
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=1618805&r1=1618804&r2=1618805&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:51 2014
@@ -18,32 +18,32 @@
<div class="col-lg-2">
</div>
<div class="col-lg-4">
- <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 class="dropdown">
+ <label for="datetimepicker-from">From</label>
+ <a class="dropdown-toggle" id="dropdown-startdate" role="button" data-toggle="dropdown" data-target="#" href="#">
+ <button type="button" class="btn btn-default"><i class="glyphicon glyphicon-calendar"></i></button>
+ </a>
+ <input type="text" class="form-control" data-ng-model="data.startDate" id="datetimepicker-from">
+ <ul class="dropdown-menu" role="menu" aria-labelledby="dropdown-enddate">
+ <li>
+ <datetimepicker data-ng-model="data.startDate" data-datetimepicker-config="{ }"/>
+ </li>
+ </ul>
</div>
</div>
<div class="col-lg-4">
<div class="dropdown">
<label for="datetimepicker-to">To</label>
- <div class="input-group">
-
- <input type="text" class="form-control" data-ng-model="endDate" id="datetimepicker-to">
- <span class="input-group-addon">
- <a class="dropdown-toggle" id="dropdown-enddate" role="button" data-toggle="dropdown" data-target="#" href="#">
- <i class="glyphicon glyphicon-calendar"></i>
- </a>
- </span>
- </div>
+ <a class="dropdown-toggle" id="dropdown-enddate" role="button" data-toggle="dropdown" data-target="#" href="#">
+ <button type="button" class="btn btn-default"><i class="glyphicon glyphicon-calendar"></i></button>
+ </a>
+ <input type="text" class="form-control" data-ng-model="data.endDate" id="datetimepicker-to">
<ul class="dropdown-menu" role="menu" aria-labelledby="dropdown-enddate">
<li>
- <datetimepicker data-ng-model="endDate" data-datetimepicker-config="{ }"/>
+ <datetimepicker data-ng-model="data.endDate" data-datetimepicker-config="{ }"/>
</li>
</ul>
</div>
-
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-primary" ng-click="updateGraphs()">Update</button>