Extracted redundancy into helper

Created patch that adds method to Issues Helper to clean up views.

Author: travis

app/views/spent_time/_javascript_report.html.erb

@@ -13,30 +13,11 @@
             <% @issue.time_entries.last( Setting.plugin_redmine_spent_time_in_issue_description['spent_time_max_display'].to_i ).each_with_index do |entry, index| %>
               <%= "," if index > 0 %> {
 
-                <% # Repeating code from _report.html.erb
-
-                if Setting.plugin_redmine_spent_time_in_issue_description['time_format'].eql? "human"
-                  hours = entry.hours.to_i
-                  minutes = entry.hours * 60
-                  minutes = (minutes - hours * 60 ).to_i
-
-                  time_spent = ""
-
-                  if hours == 1
-                    time_spent = t('plugin_spent_time_in_issue.datetime.hours.one')
-                  elsif hours > 1
-                    time_spent = t('plugin_spent_time_in_issue.datetime.hours.other', hours: hours )
-                  end
-
-                  if minutes == 1
-                    time_spent << " " << t('plugin_spent_time_in_issue.datetime.minutes.one')
-                  elsif minutes > 1
-                    time_spent << " " << t('plugin_spent_time_in_issue.datetime.minutes.other', minutes: minutes )
-                  end
-                else
-                  time_spent = entry.hours
-                end
-
+                <% if Setting.plugin_redmine_spent_time_in_issue_description['time_format'].eql? "human"
+                    time_spent = humanized_time( entry.hours )
+                   else
+                    time_spent = entry.hours
+                   end
                %>
 
               <%=raw '"spent_on":"' << entry.spent_on.strftime("%m/%d/%Y") << '",' if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'spentOn' %>

app/views/spent_time/_report.html.erb

@@ -22,23 +22,7 @@
           <% if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'hours'
 
                if Setting.plugin_redmine_spent_time_in_issue_description['time_format'].eql? "human"
-                 hours = entry.hours.to_i
-                 minutes = entry.hours * 60
-                 minutes = (minutes - hours * 60 ).to_i
-
-                 time_spent = ""
-
-                 if hours == 1
-                   time_spent = t('plugin_spent_time_in_issue.datetime.hours.one')
-                 elsif hours > 1
-                   time_spent = t('plugin_spent_time_in_issue.datetime.hours.other', hours: hours )
-                 end
-
-                 if minutes == 1
-                   time_spent << " " << t('plugin_spent_time_in_issue.datetime.minutes.one')
-                 elsif minutes > 1
-                   time_spent << " " << t('plugin_spent_time_in_issue.datetime.minutes.other', minutes: minutes )
-                 end
+                 time_spent = humanized_time( entry.hours )
                else
                  time_spent = entry.hours
                end

config/locales/en.yml

@@ -9,13 +9,13 @@ en:
         datetime:
           hours:
             one: 1 hour
-            other: %{hours} hours
+            other: "%{hours} hours"
           minutes:
             one: 1 minute
-            other: %{minutes} minutes
+            other: "%{minutes} minutes"
         user: User
         hours: Hours
         comments: Comments
         display_cols: Display Columns
         activity: Activity
-        seeAllCount: ( See all %{count} entries )
+        seeAllCount: "( See all %{count} entries )"

init.rb

@@ -1,4 +1,3 @@
-
 require 'redmine'
 
 require_dependency 'issue_description_with_spent_time_hook_listener'
@@ -16,3 +15,8 @@
                         },
                         :partial => 'settings/spent_time_settings' )
 end
+
+Rails.configuration.to_prepare do
+    require_dependency 'issue_helper_patch'
+    IssuesHelper.send     :include, IssuesHelperPatch
+end

lib/issue_helper_patch.rb

@@ -0,0 +1,33 @@
+module IssuesHelperPatch
+  module InstanceMethods
+
+    def humanized_time(entry_hours)
+      hours = entry_hours.to_i
+      minutes = entry_hours * 60
+      minutes = (minutes - hours * 60 ).to_i
+
+      time_spent = case
+      when hours == 1
+        t('plugin_spent_time_in_issue.datetime.hours.one')
+      when hours > 1
+        t('plugin_spent_time_in_issue.datetime.hours.other', hours: hours)
+      else
+        ""
+      end
+
+      if minutes == 1
+        time_spent << " " << t('plugin_spent_time_in_issue.datetime.minutes.one')
+      elsif minutes > 1
+        time_spent << " " << t('plugin_spent_time_in_issue.datetime.minutes.other', minutes: minutes)
+      else
+        time_spent
+      end
+    end
+
+  end
+
+  def self.included(receiver)
+    receiver.send :include, InstanceMethods
+  end
+end
+