[Mezuro] Added date selection form that reloads project result

Caio Salgado + Alessandro Palmeira · Paulo Meireles
1 parent 087a62e6
Showing 3 changed files with 25 additions and 23 deletions Show diff stats
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
plugins/mezuro/public/javascripts/project_content.js
plugins/mezuro/views/content_viewer/_project_result.rhtml
@@ -16,23 +16,12 @@ class MezuroPluginProfileController &lt; ProfileController
   end
   def project_result
-     
-    date = params[:date]
     content = profile.articles.find(params[:id])
     project_result = content.project_result
     project = content.project
-    
-    if date_verify(date)
-      client = Kalibro::Client::ProjectResultClient.new
-      if client.has_results_before(project.name, date)
-        project_result = client.last_result_before(project.name, date)
-      end
-    end
-    history = project_history project
-    
-    render :partial => 'content_viewer/project_result', :locals => { :project_result => project_result, :history => history }
-  end
+    render :partial => 'content_viewer/project_result', :locals => { :project_result => project_result}
+  end 	
   def module_result
     content = profile.articles.find(params[:id])
@@ -57,7 +46,6 @@ class MezuroPluginProfileController &lt; ProfileController
     @collector_name = params[:collector_name]
     @collector = Kalibro::Client::BaseToolClient.new.base_tool(@collector_name)
   end
-
   def new_metric_configuration
     metric_name = params[:metric_name]
     collector_name = params[:collector_name]
@@ -65,14 +53,12 @@ class MezuroPluginProfileController &lt; ProfileController
     @metric = collector.supported_metrics.find {|metric| metric.name == metric_name}
     @configuration_name = params[:configuration_name]
   end
-
   def edit_metric_configuration
     metric_name = params[:metric_name]
     @configuration_name = params[:configuration_name]
     @metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name)
     @metric = @metric_configuration.metric
   end
-
   def create_metric_configuration
     @configuration_name = params[:configuration_name]
     metric_configuration = new_metric_configuration_instance
@@ -86,7 +72,6 @@ class MezuroPluginProfileController &lt; ProfileController
     Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name)
     redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}"
   end
-
   def new_range
     @metric_name = params[:metric_name]
     @configuration_name = params[:configuration_name]
@@ -2,6 +2,7 @@ var processingTree = false;
 jQuery(function (){
   jQuery('.source-tree-link').live("click", reloadModule);
   jQuery('[data-show]').live("click", toggle_mezuro);
+  jQuery('#project_history_date').live("submit", reloadProjectWithDate);
   showLoadingProcess(true);
   showProjectContent();
 });
@@ -10,6 +11,11 @@ function showProjectContent() {
   callAction('project_state', {}, showProjectContentFor);
 }
+function reloadProjectWithDate(){
+	reloadProject();
+  return false;
+}
+
 function toggle_mezuro(){
   var element = jQuery(this).attr('data-show');
   jQuery(element).toggle();
@@ -25,11 +31,12 @@ function reloadModule(){
   return false;
 }
-function reloadProject(date){
+function reloadProject(){
   showLoadingProcess(true);
-  callAction('project_result', {date: date}, showProjectResult);
-  callAction('project_tree', {date: date}, showProjectTree);
-  callAction('module_result', {date: date}, showModuleResult);
+  
+  callAction('project_result', {}, showProjectResult);
+  callAction('project_tree', {}, showProjectTree);
+  callAction('module_result', {}, showModuleResult);
 }
 function showProjectContentFor(state){
@@ -37,7 +44,7 @@ function showProjectContentFor(state){
     callAction('project_error', {}, showProjectResult);
   else if (state == 'READY') {
     callAction('project_result', {}, showProjectResult);
-    callAction('project_tree', {}, showProjectTree);
+    //callAction('project_tree', {}, showProjectTree);
     var project_name = jQuery("#project-result").attr('data-project-name');
     callAction('module_result', {module_name: project_name}, showModuleResult);
   }
-Project history <%=select_tag "projectHistory",options_for_select(history), :onChange=>'reloadProject(this.value)'%>
+Project history
+
+<% form_for :project_date, :html=>{:id=>"project_history_date"} do |f| %>
+  <%= f.text_field :day, :size => 1, :maxlength => 2 %>
+  <%= f.text_field :month, :size => 1, :maxlength => 2  %>
+  <%= f.text_field :year, :size => 1, :maxlength => 4   %>
+  <p>
+    <%= f.submit "Save" %>
+  </p>
+<% end %>
+
 <h4><%= _('Result') %></h4>
1	-Project history <%=select_tag "projectHistory",options_for_select(history), :onChange=>'reloadProject(this.value)'%>	1	+Project history
		2	+
		3	+<% form_for :project_date, :html=>{:id=>"project_history_date"} do \|f\| %>
		4	+ <%= f.text_field :day, :size => 1, :maxlength => 2 %>
		5	+ <%= f.text_field :month, :size => 1, :maxlength => 2 %>
		6	+ <%= f.text_field :year, :size => 1, :maxlength => 4 %>
		7	+ <p>
		8	+ <%= f.submit "Save" %>
		9	+ </p>
		10	+<% end %>
		11	+
2		12
3	<h4><%= _('Result') %></h4>	13	<h4><%= _('Result') %></h4>
4		14