Download as
Browse Code »

Commit f9adf66a482072b48ba48b05692db21e2987d0c9

Authored by João M. M. da Silva + Rafael Manzo + Diego Araújo
Committed by João M. M. da Silva
1 parent 60e11e2c
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] Draft to insert the x axis on grade history charts.

Showing 2 changed files with 16 additions and 9 deletions   Show diff stats
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
  Diff comments   View file @f9adf66
@@ -90,15 +90,15 @@ class MezuroPluginProfileController < ProfileController @@ -90,15 +90,15 @@ class MezuroPluginProfileController < ProfileController
90 90
91 def filtering_metric_history(metric_name, module_history) 91 def filtering_metric_history(metric_name, module_history)
92 metrics_history = module_history.map do |module_result| 92 metrics_history = module_history.map do |module_result|
93 - module_result.metric_results 93 + [module_result.metric_results, module_result.date.to_s[0..9]]
94 end 94 end
95 - metric_history = metrics_history.map do |array_of_metric_result|  
96 - (array_of_metric_result.select do |metric_result| 95 + metric_history = metrics_history.map do |metric_results_with_date|
  96 + [(metric_results_with_date.first.select do |metric_result|
97 metric_result.metric.name.delete("() ") == metric_name 97 metric_result.metric.name.delete("() ") == metric_name
98 - end).first 98 + end).first, metric_results_with_date.last]
99 end 99 end
100 - metric_history.map do |metric_result|  
101 - metric_result.value 100 + metric_history.map do |metric_result_with_date|
  101 + [metric_result_with_date.first.value, metric_result_with_date.last]
102 end 102 end
103 end 103 end
104 104
plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
  Diff comments   View file @f9adf66
@@ -17,14 +17,21 @@ class MezuroPlugin::Helpers::ContentViewerHelper @@ -17,14 +17,21 @@ class MezuroPlugin::Helpers::ContentViewerHelper
17 formated_options 17 formated_options
18 end 18 end
19 19
20 - def self.generate_chart(values)  
21 - Gchart.line( 20 + def self.generate_chart(score_history)
  21 + values = []
  22 + labels = []
  23 + score_history.each do |score_data|
  24 + values << score_data.first
  25 + labels << score_data.last
  26 + end
  27 + Gchart.line(
22 :title_color => 'FF0000', 28 :title_color => 'FF0000',
23 :size => '600x180', 29 :size => '600x180',
24 :bg => {:color => 'efefef', :type => 'stripes'}, 30 :bg => {:color => 'efefef', :type => 'stripes'},
25 :line_colors => 'c4a000', 31 :line_colors => 'c4a000',
26 :data => values, 32 :data => values,
27 - :axis_with_labels => 'y', 33 + :labels => labels,
  34 + :axis_with_labels => ['y','x'],
28 :max_value => values.max, 35 :max_value => values.max,
29 :min_value => values.min 36 :min_value => values.min
30 ) 37 )