ecom_core 1.1.18 → 1.1.19

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cbaba2b0f521af3d18d5636be2e3be40c6de15aa9f3951b5c3d8b57bdc634e83
4
- data.tar.gz: 24ab07446617733ce416002684e0565f4bb04e66ad0a30d0b28d1f1cd79cf9a2
3
+ metadata.gz: dcebadd1810f6eea78c0ac3507080297092400114d9bc9eefdeda30361e9eb92
4
+ data.tar.gz: efde6b5cea91a56d8a7cf87e5fb58650fb5bffa5b3a5e8a849915e0a89713665
5
5
  SHA512:
6
- metadata.gz: 88dc9269297366e77f415c768da3bb457414b57143f3aef34df98cbbc3923ac7a125f4bec6005f0f46ff071a64dfabb2295c91931b1033ad872f02cfc5100e04
7
- data.tar.gz: cec52dafb2589e7711300bd0322425be7c670ee83bc440def6f26ee6663f10edf6fd1b4231327e28603e9e6bcea95e09e1635c6ce97dda774f69cdea736f58e7
6
+ metadata.gz: 50c886b4ea192ff7addd00bbb21d88dcc022b91e428c8a8776d3a298ac6f8443c4ce8790ebd3968af2ad1e7a5e1037429090455d81f98dac4f2b7fece6b3cee1
7
+ data.tar.gz: '058f44af017d5cb20b7bd5da50f859d6cb8e494b9ed1e11c494b1f49e6681ee2d9f3d2c04b1895d1553f53448bb6ac9139e3f72b0c351f678732998210345a4e'
@@ -2,25 +2,11 @@ module Ecom
2
2
  module Core
3
3
  class CrewTime < ApplicationRecord
4
4
  belongs_to :attendance_sheet_entry
5
- belongs_to :overtime_type, optional: true
5
+ belongs_to :revision_to, class_name: 'Ecom::Core::CrewTime', optional: true
6
+ belongs_to :created_by, class_name: 'Ecom::Core::User'
7
+ has_one :revision, class_name: 'Ecom::Core::CrewOvertime', foreign_key: :revision_to_id
6
8
 
7
- validates :hours, :converted_hours, presence: true
8
- # validates_each :date do |record, attr, value|
9
- # if record.crew && value && (value < record.crew.employment_date)
10
- # record.errors.add(attr, 'should be after employment date')
11
- # end
12
- # end
13
-
14
- before_save :calculate_converted_hours
15
-
16
- def calculate_converted_hours
17
- if overtime
18
- rate = OvertimeType.find(overtime_type_id).rate
19
- self.converted_hours = hours * rate
20
- else
21
- self.converted_hours = hours
22
- end
23
- end
9
+ validates :hours, presence: true
24
10
  end
25
11
  end
26
12
  end
@@ -0,0 +1,17 @@
1
+ class FixCrewTimeColumns < ActiveRecord::Migration[6.0]
2
+ def change
3
+ remove_column :ecom_core_crew_times, :overtime, :boolean
4
+ remove_column :ecom_core_crew_times, :overtime_type_id, :integer
5
+ remove_column :ecom_core_crew_times, :converted_hours, :float
6
+
7
+ add_column :ecom_core_crew_times, :revised, :boolean, default: false, null: false
8
+ add_column :ecom_core_crew_times, :revision_to_id, :integer
9
+ add_column :ecom_core_crew_times, :created_by_id, :integer
10
+
11
+ add_index :ecom_core_crew_times, :revision_to_id, name: 'ct_on_rt_indx'
12
+ add_index :ecom_core_crew_times, :created_by_id, name: 'cb_on_ct_indx'
13
+
14
+ add_foreign_key :ecom_core_crew_times, :ecom_core_crew_times, column: :revision_to_id
15
+ add_foreign_key :ecom_core_crew_times, :ecom_core_users, column: :created_by_id
16
+ end
17
+ end
@@ -1,5 +1,5 @@
1
1
  module Ecom
2
2
  module Core
3
- VERSION = '1.1.18'.freeze
3
+ VERSION = '1.1.19'.freeze
4
4
  end
5
5
  end
@@ -3,10 +3,10 @@ FactoryBot.define do
3
3
  checkin_time { Time.now }
4
4
  checkout_time { Time.now + 2 * 60 * 60 }
5
5
  hours { 2 }
6
- converted_hours { 2 }
7
6
  remark { FFaker::Name.name }
8
- overtime { false }
9
- overtime_type { nil }
10
7
  association :attendance_sheet_entry
8
+ revised { false }
9
+ revision_to { nil }
10
+ association :created_by, factory: :user
11
11
  end
12
12
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ecom_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.18
4
+ version: 1.1.19
5
5
  platform: ruby
6
6
  authors:
7
7
  - Henock L.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-04-11 00:00:00.000000000 Z
11
+ date: 2020-04-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aasm
@@ -309,6 +309,7 @@ files:
309
309
  - db/migrate/20200410090701_create_ecom_core_overtime_sheets.rb
310
310
  - db/migrate/20200410100035_create_ecom_core_overtime_sheet_entries.rb
311
311
  - db/migrate/20200410111827_create_ecom_core_crew_overtimes.rb
312
+ - db/migrate/20200413144023_fix_crew_time_columns.rb
312
313
  - lib/ecom/core.rb
313
314
  - lib/ecom/core/engine.rb
314
315
  - lib/ecom/core/version.rb