ecom_core 1.1.22 → 1.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b94415c80a265d838bd9ea7ce3ea2f7ca1993ffeb10dfe30d29462f5cf10c7d
-  data.tar.gz: 8d69cd67d8101909bd6c0a62dd10d296746b0e90a03837bce669e6a82098531b
+  metadata.gz: 9762a1b0d92bec25c6c0e52c814ee95a2e48e5b271c39d59d28fb8ff4d9b01f2
+  data.tar.gz: 0d664422f9ed3f12b49889383b674c3b33090f4d5a0ea9f81c849cb70580b068
 SHA512:
-  metadata.gz: 33126ede6c788eb2eff9665b16df30b53d4ce172bb6e2517546237ac81daf52904414732b2a313760686976d48ffe60111394a9fb2b996cbbc32fe1a9fc76377
-  data.tar.gz: 0c3fa5d8541eeaa4c46234c2a2e4854d1606b0c843e6babcbdcc226f6a7bfa77fc609abba6465a856075abf950917fdd31f7aa2896aed823cb94dbfa289cb6b5
+  metadata.gz: 9b88471b8c2196bcfdb57f087a50be078e7e57def36adb2e3a4dbdb9106701374ce7eb503240cee109c9be700b141dc78a3500222c09bb7651cb00fc2d2989eb
+  data.tar.gz: bd6e8e1dda621385024a9460a849cb5a6ab198cdc34aa32f03bfe19904216e7bdd76c66a15466b525b7e734dbde94c0a089af110e18be1bc4405e0e0cc49e18d

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

@@ -7,9 +7,9 @@ module Ecom
       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')}
+        MORNING => {start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('9:00 AM')},
+        AFTERNOON => {start: Time.zone.parse('10:00 AM'), end: Time.zone.parse('2:00 PM')},
+        BOTH => {start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('2:00 PM')}
       }.freeze
 
       belongs_to :attendance_sheet_entry
@@ -19,10 +19,10 @@ module Ecom
 
       validates :hours, presence: true
 
-      before_save :calculate_hours
+      before_validation :calculate_hours
 
       def calculate_hours
-        self.hours = checkout_time.nil? ? 0 : compute_hours
+        self.hours = (checkout_time.nil? || checkin_time.nil?) ? 0 : compute_hours
       end
 
       # A method to check if checkin and checkout range falls in the morning,

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

@@ -9,13 +9,13 @@ module Ecom
         SQL
         menu = Menu.joins(join_sql).where('UR.id IN (?)', role_ids).distinct
         menu_list = menu.select { |m| m.parent.nil? }.each_with_object([]) do |item, list|
-          list << { id: item.id, label: item.label, icon: item.icon, children: [] }
+          list << { id: item.id, text: item.label, iconCss: item.icon, items: [] }
         end
 
         menu_list.each do |ml|
-          ml[:children] = menu.reject { |m| m.parent.nil? }.each_with_object([]) do |item, list|
+          ml[:items] = menu.reject { |m| m.parent.nil? }.each_with_object([]) do |item, list|
             if item.parent_id == ml[:id]
-              list << { id: item.id, label: item.label, icon: item.icon, route: item.route }
+              list << { id: item.id, text: item.label, iconCss: item.icon, url: item.route }
             end
           end
         end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.1.22'.freeze
+    VERSION = '1.1.27'.freeze
   end
 end

metadata

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