[PATCH] added to_a to chart_dataset, simplified chart view logic

Jan Provaznik jprovazn at redhat.com
Wed Jul 25 08:00:04 UTC 2012


On 07/24/2012 05:07 PM, Tzu-Mainn Chen wrote:
> ---
>   src/app/util/chart_datasets.rb             |   12 +++++++++++-
>   src/app/views/charts/_time_chart.html.haml |    7 +------
>   src/app/views/logs/_pretty_view.html.haml  |    2 +-
>   src/app/views/providers/index.html.haml    |    2 +-
>   4 files changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/src/app/util/chart_datasets.rb b/src/app/util/chart_datasets.rb
> index 3e9d3e6..43bf705 100644
> --- a/src/app/util/chart_datasets.rb
> +++ b/src/app/util/chart_datasets.rb
> @@ -15,7 +15,6 @@
>   #
>
>   class ChartDatasets
> -  attr_accessor :data
>
>     def initialize(from_date, to_date)
>       @data = Hash.new
> @@ -56,4 +55,15 @@ class ChartDatasets
>       @data[label] << [timestamp, @counts[label]]
>     end
>
> +  def to_a
> +    return @data.to_a.sort{ |a,b|
> +      if a[0] == "All"
> +        -1
> +      elsif b[0] == "All"
> +        1
> +      else
> +        a[0] <=> b[0]
> +      end
> +    }
> +  end
>   end
> diff --git a/src/app/views/charts/_time_chart.html.haml b/src/app/views/charts/_time_chart.html.haml
> index c1db5fb..ea61244 100644
> --- a/src/app/views/charts/_time_chart.html.haml
> +++ b/src/app/views/charts/_time_chart.html.haml
> @@ -3,12 +3,7 @@
>   :javascript
>     $(function () {
>       var datasets = [
> -      #{ datasets.reject{|label,data| label != "All"}.each.map{ |label,data| "{
> -        label: \"" + label + "\",
> -        data: [#{ data.each.map{ |p| "[#{p[0]}, #{p[1]}]"}.join(", ") }]
> -      },
> -      "} }
> -      #{ datasets.reject{|label,data| label == "All"}.each.map{ |label,data| "{
> +      #{ datasets.each.map{ |label,data| "{
>           label: \"" + label + "\",
>           data: [#{ data.each.map{ |p| "[#{p[0]}, #{p[1]}]"}.join(", ") }]
>         }" }.join(",
> diff --git a/src/app/views/logs/_pretty_view.html.haml b/src/app/views/logs/_pretty_view.html.haml
> index ac8d223..16ca064 100644
> --- a/src/app/views/logs/_pretty_view.html.haml
> +++ b/src/app/views/logs/_pretty_view.html.haml
> @@ -14,4 +14,4 @@
>           = restful_submit_tag t("filter_table.apply_filters"), "index", filter_logs_path, 'POST', :class => 'button', :id => 'apply_logs_filter'
>   %br
>
> -= render :partial => 'charts/time_chart', :locals => { :datasets => @datasets.data, :from_date => @from_date, :to_date => @to_date, :name => 'log-history-graph' }
> += render :partial => 'charts/time_chart', :locals => { :datasets => @datasets.to_a, :from_date => @from_date, :to_date => @to_date, :name => 'log-history-graph' }
> diff --git a/src/app/views/providers/index.html.haml b/src/app/views/providers/index.html.haml
> index 7ea0da6..be644b0 100644
> --- a/src/app/views/providers/index.html.haml
> +++ b/src/app/views/providers/index.html.haml
> @@ -46,4 +46,4 @@
>     %header
>       %h2.activity #{t'activity.activity'}
>     .content
> -    = render :partial => 'charts/time_chart', :locals => { :datasets => @datasets.data, :from_date => @from_date, :to_date => @to_date, :name => 'provider-history-graph' }
> +    = render :partial => 'charts/time_chart', :locals => { :datasets => @datasets.to_a, :from_date => @from_date, :to_date => @to_date, :name => 'provider-history-graph' }
>

ACK




More information about the aeolus-devel mailing list