ecom_core 1.2.25 → 1.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55981c8967b5bc6d73d2ee78c31f2b0cdab1fbe48a43151ac23364b4b49c3a2e
-  data.tar.gz: c92cf858178d5225c806b0f65faf21bb67d819d2397fe564c0306866a950a34b
+  metadata.gz: cc33c4120563276cee995e753b7c6e9bdcff0740e9b2e306549abfca286fa8b0
+  data.tar.gz: 3cf51d8bf2777ff6a56b4659b404513d85c1aa9289069284ae17f8339c3f0df8
 SHA512:
-  metadata.gz: 1f79dd43c005604fed22a80bf4b071f1e07f5cddc8c6de368f96b7e0d06413d15edad31a73792ba353c31b8d7e9dc7c0553fe0a414bf9c065bcdb127f60dba7a
-  data.tar.gz: 4c4944902306db1e7317deb45cbcd5cdb91c0aa8ef9b12184ef2c9f25fcf1814fbebe6c1b6db6a63c48977e7484ae67fb6b73b2d2a503f30f2cfcaefcf26c1b7
+  metadata.gz: 6380cdb381fe5dd76533f94351ee2fddb3be0ef6559c39d883f2e41999c50dd7fd045a9f9b58854e58433c3f5a67924c3f9fed4c24977f5fc1d880be7bf1bb43
+  data.tar.gz: ce5cb1bac51e23a63dbc85b77129b1281d847323fae967f5fa9178544f91efeb679047748da472d1139e4396dc2e7d77a1699acc6fd88912dadd97066c98e125

data/app/models/ecom/core/task.rb

@@ -7,6 +7,7 @@ module Ecom
 
       belongs_to :work_product
       belongs_to :task_template
+      belongs_to :work_package, optional: true
       belongs_to :performer, class_name: 'Ecom::Core::User', optional: true
       belongs_to :approver, class_name: 'Ecom::Core::User', optional: true
       belongs_to :supervisor, class_name: 'Ecom::Core::User', optional: true

data/app/models/ecom/core/work_package.rb

@@ -6,7 +6,7 @@ module Ecom
       validates :code, :name, presence: true
       validates :code, uniqueness: true
 
-      has_many :work_products
+      has_many :tasks
     end
   end
 end

data/app/models/ecom/core/work_product.rb

@@ -26,7 +26,6 @@ module Ecom
       belongs_to :work_product_template
       belongs_to :project
       belongs_to :product_group, optional: true
-      belongs_to :work_package, optional: true
       belongs_to :approver, class_name: 'Ecom::Core::User', optional: true
       belongs_to :supervisor, class_name: 'Ecom::Core::User', optional: true
       belongs_to :quality_controller, class_name: 'Ecom::Core::User', optional: true

data/app/uploaders/ecom/core/photo_uploader.rb

@@ -10,6 +10,10 @@ module Ecom
       def extension_whitelist
         %w[jpg jpeg gif png]
       end
+
+      def filename
+        original_filename
+      end
     end
   end
 end

data/db/migrate/20191202235434_create_ecom_core_work_products.rb

@@ -9,10 +9,6 @@ class CreateEcomCoreWorkProducts < ActiveRecord::Migration[6.0]
                    null: true,
                    index: { name: 'wp_on_pg_indx' },
                    foreign_key: { to_table: :ecom_core_product_groups }
-      t.references :work_package,
-                   null: true,
-                   index: { name: 'wp_on_wp_indx' },
-                   foreign_key: { to_table: :ecom_core_work_packages } 
       t.references :work_product_template,
                    null: false,
                    index: { name: 'wpt_on_wp_indx' },

data/db/migrate/20191207103735_create_ecom_core_tasks.rb

@@ -10,6 +10,10 @@ class CreateEcomCoreTasks < ActiveRecord::Migration[6.0]
       t.string :status, null: false, default: :new
       t.integer :percent_completed, null: false, default: 0
       t.string :remark
+      t.references :work_package,
+                   null: true,
+                   index: { name: 'wp_on_wp_indx' },
+                   foreign_key: { to_table: :ecom_core_work_packages }
       t.references :performer,
                    null: true,
                    index: { name: 'tasks_on_performer_indx' },

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.25'.freeze
+    VERSION = '1.2.26'.freeze
   end
 end

data/spec/factories/ecom/core/tasks.rb

@@ -16,5 +16,6 @@ FactoryBot.define do
     association :quality_controller, factory: :user
     association :task_template
     association :work_product
+    association :work_package
   end
 end

data/spec/factories/ecom/core/work_products.rb

@@ -5,7 +5,6 @@ FactoryBot.define do
     design_reference_no { FFaker::Guid.guid }
     dimension { [{ label: 'Length', name: 'length', value: 12 }] }
     association :product_group
-    association :work_package
     association :work_product_template
     association :project
     status { Ecom::Core::WorkProduct::NEW }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.25
+  version: 1.2.26
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm