ecom_core 1.2.13 → 1.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 785564a6c5e451baa829ed1114ec89b5fb0247a3894a09fd2683b2967e1ae49b
-  data.tar.gz: d0dbc33358d5759b276f0d92575efc6e2333f2bac15674deb81a40c6b5cb850a
+  metadata.gz: faf0a77147b59f982b4e26d123d93a93f7f51daa2f0d47b453df22ceac084f3e
+  data.tar.gz: c7faa1131252a81ac43cbdd8b848c3f66f2db84cf09e64296de3fd7b490e116e
 SHA512:
-  metadata.gz: be05151af2bb4f6117929e9a220ee1a466629464704ba24054f1be4da8ac1b67f03b8fb8affcea5958d8d6e6f18681f0783dce2744d2f01ef00be6af2479fa0d
-  data.tar.gz: 87f31a859e9e3c2aaa26af4ae2627a425883e4ab3a8c555bbf3a0ed80b30b754fd9ca0ecce920bee1a78fc69f8ab9f266c5878bea6f3fb6814595e8a0e28290c
+  metadata.gz: a83643810ff0d997045c7efa28da6a81f2b7c2f9b5a9cc13ed556735ab09559e6e55133f6e9412add7f8d597f1dffe705e195cfe84fa3c09ff0c4ceae5857f29
+  data.tar.gz: b234a2bbcaad56cf90d94d974f0d611497dd9202056cbb3103775d502a156783a52e87d04afd0373bf9c3dc852fc20a395fe0d4f4ce0bdd4fcdb3c8ac796f356

data/app/models/ecom/core/{booked_equipment_item.rb → booked_item.rb}

@@ -1,6 +1,6 @@
 module Ecom
   module Core
-    class BookedEquipmentItem < ApplicationRecord
+    class BookedItem < ApplicationRecord
       belongs_to :booking
       belongs_to :requested_item
       belongs_to :equipment_item

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

@@ -8,9 +8,9 @@ module Ecom
 
       belongs_to :equipment_request
       belongs_to :booked_by, class_name: 'Ecom::Core::User'
-      belongs_to :booked_for, class_name: 'Ecom::Core::User'
+      has_many :booked_items
 
       validates :status, presence: true, inclusion: STATUSES
     end
   end
-end
+end

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

@@ -2,15 +2,15 @@ module Ecom
   module Core
     class CrewTime < ApplicationRecord
       # Time Ranges
-      MORNING = 'Morning'.freeze
-      AFTERNOON = 'Afternoon'.freeze
-      BOTH = 'Both'.freeze
+      MORNING = :morning
+      AFTERNOON = :afternoon
+      FULL_DAY = :full_day
 
-      TIME_RANGE = {
-        MORNING => { start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('9:00 AM') },
-        AFTERNOON => { start: Time.zone.parse('10:00 AM'), end: Time.zone.parse('2:00 PM') },
-        BOTH => { start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('2:00 PM') }
-      }.freeze
+      # TIME_RANGE = {
+      #   MORNING => { start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('9:00 AM') },
+      #   AFTERNOON => { start: Time.zone.parse('10:00 AM'), end: Time.zone.parse('2:00 PM') },
+      #   BOTH => { start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('2:00 PM') }
+      # }.freeze
 
       belongs_to :attendance_sheet_entry
       belongs_to :revision_to, class_name: 'Ecom::Core::CrewTime', optional: true
@@ -47,15 +47,42 @@ module Ecom
         attendance_sheet_entry.save
       end
 
+      # A method to get the available time ranges at a given point.
+      # We cannot define the range variables as a constant because
+      # the parsing should be done at the exact moment we are about
+      # to do time range calculations to avoid errors caused by date
+      # mismatches
+      def get_range
+        morning = {
+          start: Time.zone.parse('5:00 AM'),
+          finish: Time.zone.parse('9:00 AM')
+        }
+        afternoon = {
+          start: Time.zone.parse('10:00 AM'),
+          finish: Time.zone.parse('2:00 PM')
+        }
+        full_day = {
+          start: Time.zone.parse('5:00 AM'),
+          finish: Time.zone.parse('2:00 PM')
+        }
+
+        {
+          morning: morning,
+          afternoon: afternoon,
+          full_day: full_day
+        }
+      end
+
       # A method to check if checkin and checkout range falls in the morning,
       # afternoon, or both.
       def find_range(start, finish)
