fix time entries analytics

codelittinc · Mar 21, 2024 · 2e697fe · 2e697fe
1 parent 5b51525
commit 2e697fe
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/utils/analytics/time_entries/expected_hours.rb b/app/utils/analytics/time_entries/expected_hours.rb
@@ -16,8 +16,12 @@ def data
       end
 
       def entries
-        days = ([@start_date, @assignment.start_date].max..[@end_date, @assignment.end_date].min).filter do |d|
-          !d.sunday? && !d.saturday?
+        start_date = [@start_date, @assignment.start_date].max
+        end_date = [@end_date, @assignment.end_date].min
+
+        # Convert the range into an array of dates
+        days = (start_date.to_date..end_date.to_date).to_a.select do |d|
+          d.wday.between?(1, 5) # Exclude Saturday (6) and Sunday (0)
         end
 
         days.map do |day|