ecom_core 1.1.14 → 1.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b8bc2e6d8400e996f20f351ee949cff29dbbbba72dbb396c2039b51714ac6f7
-  data.tar.gz: f4c58d21264802a0dc6b18a2adf895205a66c33cbbb160e7b677e9e65eae5465
+  metadata.gz: dcebadd1810f6eea78c0ac3507080297092400114d9bc9eefdeda30361e9eb92
+  data.tar.gz: efde6b5cea91a56d8a7cf87e5fb58650fb5bffa5b3a5e8a849915e0a89713665
 SHA512:
-  metadata.gz: e3a700353f3e4fc0bf5e7402026c0ae492a51dae4e30c42a21125e0cef713923910add513c1dc37dfd5aefff06de0451e15c8ca6493e6e226903ec389c736b78
-  data.tar.gz: 39c78b1cd0607c49a7c954b96ce87af031067c198ee78ac628f43715604a38b5b665a11d3019d5abfd5a72db8efb386878a91112143140a4b81bc782126b30a6
+  metadata.gz: 50c886b4ea192ff7addd00bbb21d88dcc022b91e428c8a8776d3a298ac6f8443c4ce8790ebd3968af2ad1e7a5e1037429090455d81f98dac4f2b7fece6b3cee1
+  data.tar.gz: '058f44af017d5cb20b7bd5da50f859d6cb8e494b9ed1e11c494b1f49e6681ee2d9f3d2c04b1895d1553f53448bb6ac9139e3f72b0c351f678732998210345a4e'

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

@@ -2,22 +2,32 @@ module Ecom
   module Core
     class AttendanceSheet < ApplicationRecord
       OPEN = 'Open'.freeze
-      CLOSED = 'Closed'.freeze
+      SUBMITTED = 'Submitted'.freeze
+      APPROVED = 'Approved'.freeze
 
       validates :date, :opened_at, presence: true, uniqueness: true
-      validates :status, inclusion: [OPEN, CLOSED]
+      validates :status, inclusion: [OPEN, SUBMITTED, APPROVED]
 
       has_many :attendance_sheet_entries
 
-      scope :open, -> { find_by(status: OPEN) }
-      scope :current_open, -> { where(status: OPEN, date: Date.today) }
+      scope :open, -> { where(status: OPEN) }
+      scope :current, -> { where(date: Date.today) }
+      scope :current_open, -> { open.current }
+
+      def self.open_for_date(date)
+        AttendanceSheet.find_by(status: OPEN, date: date)
+      end
+
+      def self.open_exists?
+        AttendanceSheet.open.exists?
+      end
 
       def self.exists_for_today?
-        AttendanceSheet.where(date: Date.today).exists?
+        AttendanceSheet.current.exists?
       end
 
       def self.open_exists_for_today?
-        where(status: OPEN, date: Date.today).exists?
+        AttendanceSheet.current_open.exists?
       end
 
       # Attendance sheet should be created using the
@@ -28,29 +38,32 @@ module Ecom
       def self.create_current
         raise 'Attendance sheet already created for the day.' if AttendanceSheet.exists_for_today?
 
+        raise 'There is an open attendance sheet which needs to be submitted before creating a new one.' if AttendanceSheet.open_exists?
+
         AttendanceSheet.create(date: Date.today, opened_at: Time.now, status: OPEN)
       end
 
-      def self.close_current
+      def self.submit_current
         sheet = AttendanceSheet.find_by(date: Date.today, status: OPEN)
 
-        raise 'There is no attendance sheet to close.' if sheet.nil?
+        raise 'There is no open attendance sheet to submit.' if sheet.nil?
 
         sheet.closed_at = Time.now
-        sheet.status = CLOSED
+        sheet.status = SUBMITTED
         sheet.save
         sheet
       end
 
       # This method should be used by privileged users
-      # to close the attendance sheet after the date has
+      # to submit the attendance sheet after the date has
       # passed. Normally, timekeepers need to open and close
       # an attendance sheet of a date on the specific date.
-      def self.close
-        raise 'There is no attendance sheet to close.' unless AttendanceSheet.open_exists_for_today?
+      def self.submit(date)
+        sheet = AttendanceSheet.open_for_date(date)
+        raise 'There is no open attendance sheet to submit for the selected day.' unless sheet
 
-        sheet = AttendanceSheet.open
         sheet.closed_at = Time.now
+        sheet.status = SUBMITTED
         sheet.save
         sheet
       end

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', foreign_key: :revision_to_id
+
+      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/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/app/models/ecom/core/overtime_sheet.rb

@@ -0,0 +1,42 @@
+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, -> { where(status: OPEN) }
+      scope :for_date, ->(date) { where(date: date) }
+
+      def self.open_exists?
+        OvertimeSheet.open.exists?
+      end
+
+      def self.open_for_date_exists?(date)
+        OvertimeSheet.open.for_date(date).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_for_date_exists?(date)
+          raise 'There is already an open overtime sheet for the selected date.'
+        end
+
+        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,9 @@
+module Ecom
+  module Core
+    class OvertimeSheetEntry < ApplicationRecord
+      belongs_to :overtime_sheet
+      belongs_to :crew
+      has_many :crew_overtimes
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Ecom
       has_and_belongs_to_many :user_roles, join_table: 'ecom_core_users_user_roles'
 
       VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i.freeze
-      validates :first_name, :last_name, :active, presence: true
+      validates :first_name, :last_name, presence: true
       validates :email, presence: true, format: { with: VALID_EMAIL_REGEX }, uniqueness: { case_sensitive: false }
       validates :password, presence: true, length: { minimum: 6 }, confirmation: true, if: :password
 

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/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.14'.freeze
+    VERSION = '1.1.19'.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/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

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