ecom_core 1.1.13 → 1.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83f559494c6d48cedb7b001a97bb4b5b2cdaa7258bcee099c8e04d2c7f3c65c7
-  data.tar.gz: e654ac874380e80a456bb1dcf9c144c629eb46877f05836b683079b3851d2fc8
+  metadata.gz: cbaba2b0f521af3d18d5636be2e3be40c6de15aa9f3951b5c3d8b57bdc634e83
+  data.tar.gz: 24ab07446617733ce416002684e0565f4bb04e66ad0a30d0b28d1f1cd79cf9a2
 SHA512:
-  metadata.gz: dc5caae19f7c33dea9d4c20a084c987857047d1d63b77afaa1a213612eac3e5c76923cc2be464564050a7b5c8e1fb35a82961fd5d6216bd3f05bc7cd09aee5f6
-  data.tar.gz: 51b882441cf2b6ff81b0028a0e688fe583297ade03b795dd8009f6f20f6a2b7c0c1bb9a5dee7e17cd2d934ae497add907147c6ed6db8b195a4f83c780f9859a8
+  metadata.gz: 88dc9269297366e77f415c768da3bb457414b57143f3aef34df98cbbc3923ac7a125f4bec6005f0f46ff071a64dfabb2295c91931b1033ad872f02cfc5100e04
+  data.tar.gz: cec52dafb2589e7711300bd0322425be7c670ee83bc440def6f26ee6663f10edf6fd1b4231327e28603e9e6bcea95e09e1635c6ce97dda774f69cdea736f58e7

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/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/app/services/ecom/core/menu_service.rb

@@ -9,19 +9,16 @@ 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, items: [] }
+          list << { id: item.id, label: item.label, icon: item.icon, children: [] }
         end
 
         menu_list.each do |ml|
-          ml[:items] = menu.reject { |m| m.parent.nil? }.each_with_object([]) do |item, list|
+          ml[:children] = 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 }
             end
           end
         end
-
-        # Remove id key
-        menu_list.map { |ml| ml.delete(:id) }
         menu_list
       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.13'.freeze
+    VERSION = '1.1.18'.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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.1.18
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2020-04-11 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,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