cleaning up

moving methods into Issue Helper to clean up view templates.

Author: travis

app/views/spent_time/_javascript_report.html.erb

@@ -13,18 +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 %> {
 
-                <% 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' %>
-              <%=raw '"user":"' <<  entry.user.to_s << '",' if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'user' %>
-              <%=raw '"hours":"' << time_spent << '",' if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'hours' %>
-              <%=raw '"activity":"' << entry.activity.to_s << '",'  if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'activity' %>
-              <%=raw '"comments":"' << entry.comments << '",' if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'comments' %>
+              <%=raw '"spent_on":"' << entry.spent_on.strftime("%m/%d/%Y") << '",' if is_spent_on_shown( entry ) %>
+              <%=raw '"user":"' <<  entry.user.to_s << '",' if is_user_shown( entry ) %>
+              <%=raw '"hours":"' << report_time_spent( entry ) << '",' if is_report_time_shown( entry ) %>
+              <%=raw '"activity":"' << entry.activity.to_s << '",'  if is_activity_shown( entry ) %>
+              <%=raw '"comments":"' << entry.comments << '",' if is_comment_shown( entry ) %>
 
               }
             <% end %>

app/views/spent_time/_report.html.erb

@@ -17,23 +17,11 @@
     <tbody>
       <% @issue.time_entries.last( Setting.plugin_redmine_spent_time_in_issue_description['spent_time_max_display'].to_i ).each do |entry| %>
         <tr>
-          <%= content_tag(:td, entry.spent_on.strftime("%m/%d/%Y") ) if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'spentOn'  %>
-          <%= content_tag(:td, link_to_user( entry.user )) if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'user' %>
-          <% 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"
-                 time_spent = humanized_time( entry.hours )
-               else
-                 time_spent = entry.hours
-               end
-
-             %>
-
-           <%= content_tag(:td, time_spent ) %>
-
-          <% end %>
-          <%= content_tag(:td, entry.comments ) if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'comments'  %>
-          <%= content_tag(:td, entry.activity ) if Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'activity'  %>
+          <%= content_tag(:td, entry.spent_on.strftime("%m/%d/%Y") ) if is_spent_on_shown( entry ) %>
+          <%= content_tag(:td, link_to_user( entry.user )) if is_user_shown( entry ) %>
+          <%= content_tag(:td, report_time_spent( entry ) ) if is_report_time_shown( entry ) %>
+          <%= content_tag(:td, entry.comments ) if is_comment_shown( entry ) %>
+          <%= content_tag(:td, entry.activity ) if is_activity_shown( entry ) %>
         </tr>
       <% end %>
     </tbody>

lib/issue_helper_patch.rb

@@ -26,6 +26,34 @@ def humanized_time(entry_hours)
 
   end
 
+  def report_time_spent(entry)
+    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
+  end
+
+  def is_report_time_shown( entry )
+    Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'hours'
+  end
+
+  def is_spent_on_shown( entry )
+    Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'spentOn'
+  end
+
+  def is_user_shown( entry )
+    Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'user'
+  end
+
+  def is_comment_shown( entry )
+    Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'comments'
+  end
+
+  def is_activity_shown( entry )
+    Setting.plugin_redmine_spent_time_in_issue_description['display_columns'].include? 'activity'
+  end
+
   def self.included(receiver)
     receiver.send :include, InstanceMethods
   end