ecom_core 1.1.20 → 1.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 672b1f9f1a955dcac03f793da08b27a24f387497ecfee9184167910442549657
-  data.tar.gz: d3cadc37e590e75eef9d644f324c31056f840d38660880888331f9f6a24ec5a7
+  metadata.gz: 20baeb3e84b28e3138d9d2b64cc0f91afe5e3e79361baa4564b280eca1d7db92
+  data.tar.gz: 714499d1b00181a32b8ac85dd2a469d3474ec590ac4c0bb958d655285420647a
 SHA512:
-  metadata.gz: 5e0d2a1571d1a8f620c62f5fad07ed9c556d9b64a6f01a38956ff45dc7a62e5d8ba0eceede147bcb6f4248a6b05f25561c56bc41f05779aa676f72fee831c7b8
-  data.tar.gz: f01a205f8a37a0d97468ec5e0b97cbf5fde5b8e5aaa06da4b77854a3fb51890c7ee910b191b1cd19b4f01b285834ddd00c6b1c6e528011a8f94e284c0c7486f0
+  metadata.gz: 99fa344c2db5b7a704eed5cf9191c9f620f95b0f74cb1e38da9c121e91b6d3b477b1b8bea16387647f0bda528054f8b6ae55276a74944bf08998c070d660a4a7
+  data.tar.gz: 1959a1648e993edd98fa846391b38bc967c8844fde3b85ab9c99dde4bbbed683bcb9c57ce215fc2657348a36eb3b539a7dfdb878dd73df022a21d4bcdc4bee6b

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

@@ -8,13 +8,13 @@ module Ecom
 
       has_one :revision, class_name: 'Ecom::Core::CrewOvertime', foreign_key: :revision_to_id
 
-      validates :hours, :converted_hours, presence: true
+      validates :hours, :raw_hours, presence: true
 
-      before_save :calculate_converted_hours
+      before_save :calculate_hours
 
-      def calculate_converted_hours
+      def calculate_hours
         rate = OvertimeType.find(overtime_type_id).rate
-        self.converted_hours = hours * rate
+        self.hours = raw_hours * rate
       end
     end
   end

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

@@ -1,12 +1,52 @@
 module Ecom
   module Core
     class CrewTime < ApplicationRecord
+      # Time Ranges
+      MORNING = 'Morning'.freeze
+      AFTERNOON = 'Afternoon'.freeze
+      BOTH = 'Both'.freeze
+
+      TIME_RANGE = {
+        MORNING => {start: Time.parse('8:00 AM'), end: Time.parse('12:00 PM')},
+        AFTERNOON => {start: Time.parse('1:00 PM'), end: Time.parse('5:00 PM')},
+        BOTH => {start: Time.parse('8:00 AM'), end: Time.parse('5:00 PM')}
+      }.freeze
+
       belongs_to :attendance_sheet_entry
       belongs_to :revision_to, class_name: 'Ecom::Core::CrewTime', optional: true
       belongs_to :created_by, class_name: 'Ecom::Core::User'
-      has_one :revision, class_name: 'Ecom::Core::CrewOvertime', foreign_key: :revision_to_id
+      has_one :revision, class_name: 'Ecom::Core::CrewTime', foreign_key: :revision_to_id
 
       validates :hours, presence: true
+
+      before_save :calculate_hours
+
+      def calculate_hours
+        self.hours = checkout_time.nil? ? 0 : compute_hours
+      end
+
+      # 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])
+          MORNING
+        elsif checkin_time.after?(TIME_RANGE[MORNING][:end]) && checkout_time.after?(TIME_RANGE[AFTERNOON][:start])
+          AFTERNOON
+        else
+          BOTH
+        end
+      end
+
+      # 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
+        time = (right - left) / 1.hour
+        time -= 1 if range == BOTH
+        time
+      end
     end
   end
 end

data/db/migrate/20200414044144_adjust_crew_overtime_column_names.rb

@@ -0,0 +1,6 @@
+class AdjustCrewOvertimeColumnNames < ActiveRecord::Migration[6.0]
+  def change
+    rename_column :ecom_core_crew_overtimes, :hours, :raw_hours
+    rename_column :ecom_core_crew_overtimes, :converted_hours, :hours
+  end
+end

data/db/migrate/20200414185248_change_time_columns_to_datetime.rb

@@ -0,0 +1,6 @@
+class ChangeTimeColumnsToDatetime < ActiveRecord::Migration[6.0]
+  def change
+    change_column :ecom_core_crew_times, :checkin_time, :datetime
+    change_column :ecom_core_crew_times, :checkout_time, :datetime
+  end
+end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.1.20'.freeze
+    VERSION = '1.1.21'.freeze
   end
 end

data/spec/factories/ecom/core/crew_overtimes.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :crew_overtime, class: 'Ecom::Core::CrewOvertime' do
+    raw_hours { 2 }
     hours { 2 }
-    converted_hours { 2 }
     remark { FFaker::Name.name }
     association :overtime_type
     association :overtime_sheet_entry

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.1.20
+  version: 1.1.21
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -295,6 +295,8 @@ files:
 - db/migrate/20200410100035_create_ecom_core_overtime_sheet_entries.rb
 - db/migrate/20200410111827_create_ecom_core_crew_overtimes.rb
 - db/migrate/20200413144023_fix_crew_time_columns.rb
+- db/migrate/20200414044144_adjust_crew_overtime_column_names.rb
+- db/migrate/20200414185248_change_time_columns_to_datetime.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb