enable filtering of budget-controlling column in order-controlling (63925)

app/domain/order/report.rb

@@ -8,6 +8,8 @@
 class Order
   class Report
     include Filterable
+    include OrderHelper
+    include ProgressBarHelper
 
     attr_reader :period, :params
 
@@ -196,6 +198,8 @@ def sort_entries(entries)
       match = sort_by_target?
       if match
         sort_by_target(entries, match[1], dir)
+      elsif sort_by_budget?
+        sort_by_budget(entries, dir)
       elsif sort_by_string?
         sort_by_string(entries, dir)
       elsif sort_by_number?
@@ -219,6 +223,10 @@ def sort_by_target?
       params[:sort].to_s.match(/\Atarget_scope_(\d+)\z/)
     end
 
+    def sort_by_budget?
+      params[:sort].to_s == 'budget_controlling'
+    end
+
     def sort_by_string(entries, dir)
       sorted = entries.sort_by do |e|
         e.send(params[:sort])
@@ -238,5 +246,11 @@ def sort_by_target(entries, target_scope_id, dir)
         dir * OrderTarget::RATINGS.index(e.target(target_scope_id).try(:rating)).to_i
       end
     end
+
+    def sort_by_budget(entries, dir)
+      entries.sort_by do |e|
+        dir * get_order_budget_used_percentage(e)
+      end
+    end
   end
 end

app/helpers/order_helper.rb

@@ -136,76 +136,6 @@ def order_option(order, selected = false)
                 data: { data: json.to_json })
   end
 
-  def order_progress_bar(order)
-    progress = order_progress(order)
-
-    order_progress_bar_link(order.order, progress) do
-      ''.html_safe.tap do |content|
-        if (progress[:percent]).positive?
-          content << content_tag(
-            :div,
-            nil,
-            class: 'progress-bar progress-bar-success',
-            style: "width:#{f(progress[:percent])}%"
-          )
-        end
-
-        if (progress[:over_budget_percent]).positive?
-          content << content_tag(
-            :div,
-            nil,
-            class: 'progress-bar progress-bar-danger',
-            style: "width:#{f(progress[:over_budget_percent])}%"
-          )
-        end
-      end
-    end
-  end
-
-  private
-
-  def order_progress_bar_link(order, progress, &)
-    title = "#{f(progress[:percent_title])}% geleistet"
-
-    if can?(:show, order)
-      link_to(order_order_controlling_url(order.id),
-              { class: 'progress', title: },
-              &)
-    else
-      content_tag(:div, yield, class: 'progress', title:)
-    end
-  end
-
-  def order_progress(order)
-    progress = order_progress_hash
-    return progress unless order.offered_amount.positive?
-
-    calculate_order_progress(order, progress)
-    progress
-  end
-
-  def order_progress_hash
-    {
-      percent: 0,
-      over_budget_percent: 0
-    }
-  end
-
-  def calculate_order_progress(order, progress)
-    progress[:percent] = 100 /
-                         order.offered_amount.to_f *
-                         order.supplied_amount.to_f
-    progress[:percent_title] = progress[:percent]
-
-    return unless order.supplied_amount.to_f > order.offered_amount.to_f
-
-    progress[:over_budget_percent] =
-      (order.supplied_amount.to_f - order.offered_amount.to_f) /
-      order.supplied_amount.to_f *
-      100
-    progress[:percent] = 100 - progress[:over_budget_percent]
-  end
-
   def order_report_billability_class(value)
     config = Settings.reports.orders.billability
     if value >= config.green

app/helpers/progress_bar_helper.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+#  Copyright (c) 2006-2017, Puzzle ITC GmbH. This file is part of
+#  PuzzleTime and licensed under the Affero General Public License version 3
+#  or later. See the COPYING file at the top-level directory or at
+#  https://github.com/puzzle/puzzletime.
+
+module ProgressBarHelper
+  # returns the percentage of the budget that is already used, defaulting to 0 for orders with no budget
+  def get_order_budget_used_percentage(order)
+    order_progress(order)[:percent_title] || 0
+  end
+
+  def order_progress_bar(order)
+    progress = order_progress(order)
+
+    order_progress_bar_link(order.order, progress) do
+      ''.html_safe.tap do |content|
+        if (progress[:percent]).positive?
+          content << content_tag(
+            :div,
+            nil,
+            class: 'progress-bar progress-bar-success',
+            style: "width:#{f(progress[:percent])}%"
+          )
+        end
+
+        if (progress[:over_budget_percent]).positive?
+          content << content_tag(
+            :div,
+            nil,
+            class: 'progress-bar progress-bar-danger',
+            style: "width:#{f(progress[:over_budget_percent])}%"
+          )
+        end
+      end
+    end
+  end
+
+  private
+
+  def order_progress_bar_link(order, progress, &)
+    title = "#{f((progress[:percent_title]) || 0)}% geleistet"
+
+    if can?(:show, order)
+      link_to(order_order_controlling_url(order.id),
+              { class: 'progress', title: },
+              &)
+    else
+      content_tag(:div, yield, class: 'progress', title:)
+    end
+  end
+
+  def order_progress(order)
+    progress = order_progress_hash
+    return progress unless order.offered_amount.positive?
+
+    calculate_order_progress(order, progress)
+    progress
+  end
+
+  def order_progress_hash
+    {
+      percent: 0,
+      over_budget_percent: 0
+    }
+  end
+
+  def calculate_order_progress(order, progress)
+    progress[:percent] = 100 /
+                         order.offered_amount.to_f *
+                         order.supplied_amount.to_f
+    progress[:percent_title] = progress[:percent]
+
+    return unless order.supplied_amount.to_f > order.offered_amount.to_f
+
+    progress[:over_budget_percent] =
+      (order.supplied_amount.to_f - order.offered_amount.to_f) /
+      order.supplied_amount.to_f *
+      100
+    progress[:percent] = (100 - progress[:over_budget_percent])
+  end
+end

app/views/order_reports/_list.html.haml

@@ -27,7 +27,7 @@
             %th.right{title: 'Verhältnis von verrechenbaren Stunden zu geleisteten Stunden'}
               = sort_link(:billability, 'Verrechen­barkeit'.html_safe)
             %th{ style: 'width: 15%' }
-              Budget-Controlling
+              = sort_link('budget_controlling', 'Budget-Controlling')
             %th.right{title: 'Durchschnitt der offerierten Stundensätze aller Buchungspositionen'}
               = sort_link(:offered_rate, 'Offerierter Stundensatz')
             %th.right{title: 'Verhältnis von verrechneten Beträgen zu verrechenbaren Stunden'}

test/domain/order/report_test.rb

@@ -141,8 +141,14 @@ class ReportTest < ActiveSupport::TestCase
       assert_equal orders(:allgemein, :webauftritt, :puzzletime), report.entries.collect(&:order)
     end
 
+    test 'sort by budget use' do
+      report(sort: 'budget_controlling')
+
+      assert_equal orders(:puzzletime, :webauftritt, :allgemein), report.entries.collect(&:order)
+    end
+
     test 'sort by offered_amount' do
-      report(sort: 'offered_amount')
+      report(sort: 'offered_amount', sort_dir: 'asc')
 
       assert_equal orders(:webauftritt, :puzzletime, :allgemein), report.entries.collect(&:order)
     end