ecom_core 1.2.5 → 1.2.11

data/db/migrate/20200126082103_create_ecom_core_payments.rb

@@ -3,11 +3,14 @@ class CreateEcomCorePayments < ActiveRecord::Migration[6.0]
     create_table :ecom_core_payments do |t|
       t.date :from, null: false
       t.date :to, null: false
-      t.references :payroll, null: false, index: { name: 'payments_on_payroll_indx' }
+      t.boolean :approved, null: false, default: false
+      t.integer :payment_order, null: false, default: 1
+      t.references :payroll,
+                   null: false,
+                   index: { name: 'payments_on_payroll_indx' },
+                   foreign_key: { to_table: :ecom_core_payrolls }
 
       t.timestamps
     end
-
-    add_foreign_key :ecom_core_payments, :ecom_core_payrolls, column: :payroll_id
   end
 end

data/db/migrate/20200126183218_create_ecom_core_payment_details.rb

@@ -9,13 +9,18 @@ class CreateEcomCorePaymentDetails < ActiveRecord::Migration[6.0]
       t.float :tax, null: false, default: 0
       t.float :pension, null: false, default: 0
       t.float :net_salary, null: false
-      t.references :crew, null: false, index: { name: 'pd_on_crew_indx' }
-      t.references :payment, null: false, index: { name: 'pd_on_payment_indx' }
+      t.float :advance, null: false, default: 0
+      t.float :net_pay, null: false, default: 0
+      t.references :crew,
+                   null: false,
+                   index: { name: 'pd_on_crew_indx' },
+                   foreign_key: { to_table: :ecom_core_crews }
+      t.references :payment,
+                   null: false,
+                   index: { name: 'pd_on_payment_indx' },
+                   foreign_key: { to_table: :ecom_core_payments }
 
       t.timestamps
     end
-
-    add_foreign_key :ecom_core_payment_details, :ecom_core_crews, column: :crew_id
-    add_foreign_key :ecom_core_payment_details, :ecom_core_payments, column: :payment_id
   end
 end

data/db/migrate/20200307112519_create_ecom_core_custom_payment_details.rb

@@ -14,11 +14,12 @@ class CreateEcomCoreCustomPaymentDetails < ActiveRecord::Migration[6.0]
       t.float :advance, null: false
       t.float :wage, null: false
       t.string :qualification
-      t.references :payment, null: false, index: { name: 'cpd_on_payment_indx' }
+      t.references :payment,
+                   null: false,
+                   index: { name: 'cpd_on_payment_indx' },
+                   foreign_key: { to_table: :ecom_core_payments }
 
       t.timestamps
     end
-
-    add_foreign_key :ecom_core_custom_payment_details, :ecom_core_payments, column: :payment_id
   end
 end

data/db/migrate/20200315145215_create_ecom_core_equipment_locations.rb

@@ -4,11 +4,12 @@ class CreateEcomCoreEquipmentLocations < ActiveRecord::Migration[6.0]
       t.string :name, null: false, unique: true
       t.string :description
       t.string :address, null: false
-      t.references :location_type, null: false, index: { name: 'ecel_on_lt_indx' }
+      t.references :location_type,
+                   null: false,
+                   index: { name: 'ecel_on_lt_indx' },
+                   foreign_key: { to_table: :ecom_core_lookups }
 
       t.timestamps
     end
-
-    add_foreign_key :ecom_core_equipment_locations, :ecom_core_lookups, column: :location_type_id
   end
 end

data/db/migrate/20200315150500_create_ecom_core_equipment_categories.rb

@@ -3,12 +3,14 @@ class CreateEcomCoreEquipmentCategories < ActiveRecord::Migration[6.0]
     create_table :ecom_core_equipment_categories do |t|
       t.string :name, null: false
       t.string :description
-      t.references :equipment_type, null: false, index: { name: 'et_on_ecec_indx' }
+      t.references :equipment_type,
+                   null: false,
+                   index: { name: 'et_on_ecec_indx' },
+                   foreign_key: { to_table: :ecom_core_resource_types }
 
       t.timestamps
     end
 
     add_index :ecom_core_equipment_categories, %i[name equipment_type_id], unique: true, name: 'ecec_name_et_indx'
-    add_foreign_key :ecom_core_equipment_categories, :ecom_core_resource_types, column: :equipment_type_id
   end
 end

