0
@@ -8,6 +8,7 @@ class TimesheetController < ApplicationController
0
   helper :sort
0
   include SortHelper
0
   helper :issues
0
+  include ApplicationHelper
0
 
0
   def index
0
     @from = Date.today.to_s
0
@@ -43,6 +44,8 @@ class TimesheetController < ApplicationController
0
       @timesheet.projects = @timesheet.allowed_projects
0
     end
0
 
0
+    call_hook(:plugin_timesheet_controller_report_pre_fetch_time_entries, { :timesheet => @timesheet, :params => params })
0
+
0
     @timesheet.fetch_time_entries
0
 
0
     # Sums

0
@@ -64,22 +64,31 @@ class Timesheet
0
     end
0
   end
0
   
0
+  protected
0
+
0
+  def conditions(users)
0
+    conditions = ['spent_on >= (?) AND spent_on <= (?) AND activity_id IN (?) AND user_id IN (?)',
0
+                  self.date_from, self.date_to, self.activities, users ]
0
+
0
+    Redmine::Hook.call_hook(:plugin_timesheet_model_timesheet_conditions, { :timesheet => self, :conditions => conditions})
0
+    return conditions
0
+  end
0
+
0
   private
0
 
0
   
0
   def time_entries_for_all_users(project)
0
     return project.time_entries.find(:all,
0
-                                     :conditions => ['spent_on >= (?) AND spent_on <= (?) AND activity_id IN (?) AND user_id IN (?)',
0
-                                                     self.date_from, self.date_to, self.activities, self.users ],
0
+                                     :conditions => self.conditions(self.users),
0
                                      :include => [:activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
0
                                      :order => "spent_on ASC")
0
   end
0
   
0
   def time_entries_for_current_user(project)
0
     return project.time_entries.find(:all,
0
-                                     :conditions => ['spent_on >= (?) AND spent_on <= (?) AND activity_id IN (?) AND user_id = (?)',
0
-                                                     self.date_from, self.date_to, self.activities, User.current.id ],
0
+                                     :conditions => self.conditions(User.current.id),
0
                                      :include => [:activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
0
                                      :order => "spent_on ASC")
0
   end
0
+  
0
 end