ecom_core 1.3.13 → 1.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca77271970adb2814972aed13aa5e7b5e0c04040179bf594b0e6c858a2fff74b
-  data.tar.gz: e67ec2ed2362fd9df15c6ac38edf698b5e09b0f5251b2ab37926ca1c1b8080e6
+  metadata.gz: 6ab0c6a8f72737d10832fea25871db88c0bf73fb77d64ff9cb0daff2b17e1db4
+  data.tar.gz: 66794ac216ecde16a14605908bb6aa1d1122f4da9afc2492ff706cf7990f89e9
 SHA512:
-  metadata.gz: 6f62042c5aa8366ec5edd0a019f75cac5538eb79037dd142fa297bd0d3cb40dd7a37223b1baad87492b88ad0ecb11abe8c98a7e22cabe1521a21eb1b3008407f
-  data.tar.gz: 761979e88a1dd53ce7ae0c4723b266e9c5bbe6442b39d961d111b0e29887c4e1263a34fc821a9d049acd55b6fbe65846b1e6bd8802665a179d8eb999f00e04c2
+  metadata.gz: d105dfc24a2258093e5ad7b69e67c85ce9ba9d7210f39d5b7cd380b9a44450a0f56de7f11879084975ef1049ca4fdb2fc2d6f85fe89c235211cf31fab1636e3b
+  data.tar.gz: d6152ee67ea533f0ad926843502d5b25d7f9429cffac6a982db9e126dd09f17c9118ee93167cccf15b84304726c84473a89174a4857c7e5e1b79baa9ac04506e

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

@@ -5,6 +5,7 @@ module Ecom
 
       belongs_to :crew
       belongs_to :crew_type
+      has_many :crew_contract_transactions
 
       validates :status, :contract_no, :from, :to, :place_of_work, :probation_period,
                 :contract_type, :wage, :wage_in_words, :crew_type_id, :crew_type, presence: true
@@ -14,10 +15,19 @@ module Ecom
       validates :wage, presence: true, numericality: { greater_than: 0 }
 
       validates_uniqueness_of :crew_id,
-                              if: -> { status == 'in_effect' },
+                              scope: :status,
+                              if: :contract_in_effect_exists?,
                               message: 'There can only be one contract' \
                                ' with status `In effect` for a given crew at a time'
 
+      def contract_in_effect_exists?
+        contracts_in_effect = Ecom::Core::CrewContract.where(crew_id: crew_id, status: 'in_effect')
+
+        return true unless contracts_in_effect.empty?
+
+        false
+      end
+
       def validate_date_range
         return unless from && to
 

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

@@ -13,7 +13,7 @@ module Ecom
 
       validates :checkin_time, presence: true, if: :checkout_time
       validate :time_range_validation, :total_time_validation
