Fixed holidays are not being shown after applying filters bug (#1799)

saeloun · Apr 10, 2024 · 2c11922 · 2c11922
1 parent 4426888
commit 2c11922
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/app/services/timeoff_entries/index_service.rb b/app/services/timeoff_entries/index_service.rb
@@ -2,9 +2,8 @@
 
 module TimeoffEntries
   class IndexService < ApplicationService
-    attr_reader :current_company, :current_user, :user_id, :year, :optional_timeoff_entries, :national_timeoff_entries,
-      :previous_year
-    attr_accessor :leave_balance
+    attr_reader :current_company, :current_user, :user_id, :year, :previous_year
+    attr_accessor :leave_balance, :optional_timeoff_entries, :national_timeoff_entries
 
     def initialize(current_user, current_company, user_id, year)
       @current_user = current_user
@@ -104,7 +103,7 @@ def calculate_holiday_balance
 
       def calculate_national_holiday_balance(holiday)
         total_national_holidays = holiday.holiday_infos.national.count
-        national_timeoff_entries = holiday.national_timeoff_entries.where(user: user_id)
+        @national_timeoff_entries = holiday.national_timeoff_entries.where(user: user_id)
 
         national_holidays = {
           id: "national",
@@ -123,7 +122,7 @@ def calculate_national_holiday_balance(holiday)
       def calculate_optional_holiday_balance(holiday)
         no_of_allowed_optional_holidays = holiday.no_of_allowed_optional_holidays
         time_period_optional_holidays = holiday.time_period_optional_holidays
-        optional_timeoff_entries = holiday.optional_timeoff_entries.where(user: user_id)
+        @optional_timeoff_entries = holiday.optional_timeoff_entries.where(user: user_id)
 
         total_optional_entries = TimeoffEntries::CalculateOptionalHolidayTimeoffEntriesService.new(
           time_period_optional_holidays,