-        if start.before?(TIME_RANGE[MORNING][:end]) && finish.before?(TIME_RANGE[AFTERNOON][:start])
-          MORNING
-        elsif start.after?(TIME_RANGE[MORNING][:end]) && finish.after?(TIME_RANGE[AFTERNOON][:start])
-          AFTERNOON
+        range = get_range
+        if start.before?(range[:morning][:finish]) && finish.before?(range[:afternoon][:start])
+          :morning
+        elsif start.after?(range[:morning][:finish]) && finish.after?(range[:afternoon][:start])
+          :afternoon
         else
-          BOTH
+          :full_day
         end
       end
 
@@ -63,13 +90,14 @@ module Ecom
       # of the defined morning and afternoon ranges
       def compute_hours
         # Reparse time to avoid errors caused by date differences
+        range = get_range
         start = Time.zone.parse(checkin_time.strftime('%I:%M%p'))
         finish = Time.zone.parse(checkout_time.strftime('%I:%M%p'))
-        range = find_range(start, finish)
-        left = start.before?(TIME_RANGE[range][:start]) ? TIME_RANGE[range][:start] : start
-        right = finish.after?(TIME_RANGE[range][:end]) ? TIME_RANGE[range][:end] : finish
+        day_part = find_range(start, finish)
+        left = start.before?(range[day_part][:start]) ? range[day_part][:start] : start
+        right = finish.after?(range[day_part][:finish]) ? range[day_part][:finish] : finish
         time = (right - left) / 1.hour
-        time -= 1 if range == BOTH
+        time -= 1 if day_part == FULL_DAY
         time
       end
     end

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

@@ -0,0 +1,9 @@
+module Ecom
+  module Core
+    class ProductGroup < ApplicationRecord
+      belongs_to :project
+
+      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/task.rb

@@ -1,10 +1,53 @@
 module Ecom
   module Core
     class Task < ApplicationRecord
-      belongs_to :project
+      include AASM
+
+      has_ancestry
+
+      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
+      belongs_to :quality_controller, class_name: 'Ecom::Core::User', optional: true
+
+      validates :code, :name, :status, :percent_completed, presence: true
+      validates_numericality_of :percent_completed,
+                                only_integer: true,
+                                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
+        state :submitted
+        state :under_review
+        state :completed
+
+        event :start do
+          transitions from: :new, to: :in_progress
+        end
+
+        event :submit do
+          transitions from: :in_progress, to: :submitted
+        end
+
+        event :review do
+          transitions from: :submitted, to: :under_review
+        end
+
+        event :complete do
+          transitions from: %i[submitted under_review], to: :completed
+        end
 
-      validates :code, :name, presence: true
+        event :rework do
+          transitions from: :under_review, to: :in_progress
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,10 @@
+module Ecom
+  module Core
+    class TaskResource < ApplicationRecord
+      belongs_to :task
+      belongs_to :resource_type
+
+      validates :amount, presence: true, numericality: { greater_than: 0 }
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Ecom
       has_ancestry
 
       belongs_to :task_template_type
-      has_one :work_product_template
+      has_and_belongs_to_many :work_product_templates, join_table: 'ecom_core_task_templates_work_product_templates'
       has_and_belongs_to_many :resource_types, join_table: 'ecom_core_task_templates_resource_types'
 
       validates :name, :code, presence: true

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

@@ -0,0 +1,12 @@
+module Ecom
+  module Core
+    class WorkPackage < ApplicationRecord
+      belongs_to :project
+
+      validates :code, :name, presence: true
+      validates :code, uniqueness: true
+
+      has_many :tasks
+    end
+  end
+end

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

@@ -17,53 +17,27 @@ module Ecom
     class WorkProduct < ApplicationRecord
       include AASM
 
