Merge branch 'develop' into 'master'

Develop

See merge request gtt/redmine_supply!4

Author: dkastl

app/controllers/supply_items_controller.rb

@@ -15,7 +15,7 @@ def autocomplete
   end
 
   def index
-    @supply_items = SupplyItem.where project_id: @project.id
+    @supply_items = SupplyItem.order(name: :asc).where project_id: @project.id
   end
 
   def edit
@@ -59,7 +59,7 @@ def destroy
   private
 
   def supply_item_params
-    params[:supply_item].permit :name, :description, :unit
+    params[:supply_item].permit :name, :description, :unit, :stock
   end
 
   def find_supply_item

app/models/issue_supply_item.rb

@@ -5,4 +5,26 @@ class IssueSupplyItem < ActiveRecord::Base
   validates :supply_item, presence: true
   validates :quantity, presence: true, numericality: { only_integer: true,
                                                        greater_than: 0 }
+
+  after_destroy ->(isi){
+    RedmineSupply::RecordIssueSupplyItemChange.(isi.issue,
+                                                isi.supply_item,
+                                                isi.quantity)
+  }
+
+  after_create ->(isi){
+    RedmineSupply::RecordIssueSupplyItemChange.(isi.issue,
+                                                isi.supply_item,
+                                                -1 * isi.quantity)
+  }
+
+  after_update ->(isi){
+    if isi.quantity_was != isi.quantity
+      RedmineSupply::RecordIssueSupplyItemChange.(isi.issue,
+                                                  isi.supply_item,
+                                                  isi.quantity_was - isi.quantity)
+    end
+  }
+
+
 end

app/models/issue_supply_item_change.rb

@@ -0,0 +1,30 @@
+class IssueSupplyItemChange < SupplyItemJournal
+  belongs_to :issue
+
+  validates :issue, presence: true
+
+  def activity_title
+    I18n.t :text_issue_supply_item_changed, id: issue.id, name: supply_item.name, change: change_text
+  end
+
+  def activity_url
+    {
+      controller: 'issues',
+      action: 'show',
+      id: issue.to_param
+    }
+  end
+
+  def change_text
+    # we want to display the change on the issue, thus we have to inverse the item
+    # stock change
+    change = -1 * self.change
+    if change > 0
+      "+" + supply_item.stock_text(change)
+    elsif change < 0
+      supply_item.stock_text change
+    else
+      I18n.t :text_supply_item_nochange
+    end
+  end
+end

app/models/supply_item.rb

@@ -1,12 +1,18 @@
+# frozen_string_literal: true
+
 class SupplyItem < ActiveRecord::Base
   belongs_to :project
   has_many :issue_supply_items
   has_many :issues, through: :issue_supply_items
 
+  has_many :journals, class_name: 'SupplyItemJournal', dependent: :delete_all
+
   validates :project, presence: true
   validates :name, presence: true,
                    uniqueness: { case_sensitive: false,
                                  scope: :project_id }
+  validates :stock, presence: true,
+                    numericality: { only_integer: true }
 
   scope :sorted, ->{ order name: :asc}
 
@@ -23,6 +29,10 @@ class SupplyItem < ActiveRecord::Base
     end
   }
 
+  def stock_text(amount = self.stock)
+    "#{amount} #{unit_name}"
+  end
+
   def unit_name
     I18n.t :"label_supply_item_unit_#{unit}"
   end

app/models/supply_item_creation.rb

@@ -0,0 +1,6 @@
+class SupplyItemCreation < SupplyItemJournal
+
+  def activity_title
+    I18n.t :text_supply_item_created, name: supply_item.name, stock: supply_item.stock_text
+  end
+end

app/models/supply_item_journal.rb

@@ -0,0 +1,44 @@
+class SupplyItemJournal < ActiveRecord::Base
+
+  belongs_to :supply_item
+  belongs_to :user
+  alias author user
+
+  delegate :project, to: :supply_item
+
+  validates :type, presence: true
+  validates :supply_item, presence: true
+
+  acts_as_event(
+    title: :activity_title,
+    description: '',
+    datetime: :created_at,
+    url: :activity_url
+  )
+
+  acts_as_activity_provider(
+    scope: eager_load(supply_item: :project),
+    author_key: 'supply_item_journals.user_id',
+    timestamp: 'supply_item_journals.created_at',
+    permission: :view_supply_items
+  )
+
+
+  # implement in subclasses
+  def activity_title
+    to_s
+  end
+
+  def activity_url
+    {
+      controller: 'supply_items',
+      action: 'index',
+      project_id: supply_item.project.to_param
+    }
+  end
+
+  def change
+    new_stock - old_stock if new_stock && old_stock
+  end
+
+end

app/models/supply_item_update.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+#
+class SupplyItemUpdate < SupplyItemJournal
+
+  def activity_title
+    I18n.t :text_supply_item_updated, name: supply_item.name, change: change_text
+  end
+
+  def change_text
+    if change > 0
+      "+" + supply_item.stock_text(change)
+    elsif change < 0
+      supply_item.stock_text change
+    else
+      I18n.t :text_supply_item_nochange
+    end
+  end
+
+end

app/views/supply_items/_form.html.erb

@@ -2,6 +2,7 @@
 
 <div class="box tabular">
   <p><%= f.text_field :name, required: true, size: 25 %></p>
+  <p><%= f.text_field :stock, required: true, size: 25, label: l(:field_supply_item_stock) %></p>
   <p><%= f.select :unit, SupplyItem.units.keys.map{|u|[t(:"label_supply_item_unit_#{u}"), u]}, label: l(:field_supply_item_unit) %></p>
   <p><%= f.text_area :description, label: l(:field_supply_item_description), rows: 10 %></p>
 </div>

app/views/supply_items/_list.html.erb

@@ -3,6 +3,7 @@
     <thead>
       <tr>
         <th><%= l :label_supply_item_name %></th>
+        <th><%= l :label_supply_item_stock %></th>
         <th><%= l :label_supply_item_description %></th>
         <th></th>
       </tr>

app/views/supply_items/_supply_item.html.erb

@@ -1,5 +1,6 @@
 <tr>
   <td><%= link_to supply_item.name, edit_project_supply_item_path(supply_item.project, supply_item) %></td>
+  <td><%= supply_item.stock_text %></td>
   <td class="text"><div><%= textilizable supply_item.description %></div></td>
   <td><%= delete_link(project_supply_item_path(supply_item.project, supply_item)) %>
 </tr>