ecom_core 1.1.16 → 1.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe250f7096d4de2dbcce2ab0e9ad159f107812cf69768fa6cd92962c8c80c937
-  data.tar.gz: 29bba333d43472d8339ad18a0ecd9e238a72b705c13fd86ae283ac095d9adf0b
+  metadata.gz: 7bdf3745639577dacd60d41eb82831de69cd41040b71411628f17be1a8397b42
+  data.tar.gz: 21fd30d003500d6648d42eb6be7e5d073eff6b7810148cd00aed1fd2496363ec
 SHA512:
-  metadata.gz: 981a42e43a0beeef91423b2f282c2908dd516d1c4ee56d5ad55cf6275221f3962e2ba1eacb7861d63bdb5ae4805041f1e786f321473696f540c927b8c8472b8f
-  data.tar.gz: 2a84218270b5001b34d02c16e4a5c6cfc6fc0e9d47651389e2851524bf4e6910dc8e99b6578e2d52dd7996802c06953f266034df6652a42c97c8e6608e48f162
+  metadata.gz: 769ccb1b054f0b6faf9421e323e562053d3fe7770fb3abed2af5e0535be3f61f39803deff27b4816d4b58efcb07419b46519c73906ff44c7480ee4b03e9ac099
+  data.tar.gz: 6d852af57207ad9cfbc6f30d7eaadf239c338b6c4796198e5ec8f833b69b16fba2d790d555b64b37279583e87edb8a517a7dfe0811e74b66fc21f1e0659c3b9c

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

@@ -0,0 +1,21 @@
+module Ecom
+  module Core
+    class CrewOvertime < ApplicationRecord
+      belongs_to :overtime_type
+      belongs_to :overtime_sheet_entry
+      belongs_to :revision_to, class_name: 'Ecom::Core::CrewOvertime', optional: true
+      belongs_to :created_by, class_name: 'Ecom::Core::User'
+
+      has_one :revision, class_name: 'Ecom::Core::CrewOvertime'
+
+      validates :hours, :converted_hours, presence: true
+
+      before_save :calculate_converted_hours
+
+      def calculate_converted_hours
+        rate = OvertimeType.find(overtime_type_id).rate
+        self.converted_hours = hours * rate
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+module Ecom
+  module Core
+    class OvertimeSheet < ApplicationRecord
+      OPEN = 'Open'.freeze
+      SUBMITTED = 'Submitted'.freeze
+      APPROVED = 'Approved'.freeze
+
+      validates :date, :opened_at, presence: true, uniqueness: true
+      validates :status, inclusion: [OPEN, SUBMITTED, APPROVED]
+
+      has_many :overtime_sheet_entries
+
+      scope :open, -> { find_by(status: OPEN) }
+
+      def self.open_exists?
+        OvertimeSheet.where(status: OPEN).exists?
+      end
+
+      # Overtime sheet should be created using the
+      # method below only. This is because we need to
+      # check if there is an open overtime already,
+      # and also that we have only one open overtime
+      # sheet at a time.
+      def self.create_new(date)
+        if OvertimeSheet.open_exists?
+          raise 'There is already an open overtime sheet. It has to be submitted before creating a new one.'
+        end
+
+        OvertimeSheet.create(date: date, opened_at: Time.now, status: OPEN)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Ecom
+  module Core
+    class OvertimeSheetEntry < ApplicationRecord
+      belongs_to :overtime_sheet
+      belongs_to :crew
+    end
+  end
+end

data/db/migrate/20200410090701_create_ecom_core_overtime_sheets.rb

@@ -0,0 +1,12 @@
+class CreateEcomCoreOvertimeSheets < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_overtime_sheets do |t|
+      t.date :date, null: false, unique: true
+      t.time :opened_at, null: false
+      t.time :submitted_at
+      t.string :status, null: false, default: 'Open'
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200410100035_create_ecom_core_overtime_sheet_entries.rb

@@ -0,0 +1,14 @@
+class CreateEcomCoreOvertimeSheetEntries < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_overtime_sheet_entries do |t|
+      t.references :overtime_sheet, null: false, index: { name: 'ose_on_os_indx' }
+      t.references :crew, null: false, index: { name: 'ose_on_crew_indx' }
+      t.float :total_overtime
+
+      t.timestamps
+    end
+    add_foreign_key :ecom_core_overtime_sheet_entries, :ecom_core_overtime_sheets,
+                    column: :overtime_sheet_id
+    add_foreign_key :ecom_core_overtime_sheet_entries, :ecom_core_crews, column: :crew_id
+  end
+end

