Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,3 @@ Metrics/MethodLength:
# Configuration parameters: IgnoredMethods.
Metrics/PerceivedComplexity:
Max: 32

# Offense count: 3
# Configuration parameters: EnforcedStyle, AllowedPatterns, IgnoredPatterns.
# SupportedStyles: snake_case, camelCase
Naming/MethodName:
Exclude:
- 'app/controllers/workloads_controller.rb'
- 'app/models/wl_national_holiday.rb'
- 'app/models/wl_user_vacation.rb'

# Offense count: 4
# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
Naming/MethodParameterName:
Exclude:
- 'app/helpers/workload_filters_helper.rb'

# Offense count: 8
# Configuration parameters: EnforcedStyle, AllowedIdentifiers.
# SupportedStyles: snake_case, camelCase
Naming/VariableName:
Exclude:
- 'app/helpers/workload_filters_helper.rb'
8 changes: 4 additions & 4 deletions app/controllers/workloads_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ class WorkloadsController < ApplicationController
accept_api_auth :index

def index
@first_day = sanitizeDateParameter(workload_params[:first_day], Time.zone.today - 10)
@last_day = sanitizeDateParameter(workload_params[:last_day], Time.zone.today + 50)
@today = sanitizeDateParameter(workload_params[:start_date], Time.zone.today)
@first_day = sanitize_date_parameter(workload_params[:first_day], Time.zone.today - 10)
@last_day = sanitize_date_parameter(workload_params[:last_day], Time.zone.today + 50)
@today = sanitize_date_parameter(workload_params[:start_date], Time.zone.today)
@date_check = @last_day >= @first_day

# if @today ("select as today") is before @first_day take @today as @first_day
Expand Down Expand Up @@ -114,7 +114,7 @@ def assignee_ids
groups ? { groups: WlGroupSelection.new.all_group_ids } : { users: WlUserSelection.new.all_user_ids }
end

def sanitizeDateParameter(parameter, default)
def sanitize_date_parameter(parameter, default)
return default unless parameter.respond_to?(:to_date)

parameter.to_date
Expand Down
16 changes: 8 additions & 8 deletions app/helpers/workload_filters_helper.rb
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# frozen_string_literal: true

module WorkloadFiltersHelper
def user_options_for_select(usersToShow, selectedUsers)
def user_options_for_select(users_to_show, selected_users)
result = ''
return unless usersToShow
return unless users_to_show

usersToShow.each do |user|
selected = selectedUsers.include?(user) ? 'selected="selected"' : ''
users_to_show.each do |user|
selected = selected_users.include?(user) ? 'selected="selected"' : ''

result += "<option value=\"#{h(user.id)}\" #{selected}>#{h(user.name)}</option>"
end

result.html_safe
end

def group_options_for_select(groupsToShow, selectedGroups)
def group_options_for_select(groups_to_show, selected_groups)
result = ''
return unless groupsToShow
return unless groups_to_show

groupsToShow.each do |group|
selected = selectedGroups.include?(group) ? 'selected="selected"' : ''
groups_to_show.each do |group|
selected = selected_groups.include?(group) ? 'selected="selected"' : ''

result += "<option value=\"#{h(group&.id)}\" #{selected}>#{h(group.lastname)}</option>"
end
Expand Down
6 changes: 3 additions & 3 deletions app/models/wl_national_holiday.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ class WlNationalHoliday < ActiveRecord::Base
validates :start, :end, :reason, presence: true
validate :check_datum

after_destroy :clearCache
after_save :clearCache
after_destroy :clear_cache
after_save :clear_cache

def check_datum
errors.add :end, :greater_than_start_date if workload_end_before_start?
Expand All @@ -19,7 +19,7 @@ def workload_end_before_start?
start && self.end && (start_changed? || end_changed?) && self.end < start
end

def clearCache
def clear_cache
Rails.cache.clear
end
end
6 changes: 3 additions & 3 deletions app/models/wl_user_vacation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ class WlUserVacation < ActiveRecord::Base
validates :date_from, :date_to, presence: true
validate :check_datum

after_destroy :clearCache
after_save :clearCache
after_destroy :clear_cache
after_save :clear_cache

def check_datum
errors.add :date_to, :greater_than_start_date if workload_end_before_start?
Expand All @@ -22,7 +22,7 @@ def workload_end_before_start?
date_from && date_to && (date_from_changed? || date_to_changed?) && date_to < date_from
end

def clearCache
def clear_cache
Rails.cache.clear
end
end
Loading