New Ticket     Tickets     Wiki     Browse Source     Timeline     Roadmap     Ticket Reports     Search

Changeset 82854


Ignore:
Timestamp:
08/20/11 20:09:55 (4 years ago)
Author:
derek@…
Message:

Chart drawing code was moved to partial _chart_draw.html.erb. Render the partial

Location:
branches/gsoc11-statistics/stats-server/app/views
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/gsoc11-statistics/stats-server/app/views/os_statistics/index.html.erb

    r82830 r82854  
    3535<br /> 
    3636 
    37 <% ordered_charts.each do |chart| %> 
    38   <% title = controller.chart_title chart %> 
    39   <%# Set visualization options %> 
    40   <% vis_options = {:width => 600, :height => 400, :html => {:class => "graph_chart"}} %> 
    41   <% vis_options[:title] = title %> 
    42    
    43   <%# Set table options %> 
    44   <% table_options = {:width => 600, :html => {:class => "graph_chart"}} %> 
    45   <% table_options[:title] = title %> 
    46    
    47   <% type = controller.chart_type chart %> 
    48    
    49   <%# Anchor %> 
    50   <a name=<%= chart %>> </a> 
    51   <%# Title %> 
    52   <h2> <%= title %> </h2> 
    53    
    54    
    55   <% if not controller.dataset_empty? chart %> 
    56     <%# Draw visualization %> 
    57     <% visualization chart, type, vis_options do |visualization| %> 
    58       <% controller.populate_chart chart, visualization %> 
    59     <% end %> 
    60      
    61     <%# Draw table %> 
    62     <% table = chart.to_s + "_table" %> 
    63     <% visualization table, "Table", table_options do |visualization| %> 
    64       <% controller.populate_chart chart, visualization %> 
    65     <% end %> 
    66   <% else %> 
    67     No data to display 
    68   <% end %> 
    69    
    70    
    71 <% end %> 
     37<%# Draw charts %> 
     38<%= render :partial => '/partials/chart_draw', :locals => {:charts => ordered_charts} %>   %> 
    7239 
    7340<br /> 

  • branches/gsoc11-statistics/stats-server/app/views/ports/show.html.erb

    r82828 r82854  
    6565 
    6666  <%# Draw charts %> 
    67   <% ordered_charts.each do |chart| %> 
    68     <% title = controller.chart_title chart %> 
    69     <%# Set visualization options %> 
    70     <% vis_options = {:width => 600, :height => 400, :html => {:class => "graph_chart"}} %> 
    71     <% vis_options[:title] = title %> 
    72  
    73     <%# Set table options %> 
    74     <% table_options = {:width => 600, :html => {:class => "graph_chart"}} %> 
    75     <% table_options[:title] = title %> 
    76      
    77     <% type = controller.chart_type chart %> 
    78  
    79     <%# Anchor %> 
    80     <a name=<%= chart %>> </a> 
    81     <%# Title %> 
    82     <h2> <%= title %> </h2> 
    83     
    84    
    85     <% if not controller.dataset_empty? chart %> 
    86       <%# Draw visualization %> 
    87       <% visualization chart, type, vis_options do |visualization| %> 
    88         <% controller.populate_chart chart, visualization %> 
    89       <% end %> 
    90        
    91       <%# Draw table %> 
    92       <% table = chart.to_s + "_table" %> 
    93       <% visualization table, "Table", table_options do |visualization| %> 
    94         <% controller.populate_chart chart, visualization %> 
    95       <% end %> 
    96        
    97     <% else %> 
    98       No data to display 
    99     <% end %>   
    100   <% end %> 
     67  <%= render :partial => '/partials/chart_draw', :locals => {:charts => ordered_charts} %>   %> 
    10168 
    10269  <table border=1> 
Note: See TracChangeset for help on using the changeset viewer.