##// END OF EJS Templates
Change the TimelogController's to/from dates based on the project time entries...
Change the TimelogController's to/from dates based on the project time entries Instead of looking for the earliest and latest time entry system wide for the dates in the form, now TimelogController will only look at the time entries for the current project (and parent/sub projects). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4087 e93f8b46-1217-0410-a6f0-8f06a7374b81

File last commit:

r3973:cdfc57d5442f
r3973:cdfc57d5442f
Show More
timelog_controller.rb
324 lines | 14.0 KiB | text/x-ruby | RubyLexer
/ app / controllers / timelog_controller.rb
Jean-Philippe Lang
Added time report....
r569 # redMine - project management software
# Copyright (C) 2006-2007 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 class TimelogController < ApplicationController
Jean-Philippe Lang
Highlight the current item of the main menu....
r1062 menu_item :issues
Jean-Philippe Lang
Adds cross-project time reports support (#994)....
r1777 before_filter :find_project, :authorize, :only => [:edit, :destroy]
before_filter :find_optional_project, :only => [:report, :details]
Eric Davis
Refactor: extract @available_criterias to utility method....
r3711 before_filter :load_available_criterias, :only => [:report]
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365
Jean-Philippe Lang
Adds 2 permissions (closes #859):...
r1235 verify :method => :post, :only => :destroy, :redirect_to => { :action => :details }
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 helper :sort
include SortHelper
Jean-Philippe Lang
Performance improvement on calendar and gantt (about 45% on gantt for large number of issues)....
r783 helper :issues
Jean-Philippe Lang
Adds date range filter and pagination on time entries detail view (closes #434)....
r1159 include TimelogHelper
Jean-Philippe Lang
Custom fields (list and boolean) can be used as criteria in time report (#1012)....
r1325 helper :custom_fields
include CustomFieldsHelper
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365
Jean-Philippe Lang
Added time report....
r569 def report
@criterias = params[:criterias] || []
@criterias = @criterias.select{|criteria| @available_criterias.has_key? criteria}
@criterias.uniq!
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 @criterias = @criterias[0,3]
Jean-Philippe Lang
Added time report....
r569
Jean-Philippe Lang
Various timelog report enhancements:...
r1311 @columns = (params[:columns] && %w(year month week day).include?(params[:columns])) ? params[:columns] : 'month'
Jean-Philippe Lang
Added time report....
r569
Jean-Philippe Lang
Add predefined date ranges to the time report in the same way as the details view (closes #972). It nows defaults to 'All time'....
r1303 retrieve_date_range
Jean-Philippe Lang
Added time report....
r569
unless @criterias.empty?
sql_select = @criterias.collect{|criteria| @available_criterias[criteria][:sql] + " AS " + criteria}.join(', ')
sql_group_by = @criterias.collect{|criteria| @available_criterias[criteria][:sql]}.join(', ')
Jean-Philippe Lang
Makes timelog report work at issue level (#2935)....
r2779 sql_condition = ''
Jean-Philippe Lang
Added time report....
r569
Jean-Philippe Lang
Makes timelog report work at issue level (#2935)....
r2779 if @project.nil?
sql_condition = Project.allowed_to_condition(User.current, :view_time_entries)
elsif @issue.nil?
sql_condition = @project.project_condition(Setting.display_subprojects_issues?)
else
Jean-Philippe Lang
Adds subtasking (#443) including:...
r3459 sql_condition = "#{Issue.table_name}.root_id = #{@issue.root_id} AND #{Issue.table_name}.lft >= #{@issue.lft} AND #{Issue.table_name}.rgt <= #{@issue.rgt}"
Jean-Philippe Lang
Makes timelog report work at issue level (#2935)....
r2779 end
Jean-Philippe Lang
Various timelog report enhancements:...
r1311 sql = "SELECT #{sql_select}, tyear, tmonth, tweek, spent_on, SUM(hours) AS hours"
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 sql << " FROM #{TimeEntry.table_name}"
Eric Davis
Refactor TimelogController#report's joins and provide a hook to add more....
r3817 sql << time_report_joins
Jean-Philippe Lang
Adds cross-project time reports support (#994)....
r1777 sql << " WHERE"
Jean-Philippe Lang
Makes timelog report work at issue level (#2935)....
r2779 sql << " (%s) AND" % sql_condition
Jean-Philippe Lang
Fixed: first day of date range is not included in time report with SQLite (#3112)....
r2895 sql << " (spent_on BETWEEN '%s' AND '%s')" % [ActiveRecord::Base.connection.quoted_date(@from), ActiveRecord::Base.connection.quoted_date(@to)]
Jean-Philippe Lang
Various timelog report enhancements:...
r1311 sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek, spent_on"
Jean-Philippe Lang
Added time report....
r569
@hours = ActiveRecord::Base.connection.select_all(sql)
@hours.each do |row|
case @columns
when 'year'
row['year'] = row['tyear']
when 'month'
row['month'] = "#{row['tyear']}-#{row['tmonth']}"
when 'week'
row['week'] = "#{row['tyear']}-#{row['tweek']}"
Jean-Philippe Lang
Various timelog report enhancements:...
r1311 when 'day'
row['day'] = "#{row['spent_on']}"
Jean-Philippe Lang
Added time report....
r569 end
end
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162
@total_hours = @hours.inject(0) {|s,k| s = s + k['hours'].to_f}
Jean-Philippe Lang
Add predefined date ranges to the time report in the same way as the details view (closes #972). It nows defaults to 'All time'....
r1303
@periods = []
# Date#at_beginning_of_ not supported in Rails 1.2.x
date_from = @from.to_time
# 100 columns max
while date_from <= @to.to_time && @periods.length < 100
case @columns
when 'year'
@periods << "#{date_from.year}"
date_from = (date_from + 1.year).at_beginning_of_year
when 'month'
@periods << "#{date_from.year}-#{date_from.month}"
date_from = (date_from + 1.month).at_beginning_of_month
when 'week'
@periods << "#{date_from.year}-#{date_from.to_date.cweek}"
date_from = (date_from + 7.day).at_beginning_of_week
Jean-Philippe Lang
Various timelog report enhancements:...
r1311 when 'day'
@periods << "#{date_from.to_date}"
date_from = date_from + 1.day
Jean-Philippe Lang
Add predefined date ranges to the time report in the same way as the details view (closes #972). It nows defaults to 'All time'....
r1303 end
Jean-Philippe Lang
Added time report....
r569 end
end
Jean-Philippe Lang
CSV export added to timelog report (#1009)....
r1323 respond_to do |format|
format.html { render :layout => !request.xhr? }
Jean-Philippe Lang
Use FasterCSV or ruby1.9 CSV instead of ruby1.8 builtin CSV....
r2893 format.csv { send_data(report_to_csv(@criterias, @periods, @hours), :type => 'text/csv; header=present', :filename => 'timelog.csv') }
Jean-Philippe Lang
CSV export added to timelog report (#1009)....
r1323 end
Jean-Philippe Lang
Added time report....
r569 end
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 def details
sort_init 'spent_on', 'desc'
Jean-Philippe Lang
Validates sort_key and sort_order params (#2378)....
r2169 sort_update 'spent_on' => 'spent_on',
'user' => 'user_id',
'activity' => 'activity_id',
'project' => "#{Project.table_name}.name",
'issue' => 'issue_id',
'hours' => 'hours'
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 cond = ARCondition.new
Jean-Philippe Lang
Adds cross-project time reports support (#994)....
r1777 if @project.nil?
cond << Project.allowed_to_condition(User.current, :view_time_entries)
elsif @issue.nil?
cond << @project.project_condition(Setting.display_subprojects_issues?)
else
Jean-Philippe Lang
Adds subtasking (#443) including:...
r3459 cond << "#{Issue.table_name}.root_id = #{@issue.root_id} AND #{Issue.table_name}.lft >= #{@issue.lft} AND #{Issue.table_name}.rgt <= #{@issue.rgt}"
Jean-Philippe Lang
Adds cross-project time reports support (#994)....
r1777 end
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162
Jean-Philippe Lang
Add predefined date ranges to the time report in the same way as the details view (closes #972). It nows defaults to 'All time'....
r1303 retrieve_date_range
Jean-Philippe Lang
Various timelog report enhancements:...
r1311 cond << ['spent_on BETWEEN ? AND ?', @from, @to]
Jean-Philippe Lang
Adds date range filter and pagination on time entries detail view (closes #434)....
r1159
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 TimeEntry.visible_by(User.current) do
respond_to do |format|
format.html {
# Paginate results
Jean-Philippe Lang
Adds subtasking (#443) including:...
r3459 @entry_count = TimeEntry.count(:include => [:project, :issue], :conditions => cond.conditions)
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
@entries = TimeEntry.find(:all,
:include => [:project, :activity, :user, {:issue => :tracker}],
:conditions => cond.conditions,
:order => sort_clause,
:limit => @entry_pages.items_per_page,
:offset => @entry_pages.current.offset)
Jean-Philippe Lang
Adds subtasking (#443) including:...
r3459 @total_hours = TimeEntry.sum(:hours, :include => [:project, :issue], :conditions => cond.conditions).to_f
Jean-Philippe Lang
Various timelog report enhancements:...
r1311
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 render :layout => !request.xhr?
}
Jean-Philippe Lang
Adds atom feed on time entries details (#1479)....
r1546 format.atom {
entries = TimeEntry.find(:all,
:include => [:project, :activity, :user, {:issue => :tracker}],
:conditions => cond.conditions,
:order => "#{TimeEntry.table_name}.created_on DESC",
:limit => Setting.feeds_limit.to_i)
render_feed(entries, :title => l(:label_spent_time))
}
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 format.csv {
# Export all entries
@entries = TimeEntry.find(:all,
:include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
:conditions => cond.conditions,
:order => sort_clause)
Jean-Philippe Lang
Use FasterCSV or ruby1.9 CSV instead of ruby1.8 builtin CSV....
r2893 send_data(entries_to_csv(@entries), :type => 'text/csv; header=present', :filename => 'timelog.csv')
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 }
end
Jean-Philippe Lang
Adds date range filter and pagination on time entries detail view (closes #434)....
r1159 end
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 end
def edit
Jean-Philippe Lang
Removes "xxx and return" calls (#4446)....
r3071 (render_403; return) if @time_entry && !@time_entry.editable_by?(User.current)
Jean-Philippe Lang
Fixed: Pre-filled time tracking date ignores timezone (#4160)....
r2898 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 @time_entry.attributes = params[:time_entry]
Eric Davis
Added plugin hook, :controller_timelog_edit_before_save. (#3341)...
r2675
call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 if request.post? and @time_entry.save
flash[:notice] = l(:notice_successful_update)
Jean-Philippe Lang
Unescape back_url param before calling redirect_to....
r1891 redirect_back_or_default :action => 'details', :project_id => @time_entry.project
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 return
end
end
Jean-Philippe Lang
Adds 2 permissions (closes #859):...
r1235
def destroy
Jean-Philippe Lang
Removes "xxx and return" calls (#4446)....
r3071 (render_404; return) unless @time_entry
(render_403; return) unless @time_entry.editable_by?(User.current)
Eric Davis
Handle unsuccessful destroys in TimelogController. #5700...
r3691 if @time_entry.destroy && @time_entry.destroyed?
flash[:notice] = l(:notice_successful_delete)
else
flash[:error] = l(:notice_unable_delete_time_entry)
end
Jean-Philippe Lang
Add a time tracking block for 'My page' (#615)....
r1245 redirect_to :back
Jean-Philippe Lang
Adds cross-project time reports support (#994)....
r1777 rescue ::ActionController::RedirectBackError
Jean-Philippe Lang
Adds 2 permissions (closes #859):...
r1235 redirect_to :action => 'details', :project_id => @time_entry.project
end
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365
private
def find_project
if params[:id]
@time_entry = TimeEntry.find(params[:id])
@project = @time_entry.project
elsif params[:issue_id]
@issue = Issue.find(params[:issue_id])
@project = @issue.project
elsif params[:project_id]
@project = Project.find(params[:project_id])
else
render_404
return false
end
Jean-Philippe Lang
Adds 2 permissions (closes #859):...
r1235 rescue ActiveRecord::RecordNotFound
render_404
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 end
Jean-Philippe Lang
Add predefined date ranges to the time report in the same way as the details view (closes #972). It nows defaults to 'All time'....
r1303
Jean-Philippe Lang
Adds cross-project time reports support (#994)....
r1777 def find_optional_project
if !params[:issue_id].blank?
@issue = Issue.find(params[:issue_id])
@project = @issue.project
elsif !params[:project_id].blank?
@project = Project.find(params[:project_id])
end
deny_access unless User.current.allowed_to?(:view_time_entries, @project, :global => true)
end
Jean-Philippe Lang
Time report can be done at issue level (closes #970) + timelog views xhtml validation....
r1304 # Retrieves the date range based on predefined ranges or specific from/to param dates
Jean-Philippe Lang
Add predefined date ranges to the time report in the same way as the details view (closes #972). It nows defaults to 'All time'....
r1303 def retrieve_date_range
@free_period = false
@from, @to = nil, nil
if params[:period_type] == '1' || (params[:period_type].nil? && !params[:period].nil?)
case params[:period].to_s
when 'today'
@from = @to = Date.today
when 'yesterday'
@from = @to = Date.today - 1
when 'current_week'
@from = Date.today - (Date.today.cwday - 1)%7
@to = @from + 6
when 'last_week'
@from = Date.today - 7 - (Date.today.cwday - 1)%7
@to = @from + 6
when '7_days'
@from = Date.today - 7
@to = Date.today
when 'current_month'
@from = Date.civil(Date.today.year, Date.today.month, 1)
@to = (@from >> 1) - 1
when 'last_month'
@from = Date.civil(Date.today.year, Date.today.month, 1) << 1
@to = (@from >> 1) - 1
when '30_days'
@from = Date.today - 30
@to = Date.today
when 'current_year'
@from = Date.civil(Date.today.year, 1, 1)
@to = Date.civil(Date.today.year, 12, 31)
end
elsif params[:period_type] == '2' || (params[:period_type].nil? && (!params[:from].nil? || !params[:to].nil?))
begin; @from = params[:from].to_s.to_date unless params[:from].blank?; rescue; end
begin; @to = params[:to].to_s.to_date unless params[:to].blank?; rescue; end
@free_period = true
else
# default
end
@from, @to = @to, @from if @from && @to && @from > @to
Eric Davis
Change the TimelogController's to/from dates based on the project time entries...
r3973 @from ||= (TimeEntry.earilest_date_for_project(@project) || Date.today)
@to ||= (TimeEntry.latest_date_for_project(@project) || Date.today)
Jean-Philippe Lang
Add predefined date ranges to the time report in the same way as the details view (closes #972). It nows defaults to 'All time'....
r1303 end
Eric Davis
Refactor: extract @available_criterias to utility method....
r3711
def load_available_criterias
@available_criterias = { 'project' => {:sql => "#{TimeEntry.table_name}.project_id",
:klass => Project,
:label => :label_project},
'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
:klass => Version,
:label => :label_version},
'category' => {:sql => "#{Issue.table_name}.category_id",
:klass => IssueCategory,
:label => :field_category},
'member' => {:sql => "#{TimeEntry.table_name}.user_id",
:klass => User,
:label => :label_member},
'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
:klass => Tracker,
:label => :label_tracker},
'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
:klass => TimeEntryActivity,
:label => :label_activity},
'issue' => {:sql => "#{TimeEntry.table_name}.issue_id",
:klass => Issue,
:label => :label_issue}
}
# Add list and boolean custom fields as available criterias
custom_fields = (@project.nil? ? IssueCustomField.for_all : @project.all_issue_custom_fields)
custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
@available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Issue' AND c.customized_id = #{Issue.table_name}.id)",
:format => cf.field_format,
:label => cf.name}
end if @project
# Add list and boolean time entry custom fields
TimeEntryCustomField.find(:all).select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
@available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'TimeEntry' AND c.customized_id = #{TimeEntry.table_name}.id)",
:format => cf.field_format,
:label => cf.name}
end
# Add list and boolean time entry activity custom fields
TimeEntryActivityCustomField.find(:all).select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
@available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Enumeration' AND c.customized_id = #{TimeEntry.table_name}.activity_id)",
:format => cf.field_format,
:label => cf.name}
end
Eric Davis
Added hook :controller_timelog_available_criterias...
r3712 call_hook(:controller_timelog_available_criterias, { :available_criterias => @available_criterias, :project => @project })
Eric Davis
Refactor: extract @available_criterias to utility method....
r3711 @available_criterias
end
Eric Davis
Refactor TimelogController#report's joins and provide a hook to add more....
r3817
def time_report_joins
sql = ''
sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
call_hook(:controller_timelog_time_report_joins, {:sql => sql} )
sql
end
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 end