ecom_core 1.2.34 → 1.3.2

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

@@ -10,10 +10,16 @@ FactoryBot.define do
     status { :new }
     percent_completed { 0 }
     remark { FFaker::Name.name }
+    inspection_submission_date { Date.today }
+    inspection_status { Ecom::Core::Task::NOT_INSPECTED }
+    change_order { false }
+    change_order_for { nil }
+    percentage_contribution { nil }
+    quantity { nil }
     association :performer, factory: :user
-    association :approver, factory: :user
-    association :supervisor, factory: :user
-    association :quality_controller, factory: :user
+    association :client_consultant, factory: :user
+    association :foreman, factory: :user
+    association :inspector, factory: :user
     association :task_template
     association :work_product
     association :work_package

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

@@ -0,0 +1,13 @@
+FactoryBot.define do
+  factory :unit_cost, class: Ecom::Core::UnitCost do
+    association :resource_type
+    quantity { 55 }
+    association :measurement_unit
+    price { 100 }
+    association :currency
+    effective_date { Time.now }
+    active { true }
+    utilization_factor { 1 }
+    association :set_by, factory: :user
+  end
+end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :unit_of_measure, class: Ecom::Core::UnitOfMeasure do
+    code { FFaker::Name.name }
+    name { FFaker::Name.name }
+    description { FFaker::Name.name }
+  end
+end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :work_item_resource_requirement_template, class: Ecom::Core::WorkItemResourceRequirementTemplate do
+    association :project_work_item_template
+    association :resource_type
+    work_item_quantity { 120 }
+    association :work_item_quantity_measurement_unit, factory: :non_si_measurement_unit
+    resource_quantity { 100 }
+    association :resource_quantity_measurement_unit, factory: :non_si_measurement_unit
+  end
+end

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

@@ -7,6 +7,12 @@ FactoryBot.define do
     description { FFaker::Name.name }
     start_date { Date.yesterday }
     end_date { Date.today }
+    location { FFaker::Name.name }
+    budget { 1000 }
+    resource_required { FFaker::Name.name }
+    concerns { FFaker::Name.name }
+    association :site_engineer, factory: :user
+    association :project_manager, factory: :user
     association :project
   end
 end

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

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

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

@@ -2,18 +2,12 @@ FactoryBot.define do
   factory :work_product, class: Ecom::Core::WorkProduct do
     name { FFaker::Name.name }
     description { FFaker::Name.name }
-    design_reference_no { FFaker::Guid.guid }
+    design_reference { FFaker::Guid.guid }
     association :product_group
     association :work_product_template
     association :project
-    status { Ecom::Core::WorkProduct::NEW }
-    percent_completed { FFaker::Random.rand(1..100) }
     remark { FFaker::Name.name }
-    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.34
+  version: 1.3.2
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-10 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -156,6 +156,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog-google
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -252,7 +266,6 @@ files:
 - README.md
 - Rakefile
 - app/constants/ecom/core/status_constants.rb
-- app/controllers/concerns/ecom/core/filterable.rb
 - app/controllers/concerns/ecom/core/lookupable.rb
 - app/controllers/concerns/ecom/core/resource_typeable.rb
 - app/controllers/ecom/core/access_controller.rb
@@ -263,14 +276,16 @@ files:
 - app/controllers/ecom/core/equipment_types_controller.rb
 - app/controllers/ecom/core/material_types_controller.rb
 - app/controllers/ecom/core/menus_controller.rb
-- app/controllers/ecom/core/project_crews_controller.rb
 - app/controllers/ecom/core/projects_controller.rb
+- app/controllers/ecom/core/site_crews_controller.rb
+- app/controllers/ecom/core/unit_costs_controller.rb
 - app/controllers/ecom/core/user_roles_controller.rb
 - app/controllers/ecom/core/users_controller.rb
 - app/models/ecom/core/application_module.rb
 - 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/available_unit_of_measurement.rb
 - app/models/ecom/core/booked_item.rb
 - app/models/ecom/core/booking.rb
 - app/models/ecom/core/company.rb
@@ -279,6 +294,8 @@ files:
 - app/models/ecom/core/country.rb
 - app/models/ecom/core/crew.rb
 - app/models/ecom/core/crew_contract.rb
+- app/models/ecom/core/crew_contract_transaction.rb
+- app/models/ecom/core/crew_id_card.rb
 - app/models/ecom/core/crew_overtime.rb
 - app/models/ecom/core/crew_time.rb
 - app/models/ecom/core/crew_type.rb
@@ -293,14 +310,23 @@ files:
 - app/models/ecom/core/equipment_request.rb
 - app/models/ecom/core/equipment_type.rb
 - app/models/ecom/core/equipment_valuation.rb
+- app/models/ecom/core/inspection_checklist.rb
 - app/models/ecom/core/job_card.rb
 - app/models/ecom/core/location_type.rb
+- app/models/ecom/core/lookahead_plan.rb
+- app/models/ecom/core/lookahead_plan_history.rb
+- app/models/ecom/core/lookahead_plan_review_time.rb
+- app/models/ecom/core/lookahead_plan_task_progress.rb
 - app/models/ecom/core/lookup.rb
 - app/models/ecom/core/maintenance_category.rb
 - app/models/ecom/core/maintenance_cost.rb
 - app/models/ecom/core/maintenance_service_order.rb
 - app/models/ecom/core/maintenance_status.rb
 - app/models/ecom/core/maintenance_type.rb
+- app/models/ecom/core/material.rb
+- app/models/ecom/core/material_identity.rb
+- app/models/ecom/core/material_item.rb
+- app/models/ecom/core/material_sub_type.rb
 - app/models/ecom/core/material_type.rb
 - app/models/ecom/core/measurement_unit.rb
 - app/models/ecom/core/menu.rb
@@ -310,27 +336,34 @@ files:
 - app/models/ecom/core/payment.rb
 - app/models/ecom/core/payment_detail.rb
 - app/models/ecom/core/payroll.rb
-- app/models/ecom/core/plan.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
+- app/models/ecom/core/project_template.rb
+- app/models/ecom/core/project_work_item_template.rb
 - app/models/ecom/core/requested_item.rb
+- app/models/ecom/core/resource_requisition.rb
+- app/models/ecom/core/resource_requisition_item.rb
 - app/models/ecom/core/resource_type.rb
 - app/models/ecom/core/schedule_setting.rb
 - app/models/ecom/core/schedule_unit.rb
+- app/models/ecom/core/site.rb
+- app/models/ecom/core/site_crew.rb
 - app/models/ecom/core/stakeholder.rb
 - app/models/ecom/core/stakeholder_type.rb
 - app/models/ecom/core/takeoff.rb
-- app/models/ecom/core/takeoff_calculator.rb
 - app/models/ecom/core/task.rb
+- app/models/ecom/core/task_attachment.rb
+- app/models/ecom/core/task_inspection_checklist.rb
 - app/models/ecom/core/task_resource.rb
-- app/models/ecom/core/task_step.rb
-- app/models/ecom/core/task_step_dependency.rb
 - app/models/ecom/core/task_template.rb
+- app/models/ecom/core/task_template_inspection_checklist.rb
 - app/models/ecom/core/task_template_type.rb
+- app/models/ecom/core/unit_cost.rb
+- app/models/ecom/core/unit_of_measure.rb
 - app/models/ecom/core/user.rb
 - app/models/ecom/core/user_role.rb
+- app/models/ecom/core/work_item_resource_requirement_template.rb
 - app/models/ecom/core/work_order.rb
 - app/models/ecom/core/work_package.rb
 - app/models/ecom/core/work_product.rb
@@ -338,28 +371,35 @@ files:
 - app/serializers/ecom/core/application_module_serializer.rb
 - app/serializers/ecom/core/lookup_serializer.rb
 - app/serializers/ecom/core/resource_type_serializer.rb
+- app/serializers/ecom/core/unit_cost_serializer.rb
 - app/serializers/ecom/core/user_role_serializer.rb
 - app/serializers/ecom/core/user_serializer.rb
+- app/services/ecom/core/crew_contract_transaction_service.rb
 - app/services/ecom/core/menu_service.rb
-- app/services/ecom/core/project_crew_service.rb
+- app/services/ecom/core/site_crew_service.rb
 - app/services/ecom/core/token_auth_service.rb
 - app/uploaders/ecom/core/photo_uploader.rb
+- app/uploaders/ecom/core/task_attachment_uploader.rb
 - app/validators/ecom/core/date_range_validator.rb
 - config/database.ci.yml
+- config/initializers/carrierwave.rb
 - config/routes.rb
 - db/migrate/20190101085530_create_ecom_core_companies.rb
 - db/migrate/20190101112620_create_ecom_core_lookups.rb
 - db/migrate/20190101112625_create_ecom_core_overtime_types.rb
+- db/migrate/20191118052213_create_ecom_core_unit_of_measures.rb
 - db/migrate/20191119010518_create_ecom_core_task_template_types.rb
-- db/migrate/20191119012027_create_ecom_core_takeoff_calculators.rb
 - db/migrate/20191119012030_create_ecom_core_task_templates.rb
 - db/migrate/20191119013236_create_ecom_core_work_product_templates.rb
+- db/migrate/20191119021405_create_ecom_core_project_templates.rb
+- db/migrate/20191119034319_create_ecom_core_project_work_item_templates.rb
 - db/migrate/20191119144141_create_ecom_core_stakeholder_types.rb
 - 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/20191201145816_create_ecom_core_currencies.rb
 - db/migrate/20191201145848_create_ecom_core_projects.rb
