jro_apps/redmine Commit - r7965:10509933486a

Removed unnecessary calculations in time entries index....

Jean-Philippe Lang -

r7965:10509933486a

parent child

Context file:

r7965:10509933486a

Collapse all files

app/controllers/timelog_controller.rb 0 -2

             # Redmine - project management software
             # Copyright (C) 2006-2011  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
               menu_item :issues
               before_filter :find_project, :only => [:new, :create]
               before_filter :find_time_entry, :only => [:show, :edit, :update]
               before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy]
               before_filter :authorize, :except => [:index, :report]
               before_filter :find_optional_project, :only => [:index, :report]
               accept_rss_auth :index
               accept_api_auth :index, :show, :create, :update, :destroy
               helper :sort
               include SortHelper
               helper :issues
               include TimelogHelper
               helper :custom_fields
               include CustomFieldsHelper
               def index
                 sort_init 'spent_on', 'desc'
                 sort_update 'spent_on' => 'spent_on',
                             'user' => 'user_id',
                             'activity' => 'activity_id',
                             'project' => "#{Project.table_name}.name",
                             'issue' => 'issue_id',
                             'hours' => 'hours'
                 retrieve_date_range
                 scope = TimeEntry.visible.spent_between(@from, @to)
                 if @issue
                   scope = scope.on_issue(@issue)
                 elsif @project
                   scope = scope.on_project(@project, Setting.display_subprojects_issues?)
                 end
                 respond_to do |format|
                   format.html {
                     # Paginate results
                     @entry_count = scope.count
                     @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
                     @entries = scope.all(
                       :include => [:project, :activity, :user, {:issue => :tracker}],
                       :order => sort_clause,
                       :limit  =>  @entry_pages.items_per_page,
                       :offset =>  @entry_pages.current.offset
                     )
                     @total_hours = scope.sum(:hours).to_f
                     render :layout => !request.xhr?
                   }
                   format.api  {
                     @entry_count = scope.count
                     @offset, @limit = api_offset_and_limit
                     @entries = scope.all(
                       :include => [:project, :activity, :user, {:issue => :tracker}],
                       :order => sort_clause,
                       :limit  => @limit,
                       :offset => @offset
                     )
                   }
                   format.atom {
                     entries = scope.all(
                       :include => [:project, :activity, :user, {:issue => :tracker}],
                       :order => "#{TimeEntry.table_name}.created_on DESC",
                       :limit => Setting.feeds_limit.to_i
                     )
                     render_feed(entries, :title => l(:label_spent_time))
                   }
                   format.csv {
                     # Export all entries
                     @entries = scope.all(
                       :include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
                       :order => sort_clause
                     )
                     send_data(entries_to_csv(@entries), :type => 'text/csv; header=present', :filename => 'timelog.csv')
                   }
                 end
               end
               def report
                 retrieve_date_range
                 @report = Redmine::Helpers::TimeReport.new(@project, @issue, params[:criteria], params[:columns], @from, @to)
                 respond_to do |format|
                   format.html { render :layout => !request.xhr? }
                   format.csv  { send_data(report_to_csv(@report), :type => 'text/csv; header=present', :filename => 'timelog.csv') }
                 end
               end
               def show
                 respond_to do |format|
                   # TODO: Implement html response
                   format.html { render :nothing => true, :status => 406 }
                   format.api
                 end
               end
               def new
                 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
                 @time_entry.attributes = params[:time_entry]
                 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
                 render :action => 'edit'
               end
               verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
               def create
                 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
                 @time_entry.attributes = params[:time_entry]
                 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
                 if @time_entry.save
                   respond_to do |format|
                     format.html {
                       flash[:notice] = l(:notice_successful_update)
                       redirect_back_or_default :action => 'index', :project_id => @time_entry.project
                     }
                     format.api  { render :action => 'show', :status => :created, :location => time_entry_url(@time_entry) }
                   end
                 else
                   respond_to do |format|
                     format.html { render :action => 'edit' }
                     format.api  { render_validation_errors(@time_entry) }
                   end
                 end
               end
               def edit
                 @time_entry.attributes = params[:time_entry]
                 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
               end
               verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
               def update
                 @time_entry.attributes = params[:time_entry]
                 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
                 if @time_entry.save
                   respond_to do |format|
                     format.html {
                       flash[:notice] = l(:notice_successful_update)
                       redirect_back_or_default :action => 'index', :project_id => @time_entry.project
                     }
                     format.api  { head :ok }
                   end
                 else
                   respond_to do |format|
                     format.html { render :action => 'edit' }
                     format.api  { render_validation_errors(@time_entry) }
                   end
                 end
               end
               def bulk_edit
                 @available_activities = TimeEntryActivity.shared.active
                 @custom_fields = TimeEntry.first.available_custom_fields
               end
               def bulk_update
                 attributes = parse_params_for_bulk_time_entry_attributes(params)
                 unsaved_time_entry_ids = []
                 @time_entries.each do |time_entry|
                   time_entry.reload
                   time_entry.attributes = attributes
                   call_hook(:controller_time_entries_bulk_edit_before_save, { :params => params, :time_entry => time_entry })
                   unless time_entry.save
                     # Keep unsaved time_entry ids to display them in flash error
                     unsaved_time_entry_ids << time_entry.id
                   end
                 end
                 set_flash_from_bulk_time_entry_save(@time_entries, unsaved_time_entry_ids)
                 redirect_back_or_default({:controller => 'timelog', :action => 'index', :project_id => @projects.first})
               end
               verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed }
               def destroy
                 @time_entries.each do |t|
                   begin
                     unless t.destroy && t.destroyed?
                       respond_to do |format|
                         format.html {
                           flash[:error] = l(:notice_unable_delete_time_entry)
                           redirect_to :back
                         }
                         format.api  { render_validation_errors(t) }
                       end
                       return
                     end
                   rescue ::ActionController::RedirectBackError
                     redirect_to :action => 'index', :project_id => @projects.first
                     return
                   end
                 end
                 respond_to do |format|
                   format.html {
                     flash[:notice] = l(:notice_successful_delete)
                     redirect_back_or_default(:action => 'index', :project_id => @projects.first)
                   }
                   format.api  { head :ok }
                 end
               end
             private
               def find_time_entry
                 @time_entry = TimeEntry.find(params[:id])
                 unless @time_entry.editable_by?(User.current)
                   render_403
                   return false
                 end
                 @project = @time_entry.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_time_entries
                 @time_entries = TimeEntry.find_all_by_id(params[:id] || params[:ids])
                 raise ActiveRecord::RecordNotFound if @time_entries.empty?
                 @projects = @time_entries.collect(&:project).compact.uniq
                 @project = @projects.first if @projects.size == 1
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def set_flash_from_bulk_time_entry_save(time_entries, unsaved_time_entry_ids)
                 if unsaved_time_entry_ids.empty?
                   flash[:notice] = l(:notice_successful_update) unless time_entries.empty?
                 else
                   flash[:error] = l(:notice_failed_to_save_time_entries,
                                     :count => unsaved_time_entry_ids.size,
                                     :total => time_entries.size,
                                     :ids => '#' + unsaved_time_entry_ids.join(', #'))
                 end
               end
               def find_project
                 if (issue_id = (params[:issue_id] || params[:time_entry] && params[:time_entry][:issue_id])).present?
                   @issue = Issue.find(issue_id)
                   @project = @issue.project
                 elsif (project_id = (params[:project_id] || params[:time_entry] && params[:time_entry][:project_id])).present?
                   @project = Project.find(project_id)
                 else
                   render_404
                   return false
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 if !params[:issue_id].blank?
                   @issue = Issue.find(params[:issue_id])
                   @project = @issue.project
                 elsif !params[:project_id].blank?
                   @project = Project.find(params[:project_id])
                 end
                 deny_access unless User.current.allowed_to?(:view_time_entries, @project, :global => true)
               end
               # Retrieves the date range based on predefined ranges or specific from/to param dates
               def retrieve_date_range
                 @free_period = false
                 @from, @to = nil, nil
                 if params[:period_type] == '1' || (params[:period_type].nil? && !params[:period].nil?)
                   case params[:period].to_s
                   when 'today'
                     @from = @to = Date.today
                   when 'yesterday'
                     @from = @to = Date.today - 1
                   when 'current_week'
                     @from = Date.today - (Date.today.cwday - 1)%7
                     @to = @from + 6
                   when 'last_week'
                     @from = Date.today - 7 - (Date.today.cwday - 1)%7
                     @to = @from + 6
                   when '7_days'
                     @from = Date.today - 7
                     @to = Date.today
                   when 'current_month'
                     @from = Date.civil(Date.today.year, Date.today.month, 1)
                     @to = (@from >> 1) - 1
                   when 'last_month'
                     @from = Date.civil(Date.today.year, Date.today.month, 1) << 1
                     @to = (@from >> 1) - 1
                   when '30_days'
                     @from = Date.today - 30
                     @to = Date.today
                   when 'current_year'
                     @from = Date.civil(Date.today.year, 1, 1)
                     @to = Date.civil(Date.today.year, 12, 31)
                   end
                 elsif params[:period_type] == '2' || (params[:period_type].nil? && (!params[:from].nil? || !params[:to].nil?))
                   begin; @from = params[:from].to_s.to_date unless params[:from].blank?; rescue; end
                   begin; @to = params[:to].to_s.to_date unless params[:to].blank?; rescue; end
                   @free_period = true
                 else
                   # default
                 end
                 @from, @to = @to, @from if @from && @to && @from > @to
