ecom_core 1.2.5 → 1.2.6

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :payment, class: 'Ecom::Core::Payment' do
+  factory :payment, class: Ecom::Core::Payment do
     from { Date.parse('2000-01-01') }
     to { Date.parse('2000-01-15') }
     approved { false }

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

@@ -1,7 +1,8 @@
 FactoryBot.define do
-  factory :payroll, class: 'Ecom::Core::Payroll' do
+  factory :payroll, class: Ecom::Core::Payroll do
     month { 1 }
     year { 2000 }
     approved { false }
+    association :project
   end
 end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :product_type, class: 'Ecom::Core::ProductType' do
+  factory :product_type, class: Ecom::Core::ProductType do
     name { FFaker::Name.name }
     association :work_product_template
     dimension { [{ name: 'length', label: 'length' }, { name: 'width', label: 'width' }] }

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :project_crew, class: Ecom::Core::ProjectCrew do
+    association :project
+    association :crew
+    start_date { 1.month.ago }
+    end_date { Date.tomorrow }
+    status { Ecom::Core::ProjectCrew::ACTIVE }
+  end
+end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :project, class: 'Ecom::Core::Project' do
+  factory :project, class: Ecom::Core::Project do
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     location { FFaker::Name.name }
@@ -19,5 +19,6 @@ FactoryBot.define do
     retention { FFaker::Random.rand(0..100) }
     remark { FFaker::Name.name }
     association :currency
+    association :company
   end
 end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :resource_type, class: 'Ecom::Core::ResourceType' do
+  factory :resource_type, class: Ecom::Core::ResourceType do
     code { FFaker::Name.name }
     name { FFaker::Name.name }
     base_unit { FFaker::Name.name }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :stakeholder_type, class: 'Ecom::Core::StakeholderType' do
+  factory :stakeholder_type, class: Ecom::Core::StakeholderType do
     name { FFaker::Name.name }
   end
 end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :stakeholder, class: 'Ecom::Core::Stakeholder' do
+  factory :stakeholder, class: Ecom::Core::Stakeholder do
     name { FFaker::Name.unique.name }
     type_of_business { FFaker::Name.name }
     address { FFaker::Name.name }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :task_template_type, class: 'Ecom::Core::TaskTemplateType' do
+  factory :task_template_type, class: Ecom::Core::TaskTemplateType do
     code { FFaker::Name.unique.name }
     name { FFaker::Name.unique.name }
   end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :task_template, class: 'Ecom::Core::TaskTemplate' do
+  factory :task_template, class: Ecom::Core::TaskTemplate do
     code { FFaker::Name.name }
     name { FFaker::Name.name }
     description { FFaker::Name.name }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :task, class: 'Ecom::Core::Task' do
+  factory :task, class: Ecom::Core::Task do
     code { FFaker::Name.name }
     name { FFaker::Name.name }
     description { FFaker::Name.name }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :user_role, class: 'Ecom::Core::UserRole' do
+  factory :user_role, class: Ecom::Core::UserRole do
     name { FFaker::Name.name }
     association :application_module
   end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :user, class: 'Ecom::Core::User' do
+  factory :user, class: Ecom::Core::User do
     first_name { FFaker::Name.name }
     last_name { FFaker::Name.name }
     email { FFaker::Internet.email }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :work_component_template, class: 'Ecom::Core::WorkComponentTemplate' do
+  factory :work_component_template, class: Ecom::Core::WorkComponentTemplate do
     code { FFaker::Name.name }
     name { FFaker::Name.name }
     description { FFaker::Name.name }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :work_component, class: 'Ecom::Core::WorkComponent' do
+  factory :work_component, class: Ecom::Core::WorkComponent do
     name { FFaker::Name.name }
     dimension { [{ label: 'Length', name: 'length', value: 10 }] }
     assignment_status { :unassigned }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :work_product_template, class: 'Ecom::Core::WorkProductTemplate' do
+  factory :work_product_template, class: Ecom::Core::WorkProductTemplate do
     code { FFaker::Name.unique.name }
     name { FFaker::Name.unique.name }
     description { FFaker::Name.name }

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
-  factory :work_product, class: 'Ecom::Core::WorkProduct' do
+  factory :work_product, class: Ecom::Core::WorkProduct do
     code { FFaker::Name.unique.name }
