jro_apps/redmine Commit - r13891:31bffaa053fc

Display time spent on the issue and the total time spent like estimated hours (#17550)....

Jean-Philippe Lang -

r13891:31bffaa053fc

parent child

Context file:

r13891:31bffaa053fc

Collapse all files

app/helpers/issues_helper.rb +20 -4

                end
                def issue_estimated_hours_details(issue)
-                 s = issue.estimated_hours.present? ? l_hours(issue.estimated_hours) : ""
-                 unless issue.leaf? || issue.total_estimated_hours.nil?
-                   s << " (#{l(:label_total)}: #{l_hours(issue.total_estimated_hours)})"
+                 if issue.total_estimated_hours.present?
+                   if issue.total_estimated_hours == issue.estimated_hours
+                     l_hours_short(issue.estimated_hours)
+                   else
+                     s = issue.estimated_hours.present? ? l_hours_short(issue.estimated_hours) : ""
+                     s << " (#{l(:label_total)}: #{l_hours_short(issue.total_estimated_hours)})"
+                     s.html_safe
+                   end
+                 end
+               end
+               def issue_spent_hours_details(issue)
+                 if issue.total_spent_hours > 0
+                   if issue.total_spent_hours == issue.spent_hours
+                     link_to(l_hours_short(issue.spent_hours), issue_time_entries_path(issue))
+                   else
+                     s = issue.spent_hours > 0 ? l_hours_short(issue.spent_hours) : ""
+                     s << " (#{l(:label_total)}: #{link_to l_hours_short(issue.total_spent_hours), issue_time_entries_path(issue)})"
+                     s.html_safe
+                   end
                  end
-                 s.html_safe
                end
                # Returns an array of error messages for bulk edited issues

app/views/issues/show.html.erb +3 -1

                  end
                end
                if User.current.allowed_to?(:view_time_entries, @project)
-                 rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? link_to(l_hours(@issue.total_spent_hours), issue_time_entries_path(@issue)) : "-"), :class => 'spent-time'
+                 if @issue.total_spent_hours > 0
+                   rows.right l(:label_spent_time), issue_spent_hours_details(@issue), :class => 'spent-time'
+                 end
                end
              end %>
              <%= render_custom_fields_rows(@issue) %>

lib/redmine/i18n.rb +4 0

                    l((hours < 2.0 ? :label_f_hour : :label_f_hour_plural), :value => ("%.2f" % hours.to_f))
                  end
+                 def l_hours_short(hours)
+                   "%.2f h" % hours.to_f
+                 end
                  def ll(lang, str, value=nil)
                    ::I18n.t(str.to_s, :value => value, :locale => lang.to_s.gsub(%r{(.+)\-(.+)$}) { "#{$1}-#{$2.upcase}" })
                  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