ecom_core 1.1.18 → 1.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbaba2b0f521af3d18d5636be2e3be40c6de15aa9f3951b5c3d8b57bdc634e83
-  data.tar.gz: 24ab07446617733ce416002684e0565f4bb04e66ad0a30d0b28d1f1cd79cf9a2
+  metadata.gz: dcebadd1810f6eea78c0ac3507080297092400114d9bc9eefdeda30361e9eb92
+  data.tar.gz: efde6b5cea91a56d8a7cf87e5fb58650fb5bffa5b3a5e8a849915e0a89713665
 SHA512:
-  metadata.gz: 88dc9269297366e77f415c768da3bb457414b57143f3aef34df98cbbc3923ac7a125f4bec6005f0f46ff071a64dfabb2295c91931b1033ad872f02cfc5100e04
-  data.tar.gz: cec52dafb2589e7711300bd0322425be7c670ee83bc440def6f26ee6663f10edf6fd1b4231327e28603e9e6bcea95e09e1635c6ce97dda774f69cdea736f58e7
+  metadata.gz: 50c886b4ea192ff7addd00bbb21d88dcc022b91e428c8a8776d3a298ac6f8443c4ce8790ebd3968af2ad1e7a5e1037429090455d81f98dac4f2b7fece6b3cee1
+  data.tar.gz: '058f44af017d5cb20b7bd5da50f859d6cb8e494b9ed1e11c494b1f49e6681ee2d9f3d2c04b1895d1553f53448bb6ac9139e3f72b0c351f678732998210345a4e'

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

@@ -2,25 +2,11 @@ module Ecom
   module Core
     class CrewTime < ApplicationRecord
       belongs_to :attendance_sheet_entry
-      belongs_to :overtime_type, optional: true
+      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
 
-      validates :hours, :converted_hours, presence: true
-      # validates_each :date do |record, attr, value|
-      #   if record.crew && value && (value < record.crew.employment_date)
-      #     record.errors.add(attr, 'should be after employment date')
-      #   end
-      # end
-
-      before_save :calculate_converted_hours
-
-      def calculate_converted_hours
-        if overtime
-          rate = OvertimeType.find(overtime_type_id).rate
-          self.converted_hours = hours * rate
-        else
-          self.converted_hours = hours
-        end
-      end
+      validates :hours, presence: true
     end
   end
 end

data/db/migrate/20200413144023_fix_crew_time_columns.rb

@@ -0,0 +1,17 @@
+class FixCrewTimeColumns < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :ecom_core_crew_times, :overtime, :boolean
+    remove_column :ecom_core_crew_times, :overtime_type_id, :integer
+    remove_column :ecom_core_crew_times, :converted_hours, :float
+
+    add_column :ecom_core_crew_times, :revised, :boolean, default: false, null: false
+    add_column :ecom_core_crew_times, :revision_to_id, :integer
+    add_column :ecom_core_crew_times, :created_by_id, :integer
+
+    add_index :ecom_core_crew_times, :revision_to_id, name: 'ct_on_rt_indx'
+    add_index :ecom_core_crew_times, :created_by_id, name: 'cb_on_ct_indx'
+
+    add_foreign_key :ecom_core_crew_times, :ecom_core_crew_times, column: :revision_to_id
+    add_foreign_key :ecom_core_crew_times, :ecom_core_users, column: :created_by_id
+  end
+end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.1.18'.freeze
+    VERSION = '1.1.19'.freeze
   end
 end

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

@@ -3,10 +3,10 @@ FactoryBot.define do
     checkin_time { Time.now }
     checkout_time { Time.now + 2 * 60 * 60 }
     hours { 2 }
-    converted_hours { 2 }
     remark { FFaker::Name.name }
-    overtime { false }
-    overtime_type { nil }
     association :attendance_sheet_entry
+    revised { false }
+    revision_to { nil }
+    association :created_by, factory: :user
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.1.18
+  version: 1.1.19
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-11 00:00:00.000000000 Z
+date: 2020-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -309,6 +309,7 @@ files:
 - db/migrate/20200410090701_create_ecom_core_overtime_sheets.rb
 - 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
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb