From a851177bc6ed099536a57a9df08cdf603e84ce61 Mon Sep 17 00:00:00 2001 From: Diego Araújo + Pedro Leal Date: Thu, 26 Apr 2012 15:15:42 -0300 Subject: [PATCH] [Mezuro] Trying to solve some errors with the date --- plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb | 4 +--- plugins/mezuro/lib/kalibro/client/module_result_client.rb | 8 -------- plugins/mezuro/lib/mezuro_plugin/project_content.rb | 8 +++++--- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb index b97310b..4e066c4 100644 --- a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb +++ b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb @@ -26,8 +26,7 @@ class MezuroPluginProfileController < ProfileController def module_result content = profile.articles.find(params[:id]) date = params[:date] - project_result = date.nil? ? content.project_result : content.get_date_result(date) - module_result = content.module_result(params[:module_name]) + module_result = content.module_result(params[:module_name], date) render :partial => 'content_viewer/module_result', :locals => { :module_result => module_result} end @@ -35,7 +34,6 @@ class MezuroPluginProfileController < ProfileController content = profile.articles.find(params[:id]) date = params[:date] project_result = date.nil? ? content.project_result : content.get_date_result(date) - project_result = content.project_result source_tree = project_result.node_of(params[:module_name]) render :partial =>'content_viewer/source_tree', :locals => { :source_tree => source_tree, :project_name => content.project.name} end diff --git a/plugins/mezuro/lib/kalibro/client/module_result_client.rb b/plugins/mezuro/lib/kalibro/client/module_result_client.rb index 1b0cdd3..44a70a1 100644 --- a/plugins/mezuro/lib/kalibro/client/module_result_client.rb +++ b/plugins/mezuro/lib/kalibro/client/module_result_client.rb @@ -16,12 +16,4 @@ class Kalibro::Client::ModuleResultClient {:project_name => project_name, :module_name => module_name})[:module_result] Kalibro::Entities::Entity.new.to_entity_array(value, Kalibro::Entities::ModuleResult) end - - private - - def date_with_milliseconds(date) - milliseconds = "." + (date.sec_fraction * 60 * 60 * 24 * 1000).to_s - date.to_s[0..18] + milliseconds + date.to_s[19..-1] - end - end diff --git a/plugins/mezuro/lib/mezuro_plugin/project_content.rb b/plugins/mezuro/lib/mezuro_plugin/project_content.rb index 308eabf..71183cd 100644 --- a/plugins/mezuro/lib/mezuro_plugin/project_content.rb +++ b/plugins/mezuro/lib/mezuro_plugin/project_content.rb @@ -34,9 +34,11 @@ class MezuroPlugin::ProjectContent < Article @project_result ||= client.has_results_before(name, date) ? client.last_result_before(name, date) : client.first_result_after(name, date) end - def module_result(module_name) - module_name = project.name if module_name.nil? - @module_client ||= module_result_client.module_result(project.name, module_name, project_result.date) + def module_result(module_name, date) + module_name = project.name if module_name.nil? +#FIXME date format is wrong + date = project_result.date if date.nil? + @module_client ||= module_result_client.module_result(project.name, module_name, date) end def result_history(module_name) -- libgit2 0.21.2