jro_apps/redmine Commit - r3037:4fe14e71c2d7

Adds a Setting to control how an Issue's done_ratio is calculated:...

Eric Davis -

r3037:4fe14e71c2d7

parent child

Context file:

r3037:4fe14e71c2d7

Collapse all files

db/migrate/20091123212029_add_default_done_ratio_to_issue_status.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddDefaultDoneRatioToIssueStatus < ActiveRecord::Migration
	2	def self.up
	3	add_column :issue_statuses, :default_done_ratio, :integer
	4	end
	5
	6	def self.down
	7	remove_column :issue_statuses, :default_done_ratio
	8	end
	9	end

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

NO CONTENT: new file 100644, binary diff hidden

app/controllers/issue_statuses_controller.rb +10 -1

             class IssueStatusesController < ApplicationController
               before_filter :require_admin
-              verify :method => :post, :only => [ :destroy, :create, :update, :move ],
+              verify :method => :post, :only => [ :destroy, :create, :update, :move, :update_issue_done_ratio ],
                      :redirect_to => { :action => :list }
               def index
                 flash[:error] = "Unable to delete issue status"
                 redirect_to :action => 'list'
               end
+              def update_issue_done_ratio
+                if IssueStatus.update_issue_done_ratios
+                  flash[:notice] = l(:notice_issue_done_ratios_updated)
+                else
+                  flash[:error] =  l(:error_issue_done_ratios_not_updated)
+                end
+                redirect_to :action => 'list'
+              end
             end

app/models/issue.rb +28 -1

               acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]},
                                         :author_key => :author_id
+              DONE_RATIO_OPTIONS = %w(issue_field issue_status)
               validates_presence_of :subject, :priority, :project, :tracker, :author, :status
               validates_length_of :subject, :maximum => 255
                                                       :conditions => Project.allowed_to_condition(args.first || User.current, :view_issues) } }
               named_scope :open, :conditions => ["#{IssueStatus.table_name}.is_closed = ?", false], :include => :status
+              before_save :update_done_ratio_from_issue_status
               after_save :create_journal
               # Returns true if usr or current user is allowed to view the issue
                 write_attribute :estimated_hours, (h.is_a?(String) ? h.to_hours : h)
               end
+              def done_ratio
+                if Issue.use_status_for_done_ratio? && !self.status.default_done_ratio.blank?
+                  self.status.default_done_ratio
+                else
+                  read_attribute(:done_ratio)
+                end
+              end
+              def self.use_status_for_done_ratio?
+                Setting.issue_done_ratio == 'issue_status'
+              end
+              def self.use_field_for_done_ratio?
+                Setting.issue_done_ratio == 'issue_field'
+              end
               def validate
                 if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
                   errors.add :due_date, :not_a_date
                 end
               end
+              # Set the done_ratio using the status if that setting is set.  This will keep the done_ratios
+              # even if the user turns off the setting later
+              def update_done_ratio_from_issue_status
+                if Issue.use_status_for_done_ratio? && !self.status.default_done_ratio.blank?
+                  self.done_ratio = self.status.default_done_ratio
+                end
+              end
               def after_save
                 # Reload is needed in order to get the right status
                 reload

app/models/issue_status.rb +12 0

@@ -33,6 +33,18 class IssueStatus < ActiveRecord::Base
33	def self.default	33	def self.default
34	find(:first, :conditions =>["is_default=?", true])	34	find(:first, :conditions =>["is_default=?", true])
35	end	35	end
		36
		37	# Update all the +Issues+ setting their done_ratio to the value of their +IssueStatus+
		38	def self.update_issue_done_ratios
		39	if Issue.use_status_for_done_ratio?
		40	IssueStatus.find(:all, :conditions => ["default_done_ratio >= 0"]).each do \|status\|
		41	Issue.update_all(["done_ratio = ?", status.default_done_ratio],
		42	["status_id = ?", status.id])
		43	end
		44	end
		45
		46	return Issue.use_status_for_done_ratio?
		47	end
36		48
37	# Returns an array of all statuses the given role can switch to	49	# Returns an array of all statuses the given role can switch to
38	# Uses association cache when called more than one time	50	# Uses association cache when called more than one time

app/views/issue_statuses/_form.rhtml +5 0

             <p><label for="issue_status_name"><%=l(:field_name)%><span class="required"> *</span></label>
             <%= text_field 'issue_status', 'name'  %></p>
+            <% if Issue.use_status_for_done_ratio? %>
+            <p><label for="issue_done_ratio"><%=l(:field_done_ratio)%></label>
+            <%= select 'issue_status', :default_done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
+            <% end %>
             <p><label for="issue_status_is_closed"><%=l(:field_is_closed)%></label>
             <%= check_box 'issue_status', 'is_closed' %></p>

app/views/issue_statuses/list.rhtml +7 0

             <div class="contextual">
             <%= link_to l(:label_issue_status_new), {:action => 'new'}, :class => 'icon icon-add' %>
