moves date filter into query class, allows for null dates #35

Author: jkraemer

app/controllers/issue_resource_items_controller.rb

@@ -13,7 +13,8 @@ def new
 
     query = RedmineResourceManager::ResourceItemsQuery.new(
       project: @project, category_id: nil, issue_id: params[:issue_id],
-      resource_class: @type.constantize
+      resource_class: @type.constantize,
+      filter_by_date: true
     )
 
     @resource_items = query.scope

app/models/resource_item.rb

@@ -15,7 +15,9 @@ class ResourceItem < ActiveRecord::Base
   scope :sorted, ->{ order name: :asc}
   scope :humans, ->{ where type: 'Human' }
   scope :assets, ->{ where type: 'Asset' }
-  scope :filter_by_date, -> { where("start_date < ? AND  ? < end_date", Date.today, Date.today) }
+  scope :filter_by_date, ->(date = Date.today){
+    where("(start_date is NULL or start_date <= :date) AND (end_date is NULL or :date <= end_date)", date: date)
+  }
 
   scope :like, ->(q){
     if q.present?

app/views/issue_resource_items/_new.html.erb

@@ -23,7 +23,7 @@
     <%= javascript_tag "observeResourceItemSearchfield('#{ j autocomplete_project_resource_items_path(@project, issue_id: issue.try(:id), type: @type) }');" %>
 
     <div id="resource_items_for_issue">
-      <%= render partial: 'resource_items/resource_items_for_issue', locals: { resource_items: resource_items.filter_by_date, total: @total } %>
+      <%= render partial: 'resource_items/resource_items_for_issue', locals: { resource_items: resource_items, total: @total } %>
     </div>
 
   </div>

lib/redmine_resource_manager/resource_items_query.rb

@@ -1,12 +1,13 @@
 module RedmineResourceManager
   class ResourceItemsQuery
 
-    def initialize(project:, query: nil, category_id: nil, issue_id: nil, resource_class:)
+    def initialize(project:, query: nil, category_id: nil, issue_id: nil, resource_class:, filter_by_date: false)
       @resource_class = resource_class
       @project = project
       @query = query.presence
       @category_id = category_id.presence
       @issue_id = issue_id.presence
+      @filter_by_date = filter_by_date
     end
 
     def scope
@@ -23,6 +24,7 @@ def total
     def all
       all = @resource_class.where(project_id: @project.id)
       all = all.where(category_id: @category_id) if @category_id
+      all = all.filter_by_date if @filter_by_date
       all = all.like @query if @query
       if @issue_id
         issue = @project.issues.visible.find @issue_id