data/db/migrate/20200315152143_create_ecom_core_equipment.rb

@@ -4,12 +4,14 @@ class CreateEcomCoreEquipment < ActiveRecord::Migration[6.0]
       t.string :name, null: false
       t.string :description
       t.float :minimum_acquisition_time, null: false, default: 0
-      t.references :equipment_category, null: false, index: { name: 'ec_on_ece_indx' }
+      t.references :equipment_category,
+                   null: false,
+                   index: { name: 'ec_on_ece_indx' },
+                   foreign_key: { to_table: :ecom_core_equipment_categories }
 
       t.timestamps
     end
 
     add_index :ecom_core_equipment, %i[name equipment_category_id], unique: true
-    add_foreign_key :ecom_core_equipment, :ecom_core_equipment_categories, column: :equipment_category_id
   end
 end

data/db/migrate/20200315153640_create_ecom_core_equipment_items.rb

@@ -11,13 +11,16 @@ class CreateEcomCoreEquipmentItems < ActiveRecord::Migration[6.0]
       t.date :purchase_date, null: false
       t.float :license_fee
       t.float :tax
-      t.references :equipment, null: false, index: { name: 'equipment_on_ei_indx' }
-      t.references :current_location, null: false, index: { name: 'equipment_on_el_indx' }
+      t.references :equipment,
+                   null: false,
+                   index: { name: 'equipment_on_ei_indx' },
+                   foreign_key: { to_table: :ecom_core_equipment }
+      t.references :current_location,
+                   null: false,
+                   index: { name: 'equipment_on_el_indx' },
+                   foreign_key: { to_table: :ecom_core_equipment_locations }
 
       t.timestamps
     end
-
-    add_foreign_key :ecom_core_equipment_items, :ecom_core_equipment, column: :equipment_id
-    add_foreign_key :ecom_core_equipment_items, :ecom_core_equipment_locations, column: :current_location_id
   end
 end

data/db/migrate/20200315160810_create_ecom_core_equipment_valuations.rb

@@ -11,11 +11,12 @@ class CreateEcomCoreEquipmentValuations < ActiveRecord::Migration[6.0]
       t.float :repair_rate
       t.float :rate_of_return
       t.boolean :current, null: false, default: true
-      t.references :equipment_item, index: { name: 'ev_on_ei_indx' }
+      t.references :equipment_item,
+                   null: false,
+                   index: { name: 'ev_on_ei_indx' },
+                   foreign_key: { to_table: :ecom_core_equipment_items }
 
       t.timestamps
     end
-
-    add_foreign_key :ecom_core_equipment_valuations, :ecom_core_equipment_items, column: :equipment_item_id
   end
 end

data/db/migrate/20200316125323_create_ecom_core_equipment_components.rb

@@ -3,11 +3,12 @@ class CreateEcomCoreEquipmentComponents < ActiveRecord::Migration[6.0]
     create_table :ecom_core_equipment_components do |t|
       t.string :serial_number
       t.string :name, null: false
-      t.references :equipment_item, null: false, index: { name: 'ei_on_ec_indx' }
+      t.references :equipment_item,
+                   null: false,
+                   index: { name: 'ei_on_ec_indx' },
+                   foreign_key: { to_table: :ecom_core_equipment_items }
 
       t.timestamps
     end
-
-    add_foreign_key :ecom_core_equipment_components, :ecom_core_equipment_items, column: :equipment_item_id
   end
 end

data/db/migrate/20200410090701_create_ecom_core_overtime_sheets.rb

@@ -1,12 +1,18 @@
 class CreateEcomCoreOvertimeSheets < ActiveRecord::Migration[6.0]
   def change
     create_table :ecom_core_overtime_sheets do |t|
-      t.date :date, null: false, unique: true
+      t.date :date, null: false
       t.time :opened_at, null: false
       t.time :submitted_at
+      t.string :remark
       t.string :status, null: false, default: 'Open'
+      t.references :project,
+                   null: false,
+                   index: { name: 'os_on_project_indx' },
+                   foreign_key: { to_table: :ecom_core_projects }
 
       t.timestamps
     end
+    add_index :ecom_core_overtime_sheets, %i[date project_id], unique: true
   end
 end

data/db/migrate/20200410100035_create_ecom_core_overtime_sheet_entries.rb

