Download as
Browse Code »

Commit e67c922df0692ef31a809d06f5ff26d0729ab038

Authored by Rafael Manzo
1 parent 07f196bf
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

[Mezuro] Fixed metric result view

Showing 2 changed files with 13 additions and 9 deletions   Show diff stats
plugins/mezuro/controllers/profile/mezuro_plugin_module_result_controller.rb
  Diff comments   View file @e67c922
@@ -7,7 +7,7 @@ class MezuroPluginModuleResultController < MezuroPluginProfileController @@ -7,7 +7,7 @@ class MezuroPluginModuleResultController < MezuroPluginProfileController
7 @metric_results = Kalibro::MetricResult.metric_results_of(@module_result.id) 7 @metric_results = Kalibro::MetricResult.metric_results_of(@module_result.id)
8 render :partial => 'module_result' 8 render :partial => 'module_result'
9 end 9 end
10 - 10 +
11 def metric_result_history 11 def metric_result_history
12 @history = Kalibro::MetricResult.history_of(params[:metric_name], params[:module_result_id].to_i) 12 @history = Kalibro::MetricResult.history_of(params[:metric_name], params[:module_result_id].to_i)
13 render :partial => 'score_history' 13 render :partial => 'score_history'
plugins/mezuro/views/mezuro_plugin_module_result/_metric_results.rhtml
  Diff comments   View file @e67c922
@@ -9,28 +9,32 @@ @@ -9,28 +9,32 @@
9 <tbody> 9 <tbody>
10 <% @metric_results.each do |metric_result| %> 10 <% @metric_results.each do |metric_result| %>
11 <% metric_configuration_snapshot = metric_result.metric_configuration_snapshot%> 11 <% metric_configuration_snapshot = metric_result.metric_configuration_snapshot%>
12 - <% range_snapshot = metric_configuration_snapshot.range_snapshot %> 12 + <% range_snapshots = metric_configuration_snapshot.range_snapshot %>
13 <% formatted_name = MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_configuration_snapshot) %> 13 <% formatted_name = MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_configuration_snapshot) %>
14 - <% if !range_snapshot.nil? %> 14 + <% if !range_snapshots.nil? %>
15 <tr> 15 <tr>
16 <td style="width: 74%"><a href="#" show-metric-history="<%= formatted_name %>" data-module-id="<%= @module_result_id %>"><%= metric_configuration_snapshot.metric.name %></a></td> 16 <td style="width: 74%"><a href="#" show-metric-history="<%= formatted_name %>" data-module-id="<%= @module_result_id %>"><%= metric_configuration_snapshot.metric.name %></a></td>
17 <td><%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_result.value) %></td> 17 <td><%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_result.value) %></td>
18 <td><%= metric_configuration_snapshot.weight %></td> 18 <td><%= metric_configuration_snapshot.weight %></td>
19 - <td style="background-color: #<%= range_snapshot.color %>">  
20 - <span title="<%= range_snapshot.comments %>" >  
21 - <%= range_snapshot.label %> 19 + <% range_snapshots.each do |range_snapshot| %>
  20 + <% if range_snapshot[:beginning].to_f <= metric_result.value and range_snapshot[:end].to_f > metric_result.value %>
  21 + <td style="background-color: #<%= range_snapshot[:color] %>">
  22 + <span title="<%= range_snapshot[:comments] %>" >
  23 + <%= range_snapshot[:label] %>
22 </span> 24 </span>
23 </td> 25 </td>
24 - </tr> 26 + </tr>
25 <tr class="<%= formatted_name %>" style="display: none;"> 27 <tr class="<%= formatted_name %>" style="display: none;">
26 <td colspan="3"> 28 <td colspan="3">
27 <div id='historical-<%= formatted_name %>'> 29 <div id='historical-<%= formatted_name %>'>
28 </div> 30 </div>
29 </td> 31 </td>
30 <td align="right"> 32 <td align="right">
31 - <%= range_snapshot.comments.nil? ? '' : range_snapshot.comments %>  
32 - </td> 33 + <%= range_snapshot[:comments].nil? ? '' : range_snapshot[:comments] %>
  34 + </td>
33 </tr> 35 </tr>
  36 + <% end %>
  37 + <% end %>
34 <% end %> 38 <% end %>
35 <% end %> 39 <% end %>
36 </tbody> 40 </tbody>