diff --git a/app/controllers/resource_items_controller.rb b/app/controllers/resource_items_controller.rb index 075c729..2431cdf 100644 --- a/app/controllers/resource_items_controller.rb +++ b/app/controllers/resource_items_controller.rb @@ -103,7 +103,7 @@ def resource_class def resource_item_params if parameters = params[:human] || params[:asset] - parameters.permit :name, :category_id, :start_date, :end_date, :position + parameters.permit :name, :category_id, :start_date, :end_date, :position, :active end end diff --git a/app/controllers/supply_items_controller.rb b/app/controllers/supply_items_controller.rb index f46f908..f3c3d35 100644 --- a/app/controllers/supply_items_controller.rb +++ b/app/controllers/supply_items_controller.rb @@ -155,7 +155,7 @@ def find_supply_item def permitted_supply_item_parameters cf_ids = [RedmineSupply.unit_cf&.id].compact.map(&:to_s) - [:name, :description, custom_field_values: cf_ids] + [:name, :description, :active, custom_field_values: cf_ids] end end diff --git a/app/models/resource_item.rb b/app/models/resource_item.rb index c6e1cd3..0f1bb56 100644 --- a/app/models/resource_item.rb +++ b/app/models/resource_item.rb @@ -15,6 +15,7 @@ class ResourceItem < (defined?(ApplicationRecord) == 'constant' ? ApplicationRec acts_as_positioned :scope => [:project_id, :type] scope :sorted, ->{ order :position } + scope :active, ->{ where(:active => true) } scope :humans, ->{ where type: 'Human' } scope :assets, ->{ where type: 'Asset' } scope :filter_by_date, ->(date = Date.today){ @@ -28,5 +29,8 @@ class ResourceItem < (defined?(ApplicationRecord) == 'constant' ? ApplicationRec all end } -end + def css_classes + "resource_item " + (active ? "active" : "inactive") + end +end diff --git a/app/models/supply_item.rb b/app/models/supply_item.rb index 6b7f993..897e43d 100644 --- a/app/models/supply_item.rb +++ b/app/models/supply_item.rb @@ -13,7 +13,8 @@ class SupplyItem < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecor scope: :project_id } validates :stock, presence: true, numericality: true - scope :sorted, ->{ order name: :asc} + scope :sorted, ->{ order name: :asc } + scope :active, ->{ where(:active => true) } acts_as_customizable @@ -55,4 +56,7 @@ def unit_name end end + def css_classes + "supply_item " + (active ? "active" : "inactive") + end end diff --git a/app/views/asset_resource_items/index.html.erb b/app/views/asset_resource_items/index.html.erb index ad3047a..b11daae 100644 --- a/app/views/asset_resource_items/index.html.erb +++ b/app/views/asset_resource_items/index.html.erb @@ -22,7 +22,7 @@
<% for i in @resource_items %> -<%= f.select :category_id, categories.sorted.map{|c|[c.name, c.id]}, label: l(:field_resource_category), include_blank: true %>
<% end %> +<%= f.check_box :active %>
- - diff --git a/app/views/supply_items/_form.html.erb b/app/views/supply_items/_form.html.erb index d8c8ed5..589f673 100644 --- a/app/views/supply_items/_form.html.erb +++ b/app/views/supply_items/_form.html.erb @@ -11,6 +11,7 @@<%= custom_field_tag_with_label :supply_item, value %>
<% end %><%= f.text_area :description, label: l(:field_supply_item_description), rows: 10 %>
+<%= f.check_box :active %>
<%= wikitoolbar_for 'supply_item_description' %> diff --git a/app/views/supply_items/_supply_item.html.erb b/app/views/supply_items/_supply_item.html.erb index 1222b1f..20e042d 100644 --- a/app/views/supply_items/_supply_item.html.erb +++ b/app/views/supply_items/_supply_item.html.erb @@ -1,4 +1,4 @@ -