-      belongs_to :work_product_template
-      belongs_to :task
-      belongs_to :project
-      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'
-
-      validates :name, presence: true
-      validates :design_reference_no, uniqueness: true
-
-      aasm column: 'task_status' do
-        state :new, initial: true
-        state :in_progress
-        state :submitted
-        state :under_review
-        state :completed
-
-        event :start do
-          transitions from: :new, to: :in_progress
-        end
-
-        event :submit do
-          transitions from: :in_progress, to: :submitted
-        end
+      NEW = 'New'.freeze
+      UNDER_CONSTRUCTION = 'Under Construction'.freeze
+      COMPLETED = 'Completed'.freeze
 
-        event :review do
-          transitions from: :submitted, to: :under_review
-        end
+      STATUSES = [NEW, UNDER_CONSTRUCTION, COMPLETED].freeze
 
-        event :complete do
-          transitions from: %i[submitted under_review], to: :completed
-        end
-
-        event :rework do
-          transitions from: :under_review, to: :in_progress
-        end
-      end
-
-      aasm column: 'assignment_status' do
-        state :unassigned, initial: true
-        state :assigned
-
-        event :assign do
-          transitions from: :unassigned, to: :assigned
-        end
-      end
+      belongs_to :work_product_template
+      belongs_to :project
+      belongs_to :product_group, 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
+      has_many :tasks
+
+      validates :name, :design_reference_no, :status, :percent_completed, presence: true
+      validates :design_reference_no, uniqueness: { scope: :project_id }
+      validates :status, inclusion: STATUSES
+      validates_numericality_of :percent_completed,
+                                only_integer: true,
+                                greater_than_or_equal_to: 0,
+                                less_than_or_equal_to: 100
     end
   end
 end

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
+      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/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/20191119013236_create_ecom_core_work_product_templates.rb

@@ -4,13 +4,23 @@ 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,
+      t.references :task_template_type,
                    null: false,
-                   index: { name: 'tt_on_wpt_indx' },
-                   foreign_key: { to_table: :ecom_core_task_templates }
+                   index: { name: 'wpt_on_ttt_indx' },
+                   foreign_key: { to_table: :ecom_core_task_template_types }
 
       t.timestamps
     end
+
+    create_table :ecom_core_task_templates_work_product_templates do |t|
+      t.references :task_template,
+                   null: false,
+                   index: { name: 'ttwpt_on_tt_indx' },
+                   foreign_key: { to_table: :ecom_core_task_templates }
+      t.references :work_product_template,
+                   null: false,
+                   index: { name: 'ttwpt_on_wpt_indx' },
+                   foreign_key: { to_table: :ecom_core_work_product_templates }
+    end
   end
 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/db/migrate/20191201251015_create_ecom_core_product_groups.rb

@@ -0,0 +1,13 @@
+class CreateEcomCoreProductGroups < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_product_groups do |t|
+      t.string :name, null: false, unique: true
+      t.references :project,
+                   null: false,
+                   index: { name: 'pg_on_project_indx' },
+                   foreign_key: { to_table: :ecom_core_projects }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20191202222210_create_ecom_core_work_packages.rb

@@ -0,0 +1,17 @@
+class CreateEcomCoreWorkPackages < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_work_packages do |t|
+      t.string :code, null: false, unique: true
+      t.string :name, null: false
+      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
+  end
+end

data/db/migrate/20191202235434_create_ecom_core_work_products.rb

@@ -1,15 +1,14 @@
 class CreateEcomCoreWorkProducts < ActiveRecord::Migration[6.0]
   def change
     create_table :ecom_core_work_products do |t|
-      t.string :code, null: false
       t.string :name, null: false
       t.string :description
       t.string :design_reference_no, unique: true
       t.json :dimension
-      t.references :task,
-                   null: false,
-                   index: { name: 'task_on_wp_indx' },
-                   foreign_key: { to_table: :ecom_core_tasks }
+      t.references :product_group,
+                   null: true,
+                   index: { name: 'wp_on_pg_indx' },
+                   foreign_key: { to_table: :ecom_core_product_groups }
       t.references :work_product_template,
                    null: false,
                    index: { name: 'wpt_on_wp_indx' },
@@ -18,14 +17,9 @@ class CreateEcomCoreWorkProducts < ActiveRecord::Migration[6.0]
                    null: false,
                    index: { name: 'projects_on_wp_indx' },
                    foreign_key: { to_table: :ecom_core_projects }
-      t.string :assignment_status, default: 'UNASSIGNED'
-      t.string :task_status, default: 'NEW'
-      t.integer :percent_completed
+      t.string :status, 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,
@@ -40,10 +34,11 @@ 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
 
-    add_index :ecom_core_work_products, %i[code project_id], unique: true
+    add_index :ecom_core_work_products, %i[design_reference_no project_id], unique: true, name: 'wp_on_drpi_indx'
   end
 end

data/db/migrate/20191207103735_create_ecom_core_tasks.rb

@@ -0,0 +1,45 @@
+class CreateEcomCoreTasks < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_tasks do |t|
+      t.string :code, null: false
+      t.string :name, null: false
+      t.string :description
+      t.string :ancestry
+      t.date :start_date
+      t.date :end_date
+      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' },
+                   foreign_key: { to_table: :ecom_core_users }
+      t.references :approver,
+                   null: true,
+                   index: { name: 'tasks_on_approver_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+      t.references :supervisor,
+                   null: true,
+                   index: { name: 'tasks_on_supervisor_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+      t.references :quality_controller,
+                   null: true,
+                   index: { name: 'tasks_on_qc_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+      t.references :work_product,
+                   null: false,
+                   index: { name: 'tasks_on_wp_indx' },
+                   foreign_key: { to_table: :ecom_core_work_products }
+      t.references :task_template,
+                   null: false,
+                   index: { name: 'tt_on_project_indx' },
+                   foreign_key: { to_table: :ecom_core_task_templates }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20191210724614_create_ecom_core_task_resources.rb

@@ -0,0 +1,18 @@
+class CreateEcomCoreTaskResources < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_task_resources do |t|
+      t.references :task,
+                   null: false,
+                   index: { name: 'tr_on_task_indx' },
+                   foreign_key: { to_table: :ecom_core_tasks }
+      t.references :resource_type,
+                   null: false,
+                   index: { name: 'tr_on_rt_indx' },
+                   foreign_key: { to_table: :ecom_core_resource_types }
+      t.date :date_assigned
+      t.float :amount, nullable: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200602830603_create_ecom_core_bookings.rb

@@ -9,10 +9,6 @@ class CreateEcomCoreBookings < ActiveRecord::Migration[6.0]
                    null: false,
                    index: { name: 'er_on_bb_indx' },
                    foreign_key: { to_table: :ecom_core_users }
-      t.references :booked_for,
-                   null: false,
-                   index: { name: 'booking_on_bf_indx' },
-                   foreign_key: { to_table: :ecom_core_users }
       t.string :remark
       t.string :status, null: false
 

data/db/migrate/{20200603115317_create_ecom_core_booked_equipment_items.rb → 20200603115317_create_ecom_core_booked_items.rb}

@@ -1,6 +1,6 @@
-class CreateEcomCoreBookedEquipmentItems < ActiveRecord::Migration[6.0]
+class CreateEcomCoreBookedItems < ActiveRecord::Migration[6.0]
   def change
-    create_table :ecom_core_booked_equipment_items do |t|
+    create_table :ecom_core_booked_items do |t|
       t.references :booking,
                    null: false,
                    index: { name: 'bei_on_booking_indx' },
@@ -8,7 +8,7 @@ class CreateEcomCoreBookedEquipmentItems < ActiveRecord::Migration[6.0]
       t.references :requested_item,
                   null: false,
                   index: { name: 'bei_on_ri_indx' },
-                   foreign_key: { to_table: :ecom_core_bookings }
+                  foreign_key: { to_table: :ecom_core_requested_items }
       t.references :equipment_item,
                    null: false,
                    index: { name: 'be_on_ei_indx' },

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.13'.freeze
+    VERSION = '1.2.18'.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::Name.name }
+    sequence :code do |n|
+      "AMCode#{n}"
+    end
     name { FFaker::Name.name }
   end
 end

data/spec/factories/ecom/core/{booked_equipment_items.rb → booked_items.rb}

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :booked_equipment_item, class: Ecom::Core::BookedEquipmentItem do
+  factory :booked_item, class: Ecom::Core::BookedItem do
     association :booking
     association :requested_item
     association :equipment_item

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

@@ -2,7 +2,6 @@ FactoryBot.define do
   factory :booking, class: Ecom::Core::Booking do
     association :equipment_request
     association :booked_by, factory: :user
-    association :booked_for, factory: :user
     remark { FFaker::Name.name }
     status { Ecom::Core::Booking::UNAPPROVED }
   end

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

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :company, class: Ecom::Core::Company do
-    code { FFaker::Name.name }
+    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/product_groups.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :product_group, class: Ecom::Core::ProductGroup do
+    name { FFaker::Name.name }
+    association :project
+  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/resource_types.rb

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :resource_type, class: Ecom::Core::ResourceType do
-    code { FFaker::Name.name }
+    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_resources.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :task_resource, class: Ecom::Core::TaskResource do
+    association :task
+    association :resource_type, factory: :crew_type
+    date_assigned { Date.today }
+    amount { 1 }
+  end
+end

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::Name.unique.name }
-    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,14 +1,12 @@
 FactoryBot.define do
   factory :task_template, class: Ecom::Core::TaskTemplate do
-    code { FFaker::Name.name }
+    sequence :code do |n|
+      "TTCode#{n}"
+    end
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     association :task_template_type
-
-    factory :task_template_with_product_template do
-      after :create do |task_template, _|
-        create(:work_product_template, task_template: task_template)
-      end
-    end
+    has_takeoff_fields { false }
+    fields { [{ name: 'length', label: 'Length' }] }
   end
 end

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

@@ -1,10 +1,21 @@
 FactoryBot.define do
   factory :task, class: Ecom::Core::Task do
-    code { FFaker::Name.name }
+    sequence :code do |n|
+      "TCode#{n}"
+    end
     name { FFaker::Name.name }
     description { FFaker::Name.name }
-    ancestry { FFaker::Name.name }
-    association :project
+    start_date { Date.yesterday }
+    end_date { Date.today }
+    status { :new }
+    percent_completed { 0 }
+    remark { FFaker::Name.name }
+    association :performer, factory: :user
+    association :approver, factory: :user
+    association :supervisor, factory: :user
+    association :quality_controller, factory: :user
     association :task_template
+    association :work_product
+    association :work_package
   end
 end

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

@@ -0,0 +1,12 @@
+FactoryBot.define do
+  factory :work_package, class: Ecom::Core::WorkPackage do
+    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,9 +1,12 @@
 FactoryBot.define do
   factory :work_product_template, class: Ecom::Core::WorkProductTemplate do
-    code { FFaker::Name.unique.name }
-    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 }
-    association :task_template
+    association :task_template_type
   end
 end

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

