Changeset 9662

Timestamp:

06/27/13 15:32:49 (10 years ago)

Author:

pfleck

Message:

#2063:
Rearranged axis options in jqplot charts.
Renamed selectors into seriesSelectors in CreateSeriesData.
Changed default date range on index page.

Location:

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

Files:

• App_Code/ChartHelper.cshtml (modified) (2 diffs)
• Controllers/ChartDataController.cs (modified) (3 diffs)
• Views/Home/Index.cshtml (modified) (1 diff)

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

@@ -53 +53 @@
                 },
                 yaxis: {
+                    @if (axisYFormat != null) {<text>
                     tickOptions: {
-                        @if (axisYFormat != null) { 
-                            @:formatString: "@axisYFormat",
-                        }
+                        formatString: "@axisYFormat",
                     },
+                    </text>}
+                    autoscale: true,
+                    pad: 0,
                     @if (minY != null) {
                         @:min: @minY,
@@ -64 +66 @@
                         @:max: @maxY,
                     }
-                    pad: 0,
-                    autoscale: true
                 },
             },

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

@@ -84 +84 @@
 
       return from ci in db.FactClientInfos
-             where ci.Time > start && ci.Time < end
+             where ci.Time >= start && ci.Time < end
              group ci by ci.Time into timeGroup
              orderby timeGroup.Key
@@ -90 +90 @@
     }
 
-    private static IEnumerable<IEnumerable<object[]>> CreateSeriesData<T>(IEnumerable<T> data, Func<T, DateTime> timeSelector, params Func<T, object>[] selectors) {
-      return selectors.Select(selector =>
+    private static IEnumerable<IEnumerable<object[]>> CreateSeriesData<T>(IEnumerable<T> data, Func<T, DateTime> timeSelector, params Func<T, object>[] seriesSelectors) {
+      return seriesSelectors.Select(selector =>
         data.Select(x => new[] {
           timeSelector(x).ToUniversalTime().ToUnixTimestamp(),
@@ -101 +101 @@
 
   public static class DateTimeExtensions {
-    public static long ToUnixTimestamp(this DateTime d) {
-      var duration = d - new DateTime(1970, 1, 1, 0, 0, 0);
+    public static long ToUnixTimestamp(this DateTime dateTime) {
+      var duration = dateTime - new DateTime(1970, 1, 1, 0, 0, 0);
 
       return (long)duration.TotalMilliseconds;

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/Home/Index.cshtml

@@ -45 +45 @@
             <li>End</li>
             <li>
-                @Html.TextBox("End", DateTime.Now.ToString("yyyy-MM-dd"), new { @class = "date" })
+                @Html.TextBox("End", (DateTime.Now + new TimeSpan(1, 0, 0, 0)).ToString("yyyy-MM-dd"), new { @class = "date" })
             </li>
         </ol>