ecom_core 1.0.7 → 1.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/models/ecom/core/crew.rb +1 -0
- data/app/models/ecom/core/overtime_type.rb +7 -1
- data/db/migrate/20190101112625_create_ecom_core_overtime_types.rb +12 -0
- data/lib/ecom/core/version.rb +1 -1
- data/spec/factories/ecom/core/crew_times.rb +1 -0
- data/spec/factories/ecom/core/overtime_types.rb +5 -2
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 55fbb8a69ed357b329d6fca0fbb0a665847278caba784641900a6a57965111ee
|
|
4
|
+
data.tar.gz: edaf584100e089f188e58f5c18f8dd500d90025a4173b2154e892c48fd0349a8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d633d3ee3f5d5eaf217573a21894c328ef8a89bb871c0c1409898bab0492d42d9b0b570c570efdfc34abe165974f9684eaa848f75f7f0ca58a7d8c1748da84f5
|
|
7
|
+
data.tar.gz: 48f35a518903d7783e72dd1f666b376c756b7fb1f9203ee43339259b2949702169fae12288a2a874ac78256d99494e6935839a66dd3916c74cdf7a442077b1dd
|
|
@@ -7,6 +7,7 @@ module Ecom
|
|
|
7
7
|
belongs_to :crew_type
|
|
8
8
|
|
|
9
9
|
validates :name, :qualification, presence: true
|
|
10
|
+
validates :employment, inclusion: [PERMANENT, TEMPORARY]
|
|
10
11
|
validates :wage, presence: true, if: ->(o) { o.employment == PERMANENT }
|
|
11
12
|
validates :wage, absence: true, if: ->(o) { o.employment == TEMPORARY }
|
|
12
13
|
end
|
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
module Ecom
|
|
2
2
|
module Core
|
|
3
|
-
class OvertimeType <
|
|
3
|
+
class OvertimeType < ApplicationRecord
|
|
4
|
+
validates :name, :from, :to, :rate, presence: true
|
|
5
|
+
validates :name, uniqueness: true
|
|
6
|
+
|
|
7
|
+
def in_range?(time)
|
|
8
|
+
Time.parse(time).between?(Time.parse(from), Time.parse(to))
|
|
9
|
+
end
|
|
4
10
|
end
|
|
5
11
|
end
|
|
6
12
|
end
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
class CreateEcomCoreOvertimeTypes < ActiveRecord::Migration[6.0]
|
|
2
|
+
def change
|
|
3
|
+
create_table :ecom_core_overtime_types do |t|
|
|
4
|
+
t.string :name, unique: true
|
|
5
|
+
t.string :from, null: false
|
|
6
|
+
t.string :to, null: false
|
|
7
|
+
t.float :rate, null: false
|
|
8
|
+
|
|
9
|
+
t.timestamps
|
|
10
|
+
end
|
|
11
|
+
end
|
|
12
|
+
end
|
data/lib/ecom/core/version.rb
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
FactoryBot.define do
|
|
2
|
-
factory :overtime_type, class: 'Ecom::Core::OvertimeType'
|
|
3
|
-
|
|
2
|
+
factory :overtime_type, class: 'Ecom::Core::OvertimeType' do
|
|
3
|
+
name { FFaker::Name.name }
|
|
4
|
+
from { '07:00 AM' }
|
|
5
|
+
to { '08:00 AM' }
|
|
6
|
+
rate { 1.5 }
|
|
4
7
|
end
|
|
5
8
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ecom_core
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Henock L.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-01-
|
|
11
|
+
date: 2020-01-14 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: aasm
|
|
@@ -225,6 +225,7 @@ files:
|
|
|
225
225
|
- config/database.ci.yml
|
|
226
226
|
- config/routes.rb
|
|
227
227
|
- db/migrate/20190101112620_create_ecom_core_lookups.rb
|
|
228
|
+
- db/migrate/20190101112625_create_ecom_core_overtime_types.rb
|
|
228
229
|
- db/migrate/20191119010518_create_ecom_core_task_template_types.rb
|
|
229
230
|
- db/migrate/20191119012030_create_ecom_core_task_templates.rb
|
|
230
231
|
- db/migrate/20191119013236_create_ecom_core_work_product_templates.rb
|