2010-12-04 13:13:15 +03:00
|
|
|
# Redmine - project management software
|
2012-05-05 16:56:53 +04:00
|
|
|
# Copyright (C) 2006-2012 Jean-Philippe Lang
|
2007-06-24 20:07:06 +04:00
|
|
|
#
|
|
|
|
# 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.
|
2011-08-21 13:26:32 +04:00
|
|
|
#
|
2007-06-24 20:07:06 +04:00
|
|
|
# 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.
|
2011-08-21 13:26:32 +04:00
|
|
|
#
|
2007-06-24 20:07:06 +04:00
|
|
|
# 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.
|
|
|
|
|
2007-03-23 15:22:31 +03:00
|
|
|
class TimelogController < ApplicationController
|
2008-01-19 14:53:43 +03:00
|
|
|
menu_item :issues
|
2012-01-21 18:26:51 +04:00
|
|
|
|
2012-05-29 22:54:26 +04:00
|
|
|
before_filter :find_project_for_new_time_entry, :only => [:create]
|
2011-04-04 15:54:47 +04:00
|
|
|
before_filter :find_time_entry, :only => [:show, :edit, :update]
|
|
|
|
before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy]
|
2012-01-21 18:26:51 +04:00
|
|
|
before_filter :authorize, :except => [:new, :index, :report]
|
|
|
|
|
2012-05-29 22:54:26 +04:00
|
|
|
before_filter :find_optional_project, :only => [:index, :report]
|
|
|
|
before_filter :find_optional_project_for_new_time_entry, :only => [:new]
|
2012-01-21 18:26:51 +04:00
|
|
|
before_filter :authorize_global, :only => [:new, :index, :report]
|
|
|
|
|
2011-07-09 12:56:07 +04:00
|
|
|
accept_rss_auth :index
|
|
|
|
accept_api_auth :index, :show, :create, :update, :destroy
|
2011-08-21 13:26:32 +04:00
|
|
|
|
2007-03-23 15:22:31 +03:00
|
|
|
helper :sort
|
|
|
|
include SortHelper
|
2007-10-03 21:20:04 +04:00
|
|
|
helper :issues
|
2008-02-26 21:15:58 +03:00
|
|
|
include TimelogHelper
|
2008-04-09 21:45:39 +04:00
|
|
|
helper :custom_fields
|
|
|
|
include CustomFieldsHelper
|
2011-08-21 13:26:32 +04:00
|
|
|
|
2010-10-06 22:23:45 +04:00
|
|
|
def index
|
2007-03-23 15:22:31 +03:00
|
|
|
sort_init 'spent_on', 'desc'
|
2012-06-17 00:09:12 +04:00
|
|
|
sort_update 'spent_on' => ['spent_on', "#{TimeEntry.table_name}.created_on"],
|
2008-12-24 13:03:13 +03:00
|
|
|
'user' => 'user_id',
|
|
|
|
'activity' => 'activity_id',
|
|
|
|
'project' => "#{Project.table_name}.name",
|
|
|
|
'issue' => 'issue_id',
|
|
|
|
'hours' => 'hours'
|
2011-08-21 13:26:32 +04:00
|
|
|
|
2011-12-05 02:49:46 +04:00
|
|
|
retrieve_date_range
|
|
|
|
|
|
|
|
scope = TimeEntry.visible.spent_between(@from, @to)
|
2011-03-16 20:29:30 +03:00
|
|
|
if @issue
|
2011-12-05 02:49:46 +04:00
|
|
|
scope = scope.on_issue(@issue)
|
2011-03-16 20:29:30 +03:00
|
|
|
elsif @project
|
2011-12-05 02:49:46 +04:00
|
|
|
scope = scope.on_project(@project, Setting.display_subprojects_issues?)
|
2008-08-31 20:34:54 +04:00
|
|
|
end
|
2011-08-21 13:26:32 +04:00
|
|
|
|
2011-03-16 20:29:30 +03:00
|
|
|
respond_to do |format|
|
|
|
|
format.html {
|
|
|
|
# Paginate results
|
2011-12-05 02:49:46 +04:00
|
|
|
@entry_count = scope.count
|
2011-03-16 20:29:30 +03:00
|
|
|
@entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
|
2011-12-05 02:49:46 +04:00
|
|
|
@entries = scope.all(
|
|
|
|
:include => [:project, :activity, :user, {:issue => :tracker}],
|
|
|
|
:order => sort_clause,
|
|
|
|
:limit => @entry_pages.items_per_page,
|
|
|
|
:offset => @entry_pages.current.offset
|
|
|
|
)
|
|
|
|
@total_hours = scope.sum(:hours).to_f
|
2008-04-05 20:40:26 +04:00
|
|
|
|
2011-03-16 20:29:30 +03:00
|
|
|
render :layout => !request.xhr?
|
|
|
|
}
|
|
|
|
format.api {
|
2011-12-05 02:49:46 +04:00
|
|
|
@entry_count = scope.count
|
2011-05-22 14:48:59 +04:00
|
|
|
@offset, @limit = api_offset_and_limit
|
2011-12-05 02:49:46 +04:00
|
|
|
@entries = scope.all(
|
|
|
|
:include => [:project, :activity, :user, {:issue => :tracker}],
|
|
|
|
:order => sort_clause,
|
|
|
|
:limit => @limit,
|
|
|
|
:offset => @offset
|
|
|
|
)
|
2011-03-16 20:29:30 +03:00
|
|
|
}
|
|
|
|
format.atom {
|
2011-12-05 02:49:46 +04:00
|
|
|
entries = scope.all(
|
|
|
|
:include => [:project, :activity, :user, {:issue => :tracker}],
|
|
|
|
:order => "#{TimeEntry.table_name}.created_on DESC",
|
|
|
|
:limit => Setting.feeds_limit.to_i
|
|
|
|
)
|
2011-03-16 20:29:30 +03:00
|
|
|
render_feed(entries, :title => l(:label_spent_time))
|
|
|
|
}
|
|
|
|
format.csv {
|
|
|
|
# Export all entries
|
2011-12-05 02:49:46 +04:00
|
|
|
@entries = scope.all(
|
|
|
|
:include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
|
|
|
|
:order => sort_clause
|
|
|
|
)
|
2011-03-16 20:29:30 +03:00
|
|
|
send_data(entries_to_csv(@entries), :type => 'text/csv; header=present', :filename => 'timelog.csv')
|
|
|
|
}
|
2008-02-26 21:15:58 +03:00
|
|
|
end
|
2007-03-23 15:22:31 +03:00
|
|
|
end
|
2011-08-21 13:26:32 +04:00
|
|
|
|
2011-12-02 23:33:05 +04:00
|
|
|
def report
|
|
|
|
retrieve_date_range
|
|
|
|
@report = Redmine::Helpers::TimeReport.new(@project, @issue, params[:criteria], params[:columns], @from, @to)
|
|
|
|
|
|
|
|
respond_to do |format|
|
|
|
|
format.html { render :layout => !request.xhr? }
|
|
|
|
format.csv { send_data(report_to_csv(@report), :type => 'text/csv; header=present', :filename => 'timelog.csv') }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2010-12-04 13:13:15 +03:00
|
|
|
def show
|
|
|
|
respond_to do |format|
|
|
|
|
# TODO: Implement html response
|
|
|
|
format.html { render :nothing => true, :status => 406 }
|
2010-12-04 20:43:39 +03:00
|
|
|
format.api
|
2010-12-04 13:13:15 +03:00
|
|
|
end
|
|
|
|
end
|
2010-10-07 19:51:09 +04:00
|
|
|
|
|
|
|
def new
|
|
|
|
@time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
|
2012-03-07 00:23:00 +04:00
|
|
|
@time_entry.safe_attributes = params[:time_entry]
|
2010-10-07 19:51:09 +04:00
|
|
|
end
|
2010-10-08 19:39:39 +04:00
|
|
|
|
|
|
|
def create
|
|
|
|
@time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
|
2012-03-07 00:23:00 +04:00
|
|
|
@time_entry.safe_attributes = params[:time_entry]
|
2011-08-21 13:26:32 +04:00
|
|
|
|
2010-10-08 19:39:39 +04:00
|
|
|
call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
|
2011-08-21 13:26:32 +04:00
|
|
|
|
2010-10-08 19:39:39 +04:00
|
|
|
if @time_entry.save
|
2010-12-04 13:13:15 +03:00
|
|
|
respond_to do |format|
|
|
|
|
format.html {
|
2012-01-21 14:37:19 +04:00
|
|
|
flash[:notice] = l(:notice_successful_create)
|
|
|
|
if params[:continue]
|
2012-01-21 18:26:51 +04:00
|
|
|
if params[:project_id]
|
2012-05-29 22:54:26 +04:00
|
|
|
redirect_to :action => 'new', :project_id => @time_entry.project, :issue_id => @time_entry.issue,
|
|
|
|
:time_entry => {:issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
|
|
|
|
:back_url => params[:back_url]
|
2012-01-21 18:26:51 +04:00
|
|
|
else
|
2012-11-13 07:58:38 +04:00
|
|
|
redirect_to :action => 'new',
|
2012-05-29 22:54:26 +04:00
|
|
|
:time_entry => {:project_id => @time_entry.project_id, :issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
|
|
|
|
:back_url => params[:back_url]
|
2012-01-21 18:26:51 +04:00
|
|
|
end
|
2012-01-21 14:37:19 +04:00
|
|
|
else
|
|
|
|
redirect_back_or_default :action => 'index', :project_id => @time_entry.project
|
|
|
|
end
|
2010-12-04 13:13:15 +03:00
|
|
|
}
|
2010-12-04 20:43:39 +03:00
|
|
|
format.api { render :action => 'show', :status => :created, :location => time_entry_url(@time_entry) }
|
2010-12-04 13:13:15 +03:00
|
|
|
end
|
2010-10-08 19:39:39 +04:00
|
|
|
else
|
2010-12-04 13:13:15 +03:00
|
|
|
respond_to do |format|
|
2012-01-21 18:26:51 +04:00
|
|
|
format.html { render :action => 'new' }
|
2010-12-04 13:13:15 +03:00
|
|
|
format.api { render_validation_errors(@time_entry) }
|
|
|
|
end
|
2011-08-21 13:26:32 +04:00
|
|
|
end
|
2010-10-08 19:39:39 +04:00
|
|
|
end
|
2011-08-21 13:26:32 +04:00
|
|
|
|
2007-03-23 15:22:31 +03:00
|
|
|
def edit
|
2012-03-07 00:23:00 +04:00
|
|
|
@time_entry.safe_attributes = params[:time_entry]
|
2010-10-11 19:31:42 +04:00
|
|
|
end
|
|
|
|
|
|
|
|
def update
|
2012-03-07 00:23:00 +04:00
|
|
|
@time_entry.safe_attributes = params[:time_entry]
|
2011-08-21 13:26:32 +04:00
|
|
|
|
2009-05-31 02:49:39 +04:00
|
|
|
call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
|
2011-08-21 13:26:32 +04:00
|
|
|
|
2010-10-11 19:31:42 +04:00
|
|
|
if @time_entry.save
|
2010-12-04 13:13:15 +03:00
|
|
|
respond_to do |format|
|
|
|
|
format.html {
|
|
|
|
flash[:notice] = l(:notice_successful_update)
|
|
|
|
redirect_back_or_default :action => 'index', :project_id => @time_entry.project
|
|
|
|
}
|
2012-07-14 12:13:55 +04:00
|
|
|
format.api { render_api_ok }
|
2010-12-04 13:13:15 +03:00
|
|
|
end
|
2010-10-11 19:31:42 +04:00
|
|
|
else
|
2010-12-04 13:13:15 +03:00
|
|
|
respond_to do |format|
|
|
|
|
format.html { render :action => 'edit' }
|
|
|
|
format.api { render_validation_errors(@time_entry) }
|
|
|
|
end
|
2011-08-21 13:26:32 +04:00
|
|
|
end
|
2007-03-23 15:22:31 +03:00
|
|
|
end
|
2010-10-11 19:31:42 +04:00
|
|
|
|
2011-04-04 15:53:29 +04:00
|
|
|
def bulk_edit
|
|
|
|
@available_activities = TimeEntryActivity.shared.active
|
|
|
|
@custom_fields = TimeEntry.first.available_custom_fields
|
|
|
|
end
|
|
|
|
|
|
|
|
def bulk_update
|
|
|
|
attributes = parse_params_for_bulk_time_entry_attributes(params)
|
|
|
|
|
|
|
|
unsaved_time_entry_ids = []
|
|
|
|
@time_entries.each do |time_entry|
|
|
|
|
time_entry.reload
|
2012-03-07 00:23:00 +04:00
|
|
|
time_entry.safe_attributes = attributes
|
2011-04-04 15:53:29 +04:00
|
|
|
call_hook(:controller_time_entries_bulk_edit_before_save, { :params => params, :time_entry => time_entry })
|
|
|
|
unless time_entry.save
|
|
|
|
# Keep unsaved time_entry ids to display them in flash error
|
|
|
|
unsaved_time_entry_ids << time_entry.id
|
|
|
|
end
|
|
|
|
end
|
|
|
|
set_flash_from_bulk_time_entry_save(@time_entries, unsaved_time_entry_ids)
|
2011-04-04 15:54:47 +04:00
|
|
|
redirect_back_or_default({:controller => 'timelog', :action => 'index', :project_id => @projects.first})
|
2011-04-04 15:53:29 +04:00
|
|
|
end
|
|
|
|
|
2008-03-15 00:17:09 +03:00
|
|
|
def destroy
|
2012-03-04 19:24:14 +04:00
|
|
|
destroyed = TimeEntry.transaction do
|
|
|
|
@time_entries.each do |t|
|
2011-04-04 15:54:47 +04:00
|
|
|
unless t.destroy && t.destroyed?
|
2012-03-04 19:24:14 +04:00
|
|
|
raise ActiveRecord::Rollback
|
2011-04-04 15:54:47 +04:00
|
|
|
end
|
2010-12-04 13:13:15 +03:00
|
|
|
end
|
2010-06-20 23:30:51 +04:00
|
|
|
end
|
2011-04-04 15:54:47 +04:00
|
|
|
|
|
|
|
respond_to do |format|
|
|
|
|
format.html {
|
2012-03-04 19:24:14 +04:00
|
|
|
if destroyed
|
|
|
|
flash[:notice] = l(:notice_successful_delete)
|
|
|
|
else
|
|
|
|
flash[:error] = l(:notice_unable_delete_time_entry)
|
|
|
|
end
|
2011-04-04 15:54:47 +04:00
|
|
|
redirect_back_or_default(:action => 'index', :project_id => @projects.first)
|
|
|
|
}
|
2012-03-04 19:24:14 +04:00
|
|
|
format.api {
|
|
|
|
if destroyed
|
2012-07-14 12:13:55 +04:00
|
|
|
render_api_ok
|
2012-03-04 19:24:14 +04:00
|
|
|
else
|
|
|
|
render_validation_errors(@time_entries)
|
|
|
|
end
|
|
|
|
}
|
2011-04-04 15:54:47 +04:00
|
|
|
end
|
2008-03-15 00:17:09 +03:00
|
|
|
end
|
2007-03-23 15:22:31 +03:00
|
|
|
|
|
|
|
private
|
2010-11-16 23:27:45 +03:00
|
|
|
def find_time_entry
|
|
|
|
@time_entry = TimeEntry.find(params[:id])
|
|
|
|
unless @time_entry.editable_by?(User.current)
|
|
|
|
render_403
|
|
|
|
return false
|
|
|
|
end
|
|
|
|
@project = @time_entry.project
|
|
|
|
rescue ActiveRecord::RecordNotFound
|
|
|
|
render_404
|
|
|
|
end
|
|
|
|
|
2011-04-04 15:53:29 +04:00
|
|
|
def find_time_entries
|
|
|
|
@time_entries = TimeEntry.find_all_by_id(params[:id] || params[:ids])
|
|
|
|
raise ActiveRecord::RecordNotFound if @time_entries.empty?
|
|
|
|
@projects = @time_entries.collect(&:project).compact.uniq
|
|
|
|
@project = @projects.first if @projects.size == 1
|
|
|
|
rescue ActiveRecord::RecordNotFound
|
|
|
|
render_404
|
|
|
|
end
|
|
|
|
|
|
|
|
def set_flash_from_bulk_time_entry_save(time_entries, unsaved_time_entry_ids)
|
|
|
|
if unsaved_time_entry_ids.empty?
|
|
|
|
flash[:notice] = l(:notice_successful_update) unless time_entries.empty?
|
|
|
|
else
|
|
|
|
flash[:error] = l(:notice_failed_to_save_time_entries,
|
|
|
|
:count => unsaved_time_entry_ids.size,
|
|
|
|
:total => time_entries.size,
|
|
|
|
:ids => '#' + unsaved_time_entry_ids.join(', #'))
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2012-05-29 22:54:26 +04:00
|
|
|
def find_optional_project_for_new_time_entry
|
2012-01-22 14:37:57 +04:00
|
|
|
if (project_id = (params[:project_id] || params[:time_entry] && params[:time_entry][:project_id])).present?
|
|
|
|
@project = Project.find(project_id)
|
|
|
|
end
|
2010-12-14 21:29:24 +03:00
|
|
|
if (issue_id = (params[:issue_id] || params[:time_entry] && params[:time_entry][:issue_id])).present?
|
2010-12-04 13:13:15 +03:00
|
|
|
@issue = Issue.find(issue_id)
|
2012-01-22 14:37:57 +04:00
|
|
|
@project ||= @issue.project
|
|
|
|
end
|
2012-05-29 22:54:26 +04:00
|
|
|
rescue ActiveRecord::RecordNotFound
|
|
|
|
render_404
|
|
|
|
end
|
|
|
|
|
|
|
|
def find_project_for_new_time_entry
|
|
|
|
find_optional_project_for_new_time_entry
|
2012-01-22 14:37:57 +04:00
|
|
|
if @project.nil?
|
2007-03-23 15:22:31 +03:00
|
|
|
render_404
|
|
|
|
end
|
|
|
|
end
|
2011-08-21 13:26:32 +04:00
|
|
|
|
2008-08-31 20:34:54 +04:00
|
|
|
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
|
|
|
|
end
|
2011-08-21 13:26:32 +04:00
|
|
|
|
2008-04-02 02:42:10 +04:00
|
|
|
# Retrieves the date range based on predefined ranges or specific from/to param dates
|
2008-04-01 23:40:40 +04:00
|
|
|
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
|
2012-10-09 21:40:00 +04:00
|
|
|
when 'last_2_weeks'
|
|
|
|
@from = Date.today - 14 - (Date.today.cwday - 1)%7
|
|
|
|
@to = @from + 13
|
2008-04-01 23:40:40 +04:00
|
|
|
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
|
2011-08-21 13:26:32 +04:00
|
|
|
|
2008-04-01 23:40:40 +04:00
|
|
|
@from, @to = @to, @from if @from && @to && @from > @to
|
|
|
|
end
|
2010-07-01 22:47:25 +04:00
|
|
|
|
2011-04-04 15:53:29 +04:00
|
|
|
def parse_params_for_bulk_time_entry_attributes(params)
|
|
|
|
attributes = (params[:time_entry] || {}).reject {|k,v| v.blank?}
|
|
|
|
attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
|
|
|
|
attributes[:custom_field_values].reject! {|k,v| v.blank?} if attributes[:custom_field_values]
|
|
|
|
attributes
|
|
|
|
end
|
2007-03-23 15:22:31 +03:00
|
|
|
end
|