Make member absences remaining vacation column sortable (64536)

anna-dev · Kagemaru · commit 622421658580 · 2025-12-18T15:23:58.000+01:00
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-12-09 20:43:27 UTC using RuboCop version 1.75.3.
+# on 2025-12-10 09:06:25 UTC using RuboCop version 1.75.3.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -61,7 +61,7 @@ Lint/UnreachableLoop:
   Exclude:
     - 'app/models/working_condition.rb'
 
-# Offense count: 111
+# Offense count: 114
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 282
@@ -82,15 +82,15 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 13
 
-# Offense count: 131
+# Offense count: 132
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 312
 
 # Offense count: 5
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 162
+  Max: 163
 
 # Offense count: 2
 # Configuration parameters: CountKeywordArgs.
@@ -228,7 +228,7 @@ Rails/HasManyOrHasOneDependent:
     - 'app/models/service.rb'
     - 'app/models/work_item.rb'
 
-# Offense count: 62
+# Offense count: 63
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
@@ -385,7 +385,7 @@ Style/ConditionalAssignment:
   Exclude:
     - 'app/controllers/concerns/worktimes_report.rb'
 
-# Offense count: 326
+# Offense count: 327
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
@@ -428,7 +428,7 @@ Style/OpenStructUse:
 Style/OptionalBooleanParameter:
   Enabled: false
 
-# Offense count: 71
+# Offense count: 74
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
diff --git a/AUTHORS b/AUTHORS
@@ -3,6 +3,7 @@ PuzzleTime is created by the following people:
 Code:
   Andreas Maierhofer, Puzzle ITC
   Andreas Zuber, Puzzle ITC
+  Anna Mund, Puzzle ITC
   Bruno Santschi, Puzzle ITC
   Damian Senn, Puzzle ITC
   Daniel Illi, Puzzle ITC
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -59,7 +59,7 @@ def set_period
     p = session[:period]
     return unless p.is_a? Array
 
-    @period = Period.new(*p)
+    @period = Period.new(*p) if p.is_a?(Array)
   end
 
   def sanitized_back_url
diff --git a/app/controllers/evaluator_controller.rb b/app/controllers/evaluator_controller.rb
@@ -140,7 +140,7 @@ def set_management_evaluation
         params[:category_id], Regexp.last_match[1]
       )
       when 'departmentorders'          then Evaluations::DepartmentOrdersEval.new(params[:category_id])
-      when 'absences'                  then Evaluations::AbsencesEval.new(params[:department_id], **worktime_search_conditions)
+      when 'absences'                  then Evaluations::AbsencesEval.new(params[:department_id], sort_conditions, **worktime_search_conditions)
       when 'employeeabsences'          then Evaluations::EmployeeAbsencesEval.new(
         params[:category_id], **worktime_search_conditions
       )
@@ -230,6 +230,12 @@ def worktime_search_conditions
     { absence_id: params[:absence_id] }
   end
 
+  def sort_conditions
+    return {} if params[:sort].blank?
+
+    params.to_enum.to_h.slice('sort_dir', 'sort')
+  end
+
   def authorize_action
     params[:evaluation] ||= params[:action].to_s
     evaluation
diff --git a/app/domain/evaluations/absences_eval.rb b/app/domain/evaluations/absences_eval.rb
@@ -7,35 +7,61 @@
 
 module Evaluations
   class AbsencesEval < Evaluations::Evaluation
+    include EvaluatorHelper
+    include FormatHelper
+
     self.sub_evaluation   = 'employeeabsences'
     self.division_column  = :employee_id
     self.label            = 'Members Absenzen'
     self.absences         = true
     self.detail_columns   = detail_columns.reject { |i| i == :billable }
     self.detail_labels    = detail_labels.merge(account: 'Absenz')
 
-    attr_reader :department_id
+    attr_reader :department_id, :sort_conditions
 
-    def initialize(department_id = nil, **worktime_search_conditions)
+    def initialize(department_id = nil, sort_conditions = nil, **worktime_search_conditions)
       super(Employee, **worktime_search_conditions)
       @department_id = department_id
+      @sort_conditions = sort_conditions
+    end
+
+    def divisions(period = nil, times = nil)
+      employees_with_absences(period, times).map do |e|
+        unformatted_vacations = remaining_vacations(e, format: false)
+        e.remaining_vacations = format_days(unformatted_vacations)
+        e.sort_col = unformatted_vacations * descending
+        e
+      end.sort_by(&:sort_col)
     end
 
-    def divisions(period = nil)
+    def employees_with_absences(period, times)
       scope = Employee.employed_ones(period || Period.current_year)
 
-      return scope if department_id.blank?
+      scope = scope.where(department_id: department_id) if department_id.present?
+      scope.filter do |e|
+        times_or_plannings?(self, e, times, [period])
+      end
+    end
 
-      scope.where(department_id:)
+    def division_header
+      'Member'
     end
 
     def employee_id
       division&.id
     end
 
     def division_supplement(_user)
-      [[:remaining_vacations, 'Übrige Ferien', 'right'],
-       [:overtime_vacations_tooltip, '', 'left']]
+      {
+        remaining_vacations: { title: 'Übrige Ferien', align: 'right', sortable: true },
+        overtime_vacations_tooltip: {}
+      }
+    end
+
+    private
+
+    def descending
+      sort_conditions && sort_conditions['sort_dir'] == 'desc' ? -1 : 1
     end
   end
 end
diff --git a/app/domain/evaluations/clients_eval.rb b/app/domain/evaluations/clients_eval.rb
@@ -19,7 +19,7 @@ def initialize
       super(Client)
     end
 
-    def divisions(_period = nil)
+    def divisions(_period = nil, _times = nil)
       WorkItem.joins(:client).list
     end
 
diff --git a/app/domain/evaluations/department_orders_eval.rb b/app/domain/evaluations/department_orders_eval.rb
@@ -16,13 +16,15 @@ def initialize(department_id)
       super(Department.find(department_id))
     end
 
-    def divisions(_period = nil)
+    def divisions(_period = nil, _times = nil)
       WorkItem.joins(:order).includes(:order).where(orders: { department_id: category.id }).list
     end
 
     def division_supplement(_user)
-      [[:order_completed, 'Abschluss erledigt', 'left'],
-       [:order_committed, 'Abschluss freigegeben', 'left']]
+      {
+        order_completed: { title: 'Abschluss erledigt' },
+        order_committed: { title: 'Abschluss freigegeben' }
+      }
     end
 
     def include_no_period_zero_totals
diff --git a/app/domain/evaluations/employee_work_items_eval.rb b/app/domain/evaluations/employee_work_items_eval.rb
@@ -22,7 +22,7 @@ def for?(user)
     end
 
     def division_supplement(_user)
-      []
+      {}
     end
 
     def employee_id
diff --git a/app/domain/evaluations/employees_eval.rb b/app/domain/evaluations/employees_eval.rb
@@ -18,7 +18,7 @@ def initialize(emp_search_conditions = {})
       super(Employee)
     end
 
-    def divisions(period = nil)
+    def divisions(period = nil, _times = nil)
       employees = if period
                     Employee.list
                   else
@@ -51,11 +51,13 @@ def sum_total_times(period = nil)
     end
 
     def division_supplement(_user)
-      [[:overtime, 'Überstunden', 'right'],
-       [:vacations, 'Ferien', 'right'],
-       [:overtime_vacations_tooltip, '', 'left'],
-       [:worktime_commits, 'Freigabe', 'left'],
-       [:worktime_reviews, 'Kontrolle', 'left']]
+      {
+        overtime: { title: 'Überstunden', align: 'right' },
+        vacations: { title: 'Ferien', align: 'right' },
+        overtime_vacations_tooltip: {},
+        worktime_commits: { title: 'Freigabe' },
+        worktime_reviews: { title: 'Kontrolle' }
+      }
     end
   end
 end
diff --git a/app/domain/evaluations/evaluation.rb b/app/domain/evaluations/evaluation.rb
@@ -67,7 +67,7 @@ class Evaluation
 
     # Returns a list of all division objects for the represented category.
     # May be parameterized by a period. This is ignored by default.
-    def divisions(_period = nil)
+    def divisions(_period = nil, _times = nil)
       category.send(division_method).list
     end
 
@@ -154,7 +154,11 @@ def worktime_name
     # Returns the class name of the division objects.
     def division_header
       divs = divisions
-      divs.respond_to?(:klass) ? divs.klass.model_name.human : ''
+      if divs.respond_to?(:klass)
+        divs.klass.model_name.human
+      else
+        respond_to?(:division_header) ? division_header : ''
+      end
     end
 
     # Returns a two-dimensional Array with helper methods of the evaluator
@@ -164,7 +168,7 @@ def division_header
     # No methods are called by default.
     # See EmployeeWorkItemsEval for an example.
     def division_supplement(_user)
-      []
+      {}
     end
 
     def sub_work_items_evaluation(division)
diff --git a/app/domain/evaluations/managed_orders_eval.rb b/app/domain/evaluations/managed_orders_eval.rb
@@ -17,13 +17,15 @@ def category_label
       "Kunde: #{division.order.client.name}"
     end
 
-    def divisions(_period = nil)
+    def divisions(_period = nil, _times = nil)
       WorkItem.joins(:order).includes(:order).where(orders: { responsible_id: category.id }).list
     end
 
     def division_supplement(_user)
-      [[:order_completed, 'Abschluss erledigt', 'left'],
-       [:order_committed, 'Abschluss freigegeben', 'left']]
+      {
+        order_completed: { title: 'Abschluss erledigt' },
+        order_committed: { title: 'Abschluss freigegeben' }
+      }
     end
 
     private
diff --git a/app/domain/evaluations/work_item_employees_eval.rb b/app/domain/evaluations/work_item_employees_eval.rb
@@ -43,10 +43,10 @@ def set_division_id(division_id = nil)
     end
 
     def division_supplement(_user)
-      [
-        [:worktime_commits_readonly, 'Freigabe', 'left'],
-        [:worktime_reviews_readonly, 'Kontrolle', 'left']
-      ]
+      {
+        worktime_commits_readonly: { title: 'Freigabe' },
+        worktime_reviews_readonly: { title: 'Kontrolle' }
+      }
     end
   end
 end
diff --git a/app/helpers/evaluator_helper.rb b/app/helpers/evaluator_helper.rb
@@ -40,8 +40,10 @@ def collect_times(evaluation, periods, method, *division)
     end
   end
 
-  def times_or_plannings?(evaluation, division, times)
-    @periods.each_with_index.any? do |_p, i|
+  def times_or_plannings?(evaluation, division, times = @times, periods = @periods)
+    periods.each_with_index.any? do |_p, i|
+      next unless times && times[i] && !times[i].empty?
+
       time = times[i][division.id]
       val = (time.is_a?(Hash) ? time[:hours] : time).to_f
       if evaluation.planned_hours
@@ -67,13 +69,13 @@ def overtime(employee)
     format_hour(value)
   end
 
-  def remaining_vacations(employee)
+  def remaining_vacations(employee, format: true)
     value = if @period
               employee.statistics.remaining_vacations(@period.end_date)
             else
               employee.statistics.current_remaining_vacations
             end
-    format_days(value)
+    format ? format_days(value) : value
   end
 
   def overtime_vacations_tooltip(employee)
diff --git a/app/models/employee.rb b/app/models/employee.rb
@@ -122,6 +122,8 @@ class Employee < ApplicationRecord
                                    }
   scope :active_employed_last_month, -> { joins(:employments).merge(Employment.active.during(Period.previous_month)) }
 
+  attr_accessor :remaining_vacations, :sort_col # used for multiabsence and not persisted
+
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
   devise :database_authenticatable,
diff --git a/app/views/evaluator/_category.html.haml b/app/views/evaluator/_category.html.haml
@@ -21,8 +21,9 @@
         %th.periodHead{colspan: evaluation.class.planned_hours ? 3 : nil}
           = p ? p.label : 'Total'
           &nbsp; &nbsp;
-      - evaluation.division_supplement(@user).each do |supp|
-        %th= supp[1]
+      - evaluation.division_supplement(@user).each do |_key, supp|
+        %th
+          = supp[:sortable] ? sort_link(:vacation, supp[:title]) : supp[:title]
     - if evaluation.class.planned_hours
       %tr
         %th.subhead
@@ -35,12 +36,12 @@
             Geplant
           %th.subhead.period-subhead
             Abweichung
-        - evaluation.division_supplement(@user).each do |supp|
+        - evaluation.division_supplement(@user).each do |_key, _supp|
           %th.subhead
 
   %tbody
     = render(partial: 'division',
-             collection: evaluation.divisions(@period),
+             collection: evaluation.divisions(@period, times),
              locals: { evaluation: evaluation,
                        evaluation_name: evaluation_name,
                        times: times })
@@ -54,5 +55,5 @@
                collection: collect_times(evaluation, @periods, :sum_total_times),
                locals: { evaluation: evaluation,
                          evaluation_name: evaluation_name })
-      - evaluation.division_supplement(@user).each do |supp|
+      - evaluation.division_supplement(@user).each do |_key, _supp|
         %th
diff --git a/app/views/evaluator/_division.html.haml b/app/views/evaluator/_division.html.haml
diff --git a/config/routes.rb b/config/routes.rb
diff --git a/db/seeds/development/employees.rb b/db/seeds/development/employees.rb
diff --git a/doc/development/01_setup.md b/doc/development/01_setup.md
diff --git a/test/controllers/evaluator_controller_test.rb b/test/controllers/evaluator_controller_test.rb
diff --git a/test/domain/evaluations/absences_eval_test.rb b/test/domain/evaluations/absences_eval_test.rb
diff --git a/test/integration/member_test.rb b/test/integration/member_test.rb
