ecom_core 1.2.22 → 1.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 226d69727b3ecb4a8edfb5fc4c4a92fb6c91ff999d928f5509acaa9da26ec19a
-  data.tar.gz: bb35268fa5cda39ace0d06240ad53f06da6845076df4e23041b6bd3ce147a36b
+  metadata.gz: 42f95a3904d7cdfebcafa09111ccfa6739bfda3496f67126e7d2fc43b586000f
+  data.tar.gz: e9cbda9dfca1b89b7660a50a1550ec0a0218dc2faaef488e179d5c0a5a21eedf
 SHA512:
-  metadata.gz: 6069a79e8aa94eae4e49e9a68d0783a366fdb92c355d3d73ed4fdbd0ab2feaeb3f2c4c3678d8fda11a0cf7d25b783a89677d213752b1c9e5909e84f3491e52c6
-  data.tar.gz: cf82927e16d1809c43760e3238202a87df93c10ae89b06cc482e598758c933d4368ecab45b8fb1d38c4dfec10180ae35e87e8ad785bde60d6329eac9e4c81c2f
+  metadata.gz: 704d938a16a2f48723e94663ba0161ada47c46d4c3cea081e1856d476aaaabb0820d1c0de57422f0787946bcf35a9eaac87973568c2736e3f63b7f03e4f9c77f
+  data.tar.gz: ceb93623c85ace2292f56142d3982e8be76fff618cdcad2cea79bdfe7c70d35a008e213114a885f16eacbd2de83df995287b94d66face645abb6513feeda0bbc

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

@@ -1,6 +1,7 @@
 module Ecom
   module Core
     class Crew < ApplicationRecord
+      mount_base64_uploader :photo, PhotoUploader
       PERMANENT = 'Permanent'.freeze
       SUPERVISOR = 'Supervisor'.freeze
       TEMPORARY = 'Temporary'.freeze

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

@@ -0,0 +1,17 @@
+module Ecom
+  module Core
+    class CrewContract < ApplicationRecord
+      belongs_to :crew
+
+      validates :contract_no, :from, :to, :place_of_work, :probation_period, :contract_type, presence: true
+      validates :contract_no, uniqueness: true
+      validate :validate_date_range
+
+      def validate_date_range
+        return unless from && to
+
+        errors.add(:to, 'cannot be before from date.') if from >= to
+      end
+    end
+  end
+end

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

@@ -9,6 +9,7 @@ module Ecom
       has_one :revision, class_name: 'Ecom::Core::CrewOvertime', foreign_key: :revision_to_id
 
       validates :hours, :raw_hours, presence: true