@@ -1,22 +1,20 @@
 FactoryBot.define do
   factory :work_product, class: Ecom::Core::WorkProduct do
-    code { FFaker::Name.name }
-    name { FFaker::Name.unique.name }
+    name { FFaker::Name.name }
     description { FFaker::Name.name }
-    design_reference_no { FFaker::Name.name }
+    design_reference_no { FFaker::Guid.guid }
     dimension { [{ label: 'Length', name: 'length', value: 12 }] }
-    association :task
+    association :product_group
     association :work_product_template
     association :project
-    assignment_status { :unassigned }
-    task_status { :new }
+    status { Ecom::Core::WorkProduct::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 }
+    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.13
+  version: 1.2.18
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-06 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -205,7 +205,7 @@ files:
 - app/models/ecom/core/application_record.rb
 - app/models/ecom/core/attendance_sheet.rb
 - app/models/ecom/core/attendance_sheet_entry.rb
-- app/models/ecom/core/booked_equipment_item.rb
+- app/models/ecom/core/booked_item.rb
 - app/models/ecom/core/booking.rb
 - app/models/ecom/core/company.rb
 - app/models/ecom/core/component_type.rb
@@ -234,6 +234,7 @@ files:
 - app/models/ecom/core/payment.rb
 - app/models/ecom/core/payment_detail.rb
 - app/models/ecom/core/payroll.rb
