Brought up to date with master.

app/helpers/backend/products_helper.rb

@@ -3,7 +3,8 @@ module ProductsHelper
     # Show a chart with working time spent between different activities
     # It can accept :cobbler option to specify inclusion.
     def time_spent_by_activity(resource, options = {})
-      working_periods = InterventionWorkingPeriod.with_intervention_parameter(options[:as] || :tool, resource)
+      working_periods = InterventionWorkingPeriod.precise_working_periods(options[:as] || :tool, resource)
+
       working_periods = working_periods.of_campaign(current_campaign) if options[:current_campaign]
       return nil unless current_campaign && working_periods.any?
       stopped_at = working_periods.reorder(stopped_at: :desc).first.stopped_at.to_date

app/models/intervention_participation.rb

@@ -67,6 +67,8 @@ class InterventionParticipation < Ekylibre::Record::Base
     where(intervention_id: intervention)
   }
 
+  scope :of_actor, ->(actor) { where(product_id: actor.id) }
+
   before_save do
     if intervention.present?
       intervention.update_state(id => state)

app/models/intervention_working_period.rb

@@ -69,6 +69,14 @@ class InterventionWorkingPeriod < Ekylibre::Record::Base
     where(intervention_participation: intervention_participations)
   }
 
+  scope :without_participants_intervention, lambda { |role, object|
+    where.not(intervention_id: InterventionParticipation.of_actor(object).pluck(:intervention_id).compact)
+  }
+
+  scope :precise_working_periods, lambda{|role, object| 
+    where(id: (InterventionWorkingPeriod.with_intervention_parameter(role,object).without_participants_intervention(role,object).pluck(:id) + InterventionWorkingPeriod.of_intervention_participations(object.intervention_participations).pluck(:id)))
+  }
+
   scope :of_nature, lambda { |nature|
     where(nature: nature)
   }