+      validate :validate_overtime_by_type
 
       scope :by_overtime, lambda { |id|
         joins(:overtime_sheet_entry).where(ecom_core_overtime_sheet_entries: { overtime_sheet_id: id })
@@ -17,6 +18,18 @@ module Ecom
 
       before_save :calculate_hours
 
+      def validate_overtime_by_type
+        return unless overtime_type
+
+        start = Time.zone.parse(overtime_type.from)
+        finish = Time.zone.parse(overtime_type.to)
+        diff = ((finish - start) / 3600).round
+
+        return unless raw_hours > diff
+
+        errors.add(:crew_overtime, 'The selected overtime type does not allow the specified amount of hours.')
+      end
+
       def calculate_hours
         rate = OvertimeType.find(overtime_type_id).rate
         self.hours = raw_hours * rate

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

@@ -6,18 +6,13 @@ module Ecom
       AFTERNOON = :afternoon
       FULL_DAY = :full_day
 
-      # TIME_RANGE = {
-      #   MORNING => { start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('9:00 AM') },
-      #   AFTERNOON => { start: Time.zone.parse('10:00 AM'), end: Time.zone.parse('2:00 PM') },
-      #   BOTH => { start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('2:00 PM') }
-      # }.freeze
-
       belongs_to :attendance_sheet_entry
       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::CrewTime', foreign_key: :revision_to_id
 
       validates :checkin_time, presence: true, if: :checkout_time
+      validate :checkout_is_greater_than_checkin
 
       scope :by_attendance, lambda { |id|
         joins(:attendance_sheet_entry).where(ecom_core_attendance_sheet_entries: { attendance_sheet_id: id })
@@ -27,6 +22,12 @@ module Ecom
       before_save :calculate_hours
       after_save :calculate_total
 
+      def checkout_is_greater_than_checkin
+        return unless checkin_time && checkout_time && checkout_time <= checkin_time
+
+        errors.add(:checkout_time, "can't be less than checkin time.")
+      end
+
       def calculate_hours
         self.hours = if checkout_time.nil? || checkin_time.nil?
                        0

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

@@ -17,7 +17,7 @@ module Ecom
           m = 1
           y += 1
         end
-        Payroll.create(month: m, year: y)
+        Payroll.create(month: m, year: y, project_id: project_id)
       end
     end
   end

data/app/uploaders/ecom/core/photo_uploader.rb

@@ -0,0 +1,19 @@
+module Ecom
+  module Core
+    class PhotoUploader < CarrierWave::Uploader::Base
+      storage :file
+
+      def store_dir
+        "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+      end
+
+      def extension_whitelist
+        %w[jpg jpeg gif png]
+      end
+
+      def filename
+        original_filename
+      end
+    end
+  end
+end

data/db/migrate/20191225100054_create_ecom_core_crews.rb

@@ -12,6 +12,7 @@ class CreateEcomCoreCrews < ActiveRecord::Migration[6.0]
       t.string :wage_in_words, null: false
       t.date :employment_date
       t.boolean :sub_contracted, null: false, default: false
+      t.string :photo
       t.string :guarantor_name
       t.string :guarantor_phone
       t.boolean :active, null: false, default: true

data/db/migrate/20200901085227_create_ecom_core_crew_contracts.rb

@@ -0,0 +1,20 @@
+class CreateEcomCoreCrewContracts < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_crew_contracts do |t|
+      t.string :contract_no, null: false, unique: true
+      t.date :from, null: false
+      t.date :to, null: false
+      t.string :place_of_work, null: false
+      t.integer :probation_period, null: false
+      t.string :contract_type, null: false
+      t.boolean :contract_signed, null: false, default: false
+      t.date :date_contract_signed
+      t.references :crew,
+                   null: false,
+                   index: { name: 'cc_on_crew_indx' },
+                   foreign_key: { to_table: :ecom_core_crews }
+
+      t.timestamps
+    end
+  end
+end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.22'.freeze
+    VERSION = '1.2.27'.freeze
   end
 end

data/lib/ecom_core.rb

@@ -3,3 +3,5 @@ require 'ecom/core/engine'
 require 'ancestry'
 require 'aasm'
 require 'active_model_serializers'
+require 'carrierwave'
+require 'carrierwave/base64'

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

@@ -0,0 +1,13 @@
+FactoryBot.define do
+  factory :crew_contract, class: 'Ecom::Core::CrewContract' do
+    from { Date.yesterday }
+    to { Date.tomorrow }
+    place_of_work { FFaker::Name.name }
+    probation_period { 45 }
+    contract_no { FFaker::Name.name }
+    contract_type { FFaker::Name.name }
+    contract_signed { false }
+    date_contract_signed { Date.today }
+    association :crew
+  end
+end

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

@@ -10,6 +10,7 @@ FactoryBot.define do
     wage_in_words { FFaker::Name.name }
     employment_date { Date.today - 1 }
     sub_contracted { false }
+    photo { FFaker::Name.name }
     guarantor_name { FFaker::Name.name }
     guarantor_phone { FFaker::Name.name }
     active { true }

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

@@ -4,7 +4,7 @@ FactoryBot.define do
       "OTName#{n}"
     end
     from { '07:00 AM' }
-    to { '08:00 AM' }
+    to { '09:00 AM' }
     rate { 1.5 }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.22
+  version: 1.2.27
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-01 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -38,6 +38,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: after_commit_everywhere
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: ancestry
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +86,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: carrierwave-base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +259,7 @@ files:
 - app/models/ecom/core/component_type.rb
 - app/models/ecom/core/country.rb
 - app/models/ecom/core/crew.rb
+- app/models/ecom/core/crew_contract.rb
 - app/models/ecom/core/crew_overtime.rb
 - app/models/ecom/core/crew_time.rb
 - app/models/ecom/core/crew_type.rb
@@ -258,6 +307,7 @@ files:
 - app/serializers/ecom/core/user_serializer.rb
 - app/services/ecom/core/menu_service.rb
 - app/services/ecom/core/token_auth_service.rb
+- app/uploaders/ecom/core/photo_uploader.rb
 - app/validators/ecom/core/date_range_validator.rb
 - config/database.ci.yml
 - config/routes.rb
@@ -305,6 +355,7 @@ files:
 - db/migrate/20200602130247_create_ecom_core_requested_items.rb
 - db/migrate/20200602830603_create_ecom_core_bookings.rb
 - db/migrate/20200603115317_create_ecom_core_booked_items.rb
+- db/migrate/20200901085227_create_ecom_core_crew_contracts.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
@@ -318,6 +369,7 @@ files:
 - spec/factories/ecom/core/companies.rb
 - spec/factories/ecom/core/component_types.rb
 - spec/factories/ecom/core/countries.rb
+- spec/factories/ecom/core/crew_contracts.rb
 - spec/factories/ecom/core/crew_overtimes.rb
 - spec/factories/ecom/core/crew_times.rb
 - spec/factories/ecom/core/crew_types.rb