Download as
Browse Code »

Commit 06d09a45ec152093238bd0324cb2f7ff019baf0f

Authored by Diego Camarinha
Committed by Paulo Meireles
1 parent ad1a898d
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

[Mezuro] Changed the table for metric history

Showing 3 changed files with 17 additions and 21 deletions   Show diff stats
plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
  Diff comments   View file @06d09a4
... ... @@ -99,14 +99,6 @@ class MezuroPluginMyprofileController < ProfileController
99 99 redirect_to "/#{profile.identifier}/#{configuration_name.downcase.gsub(/\s/, '-')}"
100 100 end
101 101  
102   - def module_metrics_history
103   - metric_name = params[:metric_name]
104   - content = profile.articles.find(params[:id])
105   - module_history = content.result_history(params[:module_name])
106   - date_history = module_history.collect { |x| x.date }
107   - metric_history = module_history.collect { |x| (x.metric_results.select { |y| y.metric.name.delete("() ") == metric_name })[0] }
108   - render :partial => 'content_viewer/metric_history', :locals => {:metric_history => metric_history, :date_history => date_history }
109   - end
110 102 private
111 103  
112 104 def new_metric_configuration_instance
... ...
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
  Diff comments   View file @06d09a4
... ... @@ -40,5 +40,13 @@ class MezuroPluginProfileController < ProfileController
40 40 source_tree = project_result.node_of(params[:module_name])
41 41 render :partial =>'content_viewer/source_tree', :locals => { :source_tree => source_tree, :project_name => content.project.name}
42 42 end
43   -
  43 +
  44 + def module_metrics_history
  45 + metric_name = params[:metric_name]
  46 + content = profile.articles.find(params[:id])
  47 + module_history = content.result_history(params[:module_name])
  48 + date_history = module_history.collect { |x| x.date }
  49 + metric_history = module_history.collect { |x| (x.metric_results.select { |y| y.metric.name.delete("() ") == metric_name })[0] }
  50 + render :partial => 'content_viewer/metric_history', :locals => {:metric_history => metric_history, :date_history => date_history }
  51 + end
44 52 end
... ...
plugins/mezuro/views/content_viewer/_metric_history.rhtml
  Diff comments   View file @06d09a4
1 1 <table width="100%">
2   - <tr>
3   - <% date_history.each do |date| %>
4   - <td> <b> <%= date %> </b> </td>
5   - <% end %>
6   - </tr>
7   - <tr>
8   - <% metric_history.each do |metric_result| %>
9   - <td>
10   - <%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_result.value) %>
11   - </td>
12   - <% end %>
13   - </tr>
  2 + <% cont = 0 %>
  3 + <% date_history.each do |date| %>
  4 + <tr>
  5 + <td width="70%"> <b> <%= date %> </b> </td>
  6 + <td width="30%"> <%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_history[cont].value) %> </td>
  7 + </tr>
  8 + <% cont = cont + 1 %>
  9 + <% end %>
14 10 </table>
... ...