Implemented settings for enabling/disabling each of the five 'columns…

…' on the issuelist bottom summary line. All 'columns' are enabled by default. Again, when a 'column' is disabled also its calculations are disabled, thus saving on requests/load. Provided english i18n-stubs for introduced i18n-symbols, for all other languages.
MischaTheEvil · Oct 26, 2011 · df9cded · df9cded
1 parent b113c08
commit df9cded
Show file tree

Hide file tree

Showing 47 changed files with 323 additions and 56 deletions.
diff --git a/app/views/hooks/redmine_spent_time_column/_view_issues_index_bottom.html.erb b/app/views/hooks/redmine_spent_time_column/_view_issues_index_bottom.html.erb
@@ -4,11 +4,21 @@
     if Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_on_issuelists'] == '1'
         @issues.each do |issue|
             if User.current.allowed_to?(:view_time_entries, issue.project)
-                estimated_hours         += issue.estimated_hours        ||0.0
-                spent_hours             += issue.spent_hours            ||0.0
-                calculated_spent_hours  += issue.calculated_spent_hours ||0.0
-                divergent_hours         += issue.divergent_hours        ||0.0
-                remaining_hours         += issue.remaining_hours        ||0.0
+                if Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_estimated_hours'] == '1'
+                    estimated_hours         += issue.estimated_hours        ||0.0
+                end
+                if Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_spent_hours'] == '1'
+                    spent_hours             += issue.spent_hours            ||0.0
+                end
+                if Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_calculated_spent_hours'] == '1'
+                    calculated_spent_hours  += issue.calculated_spent_hours ||0.0
+                end
+                if Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_divergent_hours'] == '1'
+                    divergent_hours         += issue.divergent_hours        ||0.0
+                end
+                if Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_remaining_hours'] == '1'
+                    remaining_hours         += issue.remaining_hours        ||0.0
+                end
             else
                 allowed_to_view_time_entries = false if not User.current.admin?
                 break
@@ -18,11 +28,21 @@
 %>
 <% if allowed_to_view_time_entries && Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_on_issuelists'] == '1' -%>
 <p class="other-formats">
-    <strong><%= t :field_estimated_hours %>:</strong> <%= estimated_hours.round(2) %>, 
-    <strong><%= t :label_spent_time %>:</strong> <%= spent_hours.round(2) %>, 
-    <strong><%= t :label_calculated_spent_hours %>:</strong> <%= calculated_spent_hours.round(2) %>, 
-    <strong><%= t :label_divergent_hours %>:</strong> <%= divergent_hours.round(2) %>, 
-    <strong><%= t :label_remaining_hours %>:</strong> <%= remaining_hours.round(2) %>
+    <% if Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_estimated_hours'] == '1' -%>
+        <strong><%= t :field_estimated_hours %>:</strong> <%= estimated_hours.round(2) %>, 
+    <% end -%>
+    <% if Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_spent_hours'] == '1' -%>
+        <strong><%= t :label_spent_time %>:</strong> <%= spent_hours.round(2) %>, 
+    <% end -%>
+    <% if Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_calculated_spent_hours'] == '1' -%>
+        <strong><%= t :label_calculated_spent_hours %>:</strong> <%= calculated_spent_hours.round(2) %>, 
+    <% end -%>
+    <% if Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_divergent_hours'] == '1' -%>
+        <strong><%= t :label_divergent_hours %>:</strong> <%= divergent_hours.round(2) %>, 
+    <% end -%>
+    <% if Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_remaining_hours'] == '1' -%>
+        <strong><%= t :label_remaining_hours %>:</strong> <%= remaining_hours.round(2) %>
+    <% end -%>
 </p>
 <% end -%>
 

diff --git a/app/views/settings/_spent_time_column_settings.html.erb b/app/views/settings/_spent_time_column_settings.html.erb
@@ -1,9 +1,31 @@
 <fieldset>
-  <legend><%= l(:legend_general_settings) %></legend>
+  <legend><%= l(:legend_bottom_summary_line_settings) %></legend>
   <p>
     <label><%= l(:setting_show_bottom_summary_line_on_issuelists) %></label>