+- app/models/ecom/core/product_group.rb
 - app/models/ecom/core/product_type.rb
 - app/models/ecom/core/project.rb
 - app/models/ecom/core/project_crew.rb
@@ -242,12 +243,12 @@ files:
 - app/models/ecom/core/stakeholder.rb
 - app/models/ecom/core/stakeholder_type.rb
 - app/models/ecom/core/task.rb
+- app/models/ecom/core/task_resource.rb
 - app/models/ecom/core/task_template.rb
 - 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
 - app/serializers/ecom/core/application_module_serializer.rb
@@ -270,17 +271,18 @@ 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/20191202103735_create_ecom_core_tasks.rb
+- db/migrate/20191201251015_create_ecom_core_product_groups.rb
 - db/migrate/20191202105355_create_task_templates_resource_types.rb
 - db/migrate/20191202220752_create_ecom_core_application_modules.rb
 - db/migrate/20191202220832_create_ecom_core_users.rb
 - db/migrate/20191202220953_create_ecom_core_user_roles.rb
 - 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
 - db/migrate/20191225121850_create_ecom_core_project_crews.rb
 - db/migrate/20191225140433_create_ecom_core_attendance_sheets.rb
@@ -302,7 +304,7 @@ files:
 - db/migrate/20200601104719_create_ecom_core_equipment_requests.rb
 - db/migrate/20200602130247_create_ecom_core_requested_items.rb
 - db/migrate/20200602830603_create_ecom_core_bookings.rb
-- db/migrate/20200603115317_create_ecom_core_booked_equipment_items.rb
+- db/migrate/20200603115317_create_ecom_core_booked_items.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
@@ -311,7 +313,7 @@ files:
 - spec/factories/ecom/core/application_modules.rb
 - spec/factories/ecom/core/attendance_sheet_entries.rb
 - spec/factories/ecom/core/attendance_sheets.rb
-- spec/factories/ecom/core/booked_equipment_items.rb
+- spec/factories/ecom/core/booked_items.rb
 - spec/factories/ecom/core/bookings.rb
 - spec/factories/ecom/core/companies.rb
 - spec/factories/ecom/core/component_types.rb
@@ -340,6 +342,7 @@ files:
 - spec/factories/ecom/core/payment_details.rb
 - spec/factories/ecom/core/payments.rb
 - spec/factories/ecom/core/payrolls.rb
+- spec/factories/ecom/core/product_groups.rb
 - spec/factories/ecom/core/product_types.rb
 - spec/factories/ecom/core/project_crews.rb
 - spec/factories/ecom/core/projects.rb
@@ -347,13 +350,13 @@ files:
 - spec/factories/ecom/core/resource_types.rb
 - spec/factories/ecom/core/stakeholder_types.rb
 - spec/factories/ecom/core/stakeholders.rb
+- spec/factories/ecom/core/task_resources.rb
 - spec/factories/ecom/core/task_template_types.rb
 - spec/factories/ecom/core/task_templates.rb
 - 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
 homepage: http://www.mks.com.et

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 :work_product
-
-      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/20191202103735_create_ecom_core_tasks.rb

@@ -1,20 +0,0 @@
-class CreateEcomCoreTasks < ActiveRecord::Migration[6.0]
-  def change
-    create_table :ecom_core_tasks do |t|
-      t.string :code, null: false
-      t.string :name, null: false
-      t.string :description
-      t.string :ancestry
-      t.references :project,
-                   null: false,
-                   index: { name: 'tasks_on_project_indx' },
-                   foreign_key: { to_table: :ecom_core_projects }
-      t.references :task_template,
-                   null: false,
-                   index: { name: 'tt_on_project_indx' },
-                   foreign_key: { to_table: :ecom_core_task_templates }
-
-      t.timestamps
-    end
-  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,11 +0,0 @@
-FactoryBot.define do
-  factory :work_component_template, class: Ecom::Core::WorkComponentTemplate do
-    code { FFaker::Name.name }
-    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