-                @from ||= (TimeEntry.earilest_date_for_project(@project) || Date.today)
-                @to   ||= (TimeEntry.latest_date_for_project(@project) || Date.today)
               end
               def parse_params_for_bulk_time_entry_attributes(params)
                 attributes = (params[:time_entry] || {}).reject {|k,v| v.blank?}
                 attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
                 attributes[:custom_field_values].reject! {|k,v| v.blank?} if attributes[:custom_field_values]
                 attributes
               end
             end

app/models/time_entry.rb +12 -20

             # Redmine - project management software
             # Copyright (C) 2006-2011  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 => 'TimeEntryActivity', :foreign_key => 'activity_id'
               attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
               acts_as_customizable
               acts_as_event :title => Proc.new {|o| "#{l_hours(o.hours)} (#{(o.issue || o.project).event_title})"},
                             :url => Proc.new {|o| {:controller => 'timelog', :action => 'index', :project_id => o.project, :issue_id => o.issue}},
                             :author => :user,
                             :description => :comments
               acts_as_activity_provider :timestamp => "#{table_name}.created_on",
                                         :author_key => :user_id,
                                         :find_options => {:include => :project}
               validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
               validates_numericality_of :hours, :allow_nil => true, :message => :invalid
               validates_length_of :comments, :maximum => 255, :allow_nil => true
               before_validation :set_project_if_nil
               validate :validate_time_entry
               named_scope :visible, lambda {|*args| {
                 :include => :project,
                 :conditions => Project.allowed_to_condition(args.shift || User.current, :view_time_entries, *args)
               }}
               named_scope :on_issue, lambda {|issue| {
                 :include => :issue,
                 :conditions => "#{Issue.table_name}.root_id = #{issue.root_id} AND #{Issue.table_name}.lft >= #{issue.lft} AND #{Issue.table_name}.rgt <= #{issue.rgt}"
               }}
               named_scope :on_project, lambda {|project, include_subprojects| {
                 :include => :project,
                 :conditions => project.project_condition(include_subprojects)
               }}
