ecom_core 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74b8ac08e5410eed69a840b271735ae7f281cd5199be1658719595dcf1f79a0d
-  data.tar.gz: b4e21006ce1fd37d1b33bbce548ad2cab59691ebed7731ef7dfef742050ef4b1
+  metadata.gz: 55fbb8a69ed357b329d6fca0fbb0a665847278caba784641900a6a57965111ee
+  data.tar.gz: edaf584100e089f188e58f5c18f8dd500d90025a4173b2154e892c48fd0349a8
 SHA512:
-  metadata.gz: 779813936451fca1ca9d7e4346f615f22c6a79f91f112e1a0f8b1468af99976b9702192727eec7c34454f1ba180d91b279c81d80053d1196f3a7668e028cd28b
-  data.tar.gz: 0c650b91746a5a4e52d90a52132efbc9e9d6ad622af6b5a5053dec3ffdfe5ff731dc02fb8086820ff604c31e6b1ae10d68f31b6d079087b0705787c93d02d54a
+  metadata.gz: d633d3ee3f5d5eaf217573a21894c328ef8a89bb871c0c1409898bab0492d42d9b0b570c570efdfc34abe165974f9684eaa848f75f7f0ca58a7d8c1748da84f5
+  data.tar.gz: 48f35a518903d7783e72dd1f666b376c756b7fb1f9203ee43339259b2949702169fae12288a2a874ac78256d99494e6935839a66dd3916c74cdf7a442077b1dd

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

@@ -7,6 +7,7 @@ module Ecom
       belongs_to :crew_type
 
       validates :name, :qualification, presence: true
+      validates :employment, inclusion: [PERMANENT, TEMPORARY]
       validates :wage, presence: true, if: ->(o) { o.employment == PERMANENT }
       validates :wage, absence: true, if: ->(o) { o.employment == TEMPORARY }
     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/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.0.7'.freeze
+    VERSION = '1.0.8'.freeze
   end
 end

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

@@ -7,5 +7,6 @@ FactoryBot.define do
     association :crew
     remark { FFaker::Name.name }
     overtime { false }
+    overtime_type { nil }
   end
 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.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-12 00:00:00.000000000 Z
+date: 2020-01-14 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