Download as
Browse Code »

Commit 06d09a45ec152093238bd0324cb2f7ff019baf0f

Authored by Diego Camarinha
Committed by Paulo Meireles
1 parent ad1a898d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

[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,14 +99,6 @@ class MezuroPluginMyprofileController < ProfileController
99 redirect_to "/#{profile.identifier}/#{configuration_name.downcase.gsub(/\s/, '-')}" 99 redirect_to "/#{profile.identifier}/#{configuration_name.downcase.gsub(/\s/, '-')}"
100 end 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 private 102 private
111 103
112 def new_metric_configuration_instance 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,5 +40,13 @@ class MezuroPluginProfileController < ProfileController
40 source_tree = project_result.node_of(params[:module_name]) 40 source_tree = project_result.node_of(params[:module_name])
41 render :partial =>'content_viewer/source_tree', :locals => { :source_tree => source_tree, :project_name => content.project.name} 41 render :partial =>'content_viewer/source_tree', :locals => { :source_tree => source_tree, :project_name => content.project.name}
42 end 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 end 52 end
plugins/mezuro/views/content_viewer/_metric_history.rhtml
  Diff comments   View file @06d09a4
1 <table width="100%"> 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 </table> 10 </table>