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:09:07 UTC
svn commit: r1618807 -
/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js
Author: olamy
Date: Tue Aug 19 06:09:07 2014
New Revision: 1618807
URL: http://svn.apache.org/r1618807
Log:
fix x date label
Modified:
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-jvm.js
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=1618807&r1=1618806&r2=1618807&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:09:07 2014
@@ -111,7 +111,7 @@ define(['jquery','angular','bootstrap','
var drawActiveThreads = function(){
activeThreads.query({start:$scope.data.startDate.getTime(),end:$scope.data.endDate.getTime()} ).$promise.then(function(results){
var morrisDatas=toMorrisFormat(results.data);
- $("#activethreads" ).empty();
+ jQuery("#activethreads").empty();
Morris.Line({
element: 'activethreads',
data: morrisDatas,
@@ -119,7 +119,9 @@ define(['jquery','angular','bootstrap','
ykeys: 'y',
labels: [results.label],
xLabelFormat:function(ret){
- return "";
+ var date = new Date();
+ date.setTime(morrisDatas[ret.x].x);
+ return date.toLocaleString();
},
parseTime: false,
hideHover: 'auto'