Adding more columns:

- Calculated spent time = Estimated time * % Done
- Divergent time = Spent time - Calculated spent time
- Remaining time = Estimated time - (Estimated time * % Done)

config/locales/bg.yml

@@ -0,0 +1,4 @@
+'bg':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/bs.yml

@@ -0,0 +1,4 @@
+'bs':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/ca.yml

@@ -0,0 +1,4 @@
+'ca':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/cs.yml

@@ -0,0 +1,4 @@
+'cs':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/da.yml

@@ -0,0 +1,4 @@
+'da':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/de.yml

@@ -0,0 +1,4 @@
+'de':
+  label_calculated_spent_hours: Rechnerisch aufgewendete Zeit
+  label_divergent_hours: Zeitabweichung
+  label_remaining_hours: Verbleibende Zeit

config/locales/el.yml

@@ -0,0 +1,4 @@
+'el':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/en-GB.yml

@@ -0,0 +1,4 @@
+'en-GB':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/en.yml

@@ -0,0 +1,4 @@
+en:
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/es.yml

@@ -0,0 +1,4 @@
+'es':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/eu.yml

@@ -0,0 +1,4 @@
+'eu':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/fa.yml

@@ -0,0 +1,4 @@
+'fa':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/fi.yml

@@ -0,0 +1,4 @@
+'fi':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/fr.yml

@@ -0,0 +1,4 @@
+'fr':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/gl.yml

@@ -0,0 +1,4 @@
+'gl':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/he.yml

@@ -0,0 +1,4 @@
+'he':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/hr.yml

@@ -0,0 +1,4 @@
+'hr':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/hu.yml

@@ -0,0 +1,4 @@
+'hu':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/id.yml

@@ -0,0 +1,4 @@
+'id':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/it.yml

@@ -0,0 +1,4 @@
+'it':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/ja.yml

@@ -0,0 +1,4 @@
+'ja':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/ko.yml

@@ -0,0 +1,4 @@
+'ko':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/lt.yml

@@ -0,0 +1,4 @@
+'lt':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/lv.yml

@@ -0,0 +1,4 @@
+'lv':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/mk.yml

@@ -0,0 +1,4 @@
+'mk':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/mn.yml

@@ -0,0 +1,4 @@
+'mn':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/nl.yml

@@ -0,0 +1,4 @@
+'nl':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/no.yml

@@ -0,0 +1,4 @@
+'no':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/pl.yml

@@ -0,0 +1,4 @@
+'pl':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/pt-BR.yml

@@ -0,0 +1,4 @@
+'pt-BR':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/pt.yml

@@ -0,0 +1,4 @@
+'pt':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/ro.yml

@@ -0,0 +1,4 @@
+'ro':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/ru.yml

@@ -0,0 +1,4 @@
+'ru':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/sk.yml

@@ -0,0 +1,4 @@
+'sk':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/sl.yml

@@ -0,0 +1,4 @@
+'sl':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/sr-YU.yml

@@ -0,0 +1,4 @@
+'sr-YU':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/sr.yml

@@ -0,0 +1,4 @@
+'sr':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/sv.yml

@@ -0,0 +1,4 @@
+'sv':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/th.yml

@@ -0,0 +1,4 @@
+'th':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/tr.yml

@@ -0,0 +1,4 @@
+'tr':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/uk.yml

@@ -0,0 +1,4 @@
+'uk':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/vi.yml

@@ -0,0 +1,4 @@
+'vi':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/zh-TW.yml

@@ -0,0 +1,4 @@
+'zh-TW':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

config/locales/zh.yml

@@ -0,0 +1,4 @@
+'zh':
+  label_calculated_spent_hours: Calculated spent time
+  label_divergent_hours: Divergent time 
+  label_remaining_hours: Remaining time

init.rb

@@ -2,6 +2,7 @@
 require 'dispatcher'
 
 Dispatcher.to_prepare do
+  Issue.send(:include, RedmineSpentTimeColumn::Patches::IssuePatch) unless Issue.include?(RedmineSpentTimeColumn::Patches::IssuePatch)
   Query.send(:include, RedmineSpentTimeColumn::Patches::QueryPatch) unless Query.include?(RedmineSpentTimeColumn::Patches::QueryPatch)
   QueriesHelper.send(:include, RedmineSpentTimeColumn::Patches::QueriesHelperPatch) unless QueriesHelper.include?(RedmineSpentTimeColumn::Patches::QueriesHelperPatch)
 end
@@ -10,5 +11,5 @@
   name 'Redmine Spent Time Column'
   author 'Jan Schulz-Hofen, Planio GmbH'
   description 'This plugin adds a spent time column to issue lists.'
-  version '1.0.0'
+  version '1.1.0'
 end

lib/redmine_spent_time_column/patches/issue_patch.rb

@@ -0,0 +1,19 @@
+module RedmineSpentTimeColumn
+  module Patches
+    module IssuePatch
+
+      def calculated_spent_hours
+        @calculated_spent_hours ||= self_and_descendants.sum("estimated_hours * done_ratio / 100").to_f || 0.0
+      end
+
+      def divergent_hours
+        @divergent_hours ||= spent_hours - calculated_spent_hours
+      end
+
+      def remaining_hours
+        @remaining_hours ||= self_and_descendants.sum("estimated_hours - (estimated_hours * done_ratio / 100)").to_f || 0.0
+      end
+
+    end
+  end
+end

lib/redmine_spent_time_column/patches/queries_helper_patch.rb

@@ -4,7 +4,7 @@ module QueriesHelperPatch
 
       def column_content_with_spent_hours(column, issue)
         value = column.value(issue)
-        if %w(Fixnum Float).include?( value.class.name ) and column.name == :spent_hours
+        if %w(Fixnum Float).include?( value.class.name ) and [:spent_hours, :calculated_spent_hours, :divergent_hours, :remaining_hours].include?(column.name)
           sprintf "%.2f", value
         else
           column_content_without_spent_hours(column, issue)

lib/redmine_spent_time_column/patches/query_patch.rb

@@ -5,7 +5,27 @@ module QueryPatch
       def available_columns_with_spent_hours
         returning available_columns_without_spent_hours do |columns|
           if (project and User.current.allowed_to?(:view_time_entries, project)) or User.current.admin?
-            columns << QueryColumn.new(:spent_hours, :caption => :label_spent_time, :sortable => "(select sum(hours) from #{TimeEntry.table_name} where #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id)") unless columns.detect{ |c| c.name == :spent_hours }
+
+            columns << QueryColumn.new(:spent_hours, 
+              :caption => :label_spent_time, 
+              :sortable => "(select sum(hours) from #{TimeEntry.table_name} where #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id)"
+            ) unless columns.detect{ |c| c.name == :spent_hours }
+
+            columns << QueryColumn.new(:calculated_spent_hours,
+              :caption => :label_calculated_spent_hours,
+              :sortable => "(IF(#{Issue.table_name}.estimated_hours IS NULL,0,#{Issue.table_name}.estimated_hours) * #{Issue.table_name}.done_ratio / 100)"
+            ) unless columns.detect{ |c| c.name == :calculated_spent_hours }
+
+            columns << QueryColumn.new(:divergent_hours,
+              :caption => :label_divergent_hours,
+              :sortable => "((select sum(hours) from #{TimeEntry.table_name} where #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id) - (IF(#{Issue.table_name}.estimated_hours IS NULL,0,#{Issue.table_name}.estimated_hours) * #{Issue.table_name}.done_ratio / 100))"
+            ) unless columns.detect{ |c| c.name == :divergent_hours }
+
+            columns << QueryColumn.new(:remaining_hours,
+              :caption => :label_remaining_hours,
+              :sortable => "(IF(#{Issue.table_name}.estimated_hours IS NULL,0,#{Issue.table_name}.estimated_hours) - (IF(#{Issue.table_name}.estimated_hours IS NULL,0,#{Issue.table_name}.estimated_hours) * #{Issue.table_name}.done_ratio / 100))"
+            ) unless columns.detect{ |c| c.name == :remaining_hours }
+
           end
         end
       end