ecom_core 1.2.30 → 1.2.35

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

@@ -3,6 +3,6 @@ FactoryBot.define do
     month { 1 }
     year { 2000 }
     approved { false }
-    association :project
+    association :site
   end
 end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :plan, class: Ecom::Core::Plan do
+    name { FFaker::Name.name }
+    start_date { Time.now }
+    end_date { (Time.now + 1.day).to_s }
+    status { Ecom::Core::Plan::STATUSES.sample }
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :project_template, class: Ecom::Core::ProjectTemplate do
+    code { FFaker::Name.name }
+    name { FFaker::Name.name }
+    description { FFaker::Name.name }
+    association :task_template_type
+  end
+end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :project_work_item_template, class: Ecom::Core::ProjectWorkItemTemplate do
+    association :task_template
+    association :work_product_template
+    association :project_template
+  end
+end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :site_crew, class: Ecom::Core::SiteCrew do
+    association :crew
+    association :site
+    site_crew_type { Ecom::Core::SiteCrew::SITE_CREW_TYPES.sample }
+    start_date { Time.now }
+    end_date { Time.now + 1.month }
+    status { 'Active' }
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :site, class: Ecom::Core::Site do
+    name { FFaker::Name.name }
+    address { FFaker::Address.street_address }
+    association :project
+    status { Ecom::Core::Site::STATUSES.sample }
+  end
+end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :takeoff, class: Ecom::Core::Takeoff do
+    association :task
+    takeoff_quantity { 33 }
+  end
+end

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

@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :task_inspection_checklist, class: Ecom::Core::TaskInspectionChecklist do
+    name { FFaker::Name.name }
+    date_of_inspection { Date.today }
+    association :inspected_by, factory: :user
+    status { Ecom::Core::TaskInspectionChecklist::NOT_INSPECTED }
+    remark { FFaker::Name.name }
+    recommendation { FFaker::Name.name }
+    association :task
+  end
+end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :task_template_inspection_checklist, class: Ecom::Core::TaskTemplateInspectionChecklist do
+    association :task_template
+    association :inspection_checklist
+    standard { FFaker::Name.name }
+  end
+end

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

@@ -7,6 +7,16 @@ FactoryBot.define do
     description { FFaker::Name.name }
     association :task_template_type
     has_takeoff_fields { false }
-    fields { [{ name: 'length', label: 'Length' }] }
+    takeoff_fields { [{ name: 'length', label: 'Length' }] }
+    percentage_contribution { nil }
+    task_sequence { 1 }
+    has_inspection { false }
+    discipline { false }
+    task_completion_detail do
+      [
+        { name: 'length', label: 'Length' },
+        { name: 'width', label: 'Width' }
+      ]
+    end
   end
 end

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

@@ -10,10 +10,15 @@ 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 }
     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/work_orders.rb

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :work_order, class: Ecom::Core::WorkOrder do
+    name { FFaker::Name.unique.name }
+    association :assigned_to, factory: :crew
+    association :generated_by, factory: :user
+    start_date { (Time.now + 1.day).to_s }
+    end_date { (Time.now + 1.month).to_s }
+    status { Ecom::Core::WorkOrder::STATUSES.sample }
+  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,19 +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 }
-    dimension { [{ label: 'Length', name: 'length', value: 12 }] }
+    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.30
+  version: 1.2.35
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -142,6 +142,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.0.3
+- !ruby/object:Gem::Dependency
+  name: json-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -248,14 +262,15 @@ 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/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
@@ -264,11 +279,14 @@ 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
 - app/models/ecom/core/currency.rb
 - app/models/ecom/core/custom_payment_detail.rb
+- app/models/ecom/core/dimension_element.rb
 - app/models/ecom/core/equipment.rb
 - app/models/ecom/core/equipment_category.rb
 - app/models/ecom/core/equipment_component.rb
@@ -277,6 +295,7 @@ 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/lookup.rb
@@ -285,7 +304,12 @@ files:
 - 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
 - app/models/ecom/core/overtime_sheet.rb
 - app/models/ecom/core/overtime_sheet_entry.rb
@@ -293,22 +317,30 @@ 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_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/task.rb
+- app/models/ecom/core/task_inspection_checklist.rb
 - app/models/ecom/core/task_resource.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/user.rb
 - app/models/ecom/core/user_role.rb
+- app/models/ecom/core/work_order.rb
 - app/models/ecom/core/work_package.rb
 - app/models/ecom/core/work_product.rb
 - app/models/ecom/core/work_product_template.rb
@@ -317,8 +349,9 @@ files:
 - app/serializers/ecom/core/resource_type_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/validators/ecom/core/date_range_validator.rb
@@ -330,12 +363,15 @@ files:
 - db/migrate/20191119010518_create_ecom_core_task_template_types.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
@@ -344,10 +380,11 @@ 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/20191207103729_create_ecom_core_crews.rb
+- db/migrate/20191207103730_create_ecom_core_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/20191225100054_create_ecom_core_crews.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
@@ -368,14 +405,25 @@ 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/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
 - db/migrate/20200919072216_create_ecom_core_schedule_settings.rb
 - db/migrate/20200919081338_create_ecom_core_maintenance_service_orders.rb
 - 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/20200922044959_add_costs_approved_to_job_card.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
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
@@ -384,19 +432,23 @@ 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/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
@@ -405,6 +457,7 @@ 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/lookups.rb
@@ -413,7 +466,12 @@ files:
 - 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
@@ -421,22 +479,30 @@ 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_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/takeoffs.rb
+- spec/factories/ecom/core/task_inspection_checklists.rb
 - spec/factories/ecom/core/task_resources.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/user_roles.rb
 - spec/factories/ecom/core/users.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

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

@@ -1,39 +0,0 @@
-module Ecom
-  module Core
-    class ProjectCrewService
-      def update(params)
-        id = params[:project_id]
-        crew = params[:crew]
-
-        # Process new additions
-        new_crew = crew.select { |c| c[:status] == 'checked' }
-        removed = crew.select { |c| c[:status] == 'unchecked' }
-
-        crew_ids = new_crew.map { |c| c[:crew_id] }
-
-        project_crew = Ecom::Core::Crew.where(id: crew_ids)
-
-        new_entries = []
-        new_crew.each do |nc|
-          new_entries << Ecom::Core::ProjectCrew.new(
-            project_id: id, crew_id: nc[:crew_id], start_date: Date.today, status: 'Active'
-          )
-        end
-
-        Ecom::Core::ProjectCrew.transaction do
-          new_entries.each(&:save)
-        end
-
-        removed_ids = removed.map { |r| r[:crew_id] }
-        if removed_ids.count.positive?
-          removed_crew = Ecom::Core::ProjectCrew.where(project_id: id, crew_id: removed_ids)
-          Ecom::Core::ProjectCrew.transaction do
-            removed_crew.map(&:delete)
-          end
-        end
-
-        { success: true, data: project_crew }
-      end
-    end
-  end
-end