-    <%= check_box_tag 'settings[show_bottom_summary_line_on_issuelists]', 1, Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_on_issuelists'] == '1' %>
+    <%= check_box_tag 'settings[show_bottom_summary_line_on_issuelists]', 1, Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_on_issuelists'] == '1', :onclick=>"Element.toggle('bottom_summary_line_settings'); return true;" %>
   </p>
+  <div id="bottom_summary_line_settings" <%= Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_on_issuelists'] == '1' ? '' : 'style="display:none"' %>>
+    <p>
+      <label><%= l(:setting_show_bottom_summary_line_estimated_hours) %></label>
+      <%= check_box_tag 'settings[show_bottom_summary_line_estimated_hours]', 1, Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_estimated_hours'] == '1' %>
+    </p>
+    <p>
+      <label><%= l(:setting_show_bottom_summary_line_spent_hours) %></label>
+      <%= check_box_tag 'settings[show_bottom_summary_line_spent_hours]', 1, Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_spent_hours'] == '1' %>
+    </p>
+    <p>
+      <label><%= l(:setting_show_bottom_summary_line_calculated_spent_hours) %></label>
+      <%= check_box_tag 'settings[show_bottom_summary_line_calculated_spent_hours]', 1, Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_calculated_spent_hours'] == '1' %>
+    </p>
+    <p>
+      <label><%= l(:setting_show_bottom_summary_line_divergent_hours) %></label>
+      <%= check_box_tag 'settings[show_bottom_summary_line_divergent_hours]', 1, Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_divergent_hours'] == '1' %>
+    </p>
+    <p>
+      <label><%= l(:setting_show_bottom_summary_line_remaining_hours) %></label>
+      <%= check_box_tag 'settings[show_bottom_summary_line_remaining_hours]', 1, Setting.plugin_redmine_spent_time_column['show_bottom_summary_line_remaining_hours'] == '1' %>
+    </p>
+  </div>
 </fieldset>
 
 <fieldset>

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
@@ -3,9 +3,14 @@
   label_divergent_hours: Divergent time 
   label_remaining_hours: Remaining time
   setting_show_bottom_summary_line_on_issuelists: Display bottom summary line on issuelists
+  setting_show_bottom_summary_line_estimated_hours: Show Estimated time
+  setting_show_bottom_summary_line_spent_hours: Show Spent time
+  setting_show_bottom_summary_line_calculated_spent_hours: Show Calculated spent time
+  setting_show_bottom_summary_line_divergent_hours: Show Divergent time
+  setting_show_bottom_summary_line_remaining_hours: Show Remaining time
   setting_enable_spent_hours_column: Enable Spent time column
   setting_enable_calculated_spent_hours_column: Enable Calculated spent time column
   setting_enable_divergent_hours_column: Enable Divergent time column
   setting_enable_remaining_hours_column: Enable Remaining time column
-  legend_general_settings: General settings
+  legend_bottom_summary_line_settings: Bottom summary line settings
   legend_column_settings: Column settings
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
@@ -3,9 +3,14 @@
   label_divergent_hours: Divergent time 
   label_remaining_hours: Remaining time
   setting_show_bottom_summary_line_on_issuelists: Display bottom summary line on issuelists
+  setting_show_bottom_summary_line_estimated_hours: Show Estimated time
+  setting_show_bottom_summary_line_spent_hours: Show Spent time
+  setting_show_bottom_summary_line_calculated_spent_hours: Show Calculated spent time
+  setting_show_bottom_summary_line_divergent_hours: Show Divergent time
+  setting_show_bottom_summary_line_remaining_hours: Show Remaining time
   setting_enable_spent_hours_column: Enable Spent time column
   setting_enable_calculated_spent_hours_column: Enable Calculated spent time column
   setting_enable_divergent_hours_column: Enable Divergent time column
   setting_enable_remaining_hours_column: Enable Remaining time column
-  legend_general_settings: General settings
+  legend_bottom_summary_line_settings: Bottom summary line settings
   legend_column_settings: Column settings
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
@@ -3,9 +3,14 @@
   label_divergent_hours: Divergent time 
   label_remaining_hours: Remaining time
   setting_show_bottom_summary_line_on_issuelists: Display bottom summary line on issuelists
