Fix malfunction in graph slider

merge-requests/1/head
charithag 9 years ago
parent e9f0527ccf
commit 26032a4aa2

@ -25,7 +25,7 @@
opacity: 0.5; opacity: 0.5;
white-space: nowrap; white-space: nowrap;
margin-left: 3px; margin-left: 3px;
bottom: -17px; bottom: -20px;
} }
/* annotations */ /* annotations */
@ -187,6 +187,11 @@
} }
.custom_slider { .custom_slider {
top: 20px; left: 40px;
}
.custom_x_axis {
position: relative;
left: 40px; left: 40px;
height: 30px;
} }

@ -142,6 +142,8 @@ $('body').on('click', '.btn-group button', function (e) {
}); });
function getDateTime(from, to) { function getDateTime(from, to) {
fromDate = from;
toDate = to;
startDate = new Date(from); startDate = new Date(from);
endDate = new Date(to); endDate = new Date(to);
DateRange = convertDate(startDate) + " " + configObject.separator + " " + convertDate(endDate); DateRange = convertDate(startDate) + " " + configObject.separator + " " + convertDate(endDate);
@ -292,7 +294,7 @@ function drawLineGraph(graphId, chartDataRaw) {
+ '" class="custom_y_axis"></div><div class="legend_container" id="legend_container' + '" class="custom_y_axis"></div><div class="legend_container" id="legend_container'
+ graphId + '"><div id="smoother' + graphId + '" title="Smoothing"></div><div class="legend" id="legend' + graphId + '"><div id="smoother' + graphId + '" title="Smoothing"></div><div class="legend" id="legend'
+ graphId + '"></div></div><div id="' + chartDiv + graphId + '"></div></div><div id="' + chartDiv
+ '" class="custom_rickshaw_graph"></div><div id="' + sliderDiv + '" class="custom_rickshaw_graph"></div><div class="custom_x_axis"></div><div id="' + sliderDiv
+ '" class="custom_slider"></div>'); + '" class="custom_slider"></div>');
var graphConfig = { var graphConfig = {
@ -379,7 +381,7 @@ function drawBarGraph(graphId, chartDataRaw) {
+ '" class="custom_y_axis"></div><div class="legend_container" id="legend_container' + '" class="custom_y_axis"></div><div class="legend_container" id="legend_container'
+ graphId + '"><div id="smoother' + graphId + '" title="Smoothing"></div><div class="legend" id="legend' + graphId + '"><div id="smoother' + graphId + '" title="Smoothing"></div><div class="legend" id="legend'
+ graphId + '"></div></div><div id="' + chartDiv + graphId + '"></div></div><div id="' + chartDiv
+ '" class="custom_rickshaw_graph"></div><div id="' + sliderDiv + '" class="custom_rickshaw_graph"></div><div class="custom_x_axis"></div><div id="' + sliderDiv
+ '" class="custom_slider"></div>'); + '" class="custom_slider"></div>');
var graphConfig = { var graphConfig = {

Loading…
Cancel
Save