ecom_core 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55fbb8a69ed357b329d6fca0fbb0a665847278caba784641900a6a57965111ee
-  data.tar.gz: edaf584100e089f188e58f5c18f8dd500d90025a4173b2154e892c48fd0349a8
+  metadata.gz: 5b59b8dbf20e8f81cb6c76f89b92f1b0b120a9b487846039b5c2b476d177ea8a
+  data.tar.gz: c254bb1490b4512d45f6add059f3e7a8685ccd571dca843e46e8a57c9c17b9fe
 SHA512:
-  metadata.gz: d633d3ee3f5d5eaf217573a21894c328ef8a89bb871c0c1409898bab0492d42d9b0b570c570efdfc34abe165974f9684eaa848f75f7f0ca58a7d8c1748da84f5
-  data.tar.gz: 48f35a518903d7783e72dd1f666b376c756b7fb1f9203ee43339259b2949702169fae12288a2a874ac78256d99494e6935839a66dd3916c74cdf7a442077b1dd
+  metadata.gz: 6fadd3b668c06009686cdbadf0b13933d7dba415ca4e825fbb68889d380ce2803832494583bec9ccc4ac1bea28f6df79ac1da211482cc9a9b88c3fa7c1f719f5
+  data.tar.gz: ec05075973f8df540d177cb9ea188f2f68bdc7aa11250ffb164fc3bb3d9ac039df055a7251a52a54fda1c36166220ed1d3759a31e912a87bce256aaf986f4284

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/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
       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.8'.freeze
+    VERSION = '1.0.9'.freeze
   end
 end

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

@@ -4,6 +4,7 @@ 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 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Henock L.