+            <%= link_to(l(:label_update_issue_done_ratios), {:action => 'update_issue_done_ratio'}, :class => 'icon icon-multiple', :method => 'post', :confirm => l(:text_are_you_sure)) if Issue.use_status_for_done_ratio? %>
             </div>
             <h2><%=l(:label_issue_status_plural)%></h2>
             <table class="list">
               <thead><tr>
               <th><%=l(:field_status)%></th>
+              <% if Issue.use_status_for_done_ratio? %>
+              <th><%=l(:field_done_ratio)%></th>
+              <% end %>
               <th><%=l(:field_is_default)%></th>
               <th><%=l(:field_is_closed)%></th>
               <th><%=l(:button_sort)%></th>
             <% for status in @issue_statuses %>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to status.name, :action => 'edit', :id => status %></td>
+              <% if Issue.use_status_for_done_ratio? %>
+              <td align="center"><%= h status.default_done_ratio %></td>
+              <% end %>
               <td align="center"><%= image_tag 'true.png' if status.is_default? %></td>
               <td align="center"><%= image_tag 'true.png' if status.is_closed? %></td>
               <td align="center" style="width:15%;"><%= reorder_links('issue_status', {:action => 'update', :id => status}) %></td>

app/views/issues/_attributes.rhtml +2 0

             <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p>
             <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p>
             <p><%= f.text_field :estimated_hours, :size => 3 %> <%= l(:field_hours) %></p>
+            <% if Issue.use_field_for_done_ratio? %>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
+            <% end %>
             </div>
             <div style="clear:both;"> </div>

app/views/issues/_form_update.rhtml +2 0

             <p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
             </div>
             <div class="splitcontentright">
+            <% if Issue.use_field_for_done_ratio? %>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
+            <% end %>
             <% unless @issue.assignable_versions.empty? %>
             <p><%= f.select :fixed_version_id, (@issue.assignable_versions.collect {|v| [v.name, v.id]}), :include_blank => true %></p>
             <% end %>

app/views/issues/bulk_edit.rhtml +2 0

             <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %></label>
             <label><%= l(:field_due_date) %>:
             <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %></label>
+            <% if Issue.use_field_for_done_ratio? %>
             <label><%= l(:field_done_ratio) %>:
             <%= select_tag 'done_ratio', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></label>
+            <% end %>
             </p>
             <% @custom_fields.each do |custom_field| %>

app/views/issues/context_menu.rhtml +2 -1

             		</ul>
             	</li>
             	<% end -%>
+              <% if Issue.use_field_for_done_ratio? %>
             	<li class="folder">
             		<a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
             		<ul>
             		<% end -%>
             		</ul>
             	</li>
+              <% end %>
             <% if !@issue.nil? %>
             	<% if @can[:log_time] -%>
             	<li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue},

app/views/settings/_issues.rhtml +3 0

             <%= check_box_tag 'settings[display_subprojects_issues]', 1, Setting.display_subprojects_issues? %>
             </p>
+            <p><label><%= l(:setting_issue_done_ratio) %></label>
+            <%= select_tag 'settings[issue_done_ratio]', options_for_select(Issue::DONE_RATIO_OPTIONS.collect {|i| [l(i.to_sym), i]}, Setting.issue_done_ratio) %></p>
             <p><label><%= l(:setting_issues_export_limit) %></label>
             <%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p>
             </div>

config/locales/en.yml +8 -1

               notice_account_pending: "Your account was created and is now pending administrator approval."
               notice_default_data_loaded: Default configuration successfully loaded.
               notice_unable_delete_version: Unable to delete version.
+              notice_issue_done_ratios_updated: Issue done ratios updated.
               error_can_t_load_default_data: "Default configuration could not be loaded: {{value}}"
               error_scm_not_found: "The entry or revision was not found in the repository."
               error_no_default_issue_status: 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
               error_can_not_reopen_issue_on_closed_version: 'An issue assigned to a closed version can not be reopened'
               error_can_not_archive_project: This project can not be archived
+              error_issue_done_ratios_not_updated: "Issue done ratios not updated."
               warning_attachments_not_saved: "{{count}} file(s) could not be saved."
               mail_subject_lost_password: "Your {{value}} password"
               setting_sequential_project_identifiers: Generate sequential project identifiers
               setting_gravatar_enabled: Use Gravatar user icons
               setting_gravatar_default: Default Gravatar image
+              setting_issue_done_ratio: Calculate the issue done ratio with
               setting_diff_max_lines_displayed: Max number of diff lines displayed
               setting_file_max_size_displayed: Max size of text files displayed inline
               setting_repository_log_display_limit: Maximum number of revisions displayed on file log
               label_version_sharing_hierarchy: With project hierarchy
               label_version_sharing_tree: With project tree
               label_version_sharing_system: With all projects
+              label_update_issue_done_ratios: Update issue done ratios
               button_login: Login
               button_submit: Submit
               enumeration_doc_categories: Document categories
               enumeration_activities: Activities (time tracking)
               enumeration_system_activity: System Activity
+              issue_field: Use the issue field
+              issue_status: Use the issue status

config/settings.yml +2 0

               - updated_on
             display_subprojects_issues:
               default: 1
+            issue_done_ratio:
+              default: 'issue_field'
             default_projects_public:
               default: 1
             default_projects_modules:

public/stylesheets/application.css +1 0

             .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-multiple { background-image: url(../images/table_multiple.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); }

test/functional/issue_statuses_controller_test.rb +23 0

@@ -70,4 +70,27 class IssueStatusesControllerTest < ActionController::TestCase
70	assert_redirected_to 'issue_statuses/list'	70	assert_redirected_to 'issue_statuses/list'
71	assert_not_nil IssueStatus.find_by_id(1)	71	assert_not_nil IssueStatus.find_by_id(1)
72	end	72	end
		73
		74	context "on POST to :update_issue_done_ratio" do
		75	context "with Setting.issue_done_ratio using the issue_field" do
		76	setup do
		77	Setting.issue_done_ratio = 'issue_field'
		78	post :update_issue_done_ratio
		79	end
		80
		81	should_set_the_flash_to /not updated/
		82	should_redirect_to('the list') { '/issue_statuses/list' }
		83	end
		84
		85	context "with Setting.issue_done_ratio using the issue_status" do
		86	setup do
		87	Setting.issue_done_ratio = 'issue_status'
		88	post :update_issue_done_ratio
		89	end
		90
		91	should_set_the_flash_to /Issue done ratios updated/
		92	should_redirect_to('the list') { '/issue_statuses/list' }
		93	end
		94	end
		95
73	end	96	end

test/unit/issue_status_test.rb +36 0

@@ -66,4 +66,40 class IssueStatusTest < ActiveSupport::TestCase
66	status.reload	66	status.reload
67	assert status.is_default?	67	assert status.is_default?
68	end	68	end
		69
		70	context "#update_done_ratios" do
		71	setup do
		72	@issue = Issue.find(1)
		73	@issue_status = IssueStatus.find(1)
		74	@issue_status.update_attribute(:default_done_ratio, 50)
		75	end
		76
		77	context "with Setting.issue_done_ratio using the issue_field" do
		78	setup do
		79	Setting.issue_done_ratio = 'issue_field'
		80	end
		81
		82	should "change nothing" do
		83	IssueStatus.update_issue_done_ratios
		84
		85	assert_equal 0, Issue.count(:conditions => {:done_ratio => 50})
		86	end
		87	end
		88
		89	context "with Setting.issue_done_ratio using the issue_status" do
		90	setup do
		91	Setting.issue_done_ratio = 'issue_status'
		92	end
		93
		94	should "update all of the issue's done_ratios to match their Issue Status" do
		95	IssueStatus.update_issue_done_ratios
		96
		97	issues = Issue.find([1,3,4,5,6,7,9,10])
		98	issues.each do \|issue\|
		99	assert_equal @issue_status, issue.status
		100	assert_equal 50, issue.read_attribute(:done_ratio)
		101	end
		102	end
		103	end
		104	end
69	end	105	end

test/unit/issue_test.rb +60 0

@@ -529,4 +529,64 class IssueTest < ActiveSupport::TestCase
529	end	529	end
530	assert ActionMailer::Base.deliveries.empty?	530	assert ActionMailer::Base.deliveries.empty?
531	end	531	end
		532
		533	context "#done_ratio" do
		534	setup do
		535	@issue = Issue.find(1)
		536	@issue_status = IssueStatus.find(1)
		537	@issue_status.update_attribute(:default_done_ratio, 50)
		538	end
		539
		540	context "with Setting.issue_done_ratio using the issue_field" do
		541	setup do
		542	Setting.issue_done_ratio = 'issue_field'
		543	end
		544
		545	should "read the issue's field" do
		546	assert_equal 0, @issue.done_ratio
		547	end
		548	end
		549
		550	context "with Setting.issue_done_ratio using the issue_status" do
		551	setup do
		552	Setting.issue_done_ratio = 'issue_status'
		553	end
		554
		555	should "read the Issue Status's default done ratio" do
		556	assert_equal 50, @issue.done_ratio
		557	end
		558	end
		559	end
		560
		561	context "#update_done_ratio_from_issue_status" do
		562	setup do
		563	@issue = Issue.find(1)
		564	@issue_status = IssueStatus.find(1)
		565	@issue_status.update_attribute(:default_done_ratio, 50)
		566	end
		567
		568	context "with Setting.issue_done_ratio using the issue_field" do
		569	setup do
		570	Setting.issue_done_ratio = 'issue_field'
		571	end
		572
		573	should "not change the issue" do
		574	@issue.update_done_ratio_from_issue_status
		575
		576	assert_equal 0, @issue.done_ratio
		577	end
		578	end
		579
		580	context "with Setting.issue_done_ratio using the issue_status" do
		581	setup do
		582	Setting.issue_done_ratio = 'issue_status'
		583	end
		584
		585	should "not change the issue's done ratio" do
		586	@issue.update_done_ratio_from_issue_status
		587
		588	assert_equal 50, @issue.done_ratio
		589	end
		590	end
		591	end
532	end	592	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