allow configuration of resource categories to be for assets and / or workers. #26

jkraemer · jkraemer · commit 0ff57f39d96d · 2019-04-16T14:33:24.000+08:00
diff --git a/app/controllers/issue_resource_items_controller.rb b/app/controllers/issue_resource_items_controller.rb
@@ -6,9 +6,10 @@ class IssueResourceItemsController < ApplicationController
   helper :resource_items
 
   def new
-    @categories = @project.resource_categories.sorted
     @issue = find_issue_if_present
     @type = %w(Asset Human).detect{|t| t == params[:type]}
+    @categories = @project.resource_categories.sorted
+    @categories = @type == 'Asset' ? @categories.for_assets : @categories.for_humans
 
     query = RedmineResourceManager::ResourceItemsQuery.new(
       project: @project, category_id: nil, issue_id: params[:issue_id],
diff --git a/app/controllers/resource_categories_controller.rb b/app/controllers/resource_categories_controller.rb
@@ -48,7 +48,7 @@ def destroy
   private
 
   def resource_category_params
-    params[:resource_category].permit :name
+    params[:resource_category].permit :name, :for_humans, :for_assets
   end
 
   def find_resource_category
diff --git a/app/models/resource_category.rb b/app/models/resource_category.rb
@@ -4,6 +4,27 @@ class ResourceCategory < ActiveRecord::Base
 
   validates :name, presence: true,
                    uniqueness: { case_sensitive: false, scope: :project_id }
+  validate :check_usage_flags
 
   scope :sorted, ->{ order name: :asc}
+  scope :for_humans, -> { where for_humans: true }
+  scope :for_assets, -> { where for_assets: true }
+
+  private
+
+  def check_usage_flags
+    if !for_assets? and !for_humans?
+      errors.add :base, :select_category_usage
+      return
+    end
+
+    unless new_record?
+      if resource_items.humans.any? and !for_humans?
+        errors.add :for_humans, :in_use
+      end
+      if resource_items.assets.any? and !for_assets?
+        errors.add :for_assets, :in_use
+      end
+    end
+  end
 end
diff --git a/app/models/resource_item.rb b/app/models/resource_item.rb
@@ -10,6 +10,8 @@ class ResourceItem < ActiveRecord::Base
                    uniqueness: { case_sensitive: false, scope: :category_id }
 
   scope :sorted, ->{ order name: :asc}
+  scope :humans, ->{ where type: 'Human' }
+  scope :assets, ->{ where type: 'Asset' }
 
   scope :like, ->(q){
     if q.present?
diff --git a/app/views/asset_resource_items/edit.html.erb b/app/views/asset_resource_items/edit.html.erb
@@ -1,7 +1,7 @@
 <%= title [l(:label_asset_resource_item_plural), project_asset_resource_items_path(@project)], @resource_item.name %>
 
 <%= labelled_form_for @resource_item, url: project_asset_resource_item_path(@project, @resource_item), method: :patch do |f| %>
-  <%= render partial: 'form', locals: { f: f } %>
+  <%= render partial: 'form', locals: { f: f, categories: @project.resource_categories.for_assets } %>
   <p>
     <%= submit_tag l :button_save %>
   </p>
diff --git a/app/views/asset_resource_items/new.html.erb b/app/views/asset_resource_items/new.html.erb
@@ -1,7 +1,7 @@
 <%= title [l(:label_asset_resource_item_plural), project_asset_resource_items_path(@project)], l(:label_asset_resource_item_new) %>
 
 <%= labelled_form_for @resource_item, url: project_asset_resource_items_path(@project) do |f| %>
-  <%= render partial: 'resource_items/form', locals: { f: f } %>
+  <%= render partial: 'resource_items/form', locals: { f: f, categories: @project.resource_categories.for_assets } %>
   <p>
     <%= submit_tag l :button_create %>
     <%= submit_tag l(:button_create_and_continue), name: 'continue' %>
diff --git a/app/views/human_resource_items/edit.html.erb b/app/views/human_resource_items/edit.html.erb
@@ -1,7 +1,7 @@
 <%= title [l(:label_human_resource_item_plural), project_human_resource_items_path(@project)], @resource_item.name %>
 
 <%= labelled_form_for @resource_item, url: project_human_resource_item_path(@project, @resource_item), method: :patch do |f| %>
-  <%= render partial: 'resource_items/form', locals: { f: f } %>
+  <%= render partial: 'resource_items/form', locals: { f: f, categories: @project.resource_categories.for_humans } %>
   <p>
     <%= submit_tag l :button_save %>
   </p>
diff --git a/app/views/human_resource_items/new.html.erb b/app/views/human_resource_items/new.html.erb
@@ -1,7 +1,7 @@
 <%= title [l(:label_human_resource_item_plural), project_human_resource_items_path(@project)], l(:label_human_resource_item_new) %>
 
 <%= labelled_form_for @resource_item, url: project_human_resource_items_path(@project) do |f| %>
-  <%= render partial: 'resource_items/form', locals: { f: f } %>
+  <%= render partial: 'resource_items/form', locals: { f: f, categories: @project.resource_categories.for_humans } %>
   <p>
     <%= submit_tag l :button_create %>
     <%= submit_tag l(:button_create_and_continue), name: 'continue' %>
diff --git a/app/views/resource_categories/_form.html.erb b/app/views/resource_categories/_form.html.erb
@@ -2,5 +2,7 @@
 
 <div class="box tabular">
   <p><%= f.text_field :name, required: true, size: 25 %></p>
+  <p><%= f.check_box :for_assets %></p>
+  <p><%= f.check_box :for_humans %></p>
 </div>
 
diff --git a/app/views/resource_categories/_list.html.erb b/app/views/resource_categories/_list.html.erb
@@ -1,8 +1,14 @@
 <% if resource_categories.any? %>
   <table class="list resource_categories">
+    <colgroup>
+      <col width="60%" />
+      <col span="3" />
+    </colgroup>
     <thead>
       <tr>
         <th><%= l :label_resource_category_name %></th>
+        <th><%= l :label_resource_category_for_assets %></th>
+        <th><%= l :label_resource_category_for_humans %></th>
         <th></th>
       </tr>
     </thead>
diff --git a/app/views/resource_categories/_resource_category.html.erb b/app/views/resource_categories/_resource_category.html.erb
@@ -1,4 +1,6 @@
 <tr>
   <td><%= link_to resource_category.name, edit_project_resource_category_path(resource_category.project, resource_category) %></td>
+  <td class="tick"><%= checked_image resource_category.for_assets %></td>
+  <td class="tick"><%= checked_image resource_category.for_humans %></td>
   <td><%= delete_link(project_resource_category_path(resource_category.project, resource_category)) %>
 </tr>
diff --git a/app/views/resource_items/_form.html.erb b/app/views/resource_items/_form.html.erb
@@ -2,7 +2,7 @@
 
 <div class="box tabular">
   <p><%= f.text_field :name, required: true, size: 25 %></p>
-  <p><%= f.select :category_id, @project.resource_categories.sorted.map{|c|[c.name, c.id]}, label: l(:field_resource_category), include_blank: true %></p>
+  <p><%= f.select :category_id, categories.sorted.map{|c|[c.name, c.id]}, label: l(:field_resource_category), include_blank: true %></p>
 </div>
 
 
diff --git a/app/views/resource_items/edit.html.erb b/app/views/resource_items/edit.html.erb
diff --git a/app/views/resource_items/new.html.erb b/app/views/resource_items/new.html.erb
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -1,4 +1,16 @@
 en:
+  activerecord:
+    errors:
+      models:
+        resource_category:
+          attributes:
+            base:
+              select_category_usage: Please choose what this category should be used for.
+            for_assets:
+              in_use: has to be selected since this category is currently being used for assets.
+            for_humans:
+              in_use: has to be selected since this category is currently being used for people.
+
   field_resource_category: Category
   field_supply_item_description: Description
   field_supply_item_unit: Unit
@@ -7,6 +19,8 @@ en:
   field_supply_item_stock_change_comment: Comment
   field_issue_supply_item_names: Supply Items
   label_add_issue_resource_items: Add
+  label_resource_category_for_assets: For assets
+  label_resource_category_for_humans: For people
   label_resource_category_name: Name
   label_resource_category_new: New resource category
   label_resource_category_plural: Resource categories
diff --git a/db/migrate/20190416032823_add_usage_flags_to_categories.rb b/db/migrate/20190416032823_add_usage_flags_to_categories.rb
@@ -0,0 +1,9 @@
+class AddUsageFlagsToCategories < ActiveRecord::Migration[5.2]
+  def change
+    add_column :resource_categories, :for_assets, :boolean, default: false
+    add_column :resource_categories, :for_humans, :boolean, default: false
+    ResourceCategory.where(id: Asset.pluck(:category_id).uniq).update_all for_assets: true
+    ResourceCategory.where(id: Human.pluck(:category_id).uniq).update_all for_humans: true
+    ResourceCategory.where(for_humans: false, for_assets: false).update_all for_assets: true
+  end
+end
diff --git a/test/integration/asset_resource_items_test.rb b/test/integration/asset_resource_items_test.rb
@@ -13,7 +13,7 @@ def setup
     @project.enabled_modules.create! name: 'issue_tracking'
     @project.enabled_modules.create! name: 'supply'
 
-    @cat = @project.resource_categories.create! name: 'Car'
+    @cat = ResourceCategory.generate! project: @project
   end
 
   def test_asset_resource_items_require_permission
diff --git a/test/integration/human_resource_items_test.rb b/test/integration/human_resource_items_test.rb
@@ -13,7 +13,7 @@ def setup
     @project.enabled_modules.create! name: 'issue_tracking'
     @project.enabled_modules.create! name: 'supply'
 
-    @cat = @project.resource_categories.create! name: 'Car'
+    @cat = ResourceCategory.generate! project: @project
   end
 
   def test_human_resource_items_require_permission
diff --git a/test/integration/issue_resource_items_test.rb b/test/integration/issue_resource_items_test.rb
@@ -21,7 +21,7 @@ def setup
     @project = Project.find 'ecookbook'
     @project.enabled_modules.create! name: 'supply'
 
-    @cat = @project.resource_categories.create! name: 'Car'
+    @cat = ResourceCategory.generate! name: "Car", project: @project
     @item = Asset.create! project: @project, category: @cat, name: 'RCM 429'
     @issue = @project.issues.first
 
diff --git a/test/integration/resource_categories_test.rb b/test/integration/resource_categories_test.rb
@@ -20,7 +20,7 @@ def test_resource_categories_require_permission
     get '/projects/ecookbook/settings'
     assert_response :success
     assert_select 'li a', text: 'Resource categories', count: 0
-    post '/projects/ecookbook/resource_categories', params: { resource_category: { name: 'new' }}
+    post '/projects/ecookbook/resource_categories', params: { resource_category: { name: 'new', for_assets: '1' }}
     assert_response 403
   end
 
@@ -39,7 +39,7 @@ def test_resource_category_crud
     assert_response :success
 
     assert_difference 'ResourceCategory.count' do
-      post '/projects/ecookbook/resource_categories', params: { resource_category: { name: 'Car'}}
+      post '/projects/ecookbook/resource_categories', params: { resource_category: { name: 'Car', for_assets: '1' }}
     end
     assert_redirected_to '/projects/ecookbook/settings/resource_categories'
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -60,7 +60,7 @@ def self.generate!(name: 'a human', project:,
 ResourceCategory.class_eval do
   def self.generate!(name: "resource category", project:)
     r = RedmineResourceManager::SaveResourceCategory.(
-      { name: name }, project: project
+      { name: name, for_assets: true }, project: project
     )
     if r.category_saved?
       r.category
diff --git a/test/unit/issue_resource_item_test.rb b/test/unit/issue_resource_item_test.rb
@@ -21,8 +21,8 @@ def setup
     @project = Project.find 'ecookbook'
     @project.enabled_modules.create! name: 'supply'
 
-    @cat = @project.resource_categories.create! name: 'Car'
-    @item = Asset.create! category: @cat, name: 'RCM 429'
+    @cat = ResourceCategory.generate! project: @project, name: 'Car'
+    @item = Asset.create! project: @project, category: @cat, name: 'RCM 429'
     @issue = @project.issues.first
 
   end
diff --git a/test/unit/resource_category_test.rb b/test/unit/resource_category_test.rb
@@ -0,0 +1,34 @@
+require_relative '../test_helper'
+
+class ResourceCategoryTest < ActiveSupport::TestCase
+
+  fixtures :projects
+
+  setup do
+    @project = Project.find 'ecookbook'
+  end
+
+  test "should require at least one usage flag" do
+    c = ResourceCategory.new name: 'some cat'
+    refute c.valid?
+    assert e = c.errors
+    assert error = e[:base].first
+    assert_match /please choose/i, error
+  end
+
+  test "should not allow flag deselection when in use" do
+    cat = ResourceCategory.generate! project: @project
+    Asset = Asset.generate! category: cat, project: @project
+
+    cat.for_assets = false
+    cat.for_humans = true
+    refute cat.valid?
+    assert e = cat.errors
+    assert error = e[:for_assets].first
+    assert_match /being used for assets/i, error
+  end
+end
+
+
+
+
