Merge branch 'master' into feature/64444-export-invoicing-controlling

Author: Kagemaru

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-12-03 15:37:34 UTC using RuboCop version 1.75.3.
+# on 2025-12-09 20:43:27 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,18 +61,18 @@ Lint/UnreachableLoop:
   Exclude:
     - 'app/models/working_condition.rb'
 
-# Offense count: 110
+# Offense count: 111
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 282
 
-# Offense count: 55
+# Offense count: 56
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
   Max: 97
 
-# Offense count: 38
+# Offense count: 39
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 314
@@ -82,15 +82,15 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 13
 
-# Offense count: 129
+# Offense count: 131
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 312
 
 # Offense count: 5
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 157
+  Max: 162
 
 # Offense count: 2
 # Configuration parameters: CountKeywordArgs.
@@ -177,13 +177,12 @@ Naming/PredicateName:
     - 'app/helpers/dry_crud/form/builder.rb'
     - 'app/models/concerns/belonging_to_work_item.rb'
 
-# Offense count: 15
+# Offense count: 14
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
 # AllowedIdentifiers: TLS1_1, TLS1_2, capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
 Naming/VariableNumber:
   Exclude:
-    - 'test/controllers/clients_controller_test.rb'
     - 'test/controllers/contacts_controller_test.rb'
     - 'test/controllers/invoices_controller_test.rb'
     - 'test/controllers/orders_controller_test.rb'
@@ -229,7 +228,7 @@ Rails/HasManyOrHasOneDependent:
     - 'app/models/service.rb'
     - 'app/models/work_item.rb'
 
-# Offense count: 61
+# Offense count: 62
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
@@ -316,7 +315,7 @@ Rails/ReversibleMigration:
     - 'db/migrate/20160919101807_add_daily_plannings.rb'
     - 'db/migrate/20161222162235_move_probation_period_end_date_to_employee.rb'
 
-# Offense count: 45
+# Offense count: 46
 # Configuration parameters: ForbiddenMethods, AllowedMethods.
 # ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
 Rails/SkipsModelValidations:
@@ -386,7 +385,7 @@ Style/ConditionalAssignment:
   Exclude:
     - 'app/controllers/concerns/worktimes_report.rb'
 
-# Offense count: 324
+# Offense count: 326
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
@@ -429,7 +428,7 @@ Style/OpenStructUse:
 Style/OptionalBooleanParameter:
   Enabled: false
 
-# Offense count: 66
+# Offense count: 71
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https

app/controllers/concerns/cockpit_csv.rb

@@ -19,9 +19,10 @@ def send_cockpit_csv(cockpit, filename)
 
   def cockpit_csv(cockpit)
     CSV.generate do |csv|
-      csv << ['Position', 'Budget', 'Geleistete Stunden', 'Nicht verrechenbar', 'Offenes Budget', 'Geplantes Budget']
+      csv << ['Position', 'Name der Position', 'Budget', 'Geleistete Stunden', 'Nicht verrechenbar', 'Offenes Budget', 'Geplantes Budget']
       cockpit.rows.each do |row|
         csv << [row.respond_to?(:shortnames) ? row.shortnames : 'Total',
+                row.respond_to?(:name) ? row.name : '',
                 row.cells[:budget].hours,
                 row.cells[:supplied_services].hours,
                 row.cells[:not_billable].hours,

app/controllers/employee_master_data_controller.rb

@@ -48,19 +48,24 @@ def show
   private
 
   def list_entries
-    list_entries_includes(
-      Employee.select('employees.*, ' \
-                      'em.percent AS current_percent_value, ' \
-                      'departments.name, ' \
-                      'CONCAT(lastname, \' \', firstname) AS fullname')
+    query =
+      Employee
+      .left_joins(:department, :member_coach)
       .employed_ones(Period.current_day)
-      .joins('LEFT JOIN departments ON departments.id = employees.department_id')
-    ).list
+      .select(
+        employees: ['*'],
+        departments: [:name],
+        em: ['percent AS current_percent_value']
+      )
+      .select("CONCAT(employees.lastname, ' ', employees.firstname) AS fullname")
+      .select("CONCAT(member_coaches_employees.lastname, ' ', member_coaches_employees.firstname) AS member_coach")
+
+    list_entries_includes(query).list
   end
 
   def list_entries_includes(list)
     if can?(:manage, Employment)
-      list.includes(:department, :employments, current_employment: {
+      list.includes(:member_coach, :department, :employments, current_employment: {
                       employment_roles_employments: %i[
                         employment_role
                         employment_role_level
@@ -124,6 +129,7 @@ def qr_code
   self.search_columns = ['lastname', 'firstname', 'shortname', 'departments.name']
   self.sort_mappings_with_indifferent_access = {
     department: 'departments.name',
+    member_coach: 'member_coach',
     fullname: 'fullname',
     current_percent_value: 'current_percent_value'
   }.with_indifferent_access

app/controllers/employees_controller.rb

@@ -6,8 +6,8 @@
 #  https://github.com/puzzle/puzzletime.
 
 class EmployeesController < ManageController
-  self.permitted_attrs = [:firstname, :lastname, :shortname, :email, :ldapname,
-                          :department_id, :workplace_id, :crm_key, :probation_period_end_date,
+  self.permitted_attrs = [:firstname, :lastname, :shortname, :email, :ldapname, :department_id,
+                          :member_coach_id, :workplace_id, :crm_key, :probation_period_end_date,
                           :graduation, :management, :phone_office, :phone_private,
                           :street, :postal_code, :city, :birthday, :emergency_contact_name,
                           :emergency_contact_phone, :marital_status,
@@ -19,7 +19,7 @@ class EmployeesController < ManageController
 
   self.search_columns = %i[firstname lastname shortname]
 
-  self.sort_mappings = { department_id: 'departments.name' }
+  self.sort_mappings = { department_id: 'departments.name', member_coach: 'CONCAT(member_coaches_employees.lastname, member_coaches_employees.firstname)' }
 
   def show
     return if Crm.instance.blank?
@@ -51,6 +51,6 @@ def update_settings
   private
 
   def list_entries
-    super.includes(:department).references(:department)
+    super.includes(:department, :member_coach).references(:department)
   end
 end

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])
@@ -124,24 +124,25 @@ def set_default_params
     case params[:evaluation].downcase
     when 'employees'
       params[:department_id] = current_user.department_id unless params.key?(:department_id)
+      params[:member_coach_id] = current_user.id unless params.key?(:member_coach_id)
     end
   end
 
   def set_management_evaluation
     @evaluation =
       case params[:evaluation].downcase
       when 'clients'                   then Evaluations::ClientsEval.new
-      when 'employees'                 then Evaluations::EmployeesEval.new(params[:department_id])
+      when 'employees'                 then Evaluations::EmployeesEval.new(params.slice(:department_id, :member_coach_id))
       when 'departments'               then Evaluations::DepartmentsEval.new
       when 'clientworkitems'           then Evaluations::ClientWorkItemsEval.new(params[:category_id])
       when 'employeeworkitems'         then Evaluations::EmployeeWorkItemsEval.new(params[:category_id])
       when /employeesubworkitems(\d+)/ then Evaluations::EmployeeSubWorkItemsEval.new(
         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
@@ -223,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/controllers/invoice_reports_controller.rb

@@ -31,6 +31,26 @@ def index
     end
   end
 
+  def sync
+    if params['invoice_id'].blank?
+      flash[:error] = 'Interner Puzzletime Fehler beim Sync der Rechnung' # rubocop:disable Rails/I18nLocaleTexts
+      redirect_to reports_invoices_path(params.to_unsafe_h)
+      return
+    end
+
+    invoice = Invoice.find(params[:invoice_id])
+
+    if Invoicing.instance
+      begin
+        Invoicing.instance.sync_invoice(invoice)
+        flash[:notice] = "Die Rechnung #{invoice} wurde aktualisiert."
+      rescue Invoicing::Error => e
+        flash[:error] = "Fehler im Invoicing Service: #{e.message}"
+      end
+    end
+    redirect_to reports_invoices_path(params.to_unsafe_h)
+  end
+
   private
 
   def set_filter_values

app/controllers/workload_report_controller.rb

@@ -34,12 +34,11 @@ def set_department
     @department = Department.where(id: params[:department_id]).first
   end
 
-  # rubocop:disable Naming/MemoizedInstanceVariableName
   def set_period
     super
     @period ||= default_period
+    session[:period] = [@period.start_date.to_s, @period.end_date.to_s, @period.label]
   end
-  # rubocop:enable Naming/MemoizedInstanceVariableName
 
   def default_period
     month = Time.zone.today.last_month

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/employees_eval.rb

@@ -12,8 +12,9 @@ class EmployeesEval < Evaluations::Evaluation
     self.label            = 'Member Zeit'
     self.total_details    = false
 
-    def initialize(department_id = 0)
-      @department_id = department_id.to_i
+    def initialize(emp_search_conditions = {})
+      @department_id = emp_search_conditions[:department_id].to_i
+      @member_coach_id = emp_search_conditions[:member_coach_id].to_i
       super(Employee)
     end
 
@@ -23,30 +24,35 @@ def divisions(period = nil)
                   else
                     Employee.employed_ones(Period.current_year)
                   end
+      employees = employees.where(member_coach_id: @member_coach_id) unless @member_coach_id.zero?
+      employees = employees.where(department_id: @department_id) unless @department_id.zero?
 
-      if @department_id.zero?
-        employees
-      else
-        employees.where(department_id: @department_id)
-      end
+      employees
     end
 
     def employee_id
       division&.id
     end
 
     def sum_total_times(period = nil)
-      query = if @department_id.zero?
+      query = if @department_id.zero? && @member_coach_id.zero?
                 Worktime.all
-              else
+              elsif @member_coach_id.zero?
                 Department.find(@department_id).employee_worktimes
+              elsif @department_id.zero?
+                Worktime.joins(:employee)
+                        .where(employees: { member_coach_id: @member_coach_id })
+              else
+                Worktime.joins(:employee)
+                        .where(employees: { department_id: @department_id, member_coach_id: @member_coach_id })
               end
       query = query.where(type: worktime_type).in_period(period)
       query_time_sums(query)
     end
 
     def division_supplement(_user)
       [[:overtime, 'Überstunden', 'right'],
+       [:vacations, 'Ferien', 'right'],
        [:overtime_vacations_tooltip, '', 'left'],
        [:worktime_commits, 'Freigabe', 'left'],
        [:worktime_reviews, 'Kontrolle', 'left']]