-    name { FFaker::Name.name }
+    name { FFaker::Name.unique.name }
     description { FFaker::Name.name }
     design_reference_no { FFaker::Name.name }
     dimension { [{ label: 'Length', name: 'length', value: 12 }] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-10 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -204,6 +218,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/company.rb
 - app/models/ecom/core/crew.rb
 - app/models/ecom/core/crew_overtime.rb
 - app/models/ecom/core/crew_time.rb
@@ -229,6 +244,7 @@ files:
 - app/models/ecom/core/payroll.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/resource_type.rb
 - app/models/ecom/core/stakeholder.rb
 - app/models/ecom/core/stakeholder_type.rb
@@ -250,6 +266,7 @@ files:
 - app/services/ecom/core/token_auth_service.rb
 - config/database.ci.yml
 - 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/20191119010518_create_ecom_core_task_template_types.rb
@@ -271,14 +288,13 @@ files:
 - db/migrate/20191202235434_create_ecom_core_work_products.rb
 - db/migrate/20191206104247_create_ecom_core_work_components.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
 - db/migrate/20200126081005_create_ecom_core_payrolls.rb
 - db/migrate/20200126082103_create_ecom_core_payments.rb
 - db/migrate/20200126183218_create_ecom_core_payment_details.rb
-- db/migrate/20200207035823_add_additional_columns_to_payment.rb
-- db/migrate/20200207040844_add_net_pay_column_to_payment_details.rb
-- db/migrate/20200210095535_add_advance_column_to_payment_details.rb
-- db/migrate/20200221123207_add_employee_id_to_crew.rb
 - db/migrate/20200307112519_create_ecom_core_custom_payment_details.rb
 - db/migrate/20200315145215_create_ecom_core_equipment_locations.rb
 - db/migrate/20200315150500_create_ecom_core_equipment_categories.rb
@@ -286,17 +302,9 @@ files:
 - db/migrate/20200315153640_create_ecom_core_equipment_items.rb
 - db/migrate/20200315160810_create_ecom_core_equipment_valuations.rb
 - db/migrate/20200316125323_create_ecom_core_equipment_components.rb
-- db/migrate/20200401040433_create_ecom_core_attendance_sheets.rb
-- db/migrate/20200401071343_remove_date_column_from_crew_times.rb
-- db/migrate/20200401122539_create_ecom_core_attendance_sheet_entries.rb
-- db/migrate/20200401142959_relate_crew_time_with_attendance_sheet_entry.rb
-- db/migrate/20200401144137_remove_crew_time_id_from_crew.rb
 - db/migrate/20200410090701_create_ecom_core_overtime_sheets.rb
 - db/migrate/20200410100035_create_ecom_core_overtime_sheet_entries.rb
 - db/migrate/20200410111827_create_ecom_core_crew_overtimes.rb
-- db/migrate/20200413144023_fix_crew_time_columns.rb
-- db/migrate/20200414044144_adjust_crew_overtime_column_names.rb
-- db/migrate/20200414185248_change_time_columns_to_datetime.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
@@ -305,6 +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/companies.rb
 - spec/factories/ecom/core/crew_overtimes.rb
 - spec/factories/ecom/core/crew_times.rb
 - spec/factories/ecom/core/crew_types.rb
@@ -329,6 +338,7 @@ files:
 - spec/factories/ecom/core/payments.rb
 - spec/factories/ecom/core/payrolls.rb
 - spec/factories/ecom/core/product_types.rb
+- spec/factories/ecom/core/project_crews.rb
 - spec/factories/ecom/core/projects.rb
 - spec/factories/ecom/core/resource_types.rb
 - spec/factories/ecom/core/stakeholder_types.rb

data/db/migrate/20200207035823_add_additional_columns_to_payment.rb

@@ -1,6 +0,0 @@
-class AddAdditionalColumnsToPayment < ActiveRecord::Migration[6.0]
-  def change
-    add_column :ecom_core_payments, :approved, :boolean, null: false, default: false
-    add_column :ecom_core_payments, :payment_order, :integer, null: false, default: 1
-  end
-end

data/db/migrate/20200207040844_add_net_pay_column_to_payment_details.rb

@@ -1,5 +0,0 @@
-class AddNetPayColumnToPaymentDetails < ActiveRecord::Migration[6.0]
-  def change
-    add_column :ecom_core_payment_details, :net_pay, :float, null: false, default: 0
-  end
-end

data/db/migrate/20200210095535_add_advance_column_to_payment_details.rb

@@ -1,5 +0,0 @@
-class AddAdvanceColumnToPaymentDetails < ActiveRecord::Migration[6.0]
-  def change
-    add_column :ecom_core_payment_details, :advance, :float, null: false, default: 0
-  end
-end

data/db/migrate/20200221123207_add_employee_id_to_crew.rb

@@ -1,5 +0,0 @@
-class AddEmployeeIdToCrew < ActiveRecord::Migration[6.0]
-  def change
-    add_column :ecom_core_crews, :employee_id, :string
-  end
-end

data/db/migrate/20200401071343_remove_date_column_from_crew_times.rb

@@ -1,5 +0,0 @@
-class RemoveDateColumnFromCrewTimes < ActiveRecord::Migration[6.0]
-  def change
-    remove_column :ecom_core_crew_times, :date
-  end
-end

data/db/migrate/20200401122539_create_ecom_core_attendance_sheet_entries.rb

@@ -1,14 +0,0 @@
-class CreateEcomCoreAttendanceSheetEntries < ActiveRecord::Migration[6.0]
-  def change
-    create_table :ecom_core_attendance_sheet_entries do |t|
-      t.references :attendance_sheet, null: false, index: { name: 'ase_on_as_indx' }
-      t.references :crew, null: false, index: { name: 'ase_on_crew_indx' }
-      t.float :total_hours
-
-      t.timestamps
-    end
-    add_foreign_key :ecom_core_attendance_sheet_entries, :ecom_core_attendance_sheets,
-                    column: :attendance_sheet_id
-    add_foreign_key :ecom_core_attendance_sheet_entries, :ecom_core_crews, column: :crew_id
-  end
-end

data/db/migrate/20200401142959_relate_crew_time_with_attendance_sheet_entry.rb

@@ -1,8 +0,0 @@
-class RelateCrewTimeWithAttendanceSheetEntry < ActiveRecord::Migration[6.0]
-  def change
-    add_column :ecom_core_crew_times, :attendance_sheet_entry_id, :integer,
-               index: { name: 'ase_on_ct_indx' }
-    add_foreign_key :ecom_core_crew_times, :ecom_core_attendance_sheet_entries,
-                    column: :attendance_sheet_entry_id
-  end
-end

data/db/migrate/20200401144137_remove_crew_time_id_from_crew.rb

@@ -1,7 +0,0 @@
-class RemoveCrewTimeIdFromCrew < ActiveRecord::Migration[6.0]
-  def change
-    remove_foreign_key :ecom_core_crew_times, :ecom_core_crews, column: :crew_id
-    remove_index :ecom_core_crew_times, name: 'ct_on_crew_indx'
-    remove_column :ecom_core_crew_times, :crew_id
-  end
-end

data/db/migrate/20200413144023_fix_crew_time_columns.rb

@@ -1,17 +0,0 @@
-class FixCrewTimeColumns < ActiveRecord::Migration[6.0]
-  def change
-    remove_column :ecom_core_crew_times, :overtime, :boolean
-    remove_column :ecom_core_crew_times, :overtime_type_id, :integer
-    remove_column :ecom_core_crew_times, :converted_hours, :float
-
-    add_column :ecom_core_crew_times, :revised, :boolean, default: false, null: false
-    add_column :ecom_core_crew_times, :revision_to_id, :integer
-    add_column :ecom_core_crew_times, :created_by_id, :integer
-
-    add_index :ecom_core_crew_times, :revision_to_id, name: 'ct_on_rt_indx'
-    add_index :ecom_core_crew_times, :created_by_id, name: 'cb_on_ct_indx'
-
-    add_foreign_key :ecom_core_crew_times, :ecom_core_crew_times, column: :revision_to_id
-    add_foreign_key :ecom_core_crew_times, :ecom_core_users, column: :created_by_id
-  end
-end

data/db/migrate/20200414044144_adjust_crew_overtime_column_names.rb

@@ -1,6 +0,0 @@
-class AdjustCrewOvertimeColumnNames < ActiveRecord::Migration[6.0]
-  def change
-    rename_column :ecom_core_crew_overtimes, :hours, :raw_hours
-    rename_column :ecom_core_crew_overtimes, :converted_hours, :hours
-  end
-end

data/db/migrate/20200414185248_change_time_columns_to_datetime.rb

@@ -1,8 +0,0 @@
-class ChangeTimeColumnsToDatetime < ActiveRecord::Migration[6.0]
-  def change
-    remove_column :ecom_core_crew_times, :checkin_time, :time
-    add_column :ecom_core_crew_times, :checkin_time, :datetime
-    remove_column :ecom_core_crew_times, :checkout_time, :time
-    add_column :ecom_core_crew_times, :checkout_time, :datetime
-  end
-end