data/db/migrate/20200410111827_create_ecom_core_crew_overtimes.rb

@@ -0,0 +1,21 @@
+class CreateEcomCoreCrewOvertimes < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_crew_overtimes do |t|
+      t.float :hours, null: false
+      t.float :converted_hours, null: false, default: 0
+      t.string :remark
+      t.references :overtime_type, null: false, index: { name: 'ot_on_co_indx' }
+      t.references :overtime_sheet_entry, null: false, index: { name: 'ose_on_co_indx' }
+      t.boolean :revised, null: false, default: false
+      t.references :revision_to, null: true
+      t.references :created_by, null: false, index: { name: 'cb_on_co_indx' }
+
+      t.timestamps
+    end
+    add_foreign_key :ecom_core_crew_overtimes, :ecom_core_overtime_types, column: :overtime_type_id
+    add_foreign_key :ecom_core_crew_overtimes, :ecom_core_overtime_sheet_entries,
+                    column: :overtime_sheet_entry_id
+    add_foreign_key :ecom_core_crew_overtimes, :ecom_core_crew_overtimes, column: :revision_to_id
+    add_foreign_key :ecom_core_crew_overtimes, :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.16'.freeze
+    VERSION = '1.1.17'.freeze
   end
 end

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

@@ -0,0 +1,12 @@
+FactoryBot.define do
+  factory :crew_overtime, class: 'Ecom::Core::CrewOvertime' do
+    hours { 2 }
+    converted_hours { 2 }
+    remark { FFaker::Name.name }
+    association :overtime_type
+    association :overtime_sheet_entry
+    revised { false }
+    revision_to { nil }
+    association :created_by, factory: :user
+  end
+end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :overtime_sheet_entry, class: 'Ecom::Core::OvertimeSheetEntry' do
+    association :overtime_sheet
+    association :crew
+    total_overtime { FFaker::Random.rand(0..8) }
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :overtime_sheet, class: 'Ecom::Core::OvertimeSheet' do
+    date { Date.today }
+    opened_at { Time.now }
+    submitted_at { Time.now + 1.day }
+    status { Ecom::Core::OvertimeSheet::OPEN }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.1.16
+  version: 1.1.17
 platform: ruby
 authors:
 - Henock L.
@@ -219,6 +219,7 @@ files:
 - app/models/ecom/core/attendance_sheet.rb
 - app/models/ecom/core/attendance_sheet_entry.rb
 - app/models/ecom/core/crew.rb
+- app/models/ecom/core/crew_overtime.rb
 - app/models/ecom/core/crew_time.rb
 - app/models/ecom/core/crew_type.rb
 - app/models/ecom/core/currency.rb
@@ -234,6 +235,8 @@ files:
 - app/models/ecom/core/lookup.rb
 - app/models/ecom/core/material_type.rb
 - app/models/ecom/core/menu.rb
+- app/models/ecom/core/overtime_sheet.rb
+- app/models/ecom/core/overtime_sheet_entry.rb
 - app/models/ecom/core/overtime_type.rb
 - app/models/ecom/core/payment.rb
 - app/models/ecom/core/payment_detail.rb
@@ -303,6 +306,9 @@ files:
 - db/migrate/20200401122539_create_ecom_core_attendance_sheet_entries.rb
 - db/migrate/20200401142959_relate_crew_time_with_attendance_sheet_entry.rb
 - db/migrate/20200401144137_remove_crew_time_id_from_crew.rb
+- 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
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
@@ -311,6 +317,7 @@ files:
 - spec/factories/ecom/core/application_modules.rb
 - spec/factories/ecom/core/attendance_sheet_entries.rb
 - spec/factories/ecom/core/attendance_sheets.rb
+- spec/factories/ecom/core/crew_overtimes.rb
 - spec/factories/ecom/core/crew_times.rb
 - spec/factories/ecom/core/crew_types.rb
 - spec/factories/ecom/core/crews.rb
@@ -327,6 +334,8 @@ files:
 - spec/factories/ecom/core/lookups.rb
 - spec/factories/ecom/core/material_types.rb
 - spec/factories/ecom/core/menus.rb
+- spec/factories/ecom/core/overtime_sheet_entries.rb
+- spec/factories/ecom/core/overtime_sheets.rb
 - spec/factories/ecom/core/overtime_types.rb
 - spec/factories/ecom/core/payment_details.rb
 - spec/factories/ecom/core/payments.rb