ecom_core 1.2.18 → 1.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faf0a77147b59f982b4e26d123d93a93f7f51daa2f0d47b453df22ceac084f3e
-  data.tar.gz: c7faa1131252a81ac43cbdd8b848c3f66f2db84cf09e64296de3fd7b490e116e
+  metadata.gz: dec564e431b435c4775432757843f7d46c2c98d0c3858bb783e8325b630ba84f
+  data.tar.gz: 6831882fb350c6d92d1324a7f6d3fcf6a95ec334af3b551b11b6e24c93c29c75
 SHA512:
-  metadata.gz: a83643810ff0d997045c7efa28da6a81f2b7c2f9b5a9cc13ed556735ab09559e6e55133f6e9412add7f8d597f1dffe705e195cfe84fa3c09ff0c4ceae5857f29
-  data.tar.gz: b234a2bbcaad56cf90d94d974f0d611497dd9202056cbb3103775d502a156783a52e87d04afd0373bf9c3dc852fc20a395fe0d4f4ce0bdd4fcdb3c8ac796f356
+  metadata.gz: a9043260a84f6ad95cb2e3ba02329f50bb60a98159b143e58db19c5273bacc1d15d6df538ee460ded92e519071741ac32e6003ec29ae659548109d806ea50d36
+  data.tar.gz: 0e280d833e3b19ce2c87ec29f3d7880e20d015e712c289c027785c885bb8b3b601e8347ecf1290ac26bd14c5b7ccc8cae7fbbc2ecb911b3ef0f2cd97d03f87ba

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

@@ -52,7 +52,7 @@ module Ecom
       # 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
+      def define_range
         morning = {
           start: Time.zone.parse('5:00 AM'),
           finish: Time.zone.parse('9:00 AM')
@@ -76,7 +76,7 @@ module Ecom
       # A method to check if checkin and checkout range falls in the morning,
       # afternoon, or both.
       def find_range(start, finish)
-        range = get_range
+        range = define_range
         if start.before?(range[:morning][:finish]) && finish.before?(range[:afternoon][:start])
           :morning
         elsif start.after?(range[:morning][:finish]) && finish.after?(range[:afternoon][:start])
@@ -90,7 +90,7 @@ module Ecom
       # of the defined morning and afternoon ranges
       def compute_hours
         # Reparse time to avoid errors caused by date differences
-        range = get_range
+        range = define_range
         start = Time.zone.parse(checkin_time.strftime('%I:%M%p'))
         finish = Time.zone.parse(checkout_time.strftime('%I:%M%p'))
         day_part = find_range(start, finish)

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

@@ -24,14 +24,18 @@ module Ecom
         OvertimeSheet.open(project_id).where(date: date).exists?
       end
 
+      def self.exists_for_date?(date, project_id)
+        OvertimeSheet.by_project(project_id).by_date(date).exists?
+      end
+
       # Overtime sheet should be created using the
       # method below only. This is because we need to
       # check if there is an open overtime already,
       # and also that we have only one open overtime
       # sheet at a time.
       def self.create_new(date, project_id)
-        if OvertimeSheet.open_for_date_exists?(date, project_id)
-          raise 'There is already an open overtime sheet for the selected date.'
+        if OvertimeSheet.exists_for_date?(date, project_id)
+          raise 'There is already an overtime sheet for the selected date.'
         end
 
         if OvertimeSheet.open_exists?(project_id)

data/lib/ecom/core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.18
+  version: 1.2.19
 platform: ruby
 authors:
 - Henock L.