You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by rm...@apache.org on 2013/10/31 07:35:37 UTC
svn commit: r1537386 - in
/incubator/sirona/trunk/reporting/src/main/resources:
resources/js/sirona.js templates/macro.vm
Author: rmannibucau
Date: Thu Oct 31 06:35:37 2013
New Revision: 1537386
URL: http://svn.apache.org/r1537386
Log:
auto refreshing graphs
Modified:
incubator/sirona/trunk/reporting/src/main/resources/resources/js/sirona.js
incubator/sirona/trunk/reporting/src/main/resources/templates/macro.vm
Modified: incubator/sirona/trunk/reporting/src/main/resources/resources/js/sirona.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/resources/resources/js/sirona.js?rev=1537386&r1=1537385&r2=1537386&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/resources/resources/js/sirona.js (original)
+++ incubator/sirona/trunk/reporting/src/main/resources/resources/js/sirona.js Thu Oct 31 06:35:37 2013
@@ -14,38 +14,41 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-(function (Sirona, $) {
+(function (Sirona, $, undefined) {
+ var dayDuration = 24 * 3600 * 1000;
+
Sirona.extractTimeFromPicker = function (picker) {
return picker.data('datetimepicker').getLocalDate().getTime();
};
- Sirona.updateGraph = function (mapping, plugin, graph, start, end, options) {
+ Sirona.updateGraph = function (mapping, plugin, graph, start, end, options, complete, timeout) {
$.ajax({
url: mapping + "/" + plugin + "/" + graph + "/" + start + "/" + end,
type: "GET",
dataType: "json",
success: function (data) {
$.plot("#" + graph + "-graph", [ data ], options);
- }
+ },
+ complete: complete,
+ timeout: timeout
});
};
Sirona.initGraph = function(mapping, plugin, graph, options) {
- var now = new Date();
var yesterday = new Date();
- yesterday.setMinutes(now.getMinutes() - 10);
+ yesterday.setTime(yesterday.getTime() - dayDuration);
- var start = yesterday.getTime();
- var end = now.getTime();
+ var tomorrow = new Date();
+ tomorrow.setTime(tomorrow.getTime() + dayDuration);
- Sirona.updateGraph(mapping, plugin, graph, start, end, options);
+ $('#' + graph + '-datetimepicker-start').data('datetimepicker').setLocalDate(yesterday);
+ $('#' + graph + '-datetimepicker-end').data('datetimepicker').setLocalDate(tomorrow);
- $('#update-' + graph).submit(function (e) {
+ (function doUpdateGraph() {
Sirona.updateGraph(mapping, plugin, graph,
Sirona.extractTimeFromPicker($('#' + graph + '-datetimepicker-start')),
Sirona.extractTimeFromPicker($('#' + graph + '-datetimepicker-end')),
- options);
- return false;
- });
+ options, doUpdateGraph, 4000); // refresh interval = 4s
+ })();
};
}(window.Sirona = window.Sirona || {}, jQuery));
Modified: incubator/sirona/trunk/reporting/src/main/resources/templates/macro.vm
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/resources/templates/macro.vm?rev=1537386&r1=1537385&r2=1537386&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/resources/templates/macro.vm (original)
+++ incubator/sirona/trunk/reporting/src/main/resources/templates/macro.vm Thu Oct 31 06:35:37 2013
@@ -28,7 +28,7 @@
<form class="form-inline" id="update-$id" role="form">
#datePicker("From", "${id}-datetimepicker-start")
#datePicker("To", "${id}-datetimepicker-end")
- <button type="submit" class="btn btn-primary col-lg-12">Update</button>
+ #*<button type="submit" class="btn btn-primary col-lg-12">Update</button>*#
</form>
#end