jro_apps/redmine Commit - r1303:043cb37b161d

Add predefined date ranges to the time report in the same way as the details view (closes #972). It nows defaults to 'All time'....

Jean-Philippe Lang -

r1303:043cb37b161d

parent child

Context file:

r1303:043cb37b161d

Collapse all files

app/views/timelog/_date_range.rhtml created 644 +16 0

@@ -0,0 +1,16
	1	<fieldset><legend><%= l(:label_date_range) %></legend>
	2	<p>
	3	<%= radio_button_tag 'period_type', '1', !@free_period %>
	4	<%= select_tag 'period', options_for_period_select(params[:period]),
	5	:onchange => 'this.form.onsubmit();',
	6	:onfocus => '$("period_type_1").checked = true;' %>
	7	</p>
	8	<p>
	9	<%= radio_button_tag 'period_type', '2', @free_period %>
	10	<%= l(:label_date_from) %>
	11	<%= text_field_tag 'from', @from, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('from') %>
	12	<%= l(:label_date_to) %>
	13	<%= text_field_tag 'to', @to, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('to') %>
	14	<%= submit_tag l(:button_apply), :name => nil, :onclick => '$("period_type_2").checked = true;' %>
	15	</p>
	16	</fieldset>

app/controllers/timelog_controller.rb +68 -67

             # 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
               verify :method => :post, :only => :destroy, :redirect_to => { :action => :details }
               helper :sort
               include SortHelper
               helper :issues
               include TimelogHelper
               def report
                 @available_criterias = { 'project' => {:sql => "#{TimeEntry.table_name}.project_id",
                                                       :klass => Project,
                                                       :label => :label_project},
                                          'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
                                                       :klass => Version,
                                                       :label => :label_version},
                                          'category' => {:sql => "#{Issue.table_name}.category_id",
                                                         :klass => IssueCategory,
                                                         :label => :field_category},
                                          'member' => {:sql => "#{TimeEntry.table_name}.user_id",
                                                      :klass => User,
                                                      :label => :label_member},
                                          'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
                                                       :klass => Tracker,
                                                       :label => :label_tracker},
                                          'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
                                                        :klass => 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'
+                @columns = (params[:columns] && %w(year month week).include?(params[:columns])) ? params[:columns] : 'month'
-                if params[:date_from]
+                retrieve_date_range
-                  begin; @date_from = params[:date_from].to_date; rescue; end
+                @from ||= TimeEntry.minimum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today
-                end
+                @to   ||= TimeEntry.maximum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today
-                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}"
                   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 (%s)" % @project.project_condition(Setting.display_subprojects_issues?)
                   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 << " AND spent_on BETWEEN '%s' AND '%s'" % [ActiveRecord::Base.connection.quoted_date(@from.to_time), ActiveRecord::Base.connection.quoted_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 = []
-                @periods = []
+                  # Date#at_beginning_of_ not supported in Rails 1.2.x
-                date_from = @date_from
+                  date_from = @from.to_time
-                # 100 columns max
+                  # 100 columns max
-                while date_from < @date_to && @periods.length < 100
+                  while date_from <= @to.to_time && @periods.length < 100
-                  case @columns
+                    case @columns
-                  when 'year'
+                    when 'year'
-                    @periods << "#{date_from.year}"
+                      @periods << "#{date_from.year}"
-                    date_from = date_from >> 12
+                      date_from = (date_from + 1.year).at_beginning_of_year
-                  when 'month'
+                    when 'month'
-                    @periods << "#{date_from.year}-#{date_from.month}"
+                      @periods << "#{date_from.year}-#{date_from.month}"
-                    date_from = date_from >> 1
+                      date_from = (date_from + 1.month).at_beginning_of_month
-                  when 'week'
+                    when 'week'
-                    @periods << "#{date_from.year}-#{date_from.cweek}"
+                      @periods << "#{date_from.year}-#{date_from.to_date.cweek}"
-                    date_from = date_from + 7
+                      date_from = (date_from + 7.day).at_beginning_of_week
+                    end
                   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
                 cond = ARCondition.new
                 cond << (@issue.nil? ? @project.project_condition(Setting.display_subprojects_issues?) :
                                        ["#{TimeEntry.table_name}.issue_id = ?", @issue.id])
+                retrieve_date_range
                 if @from
                   if @to
                     cond << ['spent_on BETWEEN ? AND ?', @from, @to]
                   else
                     cond << ['spent_on >= ?', @from]
                   end
                 elsif @to
                   cond << ['spent_on <= ?', @to]
                 end
                 TimeEntry.visible_by(User.current) do
                   respond_to do |format|
                     format.html {
                       # Paginate results
                       @entry_count = TimeEntry.count(:include => :project, :conditions => cond.conditions)
                       @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
                       @entries = TimeEntry.find(:all,
                                                 :include => [:project, :activity, :user, {:issue => :tracker}],
                                                 :conditions => cond.conditions,
                                                 :order => sort_clause,
                                                 :limit  =>  @entry_pages.items_per_page,
                                                 :offset =>  @entry_pages.current.offset)
                       @total_hours = TimeEntry.sum(:hours, :include => :project, :conditions => cond.conditions).to_f
                       render :layout => !request.xhr?
                     }
                     format.csv {
                       # Export all entries
                       @entries = TimeEntry.find(:all,
                                                 :include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
                                                 :conditions => cond.conditions,
                                                 :order => sort_clause)
                       send_data(entries_to_csv(@entries).read, :type => 'text/csv; header=present', :filename => 'timelog.csv')
                     }
                   end
                 end
               end
               def edit
                 render_403 and return if @time_entry && !@time_entry.editable_by?(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
                   return
                 end
                 @activities = Enumeration::get_values('ACTI')
               end
               def destroy
                 render_404 and return unless @time_entry
                 render_403 and return unless @time_entry.editable_by?(User.current)
                 @time_entry.destroy
                 flash[:notice] = l(:notice_successful_delete)
                 redirect_to :back
               rescue RedirectBackError
                 redirect_to :action => 'details', :project_id => @time_entry.project
               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
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
+              # Retreive 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
+              end
             end

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

             <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 %>
+            <%= render :partial => 'date_range' %>
-            <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_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 }%>
             <p class="pagination"><%= pagination_links_full @entry_pages, @entry_count %></p>
             <p class="other-formats">
             <%= l(:label_export_to) %>
             <span><%= link_to 'CSV', params.merge(:format => 'csv'), :class => 'csv' %></span>
             </p>
             <% end %>

app/views/timelog/report.rhtml +10 -16

             <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 %>
+            <% form_remote_tag(:url => {}, :update => 'content') do %>
               <% @criterias.each do |criteria| %>
                 <%= hidden_field_tag 'criterias[]', criteria %>
               <% end %>
-              <fieldset><legend><%= l(:label_date_range) %></legend>
+              <%= hidden_field_tag 'project_id', params[:project_id] %>
-              <p>
+              <%= render :partial => 'date_range' %>
-              <%= l(:label_date_from) %>
-              <%= 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_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) %>
               </p>
               </fieldset>
+              <p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
+                                                                                        [l(:label_month), 'month'],
+                                                                                        [l(:label_week), 'week']], @columns),
+                                                                    :onchange => "this.form.onsubmit();" %>
-              <p><%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}),
+              <%= 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();",
                                                                       :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>
+            <% end %>
             <% unless @criterias.empty? %>
             <div class="total-hours">
             <p><%= l(:label_total) %>: <%= html_hours(lwr(:label_f_hour, @total_hours)) %></p>
             </div>
             <% unless @hours.empty? %>
             <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 %>

test/functional/timelog_controller_test.rb +13 -5

             # 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, :roles, :members, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses
               def setup
                 @controller = TimelogController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
               end
               def test_create
                 @request.session[:user_id] = 3
                 post :edit, :project_id => 1,
                             :time_entry => {:comments => 'Some work on TimelogControllerTest',
                                             :activity_id => '10',
                                             :spent_on => '2008-03-14',
                                             :issue_id => '1',
                                             :hours => '7.3'}
                 assert_redirected_to 'projects/ecookbook/timelog/details'
                 i = Issue.find(1)
                 t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
                 assert_not_nil t
                 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_update
                 entry = TimeEntry.find(1)
                 assert_equal 1, entry.issue_id
                 assert_equal 2, entry.user_id
                 @request.session[:user_id] = 1
                 post :edit, :id => 1,
                             :time_entry => {:issue_id => '2',
                                             :hours => '8'}
                 assert_redirected_to 'projects/ecookbook/timelog/details'
                 entry.reload
                 assert_equal 8, entry.hours
                 assert_equal 2, entry.issue_id
                 assert_equal 2, entry.user_id
               end
               def destroy
                 @request.session[:user_id] = 2
                 post :destroy, :id => 1
                 assert_redirected_to 'projects/ecookbook/timelog/details'
                 assert_nil TimeEntry.find_by_id(1)
               end
               def test_report_no_criteria
                 get :report, :project_id => 1
                 assert_response :success
                 assert_template 'report'
               end
+              def test_report_all_time
+                get :report, :project_id => 1, :criterias => ['project']
+                assert_response :success
+                assert_template 'report'
+                assert_not_nil assigns(:total_hours)
+                assert_equal "162.90", "%.2f" % assigns(:total_hours)
+              end
               def test_report_one_criteria
-                get :report, :project_id => 1, :period => 'week', :date_from => "2007-04-01", :date_to => "2007-04-30", :criterias => ['project']
+                get :report, :project_id => 1, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criterias => ['project']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "8.65", "%.2f" % assigns(:total_hours)
-             end
+              end
               def test_report_two_criterias
-                get :report, :project_id => 1, :period => 'month', :date_from => "2007-01-01", :date_to => "2007-12-31", :criterias => ["member", "activity"]
+                get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criterias => ["member", "activity"]
                 assert_response :success
                 assert_template 'report'
                 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']
+                get :report, :project_id => 1, :columns => 'week', :from => "1998-04-01", :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 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_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 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)
               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
               def test_details_csv_export
                 get :details, :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\n")
                 assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,2,Feature request,Add ingredients categories,1.0,\"\"\n")
               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