ecom_core 1.1.28 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ff3e5fd4fd9cccdf472a8b779a62617a627f1d7f5bd5ae394f0f2d36b94aa3
-  data.tar.gz: 501972e9b2abcf95aa11ad02c341cc3cdca42c71d248667ebb35834eceb588f1
+  metadata.gz: '09b8fa70ec63b31c289bacc382fb945336e8e6a3e6930e54d415ed6ba79ec5aa'
+  data.tar.gz: d8cbbc31eb4718a6b4af1808810a3defa163b4b0743d235756e618e1bb37fb10
 SHA512:
-  metadata.gz: 40e7462b2ebf07a06465f3b19c20389c3a4c8198c045f83bc153875b38270969d4bdad0fccf19581d93ccd9ea4472ae208f0edb73251114ada294c51329dfdc0
-  data.tar.gz: 56720e59765d12b7c12c219f0b13ca942c82122b32abf573ee3c040444b458e5a3ce18c91813779665a02fdff0c9d8642bc5ddf6233d252db15864a948c3c49c
+  metadata.gz: 7ba2a9547ffcb1d3085b893e44bee505639abb61caa3cdc28df3cbf56f883910ac1bea7b9645d0577b0bb006dd81a4b5df661cac74f54323a224b8b1b3d7cbc8
+  data.tar.gz: c0eb28eb93b466d7da5dcdf05876351c721e8a541e33cd0d23a26627cf5e0f1934e1e94283f35636111e949c8095e93c58c69f8a39f648c72f622898e15a5b19

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

@@ -5,10 +5,11 @@ 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
+      has_many :crew_times, through: :attendance_sheet_entries
 
       scope :open, -> { where(status: OPEN) }
       scope :current, -> { where(date: Date.today) }

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

@@ -20,17 +20,34 @@ module Ecom
       validates :checkin_time, presence: true, if: :checkout_time
 
       before_save :calculate_hours
+      after_save :calculate_total
 
       def calculate_hours
-        self.hours = checkout_time.nil? || checkin_time.nil? ? 0 : compute_hours
+        self.hours = if checkout_time.nil? || checkin_time.nil?
+                       0
+                     else
+                       compute_hours
+                     end
+      end
+
+      def calculate_total
+        compute_total_for_entry if saved_change_to_hours?
+      end
+
+      def compute_total_for_entry
+        attendance_sheet_entry.total_hours = Ecom::Core::CrewTime.where(
+          attendance_sheet_entry: attendance_sheet_entry,
+          revised: false
+        ).sum(:hours)
+        attendance_sheet_entry.save
       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])
+      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 +57,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/app/models/ecom/core/project.rb

@@ -7,7 +7,7 @@ module Ecom
       belongs_to :project_manager, class_name: 'Ecom::Core::Stakeholder'
       belongs_to :task_template
       belongs_to :currency
-  
+
       validates :name, :location, :contract_number, :date_contract_signed, :commencement_date, :completion_date,
                 :contract_amount, :advance_payment, :retention, presence: true
     end

data/app/services/ecom/core/menu_service.rb

@@ -19,7 +19,7 @@ module Ecom
             end
           end
         end
-        menu_list
+        { success: true, data: menu_list }
       end
     end
   end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.1.28'.freeze
+    VERSION = '1.2.4'.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.4
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement