adds assets / people issue query columns #25

Author: jkraemer

app/models/issue_resource_item.rb

@@ -2,7 +2,13 @@ class IssueResourceItem < ActiveRecord::Base
   belongs_to :issue
   belongs_to :resource_item
 
+  scope :sorted, ->{
+    includes(:resource_item).order("#{ResourceItem.table_name}.name ASC")
+  }
+
   # breaks the nested assignment :()
   # validates :issue, presence: true
   validates :resource_item, presence: true
+
 end
+

config/locales/en.yml

@@ -17,6 +17,8 @@ en:
   field_supply_item_stock: Stock
   field_supply_item_stock_change: Stock change
   field_supply_item_stock_change_comment: Comment
+  field_issue_asset_resource_item_names: Assets
+  field_issue_human_resource_item_names: People
   field_issue_supply_item_names: Supply Items
   label_add_issue_resource_items: Add
   label_resource_category_for_assets: For assets

lib/redmine_resource_manager/issue_patch.rb

@@ -15,28 +15,35 @@ def self.apply
             if: ->(issue, user){ user.allowed_to?(:manage_issue_resources,
                                                   issue.project) }
 
-          def issue_human_resource_items
-            issue_resource_items.includes(:resource_item)
-              .where(resource_items: { type: 'Human'})
-          end
-
-          def issue_asset_resource_items
-            issue_resource_items.includes(:resource_item)
-              .where(resource_items: { type: 'Asset'})
-          end
-
-          def resource_items_by_type
-            {
-              'asset' => resource_items.where(type: 'Asset'),
-              'human' => resource_items.where(type: 'Human')
-            }
-          end
-
         end
-
       end
     end
 
+
+    def issue_human_resource_item_names
+      IssueResourceItemsPresenter.new(issue_human_resource_items).to_s
+    end
+    def issue_asset_resource_item_names
+      IssueResourceItemsPresenter.new(issue_asset_resource_items).to_s
+    end
+
+    def issue_human_resource_items
+      issue_resource_items.includes(:resource_item)
+        .where(resource_items: { type: 'Human'})
+    end
+
+    def issue_asset_resource_items
+      issue_resource_items.includes(:resource_item)
+        .where(resource_items: { type: 'Asset'})
+    end
+
+    def resource_items_by_type
+      {
+        'asset' => resource_items.where(type: 'Asset'),
+        'human' => resource_items.where(type: 'Human')
+      }
+    end
+
   end
 end
 

lib/redmine_resource_manager/issue_resource_items_presenter.rb

@@ -0,0 +1,22 @@
+module RedmineResourceManager
+  class IssueResourceItemsPresenter < RedmineSupply::Presenter
+    def initialize(scope)
+      @scope = scope.sorted
+    end
+
+    def call
+      @scope.to_a.map{|ri| issue_resource_item_tag ri}
+    end
+
+    def to_s
+      call.join ", ".html_safe
+    end
+
+    private
+
+    def issue_resource_item_tag(issue_resource_item)
+      h issue_resource_item.resource_item.name
+    end
+
+  end
+end

lib/redmine_supply/patches/issue_patch.rb

@@ -9,10 +9,6 @@ def self.apply
 
             has_many :issue_supply_items
 
-            def issue_supply_item_names
-              IssueSupplyItemsPresenter.new(issue_supply_items).to_s
-            end
-
             accepts_nested_attributes_for :issue_supply_items
 
             safe_attributes 'issue_supply_items_attributes',
@@ -24,6 +20,10 @@ def issue_supply_item_names
         end
       end
 
+      def issue_supply_item_names
+        IssueSupplyItemsPresenter.new(issue_supply_items).to_s
+      end
+
       def issue_supply_items_attributes=(attributes = [])
         # remove items with zero quantity. existing items with zero quantity are
         # destroyed as well

lib/redmine_supply/patches/issue_query_patch.rb

@@ -15,11 +15,16 @@ def available_columns
           @available_columns << QueryColumn.new(:issue_supply_item_names)
         end
 
+        if User.current.allowed_to?(:view_issue_resources, project, global: true)
+          @available_columns << QueryColumn.new(:issue_human_resource_item_names)
+          @available_columns << QueryColumn.new(:issue_asset_resource_item_names)
+        end
+
         @available_columns
       end
 
       def add_supply_items(a)
-        a | [:issue_supply_items]
+        a | %i(issue_supply_items issue_resource_items)
       end
 
       def issues(options={})