ecom_core 1.1.28 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ff3e5fd4fd9cccdf472a8b779a62617a627f1d7f5bd5ae394f0f2d36b94aa3
-  data.tar.gz: 501972e9b2abcf95aa11ad02c341cc3cdca42c71d248667ebb35834eceb588f1
+  metadata.gz: 7c880918c195007a5c24b11ac57b0160a2cb0f4004b14b859c393865537e484a
+  data.tar.gz: 5cd617cb086e5eced01b34ee17744562ebd09a6b292cd87b04539fd991c23a8d
 SHA512:
-  metadata.gz: 40e7462b2ebf07a06465f3b19c20389c3a4c8198c045f83bc153875b38270969d4bdad0fccf19581d93ccd9ea4472ae208f0edb73251114ada294c51329dfdc0
-  data.tar.gz: 56720e59765d12b7c12c219f0b13ca942c82122b32abf573ee3c040444b458e5a3ce18c91813779665a02fdff0c9d8642bc5ddf6233d252db15864a948c3c49c
+  metadata.gz: 7dce9a7cad7872a933db194376bf18f827b250db066125b4806e17078136263e9870cb1cac44f9569304317cfcd615de4f75c7cae642c5df1cfa664f013f2cc5
+  data.tar.gz: feec5c565c568e36611345e6c672dd5c730f236ee1b4d732856c072e6e1afb7b6bdd7d4ac8776608298348c74e1b41a126eb7300020a92b4db01e70af4c6d9e4

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

@@ -5,7 +5,7 @@ module Ecom
       SUBMITTED = 'Submitted'.freeze
       APPROVED = 'Approved'.freeze
 
-      validates :date, :opened_at, presence: true, uniqueness: true
+      validates :date, presence: true, uniqueness: true
       validates :status, inclusion: [OPEN, SUBMITTED, APPROVED]
 
       has_many :attendance_sheet_entries

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

@@ -27,10 +27,10 @@ module Ecom
 
       # A method to check if checkin and checkout range falls in the morning,
       # afternoon, or both.
-      def find_range
-        if checkin_time.before?(TIME_RANGE[MORNING][:end]) && checkout_time.before?(TIME_RANGE[AFTERNOON][:start])
+      def find_range(start, finish)
+        if start.before?(TIME_RANGE[MORNING][:end]) && finish.before?(TIME_RANGE[AFTERNOON][:start])
           MORNING
-        elsif checkin_time.after?(TIME_RANGE[MORNING][:end]) && checkout_time.after?(TIME_RANGE[AFTERNOON][:start])
+        elsif start.after?(TIME_RANGE[MORNING][:end]) && finish.after?(TIME_RANGE[AFTERNOON][:start])
           AFTERNOON
         else
           BOTH
@@ -40,9 +40,12 @@ module Ecom
       # A method to adjust time ranges by trimming any time value outside
       # of the defined morning and afternoon ranges
       def compute_hours
-        range = find_range
-        left = checkin_time.before?(TIME_RANGE[range][:start]) ? TIME_RANGE[range][:start] : checkin_time
-        right = checkout_time.after?(TIME_RANGE[range][:end]) ? TIME_RANGE[range][:end] : checkout_time
+        # Reparse time to avoid errors caused by date differences
+        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
         time = (right - left) / 1.hour
         time -= 1 if range == BOTH
         time

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.1.28'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.1.28
+  version: 1.2.0
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm