Feat/fix time entries analytics

app/models/assignment.rb

@@ -6,8 +6,8 @@
 #
 #  id             :bigint           not null, primary key
 #  coverage       :float
-#  end_date       :date
-#  start_date     :date
+#  end_date       :datetime
+#  start_date     :datetime
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
 #  requirement_id :bigint           not null

app/models/requirement.rb

@@ -6,8 +6,8 @@
 #
 #  id                   :bigint           not null, primary key
 #  coverage             :float
-#  end_date             :date
-#  start_date           :date
+#  end_date             :datetime
+#  start_date           :datetime
 #  created_at           :datetime         not null
 #  updated_at           :datetime         not null
 #  profession_id        :bigint           not null

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|

db/migrate/20240321110012_change_date_to_date_time_in_requirements.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class ChangeDateToDateTimeInRequirements < ActiveRecord::Migration[7.0]
+  def up
+    change_column :requirements, :end_date, :datetime
+    change_column :requirements, :start_date, :datetime
+  end
+
+  def down
+    change_column :requirements, :end_date, :date
+    change_column :requirements, :start_date, :date
+  end
+end

db/migrate/20240321110927_change_date_to_date_time_in_assignments.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class ChangeDateToDateTimeInAssignments < ActiveRecord::Migration[7.0]
+  def up
+    change_column :assignments, :end_date, :datetime
+    change_column :assignments, :start_date, :datetime
+  end
+
+  def down
+    change_column :assignments, :end_date, :date
+    change_column :assignments, :start_date, :date
+  end
+end

spec/factories/assignments.rb

@@ -6,8 +6,8 @@
 #
 #  id             :bigint           not null, primary key
 #  coverage       :float
-#  end_date       :date
-#  start_date     :date
+#  end_date       :datetime
+#  start_date     :datetime
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
 #  requirement_id :bigint           not null

spec/factories/requirements.rb

@@ -6,8 +6,8 @@
 #
 #  id                   :bigint           not null, primary key
 #  coverage             :float
-#  end_date             :date
-#  start_date           :date
+#  end_date             :datetime
+#  start_date           :datetime
 #  created_at           :datetime         not null
 #  updated_at           :datetime         not null
 #  profession_id        :bigint           not null

spec/models/assignment_spec.rb

@@ -6,8 +6,8 @@
 #
 #  id             :bigint           not null, primary key
 #  coverage       :float
-#  end_date       :date
-#  start_date     :date
+#  end_date       :datetime
+#  start_date     :datetime
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
 #  requirement_id :bigint           not null

spec/models/requirement_spec.rb

@@ -6,8 +6,8 @@
 #
 #  id                   :bigint           not null, primary key
 #  coverage             :float
-#  end_date             :date
-#  start_date           :date
+#  end_date             :datetime
+#  start_date           :datetime
 #  created_at           :datetime         not null
 #  updated_at           :datetime         not null
 #  profession_id        :bigint           not null