Add oe to member absences form (64537)

Author: anna-dev

app/controllers/evaluator_controller.rb

@@ -13,7 +13,7 @@ class EvaluatorController < ApplicationController
 
   before_action :set_period
 
-  helper_method :search_conditions, :evaluation_type
+  helper_method :worktime_search_conditions, :evaluation_type
 
   def index
     overview
@@ -111,7 +111,7 @@ def set_default_evaluation
         params[:evaluation] = 'usersubworkitems'
         Evaluations::EmployeeSubWorkItemsEval.new(params[:category_id], @user.id)
       when 'userabsences' then Evaluations::EmployeeAbsencesEval.new(
-        @user.id, **search_conditions
+        @user.id, **worktime_search_conditions
       )
       when 'subworkitems'                                        then Evaluations::SubWorkItemsEval.new(params[:category_id])
       when 'workitememployees'                                   then Evaluations::WorkItemEmployeesEval.new(params[:category_id])
@@ -140,9 +140,9 @@ 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(**search_conditions)
+      when 'absences'                  then Evaluations::AbsencesEval.new(params[:department_id], **worktime_search_conditions)
       when 'employeeabsences'          then Evaluations::EmployeeAbsencesEval.new(
-        params[:category_id], **search_conditions
+        params[:category_id], **worktime_search_conditions
       )
       end
   end
@@ -224,7 +224,7 @@ def init_periods
     end
   end
 
-  def search_conditions
+  def worktime_search_conditions
     return {} if params[:absence_id].blank?
 
     { absence_id: params[:absence_id] }

app/domain/evaluations/absences_eval.rb

@@ -14,12 +14,19 @@ class AbsencesEval < Evaluations::Evaluation
     self.detail_columns   = detail_columns.reject { |i| i == :billable }
     self.detail_labels    = detail_labels.merge(account: 'Absenz')
 
-    def initialize(**search_conditions)
-      super(Employee, **search_conditions)
+    attr_reader :department_id
+
+    def initialize(department_id = nil, **worktime_search_conditions)
+      super(Employee, **worktime_search_conditions)
+      @department_id = department_id
     end
 
     def divisions(period = nil)
-      Employee.employed_ones(period || Period.current_year)
+      scope = Employee.employed_ones(period || Period.current_year)
+
+      return scope if department_id.blank?
+
+      scope.where(department_id:)
     end
 
     def employee_id

app/domain/evaluations/employee_absences_eval.rb

@@ -15,8 +15,8 @@ class EmployeeAbsencesEval < Evaluations::Evaluation
     self.detail_columns   = detail_columns.reject { |i| i == :billable }
     self.detail_labels    = detail_labels.merge(account: 'Absenz')
 
-    def initialize(employee_id, **search_conditions)
-      super(Employee.find(employee_id), **search_conditions)
+    def initialize(employee_id, **worktime_search_conditions)
+      super(Employee.find(employee_id), **worktime_search_conditions)
     end
 
     def for?(user)

app/domain/evaluations/evaluation.rb

@@ -61,7 +61,7 @@ class Evaluation
 
     attr_reader :category,             # category
                 :division,             # selected division for detail Evaluations, nil otherwise
-                :search_conditions
+                :worktime_search_conditions
 
     ############### Time Evaluation Functions ###############
 
@@ -111,7 +111,7 @@ def times(period)
     def worktime_query(receiver, period = nil, division = nil)
       query = receiver.worktimes.where(type: worktime_type).in_period(period)
       query = query.where("? = #{category_ref}", category_id) if division && category_ref
-      query = query.where(search_conditions) if search_conditions.present?
+      query = query.where(worktime_search_conditions) if worktime_search_conditions.present?
       query
     end
 
@@ -234,9 +234,9 @@ def account_id
     private
 
     # Initializes a new Evaluation with the given category.
-    def initialize(category, **search_conditions)
+    def initialize(category, **worktime_search_conditions)
       @category = category
-      @search_conditions = search_conditions
+      @worktime_search_conditions = worktime_search_conditions
     end
 
     def query_time_sums(query, group_by_column = nil)

app/views/evaluator/_division.html.haml

@@ -9,7 +9,7 @@
     %td
       - if sub = evaluation.sub_evaluation
         = link_to(division.label_verbose,
-                  { action: 'overview', evaluation: sub, category_id: division.id, **search_conditions },
+                  { action: 'overview', evaluation: sub, category_id: division.id, **worktime_search_conditions },
                   title: division.tooltip)
       - else
         = content_tag :span, division.label_verbose, title: division.tooltip

app/views/evaluator/_employee_absences.html.haml

@@ -7,7 +7,7 @@
 %section.employee-absences
   %h4 Absenzen
 
-  - evaluation = Evaluations::EmployeeAbsencesEval.new(params[:category_id] || @user.id, **search_conditions)
+  - evaluation = Evaluations::EmployeeAbsencesEval.new(params[:category_id] || @user.id, **worktime_search_conditions)
   = render('category',
            evaluation: evaluation,
            times: @periods.collect { |p| evaluation.sum_times_grouped(p) },

app/views/evaluator/_evallink.html.haml

@@ -10,4 +10,4 @@
                action: 'overview',
                evaluation: evallink[0],
                category_id: evallink[1],
-               **search_conditions
+               **worktime_search_conditions

app/views/evaluator/overview.html.haml

@@ -15,6 +15,8 @@
     = hidden_field_tag :page, 1
     = hidden_field_tag :category_id, params[:category_id]
     = direct_filter_select(:absence_id, 'Absenztyp',  Absence.all)
+    %br
+    = direct_filter_select(:department_id, 'Organisationseinheit', Department.list)
 
 = render 'period_link'
 

test/controllers/evaluator_controller_test.rb

@@ -26,6 +26,15 @@ class EvaluatorControllerTest < ActionController::TestCase
     end
   end
 
+  test 'GET index absences filtered by department' do
+    employees(:various_pedro).update(department: departments(:devone))
+    get :index, params: { evaluation: 'absences', department_id: departments(:devone).id }
+
+    assert_template 'overview'
+
+    assert_equal assigns(:evaluation).divisions.map(&:department_id).uniq, [departments(:devone).id]
+  end
+
   test 'GET export_csv userworkitems csv format' do
     get :export_csv, params: { evaluation: 'userworkitems' }