@@ -1,14 +1,17 @@
 class CreateEcomCoreOvertimeSheetEntries < ActiveRecord::Migration[6.0]
   def change
     create_table :ecom_core_overtime_sheet_entries do |t|
-      t.references :overtime_sheet, null: false, index: { name: 'ose_on_os_indx' }
-      t.references :crew, null: false, index: { name: 'ose_on_crew_indx' }
+      t.references :overtime_sheet,
+                   null: false,
+                   index: { name: 'ose_on_os_indx' },
+                   foreign_key: { to_table: :ecom_core_overtime_sheets }
+      t.references :crew,
+                   null: false,
+                   index: { name: 'ose_on_crew_indx' },
+                   foreign_key: { to_table: :ecom_core_crews }
       t.float :total_overtime
 
       t.timestamps
     end
-    add_foreign_key :ecom_core_overtime_sheet_entries, :ecom_core_overtime_sheets,
-                    column: :overtime_sheet_id
-    add_foreign_key :ecom_core_overtime_sheet_entries, :ecom_core_crews, column: :crew_id
   end
 end

data/db/migrate/20200410111827_create_ecom_core_crew_overtimes.rb

@@ -1,21 +1,27 @@
 class CreateEcomCoreCrewOvertimes < ActiveRecord::Migration[6.0]
   def change
     create_table :ecom_core_crew_overtimes do |t|
-      t.float :hours, null: false
-      t.float :converted_hours, null: false, default: 0
+      t.float :raw_hours, null: false
+      t.float :hours, null: false, default: 0
       t.string :remark
-      t.references :overtime_type, null: false, index: { name: 'ot_on_co_indx' }
-      t.references :overtime_sheet_entry, null: false, index: { name: 'ose_on_co_indx' }
+      t.references :overtime_type,
+                   null: false,
+                   index: { name: 'ot_on_co_indx' },
+                   foreign_key: { to_table: :ecom_core_overtime_types }
+      t.references :overtime_sheet_entry,
+                   null: false,
+                   index: { name: 'ose_on_co_indx' },
+                   foreign_key: { to_table: :ecom_core_overtime_sheet_entries }
       t.boolean :revised, null: false, default: false
