Project

General

Profile

Patch #1666 » explicit_version_completion.patch

Peter Van den Bosch, 2008-07-21 00:50

View differences:

app/models/issue.rb (working copy)
if start_date && soonest_start && start_date < soonest_start
errors.add :start_date, :activerecord_error_invalid
end
if fixed_version && !closed? && fixed_version.completed?
errors.add :fixed_version, :activerecord_error_version_completed
end
end
def validate_on_create
app/models/version.rb (working copy)
validates_length_of :name, :maximum => 60
validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :activerecord_error_not_a_date, :allow_nil => true
def validate
if completed? && open_issues_count > 0
errors.add :completed, :activerecord_error_open_issues
end
end
def start_date
effective_date
end
......
@spent_hours ||= TimeEntry.sum(:hours, :include => :issue, :conditions => ["#{Issue.table_name}.fixed_version_id = ?", id]).to_f
end
# Returns true if the version is completed: due date reached and no open issues
def completed?
effective_date && (effective_date <= Date.today) && (open_issues_count == 0)
end
def completed_pourcent
if fixed_issues.count == 0
0
......
# Returns true if the version is overdue: due date reached and some open issues
def overdue?
effective_date && (effective_date < Date.today) && (open_issues_count > 0)
effective_date && (effective_date < Date.today) && (!self.completed?)
end
def open_issues_count
app/models/project.rb (working copy)
children.select {|child| child.active?}
end
def incomplete_versions
versions.reject(&:completed?).sort
end
# Returns an array of the trackers used by the project and its sub projects
def rolled_up_trackers
@rolled_up_trackers ||=
app/controllers/projects_controller.rb (working copy)
def roadmap
@trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true])
retrieve_selected_tracker_ids(@trackers)
@versions = @project.versions.sort
@versions = @versions.select {|v| !v.completed? } unless params[:completed]
@versions = params[:completed] ? @project.versions.sort : @project.incomplete_versions
end
def activity
app/views/versions/_form.rhtml (working copy)
<p><%= f.text_field :description, :size => 60 %></p>
<p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
<p><%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
<p><%= f.check_box :completed, :label => :label_completed_version %>
</div>
app/views/issues/_form.rhtml (working copy)
{:controller => 'projects', :action => 'add_issue_category', :id => @project},
:class => 'small', :tabindex => 199) if authorize_for('projects', 'add_issue_category') %></p>
<%= content_tag('p', f.select(:fixed_version_id,
(@project.versions.sort.collect {|v| [v.name, v.id]}),
{ :include_blank => true })) unless @project.versions.empty? %>
(@project.incomplete_versions.collect {|v| [v.name, v.id]}),
{ :include_blank => true })) unless @project.incomplete_versions.empty? %>
</div>
<div class="splitcontentright">
app/views/issues/bulk_edit.rhtml (working copy)
<label><%= l(:field_fixed_version) %>:
<%= select_tag('fixed_version_id', content_tag('option', l(:label_no_change_option), :value => '') +
content_tag('option', l(:label_none), :value => 'none') +
options_from_collection_for_select(@project.versions, :id, :name)) %></label>
options_from_collection_for_select(@project.incomplete_versions, :id, :name)) %></label>
</p>
<p>
app/views/issues/_form_update.rhtml (working copy)
<div class="splitcontentright">
<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
<%= content_tag('p', f.select(:fixed_version_id,
(@project.versions.sort.collect {|v| [v.name, v.id]}),
{ :include_blank => true })) unless @project.versions.empty? %>
(@project.incomplete_versions.collect {|v| [v.name, v.id]}),
{ :include_blank => true })) unless @project.incomplete_versions.empty? %>
</div>
app/views/issues/context_menu.rhtml (working copy)
<% end -%>
</ul>
</li>
<% unless @project.versions.empty? -%>
<% unless @project.incomplete_versions.empty? -%>
<li class="folder">
<a href="#" class="submenu"><%= l(:field_fixed_version) %></a>
<ul>
<% @project.versions.sort.each do |v| -%>
<% @project.incomplete_versions.each do |v| -%>
<li><%= context_menu_link v.name, {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[fixed_version_id]' => v, :back_to => @back}, :method => :post,
:selected => (v == @issue.fixed_version), :disabled => !@can[:update] %></li>
<% end -%>
lang/en.yml (working copy)
activerecord_error_greater_than_start_date: must be greater than start date
activerecord_error_not_same_project: doesn't belong to the same project
activerecord_error_circular_dependency: This relation would create a circular dependency
activerecord_error_version_completed: is a completed version
activerecord_error_open_issues: There are still open issues
general_fmt_age: %d yr
general_fmt_age_plural: %d yrs
......
label_stay_logged_in: Stay logged in
label_disabled: disabled
label_show_completed_versions: Show completed versions
label_completed_version: Completed
label_me: me
label_board: Forum
label_board_new: New forum
lang/fr.yml (working copy)
activerecord_error_greater_than_start_date: doit être postérieur à la date de début
activerecord_error_not_same_project: n'appartient pas au même projet
activerecord_error_circular_dependency: Cette relation créerait une dépendance circulaire
activerecord_error_version_completed: est une version complétée
activerecord_error_open_issues: Il reste encore des demandes ouvertes
general_fmt_age: %d an
general_fmt_age_plural: %d ans
......
label_stay_logged_in: Rester connecté
label_disabled: désactivé
label_show_completed_versions: Voir les versions passées
label_completed_version: Complété
label_me: moi
label_board: Forum
label_board_new: Nouveau forum
lang/nl.yml (working copy)
activerecord_error_greater_than_start_date: moet hoger zijn dan startdatum
activerecord_error_not_same_project: hoort niet bij hetzelfde project
activerecord_error_circular_dependency: Deze relatie zou een circulaire afhankelijkheid tot gevolg hebben
activerecord_error_version_completed: is een afgeronde versie
activerecord_error_open_issues: Er zijn nog open issues
general_fmt_age: %d jr
general_fmt_age_plural: %d jr
......
label_stay_logged_in: Blijf ingelogd
label_disabled: uitgeschakeld
label_show_completed_versions: Toon afgeronde versies
label_completed_version: Voltooid
label_me: ik
label_board: Forum
label_board_new: Nieuw forum
db/migrate/095_add_versions_completed_status.rb (revision 0)
class AddVersionsCompletedStatus < ActiveRecord::Migration
def self.up
add_column :versions, :completed, :boolean, :default => false
end
def self.down
remove_column :versions, :completed
end
end
(1-1/3)