-      validates :hours, presence: true, numericality: { greater_than_or_equal_to: 0 }
+      validates :hours, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
 
       scope :by_attendance, lambda { |id|
         joins(:attendance_sheet_entry).where(ecom_core_attendance_sheet_entries: { attendance_sheet_id: id })
@@ -32,11 +32,8 @@ module Ecom
       def total_time_validation
         return if checkout_time.nil? || checkin_time.nil?
 
-        if new_record? & !persisted?
-          if attendance_sheet_entry.total_hours + compute_hours > 8
-            errors.add(:attendance_sheet_entry, 'has more than 8 hours')
-          end
-        elsif attendance_sheet_entry.total_hours + compute_hours - computed_hour > 8
+        if new_record? & !persisted? & (attendance_sheet_entry.total_hours + compute_hours > 8) ||
+           (attendance_sheet_entry.total_hours + compute_hours - computed_hour > 8)
           errors.add(:attendance_sheet_entry, 'has more than 8 hours')
         end
       end
@@ -119,6 +116,9 @@ module Ecom
       # the the currently presisted checkin_time and checkout_time
       def computed_hour
         # Reparse time to avoid errors caused by date differences
+
+        return 0 if checkin_time_was.nil? || checkout_time_was.nil?
+
         range = define_range
         start = Time.zone.parse(checkin_time_was.strftime('%I:%M%p'))
         finish = Time.zone.parse(checkout_time_was.strftime('%I:%M%p'))

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

@@ -19,7 +19,7 @@ module Ecom
 
       PHYSICAL_QUANTITIES = [LENGTH, MASS, TIME, CURRENT, TEMPRATURE, AREA, VOLUME, ENERGY, DENSITY].freeze
 
-      validates :name, :abbrivation, :physical_quantity,
+      validates :name, :abbreviation, :physical_quantity,
                 :conversion_factor, :system_of_measurement, presence: true
 
       validates :is_si_unit, inclusion: { in: [true, false] }

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

@@ -1,25 +1,28 @@
 module Ecom
   module Core
     class CrewContractTransactionService
-      def execute(transaction_type, crew_contract)
+      def execute(crew_contract_transaction, crew_contract)
         Ecom::Core::CrewContractTransaction.transaction do
-          case transaction_type
+          case crew_contract_transaction.transaction_type
           when Ecom::Core::CrewContractTransaction::TXN_UPDATE_CREW_TYPE
 
             create_new_id_card(crew_contract.crew, crew_contract.to)
             # update crew type
             crew = crew_contract.crew
             crew.update(crew_type_id: crew_contract.crew_type_id)
+            crew_contract_transaction.update(status: Ecom::Core::CrewContractTransaction::EXECUTED)
 
           when Ecom::Core::CrewContractTransaction::TXN_UPDATE_PLACE_OF_WORK
 
             create_new_id_card(crew_contract.crew, crew_contract.to)
+            crew_contract_transaction.update(status: Ecom::Core::CrewContractTransaction::EXECUTED)
 
           when Ecom::Core::CrewContractTransaction::TXN_UPDATE_WAGE
 
             crew = crew_contract.crew
             # update wage
             crew.update(wage: crew_contract.wage, wage_in_words: crew_contract.wage_in_words)
+            crew_contract_transaction.update(status: Ecom::Core::CrewContractTransaction::EXECUTED)
 
           when Ecom::Core::CrewContractTransaction::TXN_UPDATE_VALIDITY
 
@@ -27,18 +30,22 @@ module Ecom
             create_new_id_card(crew_contract.crew, crew_contract.to)
             make_crew_active(crew_contract.crew)
             activate_contract(crew_contract)
+            crew_contract_transaction.update(status: Ecom::Core::CrewContractTransaction::EXECUTED)
 
           when Ecom::Core::CrewContractTransaction::TXN_TERMINATE_CONTRACT
 
             # make crew inactive
             make_crew_inactive(crew_contract.crew)
 
-            # make ID card invalid
+            # make ID card and gate pass invalid
             invalidate_id_card(crew_contract.crew)
+            invalidate_gate_pass(crew_contract.crew)
 
             # make the contract void
             deactivate_contract(crew_contract)
 
+            crew_contract_transaction.update(status: Ecom::Core::CrewContractTransaction::EXECUTED)
+
           end
         end
       end
@@ -84,6 +91,10 @@ module Ecom
         current_id_card = Ecom::Core::CrewIdCard.where(crew_id: crew.id).last
         current_id_card.update(status: 'Invalid')
       end
+
+      def invalidate_gate_pass(crew)
+        Ecom::Core::SiteCrew.where(crew_id: crew.id).update(status: Ecom::Core::SiteCrew::INACTIVE)
+      end
     end
   end
 end

data/db/migrate/20200813165553_create_ecom_core_measurement_units.rb

@@ -2,7 +2,7 @@ class CreateEcomCoreMeasurementUnits < ActiveRecord::Migration[6.0]
   def change
     create_table :ecom_core_measurement_units do |t|
       t.string :name, null: false
-      t.string :abbrivation, null: false
+      t.string :abbreviation, null: false
       t.string :physical_quantity, null: false
       t.boolean :is_si_unit, null: false, default: false
       t.float :conversion_factor, null: false

data/db/migrate/20201013072924_create_ecom_core_crew_contract_transactions.rb

@@ -3,7 +3,7 @@ class CreateEcomCoreCrewContractTransactions < ActiveRecord::Migration[6.0]
     create_table :ecom_core_crew_contract_transactions do |t|
       t.string :transaction_type, null: false
       t.string :status, null: false, default: 'Pending'
-      t.datetime :effective_date, null: false
+      t.date :effective_date, null: false
 
       t.references :crew_contract,
                    null: false,

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.3.13'.freeze
+    VERSION = '1.3.14'.freeze
   end
 end

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :measurement_unit, class: Ecom::Core::MeasurementUnit do
     name { 'Meter' }
-    abbrivation { 'm' }
+    abbreviation { 'm' }
     physical_quantity { Ecom::Core::MeasurementUnit::LENGTH }
     is_si_unit { true }
     conversion_factor { 1 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.3.14
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -284,7 +284,6 @@ files:
 - 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
@@ -310,7 +309,6 @@ files:
 - 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/20191119012030_create_ecom_core_task_templates.rb
 - db/migrate/20191119013236_create_ecom_core_work_product_templates.rb
@@ -469,7 +467,6 @@ files:
 - 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

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

@@ -1,8 +0,0 @@
-module Ecom
-  module Core
-    class UnitOfMeasure < ApplicationRecord
-      validates :code, :name, presence: true
-      validates :code, uniqueness: true
-    end
-  end
-end

data/db/migrate/20191118052213_create_ecom_core_unit_of_measures.rb

@@ -1,11 +0,0 @@
-class CreateEcomCoreUnitOfMeasures < ActiveRecord::Migration[6.0]
-  def change
-    create_table :ecom_core_unit_of_measures do |t|
-      t.string :code, unique: true
-      t.string :name, null: false
-      t.string :description
-
-      t.timestamps
-    end
-  end
-end

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

@@ -1,7 +0,0 @@
-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