ecom_core 1.0.6 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 825de336d94c09a39efb8d2e52bfcfa5aed57217814924caa20eab4c19bdaa03
-  data.tar.gz: 41c833994b38d5f5d40d7ebc9020eebcd9feb77792e74ab12489fe9b68467c44
+  metadata.gz: adb99a2389da27cf20e597f3df0f857dbf1de773c2255d045bb55759067ffb4c
+  data.tar.gz: d9f3e700661b7801a39edb4bcf37e7b19fe5de32d2649efc41d340dd0bed89a7
 SHA512:
-  metadata.gz: dbd1bfbb7b0cc751528170423e0ec74817932a9a3e1b16171be22bfcb56c8ddd02f6e67ef782eb4fcbb5f6c75593b5a61acf53904f5ef42b08749c44c0294ceb
-  data.tar.gz: bea5c69fe62ef7d509f4073d4dbd297ad72dddb991bb26d34b6ffc5eb14927bccd51dfd63da875ae283a3dbfc8e0cd0668c7bc30d6a9c4d33df0dae82a3eb090
+  metadata.gz: 989e447f42b80d4cb90244824f55e1aedfa4bed71ba6cb01c1cd0c03f097be9f4baa74a57188b2e7ee86ec6a84aa8d5932ecdad97754a2489df8b3a7609784c1
+  data.tar.gz: 7930b48144947c87148205ac07e4aa4fe297df099984d32ec844ab88fe824e3d24fe44ce13f667e0e655ad364e9d635d10ea91791f2ed530e01485f7cd90e847

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

@@ -7,8 +7,9 @@ module Ecom
       belongs_to :crew_type
 
       validates :name, :qualification, presence: true
-      validates :wage, presence: true, if: ->(o) { o.employment == PERMANENT }
-      validates :wage, absence: true, if: ->(o) { o.employment == TEMPORARY }
+      validates :employment, inclusion: [PERMANENT, TEMPORARY]
+      #validates :wage, presence: true, if: ->(o) { o.employment == PERMANENT }
+      #validates :wage, absence: true, if: ->(o) { o.employment == TEMPORARY }
     end
   end
 end

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

@@ -4,7 +4,18 @@ module Ecom
       belongs_to :crew
       belongs_to :overtime_type, optional: true
 
-      validates :date, :hours, presence: true
+      validates :date, :hours, :converted_hours, presence: true
+
+      before_save :calculate_converted_hours
+
+      def calculate_converted_hours
+        if overtime
+          rate = OvertimeType.find(overtime_type_id).rate
+          self.converted_hours = hours * rate
+        else
+          self.converted_hours = hours
+        end
+      end
     end
   end
 end

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

@@ -1,6 +1,12 @@
 module Ecom
   module Core
-    class OvertimeType < Lookup
+    class OvertimeType < ApplicationRecord
+      validates :name, :from, :to, :rate, presence: true
+      validates :name, uniqueness: true
+
+      def in_range?(time)
+        Time.parse(time).between?(Time.parse(from), Time.parse(to))
+      end
     end
   end
 end

data/db/migrate/20190101112625_create_ecom_core_overtime_types.rb

@@ -0,0 +1,12 @@
+class CreateEcomCoreOvertimeTypes < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_overtime_types do |t|
+      t.string :name, unique: true
+      t.string :from, null: false
+      t.string :to, null: false
+      t.float :rate, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20191225100054_create_ecom_core_crews.rb

@@ -7,6 +7,7 @@ class CreateEcomCoreCrews < ActiveRecord::Migration[6.0]
       t.string :qualification, null: false
       t.string :employment, null: false
       t.float :wage
+      t.boolean :active, null: false, default: true
       t.references :crew_type, index: { name: 'crew_on_ct_indx' }
 
       t.timestamps

data/db/migrate/20191225211712_create_ecom_core_crew_times.rb

@@ -5,10 +5,11 @@ class CreateEcomCoreCrewTimes < ActiveRecord::Migration[6.0]
       t.time :checkin_time
       t.time :checkout_time
       t.float :hours, null: false
+      t.float :converted_hours, null: false, default: 0
       t.references :crew, index: { name: 'ct_on_crew_indx' }
       t.string :remark
       t.boolean :overtime, null: false, default: false
-      t.boolean :overtime_type_id, null: true
+      t.integer :overtime_type_id, null: true
 
       t.timestamps
     end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.0.6'.freeze
+    VERSION = '1.0.11'.freeze
   end
 end

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

@@ -4,8 +4,10 @@ FactoryBot.define do
     checkin_time { Time.now }
     checkout_time { Time.now + 2 * 60 * 60 }
     hours { 2 }
+    converted_hours { 2 }
     association :crew
     remark { FFaker::Name.name }
     overtime { false }
+    overtime_type { nil }
   end
 end

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

@@ -6,6 +6,7 @@ FactoryBot.define do
     qualification { FFaker::Name.name }
     employment { Ecom::Core::Crew::PERMANENT }
     wage { FFaker::Random.rand(1000..5000) }
+    active { true }
 
     association :crew_type
   end

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

@@ -1,5 +1,8 @@
 FactoryBot.define do
-  factory :overtime_type, class: 'Ecom::Core::OvertimeType', parent: :lookup do
-    type { 'Ecom::Core::OvertimeType' }
+  factory :overtime_type, class: 'Ecom::Core::OvertimeType' do
+    name { FFaker::Name.name }
+    from { '07:00 AM' }
+    to { '08:00 AM' }
+    rate { 1.5 }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.11
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-11 00:00:00.000000000 Z
+date: 2020-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -225,6 +225,7 @@ files:
 - config/database.ci.yml
 - config/routes.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
 - db/migrate/20191119012030_create_ecom_core_task_templates.rb
 - db/migrate/20191119013236_create_ecom_core_work_product_templates.rb