Added tracker filtering

Author: theirix

app/helpers/timesheet_helper.rb

@@ -91,6 +91,13 @@ def group_options(timesheet)
     options_from_collection_for_select(available_groups, :id, :name, :selected =>timesheet.groups)
   end
 
+  def tracker_options(timesheet)
+    available_trackers = Tracker.all
+    selected_trackers = timesheet.trackers
+    selected_trackers = available_trackers.collect{|g| g.id} if selected_trackers.blank?
+    options_from_collection_for_select(available_trackers, :id, :name, :selected =>timesheet.trackers)
+  end
+
   def user_options(timesheet)
     available_users = Timesheet.viewable_users.sort { |a,b| a.to_s.downcase <=> b.to_s.downcase }
     selected_users = timesheet.users

app/models/timesheet.rb

@@ -1,5 +1,6 @@
 class Timesheet
-  attr_accessor :date_from, :date_to, :projects, :activities, :users, :groups, :allowed_projects, :period, :period_type
+  attr_accessor :date_from, :date_to, :projects, :activities, :users, :groups, :trackers,
+    :allowed_projects, :period, :period_type
 
   # Time entries on the Timesheet in the form of:
   #   project.name => {:logs => [time entries], :users => [users shown in logs] }
@@ -18,6 +19,7 @@ class Timesheet
     :user => 'User',
     :issue => 'Issue',
     :group => 'Group',
+    :tracker => 'Tracker',
     :date => 'Date'
   }
 
@@ -32,7 +34,8 @@ def initialize(options = { })
     self.potential_time_entry_ids = options[:potential_time_entry_ids] || [ ]
     self.allowed_projects = options[:allowed_projects] || [ ]
     self.groups = [ ]
-            
+    self.trackers = [ ]
+
     unless options[:activities].nil?
       self.activities = options[:activities].collect do |activity_id|
         # Include project-overridden activities
@@ -64,7 +67,16 @@ def initialize(options = { })
         self.groups= Group.all
       end
     end
-    
+
+    unless options[:trackers].nil?
+      self.trackers = options[:trackers].collect do |tracker_id|
+        tracker = Tracker.find(tracker_id)
+        tracker.id if tracker
+      end.flatten.uniq.compact
+    else
+      self.trackers =  Tracker.all.collect { |a| a.id.to_i }
+    end
+
     if !options[:sort].nil? && options[:sort].respond_to?(:to_sym) && ValidSortOptions.keys.include?(options[:sort].to_sym)
       self.sort = options[:sort].to_sym
     else
@@ -95,6 +107,8 @@ def fetch_time_entries
       fetch_time_entries_by_issue
     when :group
       fetch_time_entries_by_group
+    when :tracker
+      fetch_time_entries_by_tracker
     when :date
       fetch_time_entries_by_date
     else
@@ -201,6 +215,7 @@ def csv_header
       '#',
       l(:label_date),
       l(:label_member),
+      l(:label_tracker),
       l(:label_activity),
       l(:label_project),
       l(:label_version),
@@ -218,6 +233,7 @@ def time_entry_to_csv(time_entry)
       time_entry.id,
       time_entry.spent_on,
       time_entry.user.name,
+      time_entry.issue.tracker.name,
       time_entry.activity.name,
       time_entry.project,
       (time_entry.issue.fixed_version if time_entry.issue),
@@ -232,24 +248,26 @@ def time_entry_to_csv(time_entry)
 
   # Array of users to find
   # String of extra conditions to add onto the query (AND)
-  def conditions(users, extra_conditions=nil)
+  def conditions(users, trackers, extra_conditions=nil)
     if self.potential_time_entry_ids.empty?
       if self.date_from.present? && self.date_to.present?
-        conditions = ["spent_on >= (:from) AND spent_on <= (:to) AND #{TimeEntry.table_name}.project_id IN (:projects) AND user_id IN (:users) AND activity_id IN (:activities)",
+        conditions = ["spent_on >= (:from) AND spent_on <= (:to) AND #{TimeEntry.table_name}.project_id IN (:projects) AND user_id IN (:users) AND activity_id IN (:activities) AND tracker_id IN (:trackers)",
           {
             :from => self.date_from,
             :to => self.date_to,
             :projects => self.projects,
             :activities => self.activities,
             :groups => self.groups,
+            :trackers => trackers,
             :users => users
           }]
       else # All time
-        conditions = ["#{TimeEntry.table_name}.project_id IN (:projects) AND user_id IN (:users) AND activity_id IN (:activities)",
+        conditions = ["#{TimeEntry.table_name}.project_id IN (:projects) AND user_id IN (:users) AND activity_id IN (:activities) AND tracker_id IN (:trackers)",
           {
             :projects => self.projects,
             :activities => self.activities,
             :groups => self.groups,
+            :trackers => trackers,
             :users => users
           }]
       end
@@ -279,46 +297,65 @@ def includes
 
 
   def time_entries_for_all_users(project)
-    return project.time_entries.includes(self.includes).
-      where(self.conditions(self.users)).
+    return project.time_entries.includes(self.includes + [{:issue => [:tracker]}]).
+      joins(:issue).
+      where(self.conditions(self.users, self.trackers)).
       order('spent_on ASC')
   end
-  
+
   def time_entries_for_all_users_in_group(group)
-    return TimeEntry.includes(self.includes).
-      where(self.conditions(group.user_ids)).
+    return TimeEntry.includes(self.includes + [{:issue => [:tracker]}]).
+      joins(:issue).
+      where(self.conditions(group.user_ids, self.trackers)).
       order('spent_on ASC')
-  end 
-  
+  end
+
+  def time_entries_for_all_users_in_tracker(tracker)
+    return TimeEntry.includes(self.includes + [{:issue => [:tracker]}]).
+      joins(:issue).
+      where(self.conditions(self.users, tracker)).
+      order('spent_on ASC')
+  end
+
   def time_entries_for_current_user(project)
     return project.time_entries.
       includes(self.includes + [:activity, :user, {:issue => [:tracker, :assigned_to, :priority]}]).
-      where(self.conditions(User.current.id)).
+      joins(:issue).
+      where(self.conditions(User.current.id, self.trackers)).
+      order('spent_on ASC')
+  end
+
+  def time_entries_for_current_user_in_tracker(tracker)
+    return TimeEntry.includes(self.includes + [:activity, :user, {:issue => [:tracker, :assigned_to, :priority]}]).
+      joins(:issue).
+      where(self.conditions(User.current.id, tracker)).
       order('spent_on ASC')
   end
 
   def issue_time_entries_for_all_users(issue)
     return issue.time_entries.includes(self.includes + [:activity, :user]).
-      where(self.conditions(self.users)).
+      joins(:issue).
+      where(self.conditions(self.users, self.trackers)).
       order('spent_on ASC')
   end
 
   def issue_time_entries_for_current_user(issue)
     return issue.time_entries.includes(self.includes + [:activity, :user]).
-      where(self.conditions(User.current.id)).
+      joins(:issue).
+      where(self.conditions(User.current.id, self.trackers)).
       order('spent_on ASC')
   end
 
-  def time_entries_for_user(user, options={})
+  def time_entries_for_user(user, trackers, options={})
     extra_conditions = options.delete(:conditions)
 
     return TimeEntry.includes(self.includes).
-      where(self.conditions([user], extra_conditions)).
+      joins(:issue).
+      where(self.conditions([user], trackers, extra_conditions)).
       order('spent_on ASC')
   end
 
   def fetch_time_entries_by_project
-    puts self.projects
     self.projects.each do |project|
       logs = []
       users = []
@@ -372,20 +409,20 @@ def fetch_time_entries_by_group
       end
     end
   end
- 
+
   def fetch_time_entries_by_user
     self.users.each do |user_id|
       logs = []
       if User.current.admin?
         # Administrators can see all time entries
-        logs = time_entries_for_user(user_id)
+        logs = time_entries_for_user(user_id, self.trackers)
       elsif User.current.id == user_id
         # Users can see their own their time entries
-        logs = time_entries_for_user(user_id)
+        logs = time_entries_for_user(user_id, self.trackers)
       elsif User.current.allowed_to_on_single_potentially_archived_project?(:see_project_timesheets, nil, :global => true)
         # User can see project timesheets in at least once place, so
         # fetch the user timelogs for those projects
-        logs = time_entries_for_user(user_id, :conditions => Project.allowed_to_condition(User.current, :see_project_timesheets))
+        logs = time_entries_for_user(user_id, self.trackers, :conditions => Project.allowed_to_condition(User.current, :see_project_timesheets))
       else
         # Rest can see nothing
       end
@@ -397,7 +434,34 @@ def fetch_time_entries_by_user
     end
   end
 
-  
+
+  def fetch_time_entries_by_tracker
+    trackers = Tracker.where(:id => self.trackers)
+    trackers.each do |tracker|
+      logs = []
+      users = []
+      if User.current.admin?
+        # Administrators can see all time entries
+        logs = time_entries_for_all_users_in_tracker(tracker.id)
+      else
+        # Users with the Role and correct permission can see all time entries
+        logs1 = time_entries_for_all_users_in_tracker(tracker.id).select do |te|
+          project = Project.find(te.project_id)
+          User.current.allowed_to_on_single_potentially_archived_project?(:see_project_timesheets, project)
+        end
+        # Users with permission to see their time entries
+        logs2 = time_entries_for_current_user_in_tracker(tracker.id).select do |te|
+          project = Project.find(te.project_id)
+          User.current.allowed_to_on_single_potentially_archived_project?(:view_time_entries, project)
+        end
+        logs = logs1 + logs2
+      end
+      unless logs.empty?
+        users = logs.collect(&:user).uniq.sort
+        self.time_entries[tracker.name] = { :logs => logs, :users => users }
+      end
+    end
+  end
 
 
   #   project => { :users => [users shown in logs],
@@ -454,7 +518,7 @@ def fetch_time_entries_by_date
     logs = []
 
     #           extra_conditions = 'GROUP_BY spent_on'
-    logs=TimeEntry.includes(self.includes).where(self.conditions(self.users))
+    logs=TimeEntry.includes(self.includes).joins(:issue).where(self.conditions(self.users, self.trackers))
 
 
     unless logs.empty?

app/views/timesheet/_form.html.erb

@@ -44,6 +44,10 @@
           <%= select_tag 'timesheet[groups][]', group_options(@timesheet), { :multiple => true, :size => @list_size} %>
         </div>
       <% end %>
+      <div class="timesheet-trackers">
+        <label for="timesheet_trackers_" class="select-all"><%= l(:label_tracker_plural)%></label>
+        <%= select_tag 'timesheet[trackers][]', tracker_options(@timesheet), { :multiple => true, :size => @list_size} %>
+      </div>
       <%= call_hook(:plugin_timesheet_view_timesheet_form, { :timesheet => @timesheet, :params => params, :list_size => @list_size }) %>
       <div class="form-actions">
         <%= submit_tag l(:button_apply),:class => 'button-small' -%>

app/views/timesheet/_time_entry.html.erb

@@ -2,6 +2,7 @@
   <td align="center"><%= check_box_tag 'ids[]', time_entry.id, false, { :class => 'checkbox' } %></td>
   <td align="center"><%= format_date(time_entry.spent_on) %></td>
   <td align="center"><%= time_entry.user.name %></td>
+  <td align="center"><%= time_entry.issue.tracker.name %></td>
   <td align="center"><%= time_entry.activity.name %></td>
   <td align="center"><%= time_entry.project.name %></td>
   <td align="center"><%= time_entry.issue.fixed_version if time_entry.issue %></td>

app/views/timesheet/_timesheet_group.html.erb

@@ -7,8 +7,9 @@
     </th>
     <th width="8%"><%= l(:label_date) %></th>
     <th width="10%"><%= l(:label_member) %></th>
-    <th width="15%"><%= l(:label_activity) %></th>
-    <th width="15%"><%= l(:label_project) %></th>
+    <th width="10%"><%= l(:label_tracker) %></th>
+    <th width="10%"><%= l(:label_activity) %></th>
+    <th width="10%"><%= l(:label_project) %></th>
     <th width="15%"><%= l(:label_version) %></th>
     <th width="10%"><%= l(:label_issue) %></th>
     <th width="25%"><%= l(:field_comments) %></th>

app/views/timesheet/report.html.erb

@@ -23,9 +23,12 @@
       <% when :group %>
         <h3><%= h entryname -%> (<%= h number_with_precision(@total[entryname], :precision => @precision) %> <%= h(l(:field_hours)) -%>)</h3>
         <%= render :partial => 'timesheet_group', :locals => {:entry => entry, :name => entryname, :total => @total[entryname] } %>
+      <% when :tracker %>
+        <h3><%= h entryname -%> (<%= h number_with_precision(@total[entryname], :precision => @precision) %> <%= h(l(:field_hours)) -%>)</h3>
+        <%= render :partial => 'timesheet_group', :locals => {:entry => entry, :name => entryname, :total => @total[entryname] } %>
       <% when :date %>
         <%#*entry[:logs].each do |log|%>
-        <% logger.debug "#{'*'*100}\n ENTRYNAME > #{entryname.to_yaml} ENTRY #{entry[:logs][0].id}\n#{'*'*100}"%> 
+        <% logger.debug "#{'*'*100}\n ENTRYNAME > #{entryname.to_yaml} ENTRY #{entry[:logs][0].id}\n#{'*'*100}"%>
 
         <h3><%= toggle_issue_arrows_date(entryname) %><%= h entryname -%> (<%= h number_with_precision(@total[entryname], :precision => @precision) %> <%= h(l(:field_hours)) -%>)</h3>
 
@@ -35,7 +38,7 @@
         <%#*end%>
       <% else %>
         <%# Default to :project %>
-        <h3><%= h entryname -%> (<%= h number_with_precision(@total[entryname], :precision => @precision) %> <%= h(l(:field_hours)) -%>) <%= showing_users(entry[:users]) %></h3> 
+        <h3><%= h entryname -%> (<%= h number_with_precision(@total[entryname], :precision => @precision) %> <%= h(l(:field_hours)) -%>) <%= showing_users(entry[:users]) %></h3>
         <%= render :partial => 'timesheet_group', :locals => {:entry => entry, :name => entryname, :total => @total[entryname] } %>
       <% end
       end # each

assets/stylesheets/timesheet.css

@@ -24,7 +24,8 @@ div#timesheet-form p { padding:0px 10px; float:left; clear:none;}
 #timesheet-form .timesheet-projects select,
 #timesheet-form .timesheet-activities select,
 #timesheet-form .timesheet-users select,
-#timesheet-form .timesheet-groups select {
+#timesheet-form .timesheet-groups select,
+#timesheet-form .timesheet-trackers select {
 	height: 300px;
 	min-width: 200px;
 	border: 1px solid #ddd;