+- db/migrate/20191201145849_create_ecom_core_sites.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
@@ -369,11 +409,10 @@ files:
 - db/migrate/20191202222210_create_ecom_core_work_packages.rb
 - db/migrate/20191202235434_create_ecom_core_work_products.rb
 - db/migrate/20191207103729_create_ecom_core_crews.rb
-- db/migrate/20191207103730_create_ecom_core_plans.rb
+- db/migrate/20191207103730_create_ecom_core_lookahead_plans.rb
 - db/migrate/20191207103731_create_ecom_core_work_orders.rb
 - db/migrate/20191207103735_create_ecom_core_tasks.rb
 - db/migrate/20191210724614_create_ecom_core_task_resources.rb
-- db/migrate/20191225121850_create_ecom_core_project_crews.rb
 - db/migrate/20191225140433_create_ecom_core_attendance_sheets.rb
 - db/migrate/20191225162539_create_ecom_core_attendance_sheet_entries.rb
 - db/migrate/20191225211712_create_ecom_core_crew_times.rb
@@ -394,10 +433,12 @@ files:
 - db/migrate/20200602130247_create_ecom_core_requested_items.rb
 - db/migrate/20200602830603_create_ecom_core_bookings.rb
 - db/migrate/20200603115317_create_ecom_core_booked_items.rb
+- db/migrate/20200616044231_create_ecom_core_material_sub_types.rb
+- db/migrate/20200616051902_create_ecom_core_material_identities.rb
+- db/migrate/20200618105233_create_ecom_core_material_items.rb
 - db/migrate/20200813165553_create_ecom_core_measurement_units.rb
+- db/migrate/20200813165555_create_ecom_core_available_unit_of_measurements.rb
 - db/migrate/20200814043632_create_ecom_core_takeoffs.rb
-- db/migrate/20200820123719_create_ecom_core_task_steps.rb
-- db/migrate/20200821130934_create_ecom_core_task_step_dependencies.rb
 - db/migrate/20200901085227_create_ecom_core_crew_contracts.rb
 - db/migrate/20200901134912_create_ecom_core_dimension_elements.rb
 - db/migrate/20200919053331_create_ecom_core_maintenance_types.rb
@@ -406,28 +447,45 @@ files:
 - db/migrate/20200919085613_create_ecom_core_job_cards.rb
 - db/migrate/20200919101941_create_ecom_core_cost_types.rb
 - db/migrate/20200919102802_create_ecom_core_maintenance_costs.rb
+- db/migrate/20201013072924_create_ecom_core_crew_contract_transactions.rb
+- db/migrate/20201013090609_create_ecom_core_site_crews.rb.rb
+- db/migrate/20201013094100_create_ecom_core_crew_id_cards.rb
+- db/migrate/20201113050953_create_ecom_core_task_inspection_checklists.rb
+- db/migrate/20201113094302_create_ecom_core_task_template_inspection_checklists.rb
+- db/migrate/20201121064916_create_ecom_core_unit_costs.rb
+- db/migrate/20201122123227_create_ecom_core_lookahead_plan_backlogs.rb
+- db/migrate/20201122170645_create_ecom_core_lookahead_plan_histories.rb
+- db/migrate/20201122170724_create_ecom_core_lookahead_plan_task_progresses.rb
+- db/migrate/20201123134917_create_ecom_core_task_attachments.rb
+- db/migrate/20201124171642_create_ecom_core_lookahead_plan_review_times.rb
+- db/migrate/20201125191158_create_ecom_core_work_item_resource_requirement_templates.rb
+- db/migrate/20201126191334_create_ecom_core_resource_requisitions.rb
+- db/migrate/20201126191349_create_ecom_core_resource_requisition_items.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
 - lib/ecom_core.rb
 - lib/tasks/ecom_core_tasks.rake
-- spec/factories/dimension_elements.rb
 - 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/available_unit_of_measurements.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
 - spec/factories/ecom/core/cost_types.rb
 - spec/factories/ecom/core/countries.rb
+- spec/factories/ecom/core/crew_contract_transactions.rb
 - spec/factories/ecom/core/crew_contracts.rb
+- spec/factories/ecom/core/crew_id_cards.rb
 - spec/factories/ecom/core/crew_overtimes.rb
 - spec/factories/ecom/core/crew_times.rb
 - spec/factories/ecom/core/crew_types.rb
 - spec/factories/ecom/core/crews.rb
 - spec/factories/ecom/core/currencies.rb
 - spec/factories/ecom/core/custom_payment_details.rb
+- spec/factories/ecom/core/dimension_elements.rb
 - spec/factories/ecom/core/equipment.rb
 - spec/factories/ecom/core/equipment_categories.rb
 - spec/factories/ecom/core/equipment_components.rb
@@ -436,15 +494,25 @@ files:
 - spec/factories/ecom/core/equipment_requests.rb
 - spec/factories/ecom/core/equipment_types.rb
 - spec/factories/ecom/core/equipment_valuations.rb
+- spec/factories/ecom/core/inspection_checklists.rb
 - spec/factories/ecom/core/job_cards.rb
 - spec/factories/ecom/core/location_types.rb
+- spec/factories/ecom/core/lookahead_plan_histories.rb
+- spec/factories/ecom/core/lookahead_plan_review_times.rb
+- spec/factories/ecom/core/lookahead_plan_task_progresses.rb
+- spec/factories/ecom/core/lookahead_plans.rb
 - spec/factories/ecom/core/lookups.rb
 - spec/factories/ecom/core/maintenance_categories.rb
 - spec/factories/ecom/core/maintenance_costs.rb
 - spec/factories/ecom/core/maintenance_service_orders.rb
 - spec/factories/ecom/core/maintenance_statuses.rb
 - spec/factories/ecom/core/maintenance_types.rb
+- spec/factories/ecom/core/material_identities.rb
+- spec/factories/ecom/core/material_items.rb
+- spec/factories/ecom/core/material_sub_types.rb
 - spec/factories/ecom/core/material_types.rb
+- spec/factories/ecom/core/materials.rb
+- spec/factories/ecom/core/measurement_units.rb
 - spec/factories/ecom/core/menus.rb
 - spec/factories/ecom/core/overtime_sheet_entries.rb
 - spec/factories/ecom/core/overtime_sheets.rb
@@ -452,32 +520,38 @@ files:
 - spec/factories/ecom/core/payment_details.rb
 - spec/factories/ecom/core/payments.rb
 - spec/factories/ecom/core/payrolls.rb
-- spec/factories/ecom/core/plans.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/project_templates.rb
+- spec/factories/ecom/core/project_work_item_templates.rb
 - spec/factories/ecom/core/projects.rb
 - spec/factories/ecom/core/requested_items.rb
+- spec/factories/ecom/core/resource_requisition_items.rb
+- spec/factories/ecom/core/resource_requisitions.rb
 - spec/factories/ecom/core/resource_types.rb
 - spec/factories/ecom/core/schedule_settings.rb
 - spec/factories/ecom/core/schedule_units.rb
+- spec/factories/ecom/core/site_crews.rb
+- spec/factories/ecom/core/sites.rb
 - spec/factories/ecom/core/stakeholder_types.rb
 - spec/factories/ecom/core/stakeholders.rb
-- spec/factories/ecom/core/takeoff_calculators.rb
 - spec/factories/ecom/core/takeoffs.rb
+- spec/factories/ecom/core/task_attachments.rb
+- spec/factories/ecom/core/task_inspection_checklists.rb
 - spec/factories/ecom/core/task_resources.rb
-- spec/factories/ecom/core/task_step_dependencies.rb
-- spec/factories/ecom/core/task_steps.rb
+- spec/factories/ecom/core/task_template_inspection_checklists.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/unit_costs.rb
+- spec/factories/ecom/core/unit_of_measures.rb
 - spec/factories/ecom/core/user_roles.rb
 - spec/factories/ecom/core/users.rb
+- spec/factories/ecom/core/work_item_resource_requirement_templates.rb
 - spec/factories/ecom/core/work_orders.rb
 - spec/factories/ecom/core/work_packages.rb
 - spec/factories/ecom/core/work_product_templates.rb
 - spec/factories/ecom/core/work_products.rb
-- spec/factories/measurement_units.rb
 homepage: http://www.mks.com.et
 licenses:
 - MIT
@@ -497,7 +571,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Core engine for construction management application.

data/app/controllers/concerns/ecom/core/filterable.rb

@@ -1,14 +0,0 @@
-module Ecom
-  module Core
-    module Filterable
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        def filter(filtering_params)
-          results = where(nil)
-          results.public_send('filter_by_condition', filtering_params) if filtering_params.present?
-        end
-      end
-    end
-  end
-end

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

@@ -1,18 +0,0 @@
-module Ecom
-  module Core
-    class Plan < ApplicationRecord
-      NEW = 'New'.freeze
-      READY_TO_START = 'Ready to start'.freeze
-      IN_PROGRESS = 'In Progress'.freeze
-      COMPLETED = 'Completed'.freeze
-
-      STATUSES = [NEW, READY_TO_START, IN_PROGRESS, COMPLETED].freeze
-
-      validates :name, :start_date, :end_date, :status, presence: true
-
-      validates :status, presence: true, inclusion: STATUSES
-
-      has_many :tasks
-    end
-  end
-end