ecom_core 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9609bd123c55bdacd45126589991ad51231db85fc6b1a4ac30b5d39aee7fb625
-  data.tar.gz: e5e453462da7dcc7596c8e7b0274bdf448affa2bc02b8b4de6d50289d4e9bb08
+  metadata.gz: 8102682bb3213f6817cdf22cbfea5518186482bcd83bb9619b4981a42b6e6c3e
+  data.tar.gz: ef9eedf363154f153d26dabd3f1724a25220aa2c2b995f2273d60d11893e5276
 SHA512:
-  metadata.gz: 8a5662a484563182b4b34099708a316ddd05408d5e3a9f3c891697bd1f681f93e16b9a42bf3598176cb7d5b161e8aa0a09c4402fae3cd7582bcf9170268cc24f
-  data.tar.gz: 61433c913b8c43962970806b9179c7b6ea9bb40626438cb5bf22e2e118ef45ed1f387489370802ff795b5b8fd2abb99b3b70e31cf0fdca740f72fda9a47f407e
+  metadata.gz: dc99f4ba8f8c7a3cfd35dba3bc74762306e05cd919edd0cfc4d8a4b76b6f331d4dd761ffcb5a09144eb453ce2e0a0debd8a27a8e4dec9c1965cb13fd593a0ad9
+  data.tar.gz: a08d94a0a4293a9a58aa7c80e30b1a14db61b2fa16667366082ac88eb5f1af3086e934864e2929ce9a15600398def095bc51f21eadef2532cc79aea2ddd1b917

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

@@ -20,9 +20,26 @@ 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,

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/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.1'.freeze
+    VERSION = '1.2.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-02 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