+  setting_show_bottom_summary_line_estimated_hours: Show Estimated time
+  setting_show_bottom_summary_line_spent_hours: Show Spent time
+  setting_show_bottom_summary_line_calculated_spent_hours: Show Calculated spent time
+  setting_show_bottom_summary_line_divergent_hours: Show Divergent time
+  setting_show_bottom_summary_line_remaining_hours: Show Remaining time
   setting_enable_spent_hours_column: Enable Spent time column
   setting_enable_calculated_spent_hours_column: Enable Calculated spent time column
   setting_enable_divergent_hours_column: Enable Divergent time column
   setting_enable_remaining_hours_column: Enable Remaining time column
-  legend_general_settings: General settings
+  legend_bottom_summary_line_settings: Bottom summary line settings
   legend_column_settings: Column settings
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
@@ -3,9 +3,14 @@
   label_divergent_hours: Divergent time 
   label_remaining_hours: Remaining time
   setting_show_bottom_summary_line_on_issuelists: Display bottom summary line on issuelists
+  setting_show_bottom_summary_line_estimated_hours: Show Estimated time
+  setting_show_bottom_summary_line_spent_hours: Show Spent time
+  setting_show_bottom_summary_line_calculated_spent_hours: Show Calculated spent time
+  setting_show_bottom_summary_line_divergent_hours: Show Divergent time
+  setting_show_bottom_summary_line_remaining_hours: Show Remaining time
   setting_enable_spent_hours_column: Enable Spent time column
   setting_enable_calculated_spent_hours_column: Enable Calculated spent time column
   setting_enable_divergent_hours_column: Enable Divergent time column
   setting_enable_remaining_hours_column: Enable Remaining time column
-  legend_general_settings: General settings
+  legend_bottom_summary_line_settings: Bottom summary line settings
   legend_column_settings: Column settings
diff --git a/config/locales/da.yml b/config/locales/da.yml
@@ -3,9 +3,14 @@
   label_divergent_hours: Divergent time 
   label_remaining_hours: Remaining time
   setting_show_bottom_summary_line_on_issuelists: Display bottom summary line on issuelists
+  setting_show_bottom_summary_line_estimated_hours: Show Estimated time
+  setting_show_bottom_summary_line_spent_hours: Show Spent time
+  setting_show_bottom_summary_line_calculated_spent_hours: Show Calculated spent time
+  setting_show_bottom_summary_line_divergent_hours: Show Divergent time
+  setting_show_bottom_summary_line_remaining_hours: Show Remaining time
   setting_enable_spent_hours_column: Enable Spent time column
   setting_enable_calculated_spent_hours_column: Enable Calculated spent time column
   setting_enable_divergent_hours_column: Enable Divergent time column
   setting_enable_remaining_hours_column: Enable Remaining time column
-  legend_general_settings: General settings
+  legend_bottom_summary_line_settings: Bottom summary line settings
   legend_column_settings: Column settings
diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -3,9 +3,14 @@
   label_divergent_hours: Zeitabweichung
   label_remaining_hours: Verbleibende Zeit
   setting_show_bottom_summary_line_on_issuelists: Display bottom summary line on issuelists
+  setting_show_bottom_summary_line_estimated_hours: Show Estimated time
+  setting_show_bottom_summary_line_spent_hours: Show Spent time
+  setting_show_bottom_summary_line_calculated_spent_hours: Show Calculated spent time
+  setting_show_bottom_summary_line_divergent_hours: Show Divergent time
+  setting_show_bottom_summary_line_remaining_hours: Show Remaining time
   setting_enable_spent_hours_column: Enable Spent time column
   setting_enable_calculated_spent_hours_column: Enable Calculated spent time column
   setting_enable_divergent_hours_column: Enable Divergent time column
   setting_enable_remaining_hours_column: Enable Remaining time column
-  legend_general_settings: General settings
+  legend_bottom_summary_line_settings: Bottom summary line settings
   legend_column_settings: Column settings
