ecom_core 1.2.17 → 1.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4ad578f6c6d7aece965edd8d3ad059afb16ff3f90445ba63f55c6afdc530b8f
-  data.tar.gz: a31af1754f7ccdc5669a1fe5747745bb8d98d0e82371db261bee62cd08d50f38
+  metadata.gz: faf0a77147b59f982b4e26d123d93a93f7f51daa2f0d47b453df22ceac084f3e
+  data.tar.gz: c7faa1131252a81ac43cbdd8b848c3f66f2db84cf09e64296de3fd7b490e116e
 SHA512:
-  metadata.gz: 7720605e3fa55dd2ff8d12358a5ece0c11f11c47647b4ac1b9be6ca35d308592d3e2ffef33c9beea298c149f5abb301f0612a194934539ab357c78699529d3cb
-  data.tar.gz: 4c1a5cf5b05c9a8f247fb0b457b9904b9e98bb884a0b5e8a8da38b8268ae7177f631c51ab905dc947042f7117b1f8bf1525a1b92b76d3b1423c24ee157f0af5f
+  metadata.gz: a83643810ff0d997045c7efa28da6a81f2b7c2f9b5a9cc13ed556735ab09559e6e55133f6e9412add7f8d597f1dffe705e195cfe84fa3c09ff0c4ceae5857f29
+  data.tar.gz: b234a2bbcaad56cf90d94d974f0d611497dd9202056cbb3103775d502a156783a52e87d04afd0373bf9c3dc852fc20a395fe0d4f4ce0bdd4fcdb3c8ac796f356

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

@@ -2,15 +2,15 @@ module Ecom
   module Core
     class CrewTime < ApplicationRecord
       # Time Ranges
-      MORNING = 'Morning'.freeze
-      AFTERNOON = 'Afternoon'.freeze
-      BOTH = 'Both'.freeze
+      MORNING = :morning
+      AFTERNOON = :afternoon
+      FULL_DAY = :full_day
 
-      TIME_RANGE = {
-        MORNING => { start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('9:00 AM') },
-        AFTERNOON => { start: Time.zone.parse('10:00 AM'), end: Time.zone.parse('2:00 PM') },
-        BOTH => { start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('2:00 PM') }
-      }.freeze
+      # TIME_RANGE = {
+      #   MORNING => { start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('9:00 AM') },
+      #   AFTERNOON => { start: Time.zone.parse('10:00 AM'), end: Time.zone.parse('2:00 PM') },
+      #   BOTH => { start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('2:00 PM') }
+      # }.freeze
 
       belongs_to :attendance_sheet_entry
       belongs_to :revision_to, class_name: 'Ecom::Core::CrewTime', optional: true
@@ -47,15 +47,42 @@ module Ecom
         attendance_sheet_entry.save
       end
 
+      # A method to get the available time ranges at a given point.
+      # We cannot define the range variables as a constant because
+      # the parsing should be done at the exact moment we are about
+      # to do time range calculations to avoid errors caused by date
+      # mismatches
+      def get_range
+        morning = {
+          start: Time.zone.parse('5:00 AM'),
+          finish: Time.zone.parse('9:00 AM')
+        }
+        afternoon = {
+          start: Time.zone.parse('10:00 AM'),
+          finish: Time.zone.parse('2:00 PM')
+        }
+        full_day = {
+          start: Time.zone.parse('5:00 AM'),
+          finish: Time.zone.parse('2:00 PM')
+        }
+
+        {
+          morning: morning,
+          afternoon: afternoon,
+          full_day: full_day
+        }
+      end
+
       # A method to check if checkin and checkout range falls in the morning,
       # afternoon, or both.
       def find_range(start, finish)
-        if start.before?(TIME_RANGE[MORNING][:end]) && finish.before?(TIME_RANGE[AFTERNOON][:start])
-          MORNING
-        elsif start.after?(TIME_RANGE[MORNING][:end]) && finish.after?(TIME_RANGE[AFTERNOON][:start])
-          AFTERNOON
+        range = get_range
+        if start.before?(range[:morning][:finish]) && finish.before?(range[:afternoon][:start])
+          :morning
+        elsif start.after?(range[:morning][:finish]) && finish.after?(range[:afternoon][:start])
+          :afternoon
         else
-          BOTH
+          :full_day
         end
       end
 
@@ -63,13 +90,14 @@ module Ecom
       # of the defined morning and afternoon ranges
       def compute_hours
         # Reparse time to avoid errors caused by date differences
+        range = get_range
         start = Time.zone.parse(checkin_time.strftime('%I:%M%p'))
         finish = Time.zone.parse(checkout_time.strftime('%I:%M%p'))
-        range = find_range(start, finish)
-        left = start.before?(TIME_RANGE[range][:start]) ? TIME_RANGE[range][:start] : start
-        right = finish.after?(TIME_RANGE[range][:end]) ? TIME_RANGE[range][:end] : finish
+        day_part = find_range(start, finish)
+        left = start.before?(range[day_part][:start]) ? range[day_part][:start] : start
+        right = finish.after?(range[day_part][:finish]) ? range[day_part][:finish] : finish
         time = (right - left) / 1.hour
-        time -= 1 if range == BOTH
+        time -= 1 if day_part == FULL_DAY
         time
       end
     end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.17'.freeze
+    VERSION = '1.2.18'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.17
+  version: 1.2.18
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm