Changeset 9644

Timestamp:

06/19/13 12:50:42 (11 years ago)

Author:

pfleck

Message:

#2063:
Fixed timezone bug in chart data.
Fixed zooming bug in jqplot dateAxisRenderer.
Reformatting.

Location:

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3

Files:

• App_Code/ChartHelper.cshtml (modified) (4 diffs)
• Controllers/ChartDataController.cs (modified) (1 diff)
• Scripts/jqPlot/plugins/jqplot.dateAxisRenderer.js (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/App_Code/ChartHelper.cshtml

@@ -53 +53 @@
                 xaxis: {
                     renderer: $.jqplot.DateAxisRenderer,
+                    pad: 0
                 },
                 yaxis: {
@@ -70 +71 @@
                 },
             },
+            gridPadding: { left: 50, right: 10 },
             cursor: {
                 show: true,
                 showTooltip: false,
                 zoom: true,
-                looseZoom: true,
                 clickReset: false,
                 dblClickReset: false,
@@ -81 +82 @@
         });
         
-        @(destinationTag)Plot.replot( {resetAxes:true} );
+        @(destinationTag)Plot.replot({ resetAxes: true });
         
         $('#@destinationTag').contextmenu(function() {
             @(destinationTag)Plot.resetZoom();
-            @(destinationTag)Plot.replot( {resetAxes: true} );
+            @(destinationTag)Plot.replot({ resetAxes: true });
             return false;
         });
         
         $(window).resize(function() {
-            @(destinationTag)Plot.replot( {resetAxes: true} );
+            @(destinationTag)Plot.replot({ resetAxes: true });
         });
     </script>
@@ -100 +101 @@
     @:        @(destinationTag)Plot.series[i].data = result[i];
     @:    }
-    @:    @(destinationTag)Plot.replot( {resetAxes: true} )
+    @:    @(destinationTag)Plot.replot({ resetAxes: true })
     @:}});
 }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ChartDataController.cs

@@ -93 +93 @@
       return selectors.Select(selector =>
         data.Select(x => new[] {
-          //timeSelector(x).ToString("yyyy-MM-dd HH:mm"),
-          timeSelector(x).ToUnixTimestamp(),
+          timeSelector(x).ToUniversalTime().ToUnixTimestamp(),
           selector(x)
         })

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Scripts/jqPlot/plugins/jqplot.dateAxisRenderer.js

@@ -340 +340 @@
         // ticks must be in order of increasing value.
         
-        min = ((this.min != null) ? new $.jsDate(this.min).getTime() : db.min);
-        max = ((this.max != null) ? new $.jsDate(this.max).getTime() : db.max);
+        min = new $.jsDate((this.min != null) ? this.min : db.min).getTime();
+        max = new $.jsDate((this.max != null) ? this.max : db.max).getTime();
 
         // see if we're zooming.  if we are, don't use the min and max we're given,
@@ -448 +448 @@
                 min = Math.floor(min/tempti) * tempti;
                 min = new $.jsDate(min);
-                min = min.getTime() + min.getUtcOffset();
+                min = min.getTime();
 
                 nttarget = Math.ceil((max - min) / tempti) + 1;