diff --git a/config/locales/el.yml b/config/locales/el.yml
@@ -3,9 +3,14 @@
   label_divergent_hours: Divergent time 
   label_remaining_hours: Remaining time
   setting_show_bottom_summary_line_on_issuelists: Display bottom summary line on issuelists
+  setting_show_bottom_summary_line_estimated_hours: Show Estimated time
+  setting_show_bottom_summary_line_spent_hours: Show Spent time
+  setting_show_bottom_summary_line_calculated_spent_hours: Show Calculated spent time
+  setting_show_bottom_summary_line_divergent_hours: Show Divergent time
+  setting_show_bottom_summary_line_remaining_hours: Show Remaining time
   setting_enable_spent_hours_column: Enable Spent time column
   setting_enable_calculated_spent_hours_column: Enable Calculated spent time column
   setting_enable_divergent_hours_column: Enable Divergent time column
   setting_enable_remaining_hours_column: Enable Remaining time column
-  legend_general_settings: General settings
+  legend_bottom_summary_line_settings: Bottom summary line settings
   legend_column_settings: Column settings
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
@@ -3,9 +3,14 @@
   label_divergent_hours: Divergent time 
   label_remaining_hours: Remaining time
   setting_show_bottom_summary_line_on_issuelists: Display bottom summary line on issuelists
+  setting_show_bottom_summary_line_estimated_hours: Show Estimated time
+  setting_show_bottom_summary_line_spent_hours: Show Spent time
+  setting_show_bottom_summary_line_calculated_spent_hours: Show Calculated spent time
+  setting_show_bottom_summary_line_divergent_hours: Show Divergent time
+  setting_show_bottom_summary_line_remaining_hours: Show Remaining time
   setting_enable_spent_hours_column: Enable Spent time column
   setting_enable_calculated_spent_hours_column: Enable Calculated spent time column
   setting_enable_divergent_hours_column: Enable Divergent time column
   setting_enable_remaining_hours_column: Enable Remaining time column
-  legend_general_settings: General settings
+  legend_bottom_summary_line_settings: Bottom summary line settings
   legend_column_settings: Column settings
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -3,9 +3,14 @@ en:
   label_divergent_hours: Divergent time 
   label_remaining_hours: Remaining time
   setting_show_bottom_summary_line_on_issuelists: Display bottom summary line on issuelists
+  setting_show_bottom_summary_line_estimated_hours: Show Estimated time
+  setting_show_bottom_summary_line_spent_hours: Show Spent time
+  setting_show_bottom_summary_line_calculated_spent_hours: Show Calculated spent time
+  setting_show_bottom_summary_line_divergent_hours: Show Divergent time
+  setting_show_bottom_summary_line_remaining_hours: Show Remaining time
   setting_enable_spent_hours_column: Enable Spent time column
   setting_enable_calculated_spent_hours_column: Enable Calculated spent time column
   setting_enable_divergent_hours_column: Enable Divergent time column
   setting_enable_remaining_hours_column: Enable Remaining time column
-  legend_general_settings: General settings
+  legend_bottom_summary_line_settings: Bottom summary line settings
   legend_column_settings: Column settings
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -3,9 +3,14 @@
   label_divergent_hours: Divergent time 
   label_remaining_hours: Remaining time
   setting_show_bottom_summary_line_on_issuelists: Display bottom summary line on issuelists
+  setting_show_bottom_summary_line_estimated_hours: Show Estimated time
+  setting_show_bottom_summary_line_spent_hours: Show Spent time
+  setting_show_bottom_summary_line_calculated_spent_hours: Show Calculated spent time
+  setting_show_bottom_summary_line_divergent_hours: Show Divergent time
+  setting_show_bottom_summary_line_remaining_hours: Show Remaining time
   setting_enable_spent_hours_column: Enable Spent time column
   setting_enable_calculated_spent_hours_column: Enable Calculated spent time column
   setting_enable_divergent_hours_column: Enable Divergent time column
   setting_enable_remaining_hours_column: Enable Remaining time column