-              named_scope :spent_between, lambda {|from, to| {
+              named_scope :spent_between, lambda {|from, to|
-                :conditions => ["#{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", from, to]
+                if from && to
-              }}
+                 {:conditions => ["#{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", from, to]}
+                elsif from
+                 {:conditions => ["#{TimeEntry.table_name}.spent_on >= ?", from]}
+                elsif to
+                 {:conditions => ["#{TimeEntry.table_name}.spent_on <= ?", to]}
+                else
+                 {}
+                end
+              }
               def after_initialize
                 if new_record? && self.activity.nil?
                   if default_activity = TimeEntryActivity.default
                     self.activity_id = default_activity.id
                   end
                   self.hours = nil if hours == 0
                 end
               end
               def set_project_if_nil
                 self.project = issue.project if issue && project.nil?
               end
               def validate_time_entry
                 errors.add :hours, :invalid if hours && (hours < 0 || hours >= 1000)
                 errors.add :project_id, :invalid if project.nil?
                 errors.add :issue_id, :invalid if (issue_id && !issue) || (issue && project!=issue.project)
               end
               def hours=(h)
                 write_attribute :hours, (h.is_a?(String) ? (h.to_hours || h) : h)
               end
               # tyear, tmonth, tweek assigned where setting spent_on attributes
               # these attributes make time aggregations easier
               def spent_on=(date)
                 super
                 if spent_on.is_a?(Time)
                   self.spent_on = spent_on.to_date
                 end
                 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 == user && usr.allowed_to?(:edit_own_time_entries, project)) || usr.allowed_to?(:edit_time_entries, project)
               end