-      t.references :revision_to, null: true
-      t.references :created_by, null: false, index: { name: 'cb_on_co_indx' }
+      t.references :revision_to,
+                   null: true,
+                   foreign_key: { to_table: :ecom_core_crew_overtimes }
+      t.references :created_by,
+                   null: false,
+                   index: { name: 'cb_on_co_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
 
       t.timestamps
     end
-    add_foreign_key :ecom_core_crew_overtimes, :ecom_core_overtime_types, column: :overtime_type_id
-    add_foreign_key :ecom_core_crew_overtimes, :ecom_core_overtime_sheet_entries,
-                    column: :overtime_sheet_entry_id
-    add_foreign_key :ecom_core_crew_overtimes, :ecom_core_crew_overtimes, column: :revision_to_id
-    add_foreign_key :ecom_core_crew_overtimes, :ecom_core_users, column: :created_by_id
   end
 end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.5'.freeze
+    VERSION = '1.2.11'.freeze
   end
 end

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

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

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :attendance_sheet_entry, class: 'Ecom::Core::AttendanceSheetEntry' do
+  factory :attendance_sheet_entry, class: Ecom::Core::AttendanceSheetEntry do
     association :attendance_sheet
     association :crew
     total_hours { FFaker::Random.rand(0..8) }

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

@@ -1,9 +1,10 @@
 FactoryBot.define do
-  factory :attendance_sheet, class: 'Ecom::Core::AttendanceSheet' do
+  factory :attendance_sheet, class: Ecom::Core::AttendanceSheet do
     date { Date.today }
     opened_at { Time.now }
     closed_at { nil }
     remark { FFaker::Name.name }
-    status { Ecom::Core::AttendanceSheet::OPEN }
+    status { Ecom::Core::StatusConstants::OPEN }
+    association :project
   end
 end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :company, class: Ecom::Core::Company do
+    code { FFaker::Name.name }
+    name { FFaker::Name.name }
+    address { FFaker::Address.street_address }
+    telephone { FFaker::PhoneNumber.phone_number }
+    email { FFaker::Internet.email }
+  end
+end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :crew_overtime, class: 'Ecom::Core::CrewOvertime' do
+  factory :crew_overtime, class: Ecom::Core::CrewOvertime do
     raw_hours { 2 }
     hours { 2 }
     remark { FFaker::Name.name }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :crew_time, class: 'Ecom::Core::CrewTime' do
+  factory :crew_time, class: Ecom::Core::CrewTime do
     checkin_time { Time.now }
     checkout_time { Time.now + 2 * 60 * 60 }
     hours { 2 }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :crew_type, class: 'Ecom::Core::CrewType', parent: :resource_type do
+  factory :crew_type, class: Ecom::Core::CrewType, parent: :resource_type do
     type { 'Ecom::Core::CrewType' }
   end
 end

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

@@ -1,11 +1,13 @@
 FactoryBot.define do
-  factory :crew, class: 'Ecom::Core::Crew' do
+  factory :crew, class: Ecom::Core::Crew do
     name { FFaker::Name.name }
+    address { FFaker::Name.name }
     phone { FFaker::Name.name }
     email { FFaker::Name.name }
     qualification { FFaker::Name.name }
     employment { Ecom::Core::Crew::PERMANENT }
     wage { FFaker::Random.rand(1000..5000) }
+    wage_in_words { FFaker::Name.name }
     employment_date { Date.today - 1 }
     sub_contracted { false }
     guarantor_name { FFaker::Name.name }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :currency, class: 'Ecom::Core::Currency' do
+  factory :currency, class: Ecom::Core::Currency do
     code { FFaker::Currency.code }
     name { FFaker::Currency.name }
   end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :custom_payment_detail, class: 'Ecom::Core::CustomPaymentDetail' do
+  factory :custom_payment_detail, class: Ecom::Core::CustomPaymentDetail do
     name { FFaker::Name.name }
     hours { 1.5 }
     ot_hours { 1.5 }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :equipment, class: 'Ecom::Core::Equipment' do
+  factory :equipment, class: Ecom::Core::Equipment do
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     minimum_acquisition_time { 10 }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :equipment_category, class: 'Ecom::Core::EquipmentCategory' do
+  factory :equipment_category, class: Ecom::Core::EquipmentCategory do
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     association :equipment_type

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :equipment_component, class: 'Ecom::Core::EquipmentComponent' do
+  factory :equipment_component, class: Ecom::Core::EquipmentComponent do
     serial_number { FFaker::Name.name }
     name { FFaker::Name.name }
     association :equipment_item

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :equipment_item, class: 'Ecom::Core::EquipmentItem' do
+  factory :equipment_item, class: Ecom::Core::EquipmentItem do
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     status { FFaker::Name.name }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :equipment_location, class: 'Ecom::Core::EquipmentLocation' do
+  factory :equipment_location, class: Ecom::Core::EquipmentLocation do
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     address { FFaker::Name.name }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :equipment_type, class: 'Ecom::Core::EquipmentType', parent: :resource_type do
+  factory :equipment_type, class: Ecom::Core::EquipmentType, parent: :resource_type do
     type { 'Ecom::Core::EquipmentType' }
   end
 end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :equipment_valuation, class: 'Ecom::Core::EquipmentValuation' do
+  factory :equipment_valuation, class: Ecom::Core::EquipmentValuation do
     equipment_value { 1500 }
     residual_value { 150 }
     work_hrs_per_yr { 150 }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :location_type, class: 'Ecom::Core::LocationType', parent: :lookup do
+  factory :location_type, class: Ecom::Core::LocationType, parent: :lookup do
     type { 'Ecom::Core::LocationType' }
   end
 end

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

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

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :material_type, class: 'Ecom::Core::MaterialType', parent: :resource_type do
+  factory :material_type, class: Ecom::Core::MaterialType, parent: :resource_type do
     type { 'Ecom::Core::MaterialType' }
   end
 end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :menu, class: 'Ecom::Core::Menu' do
+  factory :menu, class: Ecom::Core::Menu do
     label { FFaker::Name.name }
     icon { FFaker::Name.name }
     route { FFaker::Name.name }

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :overtime_sheet_entry, class: 'Ecom::Core::OvertimeSheetEntry' do
+  factory :overtime_sheet_entry, class: Ecom::Core::OvertimeSheetEntry do
     association :overtime_sheet
     association :crew
     total_overtime { FFaker::Random.rand(0..8) }