fix time entries order

codelittinc · Jul 3, 2024 · af07732 · af07732
1 parent ac06ecd
commit af07732
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/controllers/analytics/time_entries_controller.rb b/app/controllers/analytics/time_entries_controller.rb
@@ -8,7 +8,6 @@ class TimeEntriesController < ApplicationController
     def index
       @time_entries = Analytics::TimeEntriesAnalytics.new(@project, @statement_of_work, params[:start_date],
                                                           params[:end_date]).data
-
       render json: @time_entries
     end
 

diff --git a/app/utils/analytics/time_entries_analytics.rb b/app/utils/analytics/time_entries_analytics.rb
@@ -82,11 +82,11 @@ def assignments
     def requirements
       return @requirements if @requirements
 
-      @requirements = if @project
+      @requirements = if @statement_of_work
+                        Requirement.where(id: @statement_of_work.requirements.map(&:id))
+                      elsif @project
                         Requirement.where(id: @project.statement_of_works.map(&:requirements)
                                             .flatten.map(&:id))
-                      elsif @statement_of_work
-                        Requirement.where(id: @statement_of_work.requirements.map(&:id))
                       else
                         Requirement.all
                       end