jro_apps/redmine Commit - r1162:200842ba5e75

Propagates time tracking to the parent project (closes #433). Time report enhancements....

Jean-Philippe Lang -

r1162:200842ba5e75

parent child

Context file:

r1162:200842ba5e75

Collapse all files

lib/ar_condition.rb created 644 +41 0

@@ -0,0 +1,41
	1	# redMine - project management software
	2	# Copyright (C) 2006-2008 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	class ARCondition
	19	attr_reader :conditions
	20
	21	def initialize(condition=nil)
	22	@conditions = ['1=1']
	23	@conditions.add(condition) if condition
	24	end
	25
	26	def add(condition)
	27	if condition.is_a?(Array)
	28	@conditions.first << " AND (#{condition.first})"
	29	@conditions += condition[1..-1]
	30	elsif condition.is_a?(String)
	31	@conditions.first << " AND (#{condition})"
	32	else
	33	raise "Unsupported #{condition.class} condition: #{condition}"
	34	end
	35	self
	36	end
	37
	38	def <<(condition)
	39	add(condition)
	40	end
	41	end

public/images/report.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

app/controllers/projects_controller.rb +5 -1

             # 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.
             class ProjectsController < ApplicationController
               layout 'base'
               menu_item :overview
               menu_item :activity, :only => :activity
               menu_item :roadmap, :only => :roadmap
               menu_item :files, :only => [:list_files, :add_file]
               menu_item :settings, :only => :settings
               menu_item :issues, :only => [:changelog]
               before_filter :find_project, :except => [ :index, :list, :add ]
               before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy ]
               before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
               accept_key_auth :activity, :calendar
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper :issues
               helper IssuesHelper
               helper :queries
               include QueriesHelper
               helper :repositories
               include RepositoriesHelper
               include ProjectsHelper
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               # Lists visible projects
               def list
                 projects = Project.find :all,
                                         :conditions => Project.visible_by(User.current),
                                         :include => :parent
                 @project_tree = projects.group_by {|p| p.parent || p}
                 @project_tree.each_key {|p| @project_tree[p] -= [p]}
               end
               # Add a new project
               def add
                 @custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @trackers = Tracker.all
                 @root_projects = Project.find(:all,
                                               :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
                                               :order => 'name')
                 @project = Project.new(params[:project])
                 @project.enabled_module_names = Redmine::AccessControl.available_project_modules
                 if request.get?
                   @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
                   @project.trackers = Tracker.all
                 else
                   @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
                   @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => (params[:custom_fields] ? params["custom_fields"][x.id.to_s] : nil)) }
                   @project.custom_values = @custom_values
                   if @project.save
                     @project.enabled_module_names = params[:enabled_modules]
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
               end
               # Show @project
               def show
                 @custom_values = @project.custom_values.find(:all, :include => :custom_field, :order => "#{CustomField.table_name}.position")
                 @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
                 @subprojects = @project.active_children
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = @project.trackers
                 @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{Issue.table_name}.status_id", :conditions => ["project_id=? and #{IssueStatus.table_name}.is_closed=?", @project.id, false])
                 @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])
-                @total_hours = @project.time_entries.sum(:hours)
+                TimeEntry.visible_by(User.current) do
+                  @total_hours = TimeEntry.sum(:hours,
+                                               :include => :project,
+                                               :conditions => ["(#{Project.table_name}.id = ? OR #{Project.table_name}.parent_id = ?)", @project.id, @project.id]).to_f
+                end
                 @key = User.current.rss_key
               end
               def settings
                 @root_projects = Project.find(:all,
                                               :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id],
                                               :order => 'name')
                 @custom_fields = IssueCustomField.find(:all)
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @trackers = Tracker.all
                 @custom_values ||= ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
                 @repository ||= @project.repository
                 @wiki ||= @project.wiki
               end
               # Edit @project
               def edit
                 if request.post?
                   if params[:custom_fields]
                     @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                     @project.custom_values = @custom_values
                   end
                   @project.attributes = params[:project]
                   if @project.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               def modules
                 @project.enabled_module_names = params[:enabled_modules]
                 redirect_to :action => 'settings', :id => @project, :tab => 'modules'
               end
               def archive
                 @project.archive if request.post? && @project.active?
                 redirect_to :controller => 'admin', :action => 'projects'
               end
               def unarchive
                 @project.unarchive if request.post? && !@project.active?
                 redirect_to :controller => 'admin', :action => 'projects'
               end
               # Delete @project
               def destroy
                 @project_to_destroy = @project
                 if request.post? and params[:confirm]
                   @project_to_destroy.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
                 # hide project in layout
                 @project = nil
               end
               # Add a new issue category to @project
               def add_issue_category
                 @category = @project.issue_categories.build(params[:category])
                 if request.post? and @category.save
               	  respond_to do |format|
                     format.html do
                       flash[:notice] = l(:notice_successful_create)
                       redirect_to :action => 'settings', :tab => 'categories', :id => @project
                     end
                     format.js do
                       # IE doesn't support the replace_html rjs method for select box options
                       render(:update) {|page| page.replace "issue_category_id",
                         content_tag('select', '<option></option>' + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
                       }
                     end
                   end
                 end
               end
               # Add a new version to @project
               def add_version
               	@version = @project.versions.build(params[:version])
               	if request.post? and @version.save
               	  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'settings', :tab => 'versions', :id => @project
               	end
               end
               def add_file
                 if request.post?
                   @version = @project.versions.find_by_id(params[:version_id])
                   attachments = attach_files(@version, params[:attachments])
                   Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('file_added')
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                 end
                 @versions = @project.versions.sort
               end
               def list_files
                 @versions = @project.versions.sort
               end
               # Show changelog for @project
               def changelog
                 @trackers = @project.trackers.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.sort
               end
               def roadmap
                 @trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true])
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.sort
                 @versions = @versions.select {|v| !v.completed? } unless params[:completed]
               end
               def activity
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 case params[:format]
                 when 'atom'
                   # 30 last days
                   @date_from = Date.today - 30
                   @date_to = Date.today + 1
                 else
                   # current month
                   @date_from = Date.civil(@year, @month, 1)
                   @date_to = @date_from >> 1
                 end
                 @event_types = %w(issues news files documents changesets wiki_pages messages)
                 @event_types.delete('wiki_pages') unless @project.wiki
                 @event_types.delete('changesets') unless @project.repository
                 @event_types.delete('messages') unless @project.boards.any?
                 # only show what the user is allowed to view
                 @event_types = @event_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, @project)}
                 @scope = @event_types.select {|t| params["show_#{t}"]}
                 # default events if none is specified in parameters
                 @scope = (@event_types - %w(wiki_pages messages))if @scope.empty?
                 @events = []
                 if @scope.include?('issues')
                   @events += @project.issues.find(:all, :include => [:author, :tracker], :conditions => ["#{Issue.table_name}.created_on>=? and #{Issue.table_name}.created_on<=?", @date_from, @date_to] )
                   @events += @project.issues_status_changes(@date_from, @date_to)
                 end
                 if @scope.include?('news')
                   @events += @project.news.find(:all, :conditions => ["#{News.table_name}.created_on>=? and #{News.table_name}.created_on<=?", @date_from, @date_to], :include => :author )
                 end
                 if @scope.include?('files')
                   @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*", :joins => "LEFT JOIN #{Version.table_name} ON #{Version.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Version' and #{Version.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author )
                 end
                 if @scope.include?('documents')
                   @events += @project.documents.find(:all, :conditions => ["#{Document.table_name}.created_on>=? and #{Document.table_name}.created_on<=?", @date_from, @date_to] )
                   @events += Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN #{Document.table_name} ON #{Document.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Document' and #{Document.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author )
                 end
                 if @scope.include?('wiki_pages')
                   select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " +
                            "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title, " +
                            "#{WikiContent.versioned_table_name}.page_id, #{WikiContent.versioned_table_name}.author_id, " +
                            "#{WikiContent.versioned_table_name}.id"
                   joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +
                           "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id "
                   conditions = ["#{Wiki.table_name}.project_id = ? AND #{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?",
                                 @project.id, @date_from, @date_to]
                   @events += WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => conditions)
                 end
                 if @scope.include?('changesets')
                   @events += Changeset.find(:all, :include => :repository, :conditions => ["#{Repository.table_name}.project_id = ? AND #{Changeset.table_name}.committed_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
                 end
                 if @scope.include?('messages')
                   @events += Message.find(:all,
                                           :include => [:board, :author],
                                           :conditions => ["#{Board.table_name}.project_id=? AND #{Message.table_name}.parent_id IS NULL AND #{Message.table_name}.created_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
                 end
                 @events_by_day = @events.group_by(&:event_date)
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }
                   format.atom { render_feed(@events, :title => "#{@project.name}: #{l(:label_activity)}") }
                 end
               end
               def calendar
                 @trackers = @project.rolled_up_trackers
                 retrieve_selected_tracker_ids(@trackers)
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
                 events = []
                 @project.issues_with_subprojects(params[:with_subprojects]) do
                   events += Issue.find(:all,
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?)) AND #{Issue.table_name}.tracker_id IN (#{@selected_tracker_ids.join(',')})", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
                                        ) unless @selected_tracker_ids.empty?
                 end
                 events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
                 @calendar.events = events
                 render :layout => false if request.xhr?
               end
               def gantt
                 @trackers = @project.rolled_up_trackers
                 retrieve_selected_tracker_ids(@trackers)
                 if params[:year] and params[:year].to_i >0
                   @year_from = params[:year].to_i
                   if params[:month] and params[:month].to_i >=1 and params[:month].to_i <= 12
                     @month_from = params[:month].to_i
                   else
                     @month_from = 1
                   end
                 else
                   @month_from ||= Date.today.month
                   @year_from ||= Date.today.year
                 end
                 zoom = (params[:zoom] || User.current.pref[:gantt_zoom]).to_i
                 @zoom = (zoom > 0 && zoom < 5) ? zoom : 2
                 months = (params[:months] || User.current.pref[:gantt_months]).to_i
                 @months = (months > 0 && months < 25) ? months : 6
                 # Save gantt paramters as user preference (zoom and months count)
                 if (User.current.logged? && (@zoom != User.current.pref[:gantt_zoom] || @months != User.current.pref[:gantt_months]))
                   User.current.pref[:gantt_zoom], User.current.pref[:gantt_months] = @zoom, @months
                   User.current.preference.save
                 end
                 @date_from = Date.civil(@year_from, @month_from, 1)
                 @date_to = (@date_from >> @months) - 1
                 @events = []
                 @project.issues_with_subprojects(params[:with_subprojects]) do
                   @events += Issue.find(:all,
                                        :order => "start_date, due_date",
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
                                        ) unless @selected_tracker_ids.empty?
                 end
                 @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
                 @events.sort! {|x,y| x.start_date <=> y.start_date }
                 if params[:format]=='pdf'
                   @options_for_rfpdf ||= {}
                   @options_for_rfpdf[:file_name] = "#{@project.identifier}-gantt.pdf"
                   render :template => "projects/gantt.rfpdf", :layout => false
                 elsif params[:format]=='png' && respond_to?('gantt_image')
                   image = gantt_image(@events, @date_from, @months, @zoom)
                   image.format = 'PNG'
                   send_data(image.to_blob, :disposition => 'inline', :type => 'image/png', :filename => "#{@project.identifier}-gantt.png")
                 else
                   render :template => "projects/gantt.rhtml"
                 end
               end
             private
               # Find project of id params[:id]
               # if not found, redirect to project list
               # Used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def retrieve_selected_tracker_ids(selectable_trackers)
                 if ids = params[:tracker_ids]
                   @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
                 else
                   @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
                 end
               end
             end

app/controllers/timelog_controller.rb +48 -36

             # 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.
             class TimelogController < ApplicationController
               layout 'base'
               menu_item :issues
               before_filter :find_project, :authorize
               helper :sort
               include SortHelper
               helper :issues
               include TimelogHelper
               def report
-                @available_criterias = { 'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
+                @available_criterias = { 'project' => {:sql => "#{TimeEntry.table_name}.project_id",
-                                                      :values => @project.versions,
+                                                      :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",
-                                                        :values => @project.issue_categories,
+                                                        :klass => IssueCategory,
                                                         :label => :field_category},
                                          'member' => {:sql => "#{TimeEntry.table_name}.user_id",
-                                                     :values => @project.users,
+                                                     :klass => User,
                                                      :label => :label_member},
                                          'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
-                                                      :values => Tracker.find(:all),
+                                                      :klass => Tracker,
                                                       :label => :label_tracker},
                                          'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
-                                                       :values => Enumeration::get_values('ACTI'),
+                                                       :klass => Enumeration,
                                                        :label => :label_activity}
                                        }
                 @criterias = params[:criterias] || []
                 @criterias = @criterias.select{|criteria| @available_criterias.has_key? criteria}
                 @criterias.uniq!
+                @criterias = @criterias[0,3]
                 @columns = (params[:period] && %w(year month week).include?(params[:period])) ? params[:period] : 'month'
                 if params[:date_from]
                   begin; @date_from = params[:date_from].to_date; rescue; end
                 end
                 if params[:date_to]
                   begin; @date_to = params[:date_to].to_date; rescue; end
                 end
                 @date_from ||= Date.civil(Date.today.year, 1, 1)
                 @date_to ||= (Date.civil(Date.today.year, Date.today.month, 1) >> 1) - 1
                 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(', ')
                   sql = "SELECT #{sql_select}, tyear, tmonth, tweek, SUM(hours) AS hours"
-                  sql << " FROM #{TimeEntry.table_name} LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
+                  sql << " FROM #{TimeEntry.table_name}"
-                  sql << " WHERE #{TimeEntry.table_name}.project_id = %s" % @project.id
+                  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"
+                  sql << " WHERE (#{Project.table_name}.id = %s OR #{Project.table_name}.parent_id = %s)" % [@project.id, @project.id]
+                  sql << " AND (%s)" % Project.allowed_to_condition(User.current, :view_time_entries)
                   sql << " AND spent_on BETWEEN '%s' AND '%s'" % [ActiveRecord::Base.connection.quoted_date(@date_from.to_time), ActiveRecord::Base.connection.quoted_date(@date_to.to_time)]
                   sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek"
                   @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']}"
                     end
                   end
+                  @total_hours = @hours.inject(0) {|s,k| s = s + k['hours'].to_f}
                 end
                 @periods = []
                 date_from = @date_from
                 # 100 columns max
                 while date_from < @date_to && @periods.length < 100
                   case @columns
                   when 'year'
                     @periods << "#{date_from.year}"
                     date_from = date_from >> 12
                   when 'month'
                     @periods << "#{date_from.year}-#{date_from.month}"
                     date_from = date_from >> 1
                   when 'week'
                     @periods << "#{date_from.year}-#{date_from.cweek}"
                     date_from = date_from + 7
                   end
                 end
                 render :layout => false if request.xhr?
               end
               def details
                 sort_init 'spent_on', 'desc'
                 sort_update
                 @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
-                conditions = nil
+                cond = ARCondition.new
+                cond << (@issue.nil? ? ["(#{Project.table_name}.id = ? OR #{Project.table_name}.parent_id = ?)", @project.id, @project.id] :
+                                       ["#{TimeEntry.table_name}.issue_id = ?", @issue.id])
                 if @from
                   if @to
-                    conditions = ['spent_on BETWEEN ? AND ?', @from, @to]
+                    cond << ['spent_on BETWEEN ? AND ?', @from, @to]
                   else
-                    conditions = ['spent_on >= ?', @from]
+                    cond << ['spent_on >= ?', @from]
                   end
                 elsif @to
-                  conditions = ['spent_on <= ?', @to]
+                  cond << ['spent_on <= ?', @to]
                 end
-                @owner_id = User.current.id
-                respond_to do |format|
+                TimeEntry.visible_by(User.current) do
-                  format.html {
+                  respond_to do |format|
-                    # Paginate results
+                    format.html {
-                    @entry_count = (@issue ? @issue : @project).time_entries.count(:conditions => conditions)
+                      # Paginate results
-                    @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
+                      @entry_count = TimeEntry.count(:include => :project, :conditions => cond.conditions)
-                    @entries = (@issue ? @issue : @project).time_entries.find(:all,
+                      @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
-                                                                              :include => [:activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
+                      @entries = TimeEntry.find(:all,
-                                                                              :conditions => conditions,
+                                                :include => [:project, :activity, :user, {:issue => :tracker}],
-                                                                              :order => sort_clause,
+                                                :conditions => cond.conditions,
-                                                                              :limit  =>  @entry_pages.items_per_page,
+                                                :order => sort_clause,
-                                                                              :offset =>  @entry_pages.current.offset)
+                                                :limit  =>  @entry_pages.items_per_page,
-                    @total_hours = (@issue ? @issue : @project).time_entries.sum(:hours, :conditions => conditions).to_f
+                                                :offset =>  @entry_pages.current.offset)
-                    render :layout => !request.xhr?
+                      @total_hours = TimeEntry.sum(:hours, :include => :project, :conditions => cond.conditions).to_f
+                      render :layout => !request.xhr?
-                  format.csv {
-                    # Export all entries
+                    format.csv {
-                    @entries = (@issue ? @issue : @project).time_entries.find(:all,
+                      # Export all entries
-                                                                              :include => [:activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
+                      @entries = TimeEntry.find(:all,
-                                                                              :conditions => conditions,
+                                                :include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
-                                                                              :order => sort_clause)
+                                                :conditions => cond.conditions,
-                    send_data(entries_to_csv(@entries).read, :type => 'text/csv; header=present', :filename => 'timelog.csv')
+                                                :order => sort_clause)
+                      send_data(entries_to_csv(@entries).read, :type => 'text/csv; header=present', :filename => 'timelog.csv')
+                    }
+                  end
                 end
               end
               def edit
                 render_404 and return if @time_entry && @time_entry.user != User.current
                 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
                 @time_entry.attributes = params[:time_entry]
                 if request.post? and @time_entry.save
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'details', :project_id => @time_entry.project, :issue_id => @time_entry.issue
                   return
                 end
                 @activities = Enumeration::get_values('ACTI')
               end
             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
               end
             end

app/helpers/timelog_helper.rb +3 -1

             # redMine - project management software
             # Copyright (C) 2006  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.
             module TimelogHelper
               def select_hours(data, criteria, value)
-                data.select {|row| row[criteria] == value.to_s}
+                data.select {|row| row[criteria] == value}
               end
               def sum_hours(data)
                 sum = 0
                 data.each do |row|
                   sum += row['hours'].to_f
                 end
                 sum
               end
               def options_for_period_select(value)
                 options_for_select([[l(:label_all_time), 'all'],
                                     [l(:label_today), 'today'],
                                     [l(:label_yesterday), 'yesterday'],
                                     [l(:label_this_week), 'current_week'],
                                     [l(:label_last_week), 'last_week'],
                                     [l(:label_last_n_days, 7), '7_days'],
                                     [l(:label_this_month), 'current_month'],
                                     [l(:label_last_month), 'last_month'],
                                     [l(:label_last_n_days, 30), '30_days'],
                                     [l(:label_this_year), 'current_year']],
                                     value)
               end
               def entries_to_csv(entries)
                 ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')
                 export = StringIO.new
                 CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
                   # csv header fields
                   headers = [l(:field_spent_on),
                              l(:field_user),
                              l(:field_activity),
+                             l(:field_project),
                              l(:field_issue),
                              l(:field_tracker),
                              l(:field_subject),
                              l(:field_hours),
                              l(:field_comments)
                              ]
                   csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
                   # csv lines
                   entries.each do |entry|
                     fields = [l_date(entry.spent_on),
                               entry.user,
                               entry.activity,
+                              entry.project,
                               (entry.issue ? entry.issue.id : nil),
                               (entry.issue ? entry.issue.tracker : nil),
                               (entry.issue ? entry.issue.subject : nil),
                               entry.hours,
                               entry.comments
                               ]
                     csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
                   end
                 end
                 export.rewind
                 export
               end
             end

app/models/project.rb +15 0

             # redMine - project management software
             # Copyright (C) 2006  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.
             class Project < ActiveRecord::Base
               # Project statuses
               STATUS_ACTIVE     = 1
               STATUS_ARCHIVED   = 9
               has_many :members, :include => :user, :conditions => "#{User.table_name}.status=#{User::STATUS_ACTIVE}"
               has_many :users, :through => :members
               has_many :custom_values, :dependent => :delete_all, :as => :customized
               has_many :enabled_modules, :dependent => :delete_all
               has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
               has_many :issues, :dependent => :destroy, :order => "#{Issue.table_name}.created_on DESC", :include => [:status, :tracker]
               has_many :issue_changes, :through => :issues, :source => :journals
               has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
               has_many :time_entries, :dependent => :delete_all
               has_many :queries, :dependent => :delete_all
               has_many :documents, :dependent => :destroy
               has_many :news, :dependent => :delete_all, :include => :author
               has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
               has_many :boards, :order => "position ASC"
               has_one :repository, :dependent => :destroy
               has_many :changesets, :through => :repository
               has_one :wiki, :dependent => :destroy
               # Custom field for the project issues
               has_and_belongs_to_many :custom_fields,
                                       :class_name => 'IssueCustomField',
                                       :order => "#{CustomField.table_name}.position",
                                       :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}",
                                       :association_foreign_key => 'custom_field_id'
               acts_as_tree :order => "name", :counter_cache => true
               acts_as_searchable :columns => ['name', 'description'], :project_key => 'id'
               acts_as_event :title => Proc.new {|o| "#{l(:label_project)}: #{o.name}"},
                             :url => Proc.new {|o| {:controller => 'projects', :action => 'show', :id => o.id}}
               attr_protected :status, :enabled_module_names
               validates_presence_of :name, :identifier
               validates_uniqueness_of :name, :identifier
               validates_associated :custom_values, :on => :update
               validates_associated :repository, :wiki
               validates_length_of :name, :maximum => 30
               validates_length_of :homepage, :maximum => 60
               validates_length_of :identifier, :in => 3..20
               validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
               before_destroy :delete_all_members
               def identifier=(identifier)
                 super unless identifier_frozen?
               end
               def identifier_frozen?
                 errors[:identifier].nil? && !(new_record? || identifier.blank?)
               end
               def issues_with_subprojects(include_subprojects=false)
                 conditions = nil
                 if include_subprojects && !active_children.empty?
                   ids = [id] + active_children.collect {|c| c.id}
                   conditions = ["#{Issue.table_name}.project_id IN (#{ids.join(',')})"]
                 end
                 conditions ||= ["#{Issue.table_name}.project_id = ?", id]
                 # Quick and dirty fix for Rails 2 compatibility
                 Issue.send(:with_scope, :find => { :conditions => conditions }) do
                   yield
                 end
               end
               # Return all issues status changes for the project between the 2 given dates
               def issues_status_changes(from, to)
                 Journal.find(:all, :include => [:issue, :details, :user],
                                    :conditions => ["#{Journal.table_name}.journalized_type = 'Issue'" +
                                                    " AND #{Issue.table_name}.project_id = ?" +
                                                    " AND #{JournalDetail.table_name}.prop_key = 'status_id'" +
                                                    " AND #{Journal.table_name}.created_on BETWEEN ? AND ?",
                                                    id, from, to+1])
               end
               # returns latest created projects
               # non public projects will be returned only if user is a member of those
               def self.latest(user=nil, count=5)
                 find(:all, :limit => count, :conditions => visible_by(user), :order => "created_on DESC")
               end
               def self.visible_by(user=nil)
                 if user && user.admin?
                   return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
                 elsif user && user.memberships.any?
                   return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND (#{Project.table_name}.is_public = #{connection.quoted_true} or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')}))"
                 else
                   return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND #{Project.table_name}.is_public = #{connection.quoted_true}"
                 end
               end
+              def self.allowed_to_condition(user, permission)
+                statements = []
+                active_statement = "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
+                if user.admin?
+                  # no restriction
+                elsif user.logged?
+                  statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.non_member.allowed_to?(permission)
+                  allowed_project_ids = user.memberships.select {|m| m.role.allowed_to?(permission)}.collect {|m| m.project_id}
+                  statements << "#{Project.table_name}.id IN (#{allowed_project_ids.join(',')})"
+                else
+                  statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.anonymous.allowed_to?(permission)
+                end
+                statements.empty? ? active_statement : "(#{active_statement} AND (#{statements.join(' OR ')}))"
+              end
               def self.find(*args)
                 if args.first && args.first.is_a?(String) && !args.first.match(/^\d*$/)
                   project = find_by_identifier(*args)
                   raise ActiveRecord::RecordNotFound, "Couldn't find Project with identifier=#{args.first}" if project.nil?
                   project
                 else
                   super
                 end
               end
               def to_param
                 identifier
               end
               def active?
                 self.status == STATUS_ACTIVE
               end
               def archive
                 # Archive subprojects if any
                 children.each do |subproject|
                   subproject.archive
                 end
                 update_attribute :status, STATUS_ARCHIVED
               end
               def unarchive
                 return false if parent && !parent.active?
                 update_attribute :status, STATUS_ACTIVE
               end
               def active_children
                 children.select {|child| child.active?}
               end
               # Returns an array of the trackers used by the project and its sub projects
               def rolled_up_trackers
                 @rolled_up_trackers ||=
                   Tracker.find(:all, :include => :projects,
                                      :select => "DISTINCT #{Tracker.table_name}.*",
                                      :conditions => ["#{Project.table_name}.id = ? OR #{Project.table_name}.parent_id = ?", id, id],
                                      :order => "#{Tracker.table_name}.position")
               end
               # Deletes all project's members
               def delete_all_members
                 Member.delete_all(['project_id = ?', id])
               end
               # Users issues can be assigned to
               def assignable_users
                 members.select {|m| m.role.assignable?}.collect {|m| m.user}.sort
               end
               # Returns the mail adresses of users that should be always notified on project events
               def recipients
                 members.select {|m| m.mail_notification? || m.user.mail_notification?}.collect {|m| m.user.mail}
               end
               # Returns an array of all custom fields enabled for project issues
               # (explictly associated custom fields and custom fields enabled for all projects)
               def custom_fields_for_issues(tracker)
                 all_custom_fields.select {|c| tracker.custom_fields.include? c }
               end
               def all_custom_fields
                 @all_custom_fields ||= (IssueCustomField.for_all + custom_fields).uniq
               end
               def <=>(project)
                 name.downcase <=> project.name.downcase
               end
               def to_s
                 name
               end
               # Returns a short description of the projects (first lines)
               def short_description(length = 255)
                 description.gsub(/^(.{#{length}}[^\n]*).*$/m, '\1').strip if description
               end
               def allows_to?(action)
                 if action.is_a? Hash
                   allowed_actions.include? "#{action[:controller]}/#{action[:action]}"
                 else
                   allowed_permissions.include? action
                 end
               end
               def module_enabled?(module_name)
                 module_name = module_name.to_s
                 enabled_modules.detect {|m| m.name == module_name}
               end
               def enabled_module_names=(module_names)
                 enabled_modules.clear
                 module_names = [] unless module_names && module_names.is_a?(Array)
                 module_names.each do |name|
                   enabled_modules << EnabledModule.new(:name => name.to_s)
                 end
               end
             protected
               def validate
                 errors.add(parent_id, " must be a root project") if parent and parent.parent
                 errors.add_to_base("A project with subprojects can't be a subproject") if parent and children.size > 0
                 errors.add(:identifier, :activerecord_error_invalid) if !identifier.blank? && identifier.match(/^\d*$/)
               end
             private
               def allowed_permissions
                 @allowed_permissions ||= begin
                   module_names = enabled_modules.collect {|m| m.name}
                   Redmine::AccessControl.modules_permissions(module_names).collect {|p| p.name}
                 end
               end
               def allowed_actions
                 @actions_allowed ||= allowed_permissions.inject([]) { |actions, permission| actions += Redmine::AccessControl.allowed_actions(permission) }.flatten
               end
             end

app/models/time_entry.rb +6 0

             # 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.
             class TimeEntry < ActiveRecord::Base
               # could have used polymorphic association
               # project association here allows easy loading of time entries at project level with one database trip
               belongs_to :project
               belongs_to :issue
               belongs_to :user
               belongs_to :activity, :class_name => 'Enumeration', :foreign_key => :activity_id
               attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
               validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
               validates_numericality_of :hours, :allow_nil => true
               validates_length_of :comments, :maximum => 255
               def before_validation
                 self.project = issue.project if issue && project.nil?
               end
               def validate
                 errors.add :hours, :activerecord_error_invalid if hours && (hours < 0 || hours >= 1000)
                 errors.add :project_id, :activerecord_error_invalid if project.nil?
                 errors.add :issue_id, :activerecord_error_invalid if (issue_id && !issue) || (issue && project!=issue.project)
               end
               # tyear, tmonth, tweek assigned where setting spent_on attributes
               # these attributes make time aggregations easier
               def spent_on=(date)
                 super
                 self.tyear = spent_on ? spent_on.year : nil
                 self.tmonth = spent_on ? spent_on.month : nil
                 self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil
               end
               # Returns true if the time entry can be edited by usr, otherwise false
               def editable_by?(usr)
                 usr == self.user
               end
+              def self.visible_by(usr)
+                with_scope(:find => { :conditions => Project.allowed_to_condition(usr, :view_time_entries) }) do
+                  yield
+                end
+              end
             end

app/views/timelog/_list.rhtml +8 -8

             <table class="list time-entries">
             <thead>
             <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
             <%= sort_header_tag('user_id', :caption => l(:label_member)) %>
             <%= sort_header_tag('activity_id', :caption => l(:label_activity)) %>
+            <%= sort_header_tag("#{Project.table_name}.name", :caption => l(:label_project)) %>
             <%= sort_header_tag('issue_id', :caption => l(:label_issue), :default_order => 'desc') %>
             <th><%= l(:field_comments) %></th>
             <%= sort_header_tag('hours', :caption => l(:field_hours)) %>
             <th></th>
             </thead>
             <tbody>
             <% entries.each do |entry| -%>
             <tr class="time-entry <%= cycle("odd", "even") %>">
             <td class="spent_on"><%= format_date(entry.spent_on) %></td>
-            <td class="user"><%= entry.user.name %></td>
+            <td class="user"><%=h entry.user %></td>
-            <td class="activity"><%= entry.activity.name %></td>
+            <td class="activity"><%=h entry.activity %></td>
+            <td class="project"><%=h entry.project %></td>
             <td class="subject">
-              <% if entry.issue -%>
+            <% if entry.issue -%>
-              <div class="tooltip"><%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) -%>
+            <%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) -%>
-              <span class="tip"><%= render_issue_tooltip entry.issue %></span>
+            <% end -%>
-              </div>
-              <% end -%>
             </td>
             <td class="comments"><%=h entry.comments %></td>
-            <td class="hours"><%= entry.hours %></td>
+            <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
             <td align="center"><%= link_to_if_authorized(l(:button_edit),
                                                          {:controller => 'timelog', :action => 'edit', :id => entry},
                                                          :class => 'icon icon-edit') if entry.editable_by?(User.current) %></td>
             </tr>
             <% end -%>
             </tbdoy>
             </table>

app/views/timelog/_report_criteria.rhtml +11 -11

@@ -1,17 +1,17
1	<% @~~available_criterias~~[criterias[level]][~~:values~~].each do \|value\| %>	1	<% @hours.collect {\|h\| h[criterias[level]]}.uniq.each do \|value\| %>
2	<tr class="<%= cycle('odd', 'even') if criterias.length < level + 2 %>">	2	<% hours_for_value = select_hours(hours, criterias[level], value) -%>
		3	<% next if hours_for_value.empty? -%>
		4	<tr class="<%= cycle('odd', 'even') %> <%= 'last-level' unless criterias.length > level+1 %>">
3	<%= '<td></td>' * level %>	5	<%= '<td></td>' * level %>
4	<td><%= value.name %></td>	6	<td><%= value.nil? ? l(:label_none) : @available_criterias[criterias[level]][:klass].find_by_id(value) %></td>
5	<%= '<td></td>' * (criterias.length - level - 1) %>	7	<%= '<td></td>' * (criterias.length - level - 1) -%>
6	<% hours_for_value = select_hours(hours, criterias[level], value.id) %>	8	<% @periods.each do \|period\| -%>
7	<% @periods.each do \|period\| %>
8	<% sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s)) %>	9	<% sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s)) %>
9	<td ~~align~~="~~center~~"><%= ~~sum~~ > 0 ? "%.2f" % sum : ~~"-"~~ %></td>	10	<td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
10	<% end %>	11	<% end -%>
11	</tr>	12	</tr>
12	<% if criterias.length > level+1 %>	13	<% if criterias.length > level+1 -%>
13	<%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %>	14	<%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %>
14	<% end %>	15	<% end -%>
15		16
16	<% end %>	17	<% end %>
17	<% reset_cycle %>

app/views/timelog/details.rhtml +2 -1

             <div class="contextual">
+            <%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}, :class => 'icon icon-report') %>
             <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %>
             </div>
             <h2><%= l(:label_spent_time) %></h2>
             <% if @issue %>
             <h3><%= link_to(@project.name, {:action => 'details', :project_id => @project}) %> / <%= link_to_issue(@issue) %></h3>
             <% end %>
             <% form_remote_tag( :url => {}, :method => :get, :update => 'content' ) do %>
             <%= hidden_field_tag 'project_id', params[:project_id] %>
             <%= hidden_field_tag 'issue_id', params[:issue_id] if @issue %>
             <fieldset><legend><%= l(:label_date_range) %></legend>
             <p>
             <%= radio_button_tag 'period_type', '1', !@free_period %>
             <%= select_tag 'period', options_for_period_select(params[:period]),
                                      :onchange => 'this.form.onsubmit();',
                                      :onfocus => '$("period_type_1").checked = true;' %>
             </p>
             <p>
             <%= radio_button_tag 'period_type', '2', @free_period %>
             <%= l(:label_date_from) %>
             <%= text_field_tag 'from', @from, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('from') %>
             <%= l(:label_date_to) %>
             <%= text_field_tag 'to', @to, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('to') %>
-            <%= submit_tag l(:button_submit), :name => nil, :onclick => '$("period_type_2").checked = true;' %>
+            <%= submit_tag l(:button_apply), :name => nil, :onclick => '$("period_type_2").checked = true;' %>
             </p>
             </fieldset>
             <% end %>
             <div class="total-hours">
             <p><%= l(:label_total) %>: <%= html_hours(lwr(:label_f_hour, @total_hours)) %></p>
             </div>
             <% unless @entries.empty? %>
             <%= render :partial => 'list', :locals => { :entries => @entries }%>
             <div class="contextual">
                 <%= l(:label_export_to) %>
                 <%= link_to 'CSV', params.merge(:format => 'csv'), :class => 'icon icon-csv' %>
             </div>
             <p class="pagination"><%= pagination_links_full @entry_pages, @entry_count %></p>
             <% end %>
             <% content_for :header_tags do %>
                 <%= javascript_include_tag 'calendar/calendar' %>
                 <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
                 <%= javascript_include_tag 'calendar/calendar-setup' %>
                 <%= stylesheet_link_tag 'calendar' %>
             <% end %>

app/views/timelog/report.rhtml +33 -13

+            <div class="contextual">
+            <%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}, :class => 'icon icon-details') %>
+            <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %>
+            </div>
             <h2><%= l(:label_spent_time) %></h2>
             <% form_remote_tag(:url => {:project_id => @project}, :update => 'content') do %>
               <% @criterias.each do |criteria| %>
                 <%= hidden_field_tag 'criterias[]', criteria %>
               <% end %>
+              <fieldset><legend><%= l(:label_date_range) %></legend>
               <p>
-              <%= l(:label_date_from) %>: <%= text_field_tag 'date_from', @date_from, :size => 10 %><%= calendar_for('date_from') %>
+              <%= l(:label_date_from) %>
-              &nbsp;
+              <%= text_field_tag 'date_from', @date_from, :size => 10 %><%= calendar_for('date_from') %>
-              <%= l(:label_date_to) %>: <%= text_field_tag 'date_to', @date_to, :size => 10 %><%= calendar_for('date_to') %>
+              <%= l(:label_date_to) %>
-              &nbsp;
+              <%= text_field_tag 'date_to', @date_to, :size => 10 %><%= calendar_for('date_to') %>
-              <%= l(:label_details) %>:
+              <%= l(:label_details) %>
               <%= select_tag 'period', options_for_select([[l(:label_year), 'year'],
                                                            [l(:label_month), 'month'],
                                                            [l(:label_week), 'week']], @columns) %>
               &nbsp;
               <%= submit_tag l(:button_apply) %>
-              <%= link_to_remote l(:button_clear), {:url => {:project_id => @project}, :update => 'content'}, :class => 'icon icon-reload' %>
               </p>
+              </fieldset>
-              <% if @criterias.length < 3 %>
+              <p><%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}),
-              <p><%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}), :onchange => "this.form.onsubmit();") %></p>
+                                                                      :onchange => "this.form.onsubmit();",
-              <% end %>
+                                                                      :style => 'width: 200px',
+                                                                      :disabled => (@criterias.length >= 3)) %>
+                 <%= link_to_remote l(:button_clear), {:url => {:project_id => @project, :date_from => @date_from, :date_to => @date_to, :period => @columns}, :update => 'content'},
+                                                      :class => 'icon icon-reload' %></p>
-            <br />
+            <% unless @criterias.empty? %>
+            <div class="total-hours">
+            <p><%= l(:label_total) %>: <%= html_hours(lwr(:label_f_hour, @total_hours)) %></p>
+            </div>
-            <% unless @criterias.empty? %>
+            <% unless @hours.empty? %>
-            <table class="list">
+            <table class="list" id="time-report">
             <thead>
             <tr>
             <% @criterias.each do |criteria| %>
               <th width="15%"><%= l(@available_criterias[criteria][:label]) %></th>
             <% end %>
             <% @periods.each do |period| %>
               <th width="<%= ((100 - @criterias.length * 15 - 15 ) / @periods.length).to_i %>%"><%= period %></th>
             <% end %>
             </tr>
             </thead>
             <tbody>
             <%= render :partial => 'report_criteria', :locals => {:criterias => @criterias, :hours => @hours, :level => 0} %>
+              <tr class="total">
+              <td><%= l(:label_total) %></td>
+              <%= '<td></td>' * (@criterias.size - 1) %>
+              <% @periods.each do |period| -%>
+                <% sum = sum_hours(select_hours(@hours, @columns, period.to_s)) %>
+                <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
+              <% end -%>
+              </tr>
             </tbody>
             </table>
             <% end %>
             <% end %>
+            <% end %>
             <% content_for :header_tags do %>
             <%= javascript_include_tag 'calendar/calendar' %>
             <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
             <%= javascript_include_tag 'calendar/calendar-setup' %>
             <%= stylesheet_link_tag 'calendar' %>
             <% end %>

public/stylesheets/application.css +10 -1

             body { font-family: Verdana, sans-serif; font-size: 12px; color:#484848; margin: 0; padding: 0; min-width: 900px; }
             h1, h2, h3, h4 { font-family: "Trebuchet MS", Verdana, sans-serif;}
             h1 {margin:0; padding:0; font-size: 24px;}
             h2, .wiki h1 {font-size: 20px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
             h3, .wiki h2 {font-size: 16px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
             h4, .wiki h3 {font-size: 12px;padding: 2px 10px 1px 0px;margin-bottom: 5px; border-bottom: 1px dotted #bbbbbb; color: #444;}
             /***** Layout *****/
             #wrapper {background: white;}
             #top-menu {background: #2C4056;color: #fff;height:1.5em; padding: 2px 6px 0px 6px;}
             #top-menu ul {margin: 0;  padding: 0;}
             #top-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 0px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #top-menu a {color: #fff; padding-right: 4px;}
             #top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
             #account {float:right;}
             #header {height:5.3em;margin:0;background-color:#507AAA;color:#f8f8f8; padding: 4px 8px 0px 6px; position:relative;}
             #header a {color:#f8f8f8;}
             #quick-search {float:right;}
             #main-menu {position: absolute;  bottom: 0px;  left:6px; margin-right: -500px;}
             #main-menu ul {margin: 0;  padding: 0;}
             #main-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 10px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #main-menu li a {
               display: block;
               color: #fff;
               text-decoration: none;
               margin: 0;
               padding: 4px 4px 4px 4px;
               background: #2C4056;
             }
             #main-menu li a:hover, #main-menu li a.selected {background:#759FCF;}
             #main {background: url(../images/mainbg.png) repeat-x; background-color:#EEEEEE;}
             #sidebar{ float: right; width: 17%; position: relative; z-index: 9; min-height: 600px; padding: 0; margin: 0;}
             * html #sidebar{ width: 17%; }
             #sidebar h3{ font-size: 14px; margin-top:14px; color: #666;  }
             #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
             * html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; }
             #content { width: 80%; background: url(../images/contentbg.png) repeat-x; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; height:600px; min-height: 600px;}
             * html #content{ width: 80%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
             html>body #content {
             height: auto;
             min-height: 600px;
             }
             #main.nosidebar #sidebar{ display: none; }
             #main.nosidebar #content{ width: auto; border-right: 0; }
             #footer {clear: both; border-top: 1px solid #bbb; font-size: 0.9em; color: #aaa; padding: 5px; text-align:center; background:#fff;}
             #login-form table {margin-top:5em; padding:1em; margin-left: auto; margin-right: auto; border: 2px solid #FDBF3B; background-color:#FFEBC1; }
             #login-form table td {padding: 6px;}
             #login-form label {font-weight: bold;}
             .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
             /***** Links *****/
             a, a:link, a:visited{ color: #2A5685; text-decoration: none; }
             a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
             a img{ border: 0; }
             /***** Tables *****/
             table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
             table.list th {  background-color:#EEEEEE; padding: 4px; white-space:nowrap; }
             table.list td { overflow: hidden; text-overflow: ellipsis; vertical-align: top;}
             table.list td.id { width: 2%; text-align: center;}
             table.list td.checkbox { width: 15px; padding: 0px;}
             tr.issue { text-align: center; white-space: nowrap; }
             tr.issue td.subject, tr.issue td.category { white-space: normal; }
             tr.issue td.subject { text-align: left; }
             tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
             tr.entry { border: 1px solid #f8f8f8; }
             tr.entry td { white-space: nowrap; }
             tr.entry td.filename { width: 30%; }
             tr.entry td.size { text-align: right; font-size: 90%; }
             tr.entry td.revision, tr.entry td.author { text-align: center; }
             tr.entry td.age { text-align: right; }
             tr.changeset td.author { text-align: center; width: 15%; }
             tr.changeset td.committed_on { text-align: center; width: 15%; }
             tr.message { height: 2.6em; }
             tr.message td.last_message { font-size: 80%; }
             tr.message.locked td.subject a { background-image: url(../images/locked.png); }
             tr.message.sticky td.subject a { background-image: url(../images/sticky.png); font-weight: bold; }
             tr.user td { width:13%; }
             tr.user td.email { width:18%; }
             tr.user td { white-space: nowrap; }
             tr.user.locked, tr.user.registered { color: #aaa; }
             tr.user.locked a, tr.user.registered a { color: #aaa; }
             tr.time-entry { text-align: center; white-space: nowrap; }
             tr.time-entry td.subject, tr.time-entry td.comments { text-align: left; }
-            tr.time-entry td.hours { text-align: right; font-weight: bold; padding-right: 0.6em; }
+            tr.time-entry td.hours { text-align: right; font-weight: bold; padding-right: 0.5em; }
+            tr.time-entry .hours-dec { font-size: 0.9em; }
             table.list tbody tr:hover { background-color:#ffffdd; }
             table td {padding:2px;}
             table p {margin:0;}
             .odd {background-color:#f6f7f8;}
             .even {background-color: #fff;}
             .highlight { background-color: #FCFD8D;}
             .highlight.token-1 { background-color: #faa;}
             .highlight.token-2 { background-color: #afa;}
             .highlight.token-3 { background-color: #aaf;}
             .box{
             padding:6px;
             margin-bottom: 10px;
             background-color:#f6f6f6;
             color:#505050;
             line-height:1.5em;
             border: 1px solid #e4e4e4;
             }
             div.square {
              border: 1px solid #999;
              float: left;
              margin: .3em .4em 0 .4em;
              overflow: hidden;
              width: .6em; height: .6em;
             }
             .contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px; padding-left: 10px; font-size:0.9em;}
             .contextual input {font-size:0.9em;}
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             form {display: inline;}
             input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
             fieldset {border: 1px solid #e4e4e4; margin:0;}
             legend {color: #484848;}
             hr { width: 100%; height: 1px; background: #ccc; border: 0;}
             textarea.wiki-edit { width: 99%; }
             li p {margin-top: 0;}
             div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
             div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
             div#issue-changesets .changeset { padding: 4px;}
             div#issue-changesets .changeset { border-bottom: 1px solid #ddd; }
             div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
             div#activity dl { margin-left: 2em; }
             div#activity dd { margin-bottom: 1em; }
             div#activity dt { margin-bottom: 1px; }
             div#activity dt .time { color: #777; font-size: 80%; }
             div#activity dd .description { font-style: italic; }
             div#roadmap fieldset.related-issues { margin-bottom: 1em; }
             div#roadmap fieldset.related-issues ul { margin-top: 0.3em; margin-bottom: 0.3em; }
             div#roadmap .wiki h1:first-child { display: none; }
             div#roadmap .wiki h1 { font-size: 120%; }
             div#roadmap .wiki h2 { font-size: 110%; }
+            table#time-report td.hours { text-align: right; padding-right: 0.5em; }
+            table#time-report tbody tr { font-style: italic; color: #777; }
+            table#time-report tbody tr.last-level { font-style: normal; color: #555; }
+            table#time-report tbody tr.total { font-style: normal; font-weight: bold; color: #555; background-color:#EEEEEE; }
+            table#time-report .hours-dec { font-size: 0.9em; }
             div.total-hours { text-align: left; font-size: 110%; font-weight: bold; }
             div.total-hours span.hours-int { font-size: 120%; }
             .autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
             #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
             .pagination {font-size: 90%}
             p.pagination {margin-top:8px;}
             /***** Tabular forms ******/
             .tabular p{
             margin: 0;
             padding: 5px 0 8px 0;
             padding-left: 180px; /*width of left column containing the label elements*/
             height: 1%;
             clear:left;
             }
             .tabular label{
             font-weight: bold;
             float: left;
             text-align: right;
             margin-left: -180px; /*width of left column*/
             width: 175px; /*width of labels. Should be smaller than left column to create some right
             margin*/
             }
             .tabular label.floating{
             font-weight: normal;
             margin-left: 0px;
             text-align: left;
             width: 200px;
             }
             #preview fieldset {margin-top: 1em; background: url(../images/draft.png)}
             .tabular.settings p{ padding-left: 300px; }
             .tabular.settings label{ margin-left: -300px; width: 295px; }
             .required {color: #bb0000;}
             .summary {font-style: italic;}
             div.attachments p { margin:4px 0 2px 0; }
             /***** Flash & error messages ****/
             #errorExplanation, div.flash, .nodata {
                 padding: 4px 4px 4px 30px;
                 margin-bottom: 12px;
             	font-size: 1.1em;
             	border: 2px solid;
             }
             div.flash {margin-top: 8px;}
             div.flash.error, #errorExplanation {
                 background: url(../images/false.png) 8px 5px no-repeat;
             	background-color: #ffe3e3;
             	border-color: #dd0000;
             	color: #550000;
             }
             div.flash.notice {
                 background: url(../images/true.png) 8px 5px no-repeat;
             	background-color: #dfffdf;
             	border-color: #9fcf9f;
             	color: #005f00;
             }
             .nodata {
                 text-align: center;
             	background-color: #FFEBC1;
             	border-color: #FDBF3B;
             	color: #A6750C;
             }
             #errorExplanation ul { font-size: 0.9em;}
             /***** Ajax indicator ******/
             #ajax-indicator {
             position: absolute; /* fixed not supported by IE */
             background-color:#eee;
             border: 1px solid #bbb;
             top:35%;
             left:40%;
             width:20%;
             font-weight:bold;
             text-align:center;
             padding:0.6em;
             z-index:100;
             filter:alpha(opacity=50);
             opacity: 0.5;
             -khtml-opacity: 0.5;
             }
             html>body #ajax-indicator { position: fixed; }
             #ajax-indicator span {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             background-image: url(../images/loading.gif);
             padding-left: 26px;
             vertical-align: bottom;
             }
             /***** Calendar *****/
             table.cal {border-collapse: collapse; width: 100%; margin: 8px 0 6px 0;border: 1px solid #d7d7d7;}
             table.cal thead th {width: 14%;}
             table.cal tbody tr {height: 100px;}
             table.cal th { background-color:#EEEEEE; padding: 4px; }
             table.cal td {border: 1px solid #d7d7d7; vertical-align: top; font-size: 0.9em;}
             table.cal td p.day-num {font-size: 1.1em; text-align:right;}
             table.cal td.odd p.day-num {color: #bbb;}
             table.cal td.today {background:#ffffdd;}
             table.cal td.today p.day-num {font-weight: bold;}
             /***** Tooltips ******/
             .tooltip{position:relative;z-index:24;}
             .tooltip:hover{z-index:25;color:#000;}
             .tooltip span.tip{display: none; text-align:left;}
             div.tooltip:hover span.tip{
             display:block;
             position:absolute;
             top:12px; left:24px; width:270px;
             border:1px solid #555;
             background-color:#fff;
             padding: 4px;
             font-size: 0.8em;
             color:#505050;
             }
             /***** Progress bar *****/
             table.progress {
                 border: 1px solid #D7D7D7;
                 border-collapse: collapse;
                 border-spacing: 0pt;
                 empty-cells: show;
                 text-align: center;
                 float:left;
                 margin: 1px 6px 1px 0px;
             }
             table.progress td { height: 0.9em; }
             table.progress td.closed { background: #BAE0BA none repeat scroll 0%; }
             table.progress td.done { background: #DEF0DE none repeat scroll 0%; }
             table.progress td.open { background: #FFF none repeat scroll 0%; }
             p.pourcent {font-size: 80%;}
             p.progress-info {clear: left; font-style: italic; font-size: 80%;}
             div#status_by { float:right; width:380px; margin-left: 16px; margin-bottom: 16px; }
             /***** Tabs *****/
             #content .tabs {height: 2.6em; border-bottom: 1px solid #bbbbbb; margin-bottom:1.2em; position:relative;}
             #content .tabs ul {margin:0; position:absolute; bottom:-2px; padding-left:1em;}
             #content .tabs>ul { bottom:-1px; } /* others */
             #content .tabs ul li {
             float:left;
             list-style-type:none;
             white-space:nowrap;
             margin-right:8px;
             background:#fff;
             }
             #content .tabs ul li a{
             display:block;
             font-size: 0.9em;
             text-decoration:none;
             line-height:1.3em;
             padding:4px 6px 4px 6px;
             border: 1px solid #ccc;
             border-bottom: 1px solid #bbbbbb;
             background-color: #eeeeee;
             color:#777;
             font-weight:bold;
             }
             #content .tabs ul li a:hover {
             background-color: #ffffdd;
             text-decoration:none;
             }
             #content .tabs ul li a.selected {
             background-color: #fff;
             border: 1px solid #bbbbbb;
             border-bottom: 1px solid #fff;
             }
             #content .tabs ul li a.selected:hover {
             background-color: #fff;
             }
             /***** Diff *****/
             .diff_out { background: #fcc; }
             .diff_in { background: #cfc; }
             /***** Wiki *****/
             div.wiki table {
                 border: 1px solid #505050;
                 border-collapse: collapse;
             }
             div.wiki table, div.wiki td, div.wiki th {
                 border: 1px solid #bbb;
                 padding: 4px;
             }
             div.wiki .external {
                 background-position: 0% 60%;
                 background-repeat: no-repeat;
                 padding-left: 12px;
                 background-image: url(../images/external.png);
             }
             div.wiki a.new {
                 color: #b73535;
             }
             div.wiki pre {
                 margin: 1em 1em 1em 1.6em;
                 padding: 2px;
                 background-color: #fafafa;
                 border: 1px solid #dadada;
                 width:95%;
                 overflow-x: auto;
             }
             div.wiki div.toc {
                 background-color: #ffffdd;
                 border: 1px solid #e4e4e4;
                 padding: 4px;
                 line-height: 1.2em;
                 margin-bottom: 12px;
                 margin-right: 12px;
                 display: table
             }
             * html div.wiki div.toc { width: 50%; } /* IE6 doesn't autosize div */
             div.wiki div.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
             div.wiki div.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
             div.wiki div.toc a {
                 display: block;
                 font-size: 0.9em;
                 font-weight: normal;
                 text-decoration: none;
                 color: #606060;
             }
             div.wiki div.toc a:hover { color: #c61a1a; text-decoration: underline;}
             div.wiki div.toc a.heading2 { margin-left: 6px; }
             div.wiki div.toc a.heading3 { margin-left: 12px; font-size: 0.8em; }
             /***** My page layout *****/
             .block-receiver {
             border:1px dashed #c0c0c0;
             margin-bottom: 20px;
             padding: 15px 0 15px 0;
             }
             .mypage-box {
             margin:0 0 20px 0;
             color:#505050;
             line-height:1.5em;
             }
             .handle {
             cursor: move;
             }
             a.close-icon {
             display:block;
             margin-top:3px;
             overflow:hidden;
             width:12px;
             height:12px;
             background-repeat: no-repeat;
             cursor:pointer;
             background-image:url('../images/close.png');
             }
             a.close-icon:hover {
             background-image:url('../images/close_hl.png');
             }
             /***** Gantt chart *****/
             .gantt_hdr {
               position:absolute;
               top:0;
               height:16px;
               border-top: 1px solid #c0c0c0;
               border-bottom: 1px solid #c0c0c0;
               border-right: 1px solid #c0c0c0;
               text-align: center;
               overflow: hidden;
             }
             .task {
               position: absolute;
               height:8px;
               font-size:0.8em;
               color:#888;
               padding:0;
               margin:0;
               line-height:0.8em;
             }
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#66f url(../images/task_done.png); border: 1px solid #66f; }
             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
             .milestone { background-image:url(../images/milestone.png); background-repeat: no-repeat; border: 0; }
             /***** Icons *****/
             .icon {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 20px;
             padding-top: 2px;
             padding-bottom: 3px;
             }
             .icon22 {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 26px;
             line-height: 22px;
             vertical-align: middle;
             }
             .icon-add { background-image: url(../images/add.png); }
             .icon-edit { background-image: url(../images/edit.png); }
             .icon-copy { background-image: url(../images/copy.png); }
             .icon-del { background-image: url(../images/delete.png); }
             .icon-move { background-image: url(../images/move.png); }
             .icon-save { background-image: url(../images/save.png); }
             .icon-cancel { background-image: url(../images/cancel.png); }
             .icon-pdf { background-image: url(../images/pdf.png); }
             .icon-csv { background-image: url(../images/csv.png); }
             .icon-html { background-image: url(../images/html.png); }
             .icon-image { background-image: url(../images/image.png); }
             .icon-txt { background-image: url(../images/txt.png); }
             .icon-file { background-image: url(../images/file.png); }
             .icon-folder { background-image: url(../images/folder.png); }
             .open .icon-folder { background-image: url(../images/folder_open.png); }
             .icon-package { background-image: url(../images/package.png); }
             .icon-home { background-image: url(../images/home.png); }
             .icon-user { background-image: url(../images/user.png); }
             .icon-mypage { background-image: url(../images/user_page.png); }
             .icon-admin { background-image: url(../images/admin.png); }
             .icon-projects { background-image: url(../images/projects.png); }
             .icon-logout { background-image: url(../images/logout.png); }
             .icon-help { background-image: url(../images/help.png); }
             .icon-attachment  { background-image: url(../images/attachment.png); }
             .icon-index  { background-image: url(../images/index.png); }
             .icon-history  { background-image: url(../images/history.png); }
             .icon-feed  { background-image: url(../images/feed.png); }
             .icon-time  { background-image: url(../images/time.png); }
             .icon-stats  { background-image: url(../images/stats.png); }
             .icon-warning  { background-image: url(../images/warning.png); }
             .icon-fav  { background-image: url(../images/fav.png); }
             .icon-fav-off  { background-image: url(../images/fav_off.png); }
             .icon-reload  { background-image: url(../images/reload.png); }
             .icon-lock  { background-image: url(../images/locked.png); }
             .icon-unlock  { background-image: url(../images/unlock.png); }
             .icon-checked  { background-image: url(../images/true.png); }
+            .icon-details  { background-image: url(../images/zoom_in.png); }
+            .icon-report  { background-image: url(../images/report.png); }
             .icon22-projects { background-image: url(../images/22x22/projects.png); }
             .icon22-users { background-image: url(../images/22x22/users.png); }
             .icon22-tracker { background-image: url(../images/22x22/tracker.png); }
             .icon22-role { background-image: url(../images/22x22/role.png); }
             .icon22-workflow { background-image: url(../images/22x22/workflow.png); }
             .icon22-options { background-image: url(../images/22x22/options.png); }
             .icon22-notifications { background-image: url(../images/22x22/notifications.png); }
             .icon22-authent { background-image: url(../images/22x22/authent.png); }
             .icon22-info { background-image: url(../images/22x22/info.png); }
             .icon22-comment { background-image: url(../images/22x22/comment.png); }
             .icon22-package { background-image: url(../images/22x22/package.png); }
             .icon22-settings { background-image: url(../images/22x22/settings.png); }
             .icon22-plugin { background-image: url(../images/22x22/plugin.png); }
             /***** Media print specific styles *****/
             @media print {
               #top-menu, #header, #main-menu, #sidebar, #footer, .contextual { display:none; }
               #main { background: #fff; }
               #content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; }
             }

test/fixtures/time_entries.yml +18 -3

             ---
             time_entries_001:
               created_on: 2007-03-23 12:54:18 +01:00
               tweek: 12
               tmonth: 3
               project_id: 1
               comments: My hours
               updated_on: 2007-03-23 12:54:18 +01:00
-              activity_id: 8
+              activity_id: 9
               spent_on: 2007-03-23
               issue_id: 1
               id: 1
               hours: 4.25
               user_id: 2
               tyear: 2007
             time_entries_002:
               created_on: 2007-03-23 14:11:04 +01:00
               tweek: 12
               tmonth: 3
               project_id: 1
               comments: ""
               updated_on: 2007-03-23 14:11:04 +01:00
-              activity_id: 8
+              activity_id: 9
               spent_on: 2007-03-12
               issue_id: 1
               id: 2
               hours: 150.0
               user_id: 1
               tyear: 2007
             time_entries_003:
               created_on: 2007-04-21 12:20:48 +02:00
               tweek: 16
               tmonth: 4
               project_id: 1
               comments: ""
               updated_on: 2007-04-21 12:20:48 +02:00
-              activity_id: 8
+              activity_id: 9
               spent_on: 2007-04-21
               issue_id: 2
               id: 3
               hours: 1.0
               user_id: 1
               tyear: 2007
+            time_entries_004:
+              created_on: 2007-04-22 12:20:48 +02:00
+              tweek: 16
+              tmonth: 4
+              project_id: 3
+              comments: Time spent on a subproject
+              updated_on: 2007-04-22 12:20:48 +02:00
+              activity_id: 10
+              spent_on: 2007-04-22
+              issue_id:
+              id: 4
+              hours: 7.65
+              user_id: 1
+              tyear: 2007
+  No newline at end of file

test/functional/timelog_controller_test.rb +21 -9

             # 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.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'timelog_controller'
             # Re-raise errors caught by the controller.
             class TimelogController; def rescue_action(e) raise e end; end
             class TimelogControllerTest < Test::Unit::TestCase
               fixtures :projects, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses
               def setup
                 @controller = TimelogController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
               end
               def test_report_no_criteria
                 get :report, :project_id => 1
                 assert_response :success
                 assert_template 'report'
               end
               def test_report_one_criteria
-                get :report, :project_id => 1, :period => "month", :date_from => "2007-01-01", :date_to => "2007-12-31", :criterias => ["member"]
+                get :report, :project_id => 1, :period => 'week', :date_from => "2007-04-01", :date_to => "2007-04-30", :criterias => ['project']
                 assert_response :success
                 assert_template 'report'
-                assert_not_nil assigns(:hours)
+                assert_not_nil assigns(:total_hours)
-              end
+                assert_equal "8.65", "%.2f" % assigns(:total_hours)
+             end
               def test_report_two_criterias
-                get :report, :project_id => 1, :period => "week", :date_from => "2007-01-01", :date_to => "2007-12-31", :criterias => ["member", "activity"]
+                get :report, :project_id => 1, :period => 'month', :date_from => "2007-01-01", :date_to => "2007-12-31", :criterias => ["member", "activity"]
                 assert_response :success
                 assert_template 'report'
-                assert_not_nil assigns(:hours)
+                assert_not_nil assigns(:total_hours)
+                assert_equal "162.90", "%.2f" % assigns(:total_hours)
               end
+              def test_report_one_criteria_no_result
+                get :report, :project_id => 1, :period => 'week', :date_from => "1998-04-01", :date_to => "1998-04-30", :criterias => ['project']
+                assert_response :success
+                assert_template 'report'
+                assert_not_nil assigns(:total_hours)
+                assert_equal "0.00", "%.2f" % assigns(:total_hours)
+             end
               def test_details_at_project_level
                 get :details, :project_id => 1
                 assert_response :success
                 assert_template 'details'
                 assert_not_nil assigns(:entries)
-                assert_equal 3, assigns(:entries).size
+                assert_equal 4, assigns(:entries).size
+                # project and subproject
+                assert_equal [1, 3], assigns(:entries).collect(&:project_id).uniq.sort
                 assert_not_nil assigns(:total_hours)
-                assert_equal 155.25, assigns(:total_hours)
+                assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 # display all time by default
                 assert_nil assigns(:from)
                 assert_nil assigns(:to)
               end
               def test_details_at_project_level_with_date_range
                 get :details, :project_id => 1, :from => '2007-03-20', :to => '2007-04-30'
                 assert_response :success
                 assert_template 'details'
                 assert_not_nil assigns(:entries)
-                assert_equal 2, assigns(:entries).size
+                assert_equal 3, assigns(:entries).size
                 assert_not_nil assigns(:total_hours)
-                assert_equal 5.25, assigns(:total_hours)
+                assert_equal "12.90", "%.2f" % assigns(:total_hours)
                 assert_equal '2007-03-20'.to_date, assigns(:from)
                 assert_equal '2007-04-30'.to_date, assigns(:to)
               end
               def test_details_at_project_level_with_period
                 get :details, :project_id => 1, :period => '7_days'
                 assert_response :success
                 assert_template 'details'
                 assert_not_nil assigns(:entries)
                 assert_not_nil assigns(:total_hours)
                 assert_equal Date.today - 7, assigns(:from)
                 assert_equal Date.today, assigns(:to)
               end
               def test_details_at_issue_level
                 get :details, :issue_id => 1
                 assert_response :success
                 assert_template 'details'
                 assert_not_nil assigns(:entries)
                 assert_equal 2, assigns(:entries).size
                 assert_not_nil assigns(:total_hours)
                 assert_equal 154.25, assigns(:total_hours)
                 # display all time by default
                 assert_nil assigns(:from)
                 assert_nil assigns(:to)
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages