ecom_core 1.2.16 → 1.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82c394e94081fae6031af51e74ef103dc091d16b6e30ff8be5301a6f2ce42563
-  data.tar.gz: 988110edec8061117aecce19244003b94f56e5e810a7038614a8529fac3a52c4
+  metadata.gz: d4ad578f6c6d7aece965edd8d3ad059afb16ff3f90445ba63f55c6afdc530b8f
+  data.tar.gz: a31af1754f7ccdc5669a1fe5747745bb8d98d0e82371db261bee62cd08d50f38
 SHA512:
-  metadata.gz: 7b2e2332eae3a441a0eee06a701d28a1d89f4ef853da5aac9837d9e06fcb483b8052234b12c15b9a2a6473b2e5488554a22d4b44db81eed5e9e1e415bff15da4
-  data.tar.gz: 6b742e0294967e7759f0a9fe40dfc568aad618c3679cb43d5e054705331f8ffc7e4fb904e80617d2761bb4b53e9a82bd70285af9f7d6d53d170f44e8adaaf882
+  metadata.gz: 7720605e3fa55dd2ff8d12358a5ece0c11f11c47647b4ac1b9be6ca35d308592d3e2ffef33c9beea298c149f5abb301f0612a194934539ab357c78699529d3cb
+  data.tar.gz: 4c1a5cf5b05c9a8f247fb0b457b9904b9e98bb884a0b5e8a8da38b8268ae7177f631c51ab905dc947042f7117b1f8bf1525a1b92b76d3b1423c24ee157f0af5f

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

@@ -13,4 +13,4 @@ module Ecom
       validates :status, presence: true, inclusion: STATUSES
     end
   end
-end
+end

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

@@ -1,7 +1,9 @@
-module Ecom::Core
-  class ProductGroup < ApplicationRecord
-    belongs_to :project
+module Ecom
+  module Core
+    class ProductGroup < ApplicationRecord
+      belongs_to :project
 
-    validates :name, presence: true, uniqueness: true
+      validates :name, presence: true, uniqueness: true
+    end
   end
 end

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

@@ -5,7 +5,7 @@ module Ecom
       belongs_to :contractor, class_name: 'Ecom::Core::Stakeholder'
       belongs_to :consultant, class_name: 'Ecom::Core::Stakeholder'
       belongs_to :project_manager, class_name: 'Ecom::Core::Stakeholder'
-      belongs_to :task_template
+      belongs_to :task_template_type
       belongs_to :currency
       belongs_to :company
 

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

@@ -2,13 +2,9 @@ module Ecom
   module Core
     class WorkProductTemplate < ApplicationRecord
       validates :code, :name, presence: true, uniqueness: true
+      belongs_to :task_template_type
       has_and_belongs_to_many :task_templates
       has_many :product_types
-
-      scope :filtered_by_template_type, lambda { |id|
-        joins(:task_template).where('ecom_core_task_templates.task_template_type_id = ?', id)
-                             .order(:code)
-      }
     end
   end
 end

data/app/services/ecom/core/menu_service.rb

@@ -7,7 +7,7 @@ module Ecom
           INNER JOIN ecom_core_menus_user_roles MUR ON MUR.menu_id = ecom_core_menus.id
           INNER JOIN ecom_core_user_roles UR ON MUR.user_role_id = UR.id
         SQL
-        menu = Menu.joins(join_sql).where('UR.id IN (?)', role_ids).distinct
+        menu = Menu.joins(join_sql).where('UR.id IN (?)', role_ids).order(:id).distinct
         menu_list = menu.select { |m| m.parent.nil? }.each_with_object([]) do |item, list|
           list << { id: item.id, text: item.label, iconCss: item.icon, items: [] }
         end

data/db/migrate/20191119013236_create_ecom_core_work_product_templates.rb

@@ -4,7 +4,10 @@ class CreateEcomCoreWorkProductTemplates < ActiveRecord::Migration[6.0]
       t.string :code, null: false, unique: true
       t.string :name, null: false, unique: true
       t.string :description
-      t.string :remark
+      t.references :task_template_type,
+                   null: false,
+                   index: { name: 'wpt_on_ttt_indx' },
+                   foreign_key: { to_table: :ecom_core_task_template_types }
 
       t.timestamps
     end

data/db/migrate/20191201145848_create_ecom_core_projects.rb

@@ -22,10 +22,10 @@ class CreateEcomCoreProjects < ActiveRecord::Migration[6.0]
                    null: false,
                    index: { name: 'employer_on_pm_indx' },
                    foreign_key: { to_table: :ecom_core_stakeholders }
-      t.references :task_template,
+      t.references :task_template_type,
                    null: false,
                    index: { name: 'employer_on_tt_indx' },
-                   foreign_key: { to_table: :ecom_core_task_templates }
+                   foreign_key: { to_table: :ecom_core_task_template_types }
       t.string :contract_number, null: false
       t.date :date_contract_signed, null: false
       t.date :commencement_date, null: false

data/lib/ecom/core/version.rb

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

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

@@ -9,7 +9,7 @@ FactoryBot.define do
     association :contractor, factory: :stakeholder
     association :consultant, factory: :stakeholder
     association :project_manager, factory: :stakeholder
-    association :task_template
+    association :task_template_type
     contract_number { FFaker::Name.name }
     date_contract_signed { 30.days.ago }
     commencement_date { 1.day.ago }

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

@@ -7,6 +7,6 @@ FactoryBot.define do
       "Name#{n}"
     end
     description { FFaker::Name.name }
-    remark { FFaker::Name.name }
+    association :task_template_type
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.16
+  version: 1.2.17
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -248,8 +248,6 @@ files:
 - app/models/ecom/core/task_template_type.rb
 - app/models/ecom/core/user.rb
 - app/models/ecom/core/user_role.rb
-- app/models/ecom/core/work_component.rb
-- app/models/ecom/core/work_component_template.rb
 - app/models/ecom/core/work_package.rb
 - app/models/ecom/core/work_product.rb
 - app/models/ecom/core/work_product_template.rb
@@ -273,7 +271,6 @@ files:
 - db/migrate/20191119144618_create_ecom_core_stakeholders.rb
 - db/migrate/20191119145711_create_ecom_core_resource_types.rb
 - db/migrate/20191201131341_create_ecom_core_product_types.rb
-- db/migrate/20191201134420_create_ecom_core_work_component_templates.rb
 - db/migrate/20191201145816_create_ecom_core_currencies.rb
 - db/migrate/20191201145848_create_ecom_core_projects.rb
 - db/migrate/20191201251015_create_ecom_core_product_groups.rb
@@ -284,7 +281,6 @@ files:
 - db/migrate/20191202221423_create_ecom_core_menus.rb
 - db/migrate/20191202222210_create_ecom_core_work_packages.rb
 - db/migrate/20191202235434_create_ecom_core_work_products.rb
-- db/migrate/20191206104247_create_ecom_core_work_components.rb
 - db/migrate/20191207103735_create_ecom_core_tasks.rb
 - db/migrate/20191210724614_create_ecom_core_task_resources.rb
 - db/migrate/20191225100054_create_ecom_core_crews.rb
@@ -360,8 +356,6 @@ files:
 - spec/factories/ecom/core/tasks.rb
 - spec/factories/ecom/core/user_roles.rb
 - spec/factories/ecom/core/users.rb
-- spec/factories/ecom/core/work_component_templates.rb
-- spec/factories/ecom/core/work_components.rb
 - spec/factories/ecom/core/work_packages.rb
 - spec/factories/ecom/core/work_product_templates.rb
 - spec/factories/ecom/core/work_products.rb

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

@@ -1,14 +0,0 @@
-module Ecom
-  module Core
-    class WorkComponent < ApplicationRecord
-      belongs_to :performer, class_name: 'Ecom::Core::User'
-      belongs_to :approver, class_name: 'Ecom::Core::User'
-      belongs_to :supervisor, class_name: 'Ecom::Core::User'
-      belongs_to :quality_controller, class_name: 'Ecom::Core::User'
-      belongs_to :work_component_template
-      belongs_to :task
-
-      validates :name, :assignment_status, :task_status, :percent_completed, presence: true
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module Ecom
-  module Core
-    class WorkComponentTemplate < ApplicationRecord
-      belongs_to :work_product_template
-      belongs_to :task_template
-
-      validates :code, :name, presence: true
-      validates :code, uniqueness: { scope: %i[work_product_template_id task_template_id] }
-    end
-  end
-end

data/db/migrate/20191201134420_create_ecom_core_work_component_templates.rb

@@ -1,25 +0,0 @@
-class CreateEcomCoreWorkComponentTemplates < ActiveRecord::Migration[6.0]
-  def change
-    create_table :ecom_core_work_component_templates do |t|
-      t.string :code, null: false
-      t.string :name, null: false
-      t.string :description
-      t.integer :relative_percentage
-      t.json :dimension
-      t.references :work_product_template,
-                   null: false,
-                   index: { name: 'wct_on_wpt_indx' },
-                   foreign_key: { to_table: :ecom_core_work_product_templates }
-      t.references :task_template,
-                   null: false,
-                   index: { name: 'wct_on_tt_indx' },
-                   foreign_key: { to_table: :ecom_core_task_templates }
-
-      t.timestamps
-    end
-
-    add_index :ecom_core_work_component_templates, %i[code work_product_template_id task_template_id],
-              unique: true,
-              name: 'wct_on_code_wpt_id_tt_id_indx'
-  end
-end

data/db/migrate/20191206104247_create_ecom_core_work_components.rb

@@ -1,40 +0,0 @@
-class CreateEcomCoreWorkComponents < ActiveRecord::Migration[6.0]
-  def change
-    create_table :ecom_core_work_components do |t|
-      t.string :name, null: false
-      t.json :dimension
-      t.string :assignment_status, null: false, default: :unassigned
-      t.string :task_status, null: false, default: :new
-      t.integer :percent_completed, null: false, default: 0
-      t.string :remark
-      t.references :performer,
-                   null: true,
-                   index: false,
-                   foreign_key: { to_table: :ecom_core_users }
-      t.references :approver,
-                   null: true,
-                   index: false,
-                   foreign_key: { to_table: :ecom_core_users }
-      t.references :supervisor,
-                   null: true,
-                   index: false,
-                   foreign_key: { to_table: :ecom_core_users }
-      t.references :quality_controller,
-                   null: true,
-                   index: false,
-                   foreign_key: { to_table: :ecom_core_users }
-      t.date :start_date
-      t.date :completion_date
-      t.references :work_component_template,
-                   null: false,
-                   index: { name: 'wct_on_wc_indx' },
-                   foreign_key: { to_table: :ecom_core_work_component_templates }
-      t.references :work_product,
-                   null: false,
-                   index: { name: 'wp_on_wc_indx' },
-                   foreign_key: { to_table: :ecom_core_work_products }
-
-      t.timestamps
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-FactoryBot.define do
-  factory :work_component_template, class: Ecom::Core::WorkComponentTemplate do
-    sequence :code do |n|
-      "WCTCode#{n}"
-    end
-    name { FFaker::Name.name }
-    description { FFaker::Name.name }
-    relative_percentage { FFaker::Random.rand(0..100) }
-    dimension { [{ label: 'Length', name: 'length' }, { label: 'Width', name: 'width' }] }
-    association :work_product_template
-    association :task_template
-  end
-end

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

@@ -1,18 +0,0 @@
-FactoryBot.define do
-  factory :work_component, class: Ecom::Core::WorkComponent do
-    name { FFaker::Name.name }
-    dimension { [{ label: 'Length', name: 'length', value: 10 }] }
-    assignment_status { :unassigned }
-    task_status { :new }
-    percent_completed { FFaker::Random.rand(1..100) }
-    remark { FFaker::Name.name }
-    association :performer, factory: :user
-    association :approver, factory: :user
-    association :supervisor, factory: :user
-    association :quality_controller, factory: :user
-    start_date { 1.day.ago }
-    completion_date { Time.now.next_week }
-    association :work_component_template
-    association :work_product
-  end
-end