calculate figures (budget, witschaftlichkeit, Verrechneter Stundensatz) about order for all times dwspite only for selected period

Author: svenwey

app/assets/stylesheets/_orders.scss

@@ -57,10 +57,11 @@ h1.top {
   .cockpit-header {
     @include clearfix;
     margin: 0 auto;
+  }
 
-    .filter-elements {
-      margin-bottom: 20px;
-    }
+  .filter-elements {
+    margin-top: 30px;
+    margin-bottom: 10px;
   }
 
   .cockpit-header-item {

app/domain/order/cockpit.rb

@@ -26,18 +26,18 @@ def budget_open
 
     # Ist-R[currency] / Ist-V[h]
     def billed_rate
-      billable_hours.positive? ? billed_amount / billable_hours : nil
+      billable_hours.positive? ? billed_amount / overall_billable_hours : nil
     end
 
     # Ist-R[h] / Ist[h] x 100
     def cost_effectiveness_current
-      result = (order.invoices.where.not(status: 'cancelled').sum(:total_hours).to_f / total_hours) * 100.0
+      result = (order.invoices.where.not(status: 'cancelled').sum(:total_hours).to_f / overall_total_hours) * 100.0
       result.finite? ? result.round : EM_DASH
     end
 
     # (Ist[h]-Ist-NV[h]) / Ist[h] x 100
     def cost_effectiveness_forecast
-      result = (1 - (not_billable_hours / total_hours)) * 100.0
+      result = (1 - (overall_not_billable_hours / overall_total_hours)) * 100.0
       result.finite? ? result.round : EM_DASH
     end
 
@@ -59,6 +59,18 @@ def total_hours
       total.cells[:supplied_services].hours.to_f
     end
 
+    def overall_not_billable_hours
+      total.order_info[:overall_not_billable_hours].to_f
+    end
+
+    def overall_billable_hours
+      overall_total_hours - overall_not_billable_hours
+    end
+
+    def overall_total_hours
+      total.order_info[:overall_supplied_services_hours].to_f
+    end
+
     def build_rows(period)
       if sub_levels?
         rows = accounting_posts.collect { |p| AccountingPostRow.new(p, period) }

app/domain/order/cockpit/accounting_post_row.rb

@@ -8,13 +8,14 @@
 class Order
   class Cockpit
     class AccountingPostRow < Row
-      attr_reader :cells, :accounting_post
+      attr_reader :cells, :accounting_post, :row_info
 
       def initialize(accounting_post, period, label = nil)
         super(label || accounting_post.to_s)
         @period = period
         @accounting_post = accounting_post
         @cells = build_cells
+        @row_info = build_info
       end
 
       def portfolio
@@ -31,14 +32,22 @@ def billable_hours
         accounting_post_hours[true] || 0
       end
 
-      def overall_billable_hours
-        overall_acoounting_post_hours[true] || 0
+      def to_end_billable_hours
+        custom_acoounting_post_hours(Period.new(nil, @period.end_date))[true] || 0
       end
 
       def not_billable_hours
         accounting_post_hours[false] || 0
       end
 
+      def overall_supplied_services_hours
+        custom_acoounting_post_hours(Period.new(nil, nil)).values.sum
+      end
+
+      def overall_not_billable_hours
+        custom_acoounting_post_hours(Period.new(nil, nil))[false] || 0
+      end
+
       def shortnames
         accounting_post.work_item.path_shortnames
       end
@@ -78,7 +87,7 @@ def build_not_billable_cell
       end
 
       def build_open_budget_cell
-        hours = (accounting_post.offered_hours || 0) - overall_billable_hours
+        hours = (accounting_post.offered_hours || 0) - to_end_billable_hours
         build_cell_with_amount(hours)
       end
 
@@ -95,11 +104,15 @@ def calculate_amount(hours)
       end
 
       def accounting_post_hours
-        @hours ||= accounting_post.worktimes.in_period(@period).group(:billable).sum(:hours)
+        @hours = accounting_post.worktimes.in_period(@period).group(:billable).sum(:hours)
+      end
+
+      def custom_acoounting_post_hours(period)
+        @overall_hours = accounting_post.worktimes.in_period(period).group(:billable).sum(:hours)
       end
 
-      def overall_acoounting_post_hours
-        @overall_hours ||= accounting_post.worktimes.in_period(Period.new(nil, @period.end_date)).group(:billable).sum(:hours)
+      def build_info
+        { overall_not_billable_hours:, overall_supplied_services_hours: }
       end
     end
   end

app/domain/order/cockpit/total_row.rb

@@ -8,9 +8,12 @@
 class Order
   class Cockpit
     class TotalRow < Row
+      attr_reader :order_info
+
       def initialize(rows)
         super('Total')
         @cells = build_total_cells(rows)
+        @order_info = build_order_info(rows)
       end
 
       private
@@ -27,6 +30,14 @@ def build_total_cells(rows)
         hash
       end
 
+      # collect the row_info hash of every row and sum the individual values up (per key)
+      def build_order_info(rows)
+        row_infos = rows.collect(&:row_info)
+        row_infos.each_with_object(Hash.new(0)) do |row, acc|
+          row.each { |key, value| acc[key] += value }
+        end
+      end
+
       def sum_non_nil_values(cells, key, field, converter)
         values = cells.collect { |c| c[key].send(field) }
         return if values.all?(&:nil?)

app/views/accounting_posts/_cockpit_header.html.haml

@@ -3,14 +3,11 @@
 -#  or later. See the COPYING file at the top-level directory or at
 -#  https://github.com/puzzle/puzzletime.
 
-.filter-elements
-  = form_tag(nil, method: :get, id: 'cockpit_filter_form', class: 'form-inline', role: 'filter') do
-    = direct_filter_date(:start_date, 'Von', @period.start_date)
-    = direct_filter_date(:end_date, 'Bis', @period.end_date)
-    = direct_filter_select(:period_shortcut, nil, predefined_past_period_options, prompt: 'benutzerdefiniert')
 
 .cockpit-header-item
   Budget
+  %br
+  ( Gesamte Vertragslaufzeit )
   .data-item{title: "Ist-R[#{currency}]"}
     %span.figure-label verrechnet
     %span.figure
@@ -26,9 +23,7 @@
   .cockpit-header-item
     Wirtschaftlichkeit
     %br
-    (
-    = @period
-    )
+    ( Gesamte Vertragslaufzeit )
     - if @cockpit.cost_effectiveness_current
       .data-item{title: 'Ist-R[h] / Ist[h] x 100'}
         %span.figure-label Aktuell
@@ -46,9 +41,7 @@
   .cockpit-header-item{title: "Ist-R[#{currency}] / Ist-V[h]"}
     Verrechneter Stundenansatz
     %br
-    (
-    = @period
-    )
+    ( Gesamte Vertragslaufzeit )
     .data-item
       %span.figure
         = f(@cockpit.billed_rate)

app/views/accounting_posts/index.html.haml

@@ -12,6 +12,11 @@
     .cockpit-header
       = render 'cockpit_header'
 
+    .filter-elements
+      = form_tag(nil, method: :get, id: 'cockpit_filter_form', class: 'form-inline', role: 'filter') do
+        = direct_filter_date(:start_date, 'Von', @period.start_date)
+        = direct_filter_date(:end_date, 'Bis', @period.end_date)
+        = direct_filter_select(:period_shortcut, nil, predefined_past_period_options, prompt: 'benutzerdefiniert')
     .unindented
       .cockpit-table
         = render 'cockpit_table'