ecom_core 1.1.21 → 1.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20baeb3e84b28e3138d9d2b64cc0f91afe5e3e79361baa4564b280eca1d7db92
-  data.tar.gz: 714499d1b00181a32b8ac85dd2a469d3474ec590ac4c0bb958d655285420647a
+  metadata.gz: 684f4fd81b9eef6da1506b92ce20300169eb7f0af2219b0f0fab735a1d9fd7c0
+  data.tar.gz: 9353cbd91b041984ef78bdef6b0fd6a4f3d6431c18f0f598024ed9533124f710
 SHA512:
-  metadata.gz: 99fa344c2db5b7a704eed5cf9191c9f620f95b0f74cb1e38da9c121e91b6d3b477b1b8bea16387647f0bda528054f8b6ae55276a74944bf08998c070d660a4a7
-  data.tar.gz: 1959a1648e993edd98fa846391b38bc967c8844fde3b85ab9c99dde4bbbed683bcb9c57ce215fc2657348a36eb3b539a7dfdb878dd73df022a21d4bcdc4bee6b
+  metadata.gz: 6e12741b87c8af09b9c35a639539e06f597216aaf9c590a60d56d214d60b9ad7b841812ec2a857d397cac1eb2669ca0eed71c08255de745df8b7db10f44a0f6b
+  data.tar.gz: d23867509e519c65c0e28abe38ed3fa467d7ba03d5291bae9b42419c9df4eb3344b902fc5d20b6db8deca22e594e5d26bf15053dd33ead0e6e526325e617e761

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,7 +19,7 @@ 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

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/db/migrate/20200414185248_change_time_columns_to_datetime.rb

@@ -1,6 +1,8 @@
 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
+    remove_column :ecom_core_crew_times, :checkin_time, :time
+    add_column :ecom_core_crew_times, :checkin_time, :datetime
+    remove_column :ecom_core_crew_times, :checkout_time, :time
+    add_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.21'.freeze
+    VERSION = '1.1.26'.freeze
   end
 end

metadata

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