-              def self.earilest_date_for_project(project=nil)
-                finder_conditions = ARCondition.new(Project.allowed_to_condition(User.current, :view_time_entries))
-                if project
-                  finder_conditions << ["project_id IN (?)", project.hierarchy.collect(&:id)]
-                end
-                TimeEntry.minimum(:spent_on, :include => :project, :conditions => finder_conditions.conditions)
-              end
-              def self.latest_date_for_project(project=nil)
-                finder_conditions = ARCondition.new(Project.allowed_to_condition(User.current, :view_time_entries))
-                if project
-                  finder_conditions << ["project_id IN (?)", project.hierarchy.collect(&:id)]
-                end
-                TimeEntry.maximum(:spent_on, :include => :project, :conditions => finder_conditions.conditions)
-              end
             end

test/functional/timelog_controller_test.rb +5 -5

             # -*- coding: utf-8 -*-
             # Redmine - project management software
             # Copyright (C) 2006-2011  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.expand_path('../../test_helper', __FILE__)
             require 'timelog_controller'
             # Re-raise errors caught by the controller.
             class TimelogController; def rescue_action(e) raise e end; end
             class TimelogControllerTest < ActionController::TestCase
               fixtures :projects, :enabled_modules, :roles, :members,
                        :member_roles, :issues, :time_entries, :users,
                        :trackers, :enumerations, :issue_statuses,
                        :custom_fields, :custom_values
               include Redmine::I18n
               def setup
                 @controller = TimelogController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
               end
               def test_get_new
                 @request.session[:user_id] = 3
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'edit'
                 # Default activity selected
                 assert_tag :tag => 'option', :attributes => { :selected => 'selected' },
                                              :content => 'Development'
               end
               def test_get_new_should_only_show_active_time_entry_activities
                 @request.session[:user_id] = 3
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'edit'
                 assert_no_tag :tag => 'option', :content => 'Inactive Activity'
               end
               def test_get_edit_existing_time
                 @request.session[:user_id] = 2
                 get :edit, :id => 2, :project_id => nil
                 assert_response :success
                 assert_template 'edit'
                 # Default activity selected
                 assert_tag :tag => 'form', :attributes => { :action => '/projects/ecookbook/time_entries/2' }
               end
               def test_get_edit_with_an_existing_time_entry_with_inactive_activity
                 te = TimeEntry.find(1)
                 te.activity = TimeEntryActivity.find_by_name("Inactive Activity")
                 te.save!
                 @request.session[:user_id] = 1
                 get :edit, :project_id => 1, :id => 1
                 assert_response :success
                 assert_template 'edit'
                 # Blank option since nothing is pre-selected
                 assert_tag :tag => 'option', :content => '--- Please select ---'
               end
               def test_post_create
                 # TODO: should POST to issues’ time log instead of project. change form
                 # and routing
                 @request.session[:user_id] = 3
                 post :create, :project_id => 1,
                             :time_entry => {:comments => 'Some work on TimelogControllerTest',
                                             # Not the default activity
                                             :activity_id => '11',
                                             :spent_on => '2008-03-14',
                                             :issue_id => '1',
                                             :hours => '7.3'}
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 i = Issue.find(1)
                 t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
                 assert_not_nil t
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
                 assert_equal i, t.issue
                 assert_equal i.project, t.project
               end
               def test_post_create_with_blank_issue
                 # TODO: should POST to issues’ time log instead of project. change form
                 # and routing
                 @request.session[:user_id] = 3
                 post :create, :project_id => 1,
                             :time_entry => {:comments => 'Some work on TimelogControllerTest',
                                             # Not the default activity
                                             :activity_id => '11',
                                             :issue_id => '',
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'}
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
                 assert_not_nil t
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
               end
               def test_create_without_log_time_permission_should_be_denied
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :log_time
                 post :create, :project_id => 1,
                             :time_entry => {:activity_id => '11',
                                             :issue_id => '',
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'}
                 assert_response 403
               end
               def test_update
                 entry = TimeEntry.find(1)
                 assert_equal 1, entry.issue_id
                 assert_equal 2, entry.user_id
                 @request.session[:user_id] = 1
                 put :update, :id => 1,
                             :time_entry => {:issue_id => '2',
                                             :hours => '8'}
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 entry.reload
                 assert_equal 8, entry.hours
                 assert_equal 2, entry.issue_id
                 assert_equal 2, entry.user_id
               end
               def test_get_bulk_edit
                 @request.session[:user_id] = 2
                 get :bulk_edit, :ids => [1, 2]
                 assert_response :success
                 assert_template 'bulk_edit'
                 # System wide custom field
                 assert_tag :select, :attributes => {:name => 'time_entry[custom_field_values][10]'}
               end
               def test_get_bulk_edit_on_different_projects
                 @request.session[:user_id] = 2
                 get :bulk_edit, :ids => [1, 2, 6]
                 assert_response :success
                 assert_template 'bulk_edit'
               end
               def test_bulk_update
                 @request.session[:user_id] = 2
                 # update time entry activity
                 post :bulk_update, :ids => [1, 2], :time_entry => { :activity_id => 9}
                 assert_response 302
                 # check that the issues were updated
                 assert_equal [9, 9], TimeEntry.find_all_by_id([1, 2]).collect {|i| i.activity_id}
               end
               def test_bulk_update_on_different_projects
                 @request.session[:user_id] = 2
                 # makes user a manager on the other project
                 Member.create!(:user_id => 2, :project_id => 3, :role_ids => [1])
                 # update time entry activity
                 post :bulk_update, :ids => [1, 2, 4], :time_entry => { :activity_id => 9 }
                 assert_response 302
                 # check that the issues were updated
                 assert_equal [9, 9, 9], TimeEntry.find_all_by_id([1, 2, 4]).collect {|i| i.activity_id}
               end
               def test_bulk_update_on_different_projects_without_rights
                 @request.session[:user_id] = 3
                 user = User.find(3)
                 action = { :controller => "timelog", :action => "bulk_update" }
                 assert user.allowed_to?(action, TimeEntry.find(1).project)
                 assert ! user.allowed_to?(action, TimeEntry.find(5).project)
                 post :bulk_update, :ids => [1, 5], :time_entry => { :activity_id => 9 }
                 assert_response 403
               end
               def test_bulk_update_custom_field
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1, 2], :time_entry => { :custom_field_values => {'10' => '0'} }
                 assert_response 302
                 assert_equal ["0", "0"], TimeEntry.find_all_by_id([1, 2]).collect {|i| i.custom_value_for(10).value}
               end
               def test_post_bulk_update_should_redirect_back_using_the_back_url_parameter
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1,2], :back_url => '/time_entries'
                 assert_response :redirect
                 assert_redirected_to '/time_entries'
               end
               def test_post_bulk_update_should_not_redirect_back_using_the_back_url_parameter_off_the_host
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1,2], :back_url => 'http://google.com'
                 assert_response :redirect
                 assert_redirected_to :controller => 'timelog', :action => 'index', :project_id => Project.find(1).identifier
               end
               def test_post_bulk_update_without_edit_permission_should_be_denied
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :edit_time_entries
                 post :bulk_update, :ids => [1,2]
                 assert_response 403
               end
               def test_destroy
                 @request.session[:user_id] = 2
                 delete :destroy, :id => 1
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal I18n.t(:notice_successful_delete), flash[:notice]
                 assert_nil TimeEntry.find_by_id(1)
               end
               def test_destroy_should_fail
                 # simulate that this fails (e.g. due to a plugin), see #5700
                 TimeEntry.any_instance.expects(:destroy).returns(false)
                 @request.session[:user_id] = 2
                 delete :destroy, :id => 1
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal I18n.t(:notice_unable_delete_time_entry), flash[:error]
                 assert_not_nil TimeEntry.find_by_id(1)
               end
               def test_index_all_projects
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 assert_tag :form,
                   :attributes => {:action => "/time_entries", :id => 'query_form'}
               end
               def test_index_at_project_level
                 get :index, :project_id => 'ecookbook'
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 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 "162.90", "%.2f" % assigns(:total_hours)
                 # display all time by default
-                assert_equal '2007-03-12'.to_date, assigns(:from)
+                assert_nil assigns(:from)
-                assert_equal '2007-04-22'.to_date, assigns(:to)
+                assert_nil assigns(:to)
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_at_project_level_with_date_range
                 get :index, :project_id => 'ecookbook', :from => '2007-03-20', :to => '2007-04-30'
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_equal 3, assigns(:entries).size
                 assert_not_nil 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)
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_at_project_level_with_period
                 get :index, :project_id => 'ecookbook', :period => '7_days'
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_not_nil assigns(:total_hours)
                 assert_equal Date.today - 7, assigns(:from)
                 assert_equal Date.today, assigns(:to)
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_one_day
                 get :index, :project_id => 'ecookbook', :from => "2007-03-23", :to => "2007-03-23"
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "4.25", "%.2f" % assigns(:total_hours)
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_at_issue_level
                 get :index, :issue_id => 1
                 assert_response :success
                 assert_template 'index'
                 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 based on what's been logged
+                # display all time
-                assert_equal '2007-03-12'.to_date, assigns(:from)
+                assert_nil assigns(:from)
-                assert_equal '2007-04-22'.to_date, assigns(:to)
+                assert_nil assigns(:to)
                 # TODO: remove /projects/:project_id/issues/:issue_id/time_entries routes
                 # to use /issues/:issue_id/time_entries
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/issues/1/time_entries", :id => 'query_form'}
               end
               def test_index_atom_feed
                 get :index, :project_id => 1, :format => 'atom'
                 assert_response :success
                 assert_equal 'application/atom+xml', @response.content_type
                 assert_not_nil assigns(:items)
                 assert assigns(:items).first.is_a?(TimeEntry)
               end
               def test_index_all_projects_csv_export
                 Setting.date_format = '%m/%d/%Y'
                 get :index, :format => 'csv'
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment,Overtime\n")
                 assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\",\"\"\n")
               end
               def test_index_csv_export
                 Setting.date_format = '%m/%d/%Y'
                 get :index, :project_id => 1, :format => 'csv'
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment,Overtime\n")
                 assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\",\"\"\n")
               end
               def test_csv_big_5
                 user = User.find_by_id(3)
                 user.language = "zh-TW"
                 assert user.save
                 str_utf8  = "\xe4\xb8\x80\xe6\x9c\x88"
                 str_big5  = "\xa4@\xa4\xeb"
                 if str_utf8.respond_to?(:force_encoding)
                   str_utf8.force_encoding('UTF-8')
                   str_big5.force_encoding('Big5')
                 end
                 @request.session[:user_id] = 3
                 post :create, :project_id => 1,
                             :time_entry => {:comments => str_utf8,
                                             # Not the default activity
                                             :activity_id => '11',
                                             :issue_id => '',
                                             :spent_on => '2011-11-10',
                                             :hours => '7.3'}
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 t = TimeEntry.find_by_comments(str_utf8)
                 assert_not_nil t
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
                 get :index, :project_id => 1, :format => 'csv',
                     :from => '2011-11-10', :to => '2011-11-10'
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 ar = @response.body.chomp.split("\n")
                 s1 = "\xa4\xe9\xb4\xc1"
                 if str_utf8.respond_to?(:force_encoding)
                   s1.force_encoding('Big5')
                 end
                 assert ar[0].include?(s1)
                 assert ar[1].include?(str_big5)
               end
               def test_csv_cannot_convert_should_be_replaced_big_5
                 user = User.find_by_id(3)
                 user.language = "zh-TW"
                 assert user.save
                 str_utf8  = "\xe4\xbb\xa5\xe5\x86\x85"
                 if str_utf8.respond_to?(:force_encoding)
                   str_utf8.force_encoding('UTF-8')
                 end
                 @request.session[:user_id] = 3
                 post :create, :project_id => 1,
                             :time_entry => {:comments => str_utf8,
                                             # Not the default activity
                                             :activity_id => '11',
                                             :issue_id => '',
                                             :spent_on => '2011-11-10',
                                             :hours => '7.3'}
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 t = TimeEntry.find_by_comments(str_utf8)
                 assert_not_nil t
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
                 get :index, :project_id => 1, :format => 'csv',
                     :from => '2011-11-10', :to => '2011-11-10'
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 ar = @response.body.chomp.split("\n")
                 s1 = "\xa4\xe9\xb4\xc1"
                 if str_utf8.respond_to?(:force_encoding)
                   s1.force_encoding('Big5')
                 end
                 assert ar[0].include?(s1)
                 s2 = ar[1].split(",")[8]
                 if s2.respond_to?(:force_encoding)
                   s3 = "\xa5H?"
                   s3.force_encoding('Big5')
                   assert_equal s3, s2
                 elsif RUBY_PLATFORM == 'java'
                   assert_equal "??", s2
                 else
                   assert_equal "\xa5H???", s2
                 end
               end
               def test_csv_tw
                 with_settings :default_language => "zh-TW" do
                   str1  = "test_csv_tw"
                   user = User.find_by_id(3)
                   te1 = TimeEntry.create(:spent_on => '2011-11-10',
                                          :hours    => 999.9,
                                          :project  => Project.find(1),
                                          :user     => user,
                                          :activity => TimeEntryActivity.find_by_name('Design'),
                                          :comments => str1)
                   te2 = TimeEntry.find_by_comments(str1)
                   assert_not_nil te2
                   assert_equal 999.9, te2.hours
                   assert_equal 3, te2.user_id
                   get :index, :project_id => 1, :format => 'csv',
                       :from => '2011-11-10', :to => '2011-11-10'
                   assert_response :success
                   assert_equal 'text/csv', @response.content_type
                   ar = @response.body.chomp.split("\n")
                   s2 = ar[1].split(",")[7]
                   assert_equal '999.9', s2
                   str_tw = "Traditional Chinese (\xe7\xb9\x81\xe9\xab\x94\xe4\xb8\xad\xe6\x96\x87)"
                   if str_tw.respond_to?(:force_encoding)
                     str_tw.force_encoding('UTF-8')
                   end
                   assert_equal str_tw, l(:general_lang_name)
                   assert_equal ',', l(:general_csv_separator)
                   assert_equal '.', l(:general_csv_decimal_separator)
                 end
               end
               def test_csv_fr
                 with_settings :default_language => "fr" do
                   str1  = "test_csv_fr"
                   user = User.find_by_id(3)
                   te1 = TimeEntry.create(:spent_on => '2011-11-10',
                                          :hours    => 999.9,
                                          :project  => Project.find(1),
                                          :user     => user,
                                          :activity => TimeEntryActivity.find_by_name('Design'),
                                          :comments => str1)
                   te2 = TimeEntry.find_by_comments(str1)
                   assert_not_nil te2
                   assert_equal 999.9, te2.hours
                   assert_equal 3, te2.user_id
                   get :index, :project_id => 1, :format => 'csv',
                       :from => '2011-11-10', :to => '2011-11-10'
                   assert_response :success
                   assert_equal 'text/csv', @response.content_type
                   ar = @response.body.chomp.split("\n")
                   s2 = ar[1].split(";")[7]
                   assert_equal '999,9', s2
                   str_fr = "Fran\xc3\xa7ais"
                   if str_fr.respond_to?(:force_encoding)
                     str_fr.force_encoding('UTF-8')
                   end
                   assert_equal str_fr, l(:general_lang_name)
                   assert_equal ';', l(:general_csv_separator)
                   assert_equal ',', l(:general_csv_decimal_separator)
                 end
               end
             end

test/unit/time_entry_test.rb 0 -48

             # Redmine - project management software
             # Copyright (C) 2006-2011  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.expand_path('../../test_helper', __FILE__)
             class TimeEntryTest < ActiveSupport::TestCase
               fixtures :issues, :projects, :users, :time_entries,
                        :members, :roles, :member_roles, :auth_sources,
                        :trackers, :issue_statuses,
                        :projects_trackers,
                        :journals, :journal_details,
                        :issue_categories, :enumerations,
                        :groups_users,
                        :enabled_modules,
                        :workflows
               def test_hours_format
                 assertions = { "2"      => 2.0,
                                "21.1"   => 21.1,
                                "2,1"    => 2.1,
                                "1,5h"   => 1.5,
                                "7:12"   => 7.2,
                                "10h"    => 10.0,
                                "10 h"   => 10.0,
                                "45m"    => 0.75,
                                "45 m"   => 0.75,
                                "3h15"   => 3.25,
                                "3h 15"  => 3.25,
                                "3 h 15"   => 3.25,
                                "3 h 15m"  => 3.25,
                                "3 h 15 m" => 3.25,
                                "3 hours"  => 3.0,
                                "12min"    => 0.2,
                               }
                 assertions.each do |k, v|
                   t = TimeEntry.new(:hours => k)
                   assert_equal v, t.hours, "Converting #{k} failed:"
                 end
               end
               def test_hours_should_default_to_nil
                 assert_nil TimeEntry.new.hours
               end
               def test_spent_on_with_blank
                 c = TimeEntry.new
                 c.spent_on = ''
                 assert_nil c.spent_on
               end
               def test_spent_on_with_nil
                 c = TimeEntry.new
                 c.spent_on = nil
                 assert_nil c.spent_on
               end
               def test_spent_on_with_string
                 c = TimeEntry.new
                 c.spent_on = "2011-01-14"
                 assert_equal Date.parse("2011-01-14"), c.spent_on
               end
               def test_spent_on_with_invalid_string
                 c = TimeEntry.new
                 c.spent_on = "foo"
                 assert_nil c.spent_on
               end
               def test_spent_on_with_date
                 c = TimeEntry.new
                 c.spent_on = Date.today
                 assert_equal Date.today, c.spent_on
               end
               def test_spent_on_with_time
                 c = TimeEntry.new
                 c.spent_on = Time.now
                 assert_equal Date.today, c.spent_on
               end
               def test_validate_time_entry
                 anon     = User.anonymous
                 project  = Project.find(1)
                 issue    = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => anon.id, :status_id => 1,
                                      :priority => IssuePriority.all.first, :subject => 'test_create',
                                      :description => 'IssueTest#test_create', :estimated_hours => '1:30')
                 assert issue.save
                 activity = TimeEntryActivity.find_by_name('Design')
                 te = TimeEntry.create(:spent_on => '2010-01-01',
                                       :hours    => 100000,
                                       :issue    => issue,
                                       :project  => project,
                                       :user     => anon,
                                       :activity => activity)
                 assert_equal 1, te.errors.count
               end
               def test_set_project_if_nil
                 anon     = User.anonymous
                 project  = Project.find(1)
                 issue    = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => anon.id, :status_id => 1,
                                      :priority => IssuePriority.all.first, :subject => 'test_create',
                                      :description => 'IssueTest#test_create', :estimated_hours => '1:30')
                 assert issue.save
                 activity = TimeEntryActivity.find_by_name('Design')
                 te = TimeEntry.create(:spent_on => '2010-01-01',
                                       :hours    => 10,
                                       :issue    => issue,
                                       :user     => anon,
                                       :activity => activity)
                 assert_equal project.id, te.project.id
               end
-              context "#earilest_date_for_project" do
-                setup do
-                  User.current = nil
-                  @public_project = Project.generate!(:is_public => true)
-                  @issue = Issue.generate_for_project!(@public_project)
-                  TimeEntry.generate!(:spent_on => '2010-01-01',
-                                      :issue => @issue,
-                                      :project => @public_project)
-                end
-                context "without a project" do
-                  should "return the lowest spent_on value that is visible to the current user" do
-                    assert_equal "2007-03-12", TimeEntry.earilest_date_for_project.to_s
-                  end
-                end
-                context "with a project" do
-                  should "return the lowest spent_on value that is visible to the current user for that project and it's subprojects only" do
-                    assert_equal "2010-01-01", TimeEntry.earilest_date_for_project(@public_project).to_s
-                  end
-                end
-              end
-              context "#latest_date_for_project" do
-                setup do
-                  User.current = nil
-                  @public_project = Project.generate!(:is_public => true)
-                  @issue = Issue.generate_for_project!(@public_project)
-                  TimeEntry.generate!(:spent_on => '2010-01-01',
-                                      :issue => @issue,
-                                      :project => @public_project)
-                end
-                context "without a project" do
-                  should "return the highest spent_on value that is visible to the current user" do
-                    assert_equal "2010-01-01", TimeEntry.latest_date_for_project.to_s
-                  end
-                end
-                context "with a project" do
-                  should "return the highest spent_on value that is visible to the current user for that project and it's subprojects only" do
-                    project = Project.find(1)
-                    assert_equal "2007-04-22", TimeEntry.latest_date_for_project(project).to_s
-                  end
-                end
-              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