-  legend_general_settings: General settings
+  legend_bottom_summary_line_settings: Bottom summary line settings
   legend_column_settings: Column settings
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
@@ -3,9 +3,14 @@
   label_divergent_hours: Divergent time 
   label_remaining_hours: Remaining time
   setting_show_bottom_summary_line_on_issuelists: Display bottom summary line on issuelists
+  setting_show_bottom_summary_line_estimated_hours: Show Estimated time
+  setting_show_bottom_summary_line_spent_hours: Show Spent time
+  setting_show_bottom_summary_line_calculated_spent_hours: Show Calculated spent time
+  setting_show_bottom_summary_line_divergent_hours: Show Divergent time
+  setting_show_bottom_summary_line_remaining_hours: Show Remaining time
   setting_enable_spent_hours_column: Enable Spent time column
   setting_enable_calculated_spent_hours_column: Enable Calculated spent time column
   setting_enable_divergent_hours_column: Enable Divergent time column
   setting_enable_remaining_hours_column: Enable Remaining time column
-  legend_general_settings: General settings
+  legend_bottom_summary_line_settings: Bottom summary line settings
   legend_column_settings: Column settings
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
@@ -3,9 +3,14 @@
   label_divergent_hours: Divergent time 
   label_remaining_hours: Remaining time
   setting_show_bottom_summary_line_on_issuelists: Display bottom summary line on issuelists
+  setting_show_bottom_summary_line_estimated_hours: Show Estimated time
+  setting_show_bottom_summary_line_spent_hours: Show Spent time
+  setting_show_bottom_summary_line_calculated_spent_hours: Show Calculated spent time
+  setting_show_bottom_summary_line_divergent_hours: Show Divergent time
+  setting_show_bottom_summary_line_remaining_hours: Show Remaining time
   setting_enable_spent_hours_column: Enable Spent time column
   setting_enable_calculated_spent_hours_column: Enable Calculated spent time column
   setting_enable_divergent_hours_column: Enable Divergent time column
   setting_enable_remaining_hours_column: Enable Remaining time column
-  legend_general_settings: General settings
+  legend_bottom_summary_line_settings: Bottom summary line settings
   legend_column_settings: Column settings
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
@@ -3,9 +3,14 @@
   label_divergent_hours: Divergent time 
   label_remaining_hours: Remaining time
   setting_show_bottom_summary_line_on_issuelists: Display bottom summary line on issuelists
+  setting_show_bottom_summary_line_estimated_hours: Show Estimated time
+  setting_show_bottom_summary_line_spent_hours: Show Spent time
+  setting_show_bottom_summary_line_calculated_spent_hours: Show Calculated spent time
+  setting_show_bottom_summary_line_divergent_hours: Show Divergent time
+  setting_show_bottom_summary_line_remaining_hours: Show Remaining time
   setting_enable_spent_hours_column: Enable Spent time column
   setting_enable_calculated_spent_hours_column: Enable Calculated spent time column
   setting_enable_divergent_hours_column: Enable Divergent time column
   setting_enable_remaining_hours_column: Enable Remaining time column
-  legend_general_settings: General settings
+  legend_bottom_summary_line_settings: Bottom summary line settings
   legend_column_settings: Column settings
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -3,9 +3,14 @@
   label_divergent_hours: Divergent time 
   label_remaining_hours: Remaining time
   setting_show_bottom_summary_line_on_issuelists: Display bottom summary line on issuelists
+  setting_show_bottom_summary_line_estimated_hours: Show Estimated time
+  setting_show_bottom_summary_line_spent_hours: Show Spent time
+  setting_show_bottom_summary_line_calculated_spent_hours: Show Calculated spent time
+  setting_show_bottom_summary_line_divergent_hours: Show Divergent time
+  setting_show_bottom_summary_line_remaining_hours: Show Remaining time
   setting_enable_spent_hours_column: Enable Spent time column
   setting_enable_calculated_spent_hours_column: Enable Calculated spent time column
   setting_enable_divergent_hours_column: Enable Divergent time column
   setting_enable_remaining_hours_column: Enable Remaining time column
-  legend_general_settings: General settings
+  legend_bottom_summary_line_settings: Bottom summary line settings
   legend_column_settings: Column settings