ecom_core 1.1.20 → 1.1.21
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_overtime.rb +4 -4
- data/app/models/ecom/core/crew_time.rb +41 -1
- data/db/migrate/20200414044144_adjust_crew_overtime_column_names.rb +6 -0
- data/db/migrate/20200414185248_change_time_columns_to_datetime.rb +6 -0
- data/lib/ecom/core/version.rb +1 -1
- data/spec/factories/ecom/core/crew_overtimes.rb +1 -1
- metadata +4 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 20baeb3e84b28e3138d9d2b64cc0f91afe5e3e79361baa4564b280eca1d7db92
|
4
|
+
data.tar.gz: 714499d1b00181a32b8ac85dd2a469d3474ec590ac4c0bb958d655285420647a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 99fa344c2db5b7a704eed5cf9191c9f620f95b0f74cb1e38da9c121e91b6d3b477b1b8bea16387647f0bda528054f8b6ae55276a74944bf08998c070d660a4a7
|
7
|
+
data.tar.gz: 1959a1648e993edd98fa846391b38bc967c8844fde3b85ab9c99dde4bbbed683bcb9c57ce215fc2657348a36eb3b539a7dfdb878dd73df022a21d4bcdc4bee6b
|
@@ -8,13 +8,13 @@ module Ecom
|
|
8
8
|
|
9
9
|
has_one :revision, class_name: 'Ecom::Core::CrewOvertime', foreign_key: :revision_to_id
|
10
10
|
|
11
|
-
validates :hours, :
|
11
|
+
validates :hours, :raw_hours, presence: true
|
12
12
|
|
13
|
-
before_save :
|
13
|
+
before_save :calculate_hours
|
14
14
|
|
15
|
-
def
|
15
|
+
def calculate_hours
|
16
16
|
rate = OvertimeType.find(overtime_type_id).rate
|
17
|
-
self.
|
17
|
+
self.hours = raw_hours * rate
|
18
18
|
end
|
19
19
|
end
|
20
20
|
end
|
@@ -1,12 +1,52 @@
|
|
1
1
|
module Ecom
|
2
2
|
module Core
|
3
3
|
class CrewTime < ApplicationRecord
|
4
|
+
# Time Ranges
|
5
|
+
MORNING = 'Morning'.freeze
|
6
|
+
AFTERNOON = 'Afternoon'.freeze
|
7
|
+
BOTH = 'Both'.freeze
|
8
|
+
|
9
|
+
TIME_RANGE = {
|
10
|
+
MORNING => {start: Time.parse('8:00 AM'), end: Time.parse('12:00 PM')},
|
11
|
+
AFTERNOON => {start: Time.parse('1:00 PM'), end: Time.parse('5:00 PM')},
|
12
|
+
BOTH => {start: Time.parse('8:00 AM'), end: Time.parse('5:00 PM')}
|
13
|
+
}.freeze
|
14
|
+
|
4
15
|
belongs_to :attendance_sheet_entry
|
5
16
|
belongs_to :revision_to, class_name: 'Ecom::Core::CrewTime', optional: true
|
6
17
|
belongs_to :created_by, class_name: 'Ecom::Core::User'
|
7
|
-
has_one :revision, class_name: 'Ecom::Core::
|
18
|
+
has_one :revision, class_name: 'Ecom::Core::CrewTime', foreign_key: :revision_to_id
|
8
19
|
|
9
20
|
validates :hours, presence: true
|
21
|
+
|
22
|
+
before_save :calculate_hours
|
23
|
+
|
24
|
+
def calculate_hours
|
25
|
+
self.hours = checkout_time.nil? ? 0 : compute_hours
|
26
|
+
end
|
27
|
+
|
28
|
+
# A method to check if checkin and checkout range falls in the morning,
|
29
|
+
# afternoon, or both.
|
30
|
+
def find_range
|
31
|
+
if checkin_time.before?(TIME_RANGE[MORNING][:end]) && checkout_time.before?(TIME_RANGE[AFTERNOON][:start])
|
32
|
+
MORNING
|
33
|
+
elsif checkin_time.after?(TIME_RANGE[MORNING][:end]) && checkout_time.after?(TIME_RANGE[AFTERNOON][:start])
|
34
|
+
AFTERNOON
|
35
|
+
else
|
36
|
+
BOTH
|
37
|
+
end
|
38
|
+
end
|
39
|
+
|
40
|
+
# A method to adjust time ranges by trimming any time value outside
|
41
|
+
# of the defined morning and afternoon ranges
|
42
|
+
def compute_hours
|
43
|
+
range = find_range
|
44
|
+
left = checkin_time.before?(TIME_RANGE[range][:start]) ? TIME_RANGE[range][:start] : checkin_time
|
45
|
+
right = checkout_time.after?(TIME_RANGE[range][:end]) ? TIME_RANGE[range][:end] : checkout_time
|
46
|
+
time = (right - left) / 1.hour
|
47
|
+
time -= 1 if range == BOTH
|
48
|
+
time
|
49
|
+
end
|
10
50
|
end
|
11
51
|
end
|
12
52
|
end
|
data/lib/ecom/core/version.rb
CHANGED
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.1.
|
4
|
+
version: 1.1.21
|
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-04-
|
11
|
+
date: 2020-04-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: aasm
|
@@ -295,6 +295,8 @@ files:
|
|
295
295
|
- db/migrate/20200410100035_create_ecom_core_overtime_sheet_entries.rb
|
296
296
|
- db/migrate/20200410111827_create_ecom_core_crew_overtimes.rb
|
297
297
|
- db/migrate/20200413144023_fix_crew_time_columns.rb
|
298
|
+
- db/migrate/20200414044144_adjust_crew_overtime_column_names.rb
|
299
|
+
- db/migrate/20200414185248_change_time_columns_to_datetime.rb
|
298
300
|
- lib/ecom/core.rb
|
299
301
|
- lib/ecom/core/engine.rb
|
300
302
|
- lib/ecom/core/version.rb
|