ecom_core 1.2.15 → 1.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e47a28bd7b3ce16d86c8ae18b5ff906bfba496c0a862dc97c41babd5760ea9e
-  data.tar.gz: '09dd7a50a6ac74286a82557aa1561c308a2ac295b75a3472fbe6d4af583bce22'
+  metadata.gz: 82c394e94081fae6031af51e74ef103dc091d16b6e30ff8be5301a6f2ce42563
+  data.tar.gz: 988110edec8061117aecce19244003b94f56e5e810a7038614a8529fac3a52c4
 SHA512:
-  metadata.gz: a1d13e668d8382fe3a87d8386df80300488c09785b7357e7e33a061a058765abbab8ff84d798e49a065ac44c8708adebe68a5423b5387b702f8919da565871e4
-  data.tar.gz: e377ee5714e4e21c3e73bef63bb1aeec0e7621215eba0bfd81c8fd804974cb1e6b72ee1fbfd53cc746e465cf988c254dc89d2413a5ae47a8fa6e755851bc0d28
+  metadata.gz: 7b2e2332eae3a441a0eee06a701d28a1d89f4ef853da5aac9837d9e06fcb483b8052234b12c15b9a2a6473b2e5488554a22d4b44db81eed5e9e1e415bff15da4
+  data.tar.gz: 6b742e0294967e7759f0a9fe40dfc568aad618c3679cb43d5e054705331f8ffc7e4fb904e80617d2761bb4b53e9a82bd70285af9f7d6d53d170f44e8adaaf882

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

@@ -3,6 +3,8 @@ module Ecom
     class Task < ApplicationRecord
       include AASM
 
+      has_ancestry
+
       belongs_to :work_product
       belongs_to :task_template
       belongs_to :work_package, optional: true
@@ -17,6 +19,8 @@ module Ecom
                                 greater_than_or_equal_to: 0,
                                 less_than_or_equal_to: 100
 
+      scope :by_status, ->(status) { where(status: status) }
+
       aasm column: 'status' do
         state :new, initial: true
         state :in_progress

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

@@ -6,7 +6,7 @@ module Ecom
       belongs_to :supervisor, class_name: 'Ecom::Core::User'
       belongs_to :quality_controller, class_name: 'Ecom::Core::User'
       belongs_to :work_component_template
-      belongs_to :work_product
+      belongs_to :task
 
       validates :name, :assignment_status, :task_status, :percent_completed, presence: true
     end

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

@@ -1,6 +1,8 @@
 module Ecom
   module Core
     class WorkPackage < ApplicationRecord
+      belongs_to :project
+
       validates :code, :name, presence: true
       validates :code, uniqueness: true
 

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

@@ -29,6 +29,7 @@ module Ecom
       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
+      has_many :tasks
 
       validates :name, :design_reference_no, :status, :percent_completed, presence: true
       validates :design_reference_no, uniqueness: { scope: :project_id }

data/db/migrate/20191119012030_create_ecom_core_task_templates.rb

@@ -9,6 +9,8 @@ class CreateEcomCoreTaskTemplates < ActiveRecord::Migration[6.0]
                    index: { name: 'tt_on_ttt_indx' },
                    foreign_key: { to_table: :ecom_core_task_template_types }
       t.string :ancestry, index: true
+      t.boolean :has_takeoff_fields, null:false, default: false
+      t.jsonb :fields
 
       t.timestamps
     end

data/db/migrate/20191202222210_create_ecom_core_work_packages.rb

@@ -6,6 +6,10 @@ class CreateEcomCoreWorkPackages < ActiveRecord::Migration[6.0]
       t.string :description
       t.date :start_date
       t.date :end_date
+      t.references :project,
+                   null: false,
+                   index: { name: 'wp_on_project_indx' },
+                   foreign_key: { to_table: :ecom_core_projects }
 
       t.timestamps
     end

data/db/migrate/20191202235434_create_ecom_core_work_products.rb

@@ -34,6 +34,7 @@ class CreateEcomCoreWorkProducts < ActiveRecord::Migration[6.0]
                    foreign_key: { to_table: :ecom_core_users }
       t.datetime :start_date
       t.datetime :completion_date
+      t.boolean :tasks_generated, null: false, default: false
 
       t.timestamps
     end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.15'.freeze
+    VERSION = '1.2.16'.freeze
   end
 end

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

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :application_module, class: Ecom::Core::ApplicationModule do
-    code { FFaker::Guid.guid }
+    sequence :code do |n|
+      "AMCode#{n}"
+    end
     name { FFaker::Name.name }
   end
 end

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

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :company, class: Ecom::Core::Company do
-    code { FFaker::Guid.guid }
+    sequence :code do |n|
+      "CCode#{n}"
+    end
     name { FFaker::Name.name }
     address { FFaker::Address.street_address }
     telephone { FFaker::PhoneNumber.phone_number }

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

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :resource_type, class: Ecom::Core::ResourceType do
-    code { FFaker::Guid.guid }
+    sequence :code do |n|
+      "RTCode#{n}"
+    end
     name { FFaker::Name.name }
     base_unit { FFaker::Name.name }
     type { 'Ecom::Core::CrewType' }

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

@@ -1,6 +1,10 @@
 FactoryBot.define do
   factory :task_template_type, class: Ecom::Core::TaskTemplateType do
-    code { FFaker::Guid.guid }
-    name { FFaker::Name.unique.name }
+    sequence :code do |n|
+      "TTTCode#{n}"
+    end
+    sequence :name do |n|
+      "TTTName#{n}"
+    end
   end
 end

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

@@ -1,8 +1,12 @@
 FactoryBot.define do
   factory :task_template, class: Ecom::Core::TaskTemplate do
-    code { FFaker::Guid.guid }
+    sequence :code do |n|
+      "TTCode#{n}"
+    end
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     association :task_template_type
+    has_takeoff_fields { false }
+    fields { [{ name: 'length', label: 'Length' }] }
   end
 end

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

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :task, class: Ecom::Core::Task do
-    code { FFaker::Guid.guid }
+    sequence :code do |n|
+      "TCode#{n}"
+    end
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     start_date { Date.yesterday }

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

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :work_component_template, class: Ecom::Core::WorkComponentTemplate do
-    code { FFaker::Guid.guid }
+    sequence :code do |n|
+      "WCTCode#{n}"
+    end
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     relative_percentage { FFaker::Random.rand(0..100) }

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

@@ -1,9 +1,12 @@
 FactoryBot.define do
   factory :work_package, class: Ecom::Core::WorkPackage do
-    code { FFaker::Guid.guid }
+    sequence :code do |n|
+      "WPCode#{n}"
+    end
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     start_date { Date.yesterday }
     end_date { Date.today }
+    association :project
   end
 end

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

@@ -1,7 +1,11 @@
 FactoryBot.define do
   factory :work_product_template, class: Ecom::Core::WorkProductTemplate do
-    code { FFaker::Guid.guid }
-    name { FFaker::Name.unique.name }
+    sequence :code do |n|
+      "Code#{n}"
+    end
+    sequence :name do |n|
+      "Name#{n}"
+    end
     description { FFaker::Name.name }
     remark { FFaker::Name.name }
   end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :work_product, class: Ecom::Core::WorkProduct do
-    name { FFaker::Name.unique.name }
+    name { FFaker::Name.name }
     description { FFaker::Name.name }
     design_reference_no { FFaker::Guid.guid }
     dimension { [{ label: 'Length', name: 'length', value: 12 }] }
@@ -15,5 +15,6 @@ FactoryBot.define do
     association :quality_controller, factory: :user
     start_date { 1.day.ago }
     completion_date { Time.now.next_week }
+    tasks_generated { false }
   end
 end

metadata

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