@@ -63,6 +63,8 @@ class Query < ActiveRecord::Base "!" => :label_not_equals, "o" => :label_open_issues, "c" => :label_closed_issues, + "done" => :label_done_issues, + "undone" => :label_undone_issues, "!*" => :label_none, "*" => :label_all, ">=" => '>=', @@ -81,7 +83,7 @@ class Query < ActiveRecord::Base cattr_reader :operators @@operators_by_filter_type = { :list => [ "=", "!" ], - :list_status => [ "o", "=", "!", "c", "*" ], + :list_status => [ "o", "c", "=", "!", "*", "done", "undone" ], :list_optional => [ "=", "!", "!*", "*" ], :list_subprojects => [ "*", "!*", "=" ], :date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ], @@ -127,7 +129,7 @@ class Query < ActiveRecord::Base # filter requires one or more values (values_for(field) and !values_for(field).first.blank?) or # filter doesn't require any value - ["o", "c", "!*", "*", "t", "w"].include? operator_for(field) + ["o", "c", "done", "undone", "!*", "*", "t", "w"].include? operator_for(field) end if filters end @@ -326,6 +328,10 @@ class Query < ActiveRecord::Base sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id" when "c" sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id" + when "undone" + sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false} AND #{IssueStatus.table_name}.is_development_complete=#{connection.quoted_false}" if field == "status_id" + when "done" + sql = sql + "#{IssueStatus.table_name}.is_closed = #{connection.quoted_true} OR #{IssueStatus.table_name}.is_development_complete=#{connection.quoted_true}" if field == "status_id" when ">t-" sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today + 1).to_time)] when "<t-" app/models/query.rb @@ -102,6 +102,13 @@ class Version < ActiveRecord::Base @closed_issues_count ||= Issue.count(:all, :conditions => ["fixed_version_id = ? AND is_closed = ?", self.id, true], :include => :status) end + def not_estimated_undone_count + @not_estimated_undone_count ||= Issue.count(:all, :conditions => + ["fixed_version_id = ? AND estimated_hours IS NULL AND " + + "(is_closed = ? AND is_development_complete = ?)", self.id, false, + false], :include => :status) + end + def wiki_page if project.wiki && !wiki_page_title.blank? @wiki_page ||= project.wiki.find_page(wiki_page_title) app/models/version.rb @@ -36,6 +36,8 @@ function toggle_operator(field) { case "t": case "w": case "o": + case "undone": + case "done": case "c": Element.hide("div_values_" + field); break; app/views/queries/_filters.rhtml @@ -12,6 +12,22 @@ <td class="label"><%= l(:field_estimated_hours) %></td> <td class="total-hours"><%= html_hours(lwr(:label_f_hour, @version.estimated_hours)) %></td> </tr> +<% if @version.not_estimated_undone_count > 0 %> +<tr> + <td class="label"><%= l(:label_not_estimated_and_undone) %></td> + <td class="not_estimated total-hours"><%= link_to(" <span class = \"count\">%s</span> %s" % + [@version.not_estimated_undone_count, lwr(:label_issue, @version.not_estimated_undone_count).downcase], + {:controller => 'issues', + :action => 'index', + :project_id => @version.project, + :set_filter => 1, + :fields => ["estimated_hours", "fixed_version_id", "status_id"], + :values => {"estimated_hours" => [1], "fixed_version_id" => [@version], "status_id" => [1]}, + :operators => {"estimated_hours" => "!*", "fixed_version_id" => "=", "status_id" => "undone"} + } +)%></td> +</tr> +<% end %> <% if User.current.allowed_to?(:view_time_entries, @project) %> <tr> <td class="label"><%= l(:label_spent_time) %></td> app/views/versions/show.rhtml @@ -347,6 +347,10 @@ label_open_issues_plural: open label_closed_issues: closed label_closed_issues_plural: closed label_done_issues_genitive_case: done +label_done_issues: done +label_done_issues_plural: done +label_undone_issues: undone +label_undone_issues_plural: undone label_total: Total label_permissions: Permissions label_current_status: Current status @@ -535,6 +539,7 @@ label_remaining_time_short: Rem. label_issues_count: Count label_time: Time label_spent_time_log: Spent time log +label_not_estimated_and_undone: Not estimated label_issue_watchers: Watchers lang/en.yml @@ -315,7 +315,11 @@ label_public_projects: Общие проекты label_open_issues: открытый label_open_issues_plural: открытые label_closed_issues: закрытый -label_done_issues_genitive_case: сделанных +label_done_issues_genitive_case: выполненных +label_done_issues: выполненный +label_done_issues_plural: выполненные +label_undone_issues: невыполненный +label_undone_issues_plural: невыполненные label_total: Всего label_permissions: Права доступа label_current_status: Текущий статус lang/ru.yml @@ -676,3 +676,7 @@ div.wiki pre.linebreak { margin:0; padding:0; } + +.not_estimated .count { + color:red; +} \ No newline at end of file public/stylesheets/application.css 045169baf4b668ce869deb7a135340dd5962df5f Artem Vasiliev artem.vasiliev@texunatech.com http://github.com/artemv/redmine_tt/commit/2f53878ce1f51cd5c797eaa8a98e6ed327e13b96 2f53878ce1f51cd5c797eaa8a98e6ed327e13b96 2008-09-04T07:31:27-07:00 2008-09-04T07:31:27-07:00 Version page: show not estimated (undone) issues count. Count is a link that leads to relevant issues list. For this 2 new filter operators added for status: 'done' and 'undone'. 0ee9ed910f58f4a48a5836a5b73d273805e18ce5 Artem Vasiliev artem.vasiliev@texunatech.com