Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/19/13 15:29:37 (12 years ago)
Author:
pfleck
Message:

#2063:
Changed year in headers from 2012 to 2013.
Minor reformattings in chart helpers.
Refactored and simplified some statistics generator methods.

Location:
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3
Files:
13 edited

Legend:

Unmodified
Added
Removed

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

    r9644 r9646  
    11@* HeuristicLab
    2  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     2 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    33 *
    44 * This file is part of HeuristicLab.
    … …  
    3535}
    3636
    37 @helper LineChartTime(string destinationTag, string url, string title = "",
    38     double? minY = null, double? maxY = null, string axisYFormat = null) {
    39        
     37@helper LineChartTime(string destinationTag, string url, string title = "", double? minY = null, double? maxY = null, string axisYFormat = null) {
    4038    <script>
    4139        var @(destinationTag)Plot = $.jqplot("@destinationTag", "@url", {
    … …  
    4644            },
    4745            seriesDefaults: {
    48                 markerOptions: { show: false },
    49                 //fill: true
     46                markerOptions: { show: false }
    5047            },
    5148            dataRenderer: ajaxDataRenderer,
    … …  
    9794
    9895@helper RefreshChart(string destinationTag, string url, string startDateVar, string endDateVar) {
    99     @:$.ajax({url: "@(new HtmlString(url))?start=" + @startDateVar + "&end=" + @endDateVar, datatype: "json", success: function(result) {
    100     @:    for (var i = 0; i < result.length; i++) {
    101     @:        @(destinationTag)Plot.series[i].data = result[i];
    102     @:    }
    103     @:    @(destinationTag)Plot.replot({ resetAxes: true })
    104     @:}});
     96    <text>
     97    $.ajax({url: "@(new HtmlString(url))?start=" + @startDateVar + "&end=" + @endDateVar, datatype: "json", success: function(result) {
     98        for (var i = 0; i < result.length; i++) {
     99            @(destinationTag)Plot.series[i].data = result[i];
     100        }
     101        @(destinationTag)Plot.replot({ resetAxes: true })
     102    }});
     103    </text>
    105104}

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/App_Start/BundleConfig.cs

    r9625 r9646  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/App_Start/FilterConfig.cs

    r9625 r9646  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/App_Start/RouteConfig.cs

    r9625 r9646  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Content/Site.css

    r9625 r9646  
    7575
    7676#login a:hover {
    77   color: #333;
     77  color: gray;
    7878}
    7979
    … …  
    163163  margin: 1em 0;
    164164  padding: 1em;
     165  padding-top: 0;
    165166  border: 1px solid #CCC;
    166167}

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

    r9604 r9646  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

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

    r9644 r9646  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

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

    r9628 r9646  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Global.asax.cs

    r9604 r9646  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Helper/HtmMenulHelper.cs

    r9604 r9646  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Models/AccountModels.cs

    r9604 r9646  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Properties/AssemblyInfo.cs.frame

    r9604 r9646  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3232[assembly: AssemblyCompany("")]
    3333[assembly: AssemblyProduct("HeuristicLab")]
    34 [assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2013 HEAL")]
    3535[assembly: AssemblyTrademark("")]
    3636[assembly: AssemblyCulture("")]

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

    r9643 r9646  
    111111            var startDate = $('#Start').val();
    112112            var endDate = $('#End').val();
    113            
    114                         @*
    115             var url = "@Url.Action("AverageCpuUtilization", "ChartData")?start=" + startDate + "&end" + endDate;
    116            
    117             @ChartHelper.LineChartTime(
    118                 "AverageCpuUtilization",
    119                 "url",
    120                 title: "Avg. CPU Utilization History of all Slaves",
    121                 axisYFormat: "%.2f%%",
    122                 minY: 0, maxY: 100)
    123             *@
    124113
    125114            @ChartHelper.RefreshChart("AverageCpuUtilization", Url.Action("AverageCpuUtilization", "ChartData"), "startDate", "endDate")
Note: See TracChangeset for help on using the changeset viewer.