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/27 02:28:55 UTC
svn commit: r1620764 - in
/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp:
js/app/controllers/controllers-gauges.js partials/gauge-detail.html
Author: olamy
Date: Wed Aug 27 00:28:55 2014
New Revision: 1620764
URL: http://svn.apache.org/r1620764
Log:
add date search for gauge detail graph
Modified:
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-gauges.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/gauge-detail.html
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-gauges.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-gauges.js?rev=1620764&r1=1620763&r2=1620764&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-gauges.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-gauges.js Wed Aug 27 00:28:55 2014
@@ -47,6 +47,9 @@ define(['jquery','angular','bootstrap','
$scope.data.format = 'dd/MM/yyyy HH:mm:ss';
+ jQuery("#dropdown-enddate").dropdown();
+ jQuery("#dropdown-startdate").dropdown();
+
var gaugeName=$routeParams.gaugeName;
console.log("gaugeName:"+gaugeName);
@@ -76,7 +79,14 @@ define(['jquery','angular','bootstrap','
});
};
- drawGauge();
+
+ $scope.updateGraph = function(){
+ drawGauge();
+ };
+
+ $scope.updateGraph();
+
+
}]);
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/gauge-detail.html
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/gauge-detail.html?rev=1620764&r1=1620763&r2=1620764&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/gauge-detail.html (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/gauge-detail.html Wed Aug 27 00:28:55 2014
@@ -15,6 +15,41 @@
limitations under the License.
-->
<div class="row">
+ <div class="col-lg-2">
+ </div>
+ <div class="col-lg-4">
+ <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>
+ <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="data.endDate" data-datetimepicker-config="{ }"/>
+ </li>
+ </ul>
+ </div>
+ </div>
+ <div class="col-lg-2">
+ <button type="button" class="btn btn-primary" ng-click="updateGraph()">Update</button>
+ </div>
+</div>
+<div class="row">
<div class="col-lg-12">
<div class="panel panel-primary">
<div class="panel-heading">
@@ -30,4 +65,4 @@
</div>
</div>
-</div>
\ No newline at end of file
+</div>