ecom_core 1.3.4 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e7a318b5876bb64228f9ea5af19d4a6bebe8ec005fc307beff0711ecdb5ca70
-  data.tar.gz: edb05a7dc9c1bf6e43dfc8c0259cf79adf88cfc3a44b0bfcc377976a322745ac
+  metadata.gz: 93617ca2cba869a455385832706b991a6e206c6bafac294033a4b3809fb9e686
+  data.tar.gz: a6f5092c66cd10be3f4620cf06dd423acbd84152351e5e99822fb5111f9ba541
 SHA512:
-  metadata.gz: 12240a5cf8319227d7486e79778499aa71340073831b6544a2d1ce77b0ffb2bc0c870184e381ea6fddc6fc41c28298dccea2ffadf36fc2828b9bbb88e07bd4fe
-  data.tar.gz: 1c4fafd9e859327c82ca0701a9484a724aa703fe67de1e873aec4e365f612eee9e9f3cedc65331e77936bc595c40a6dba92ca73de60b4aa94b5a08ccfd7726eb
+  metadata.gz: fdcfcacdc4a155932db91f7e3e334fc1b7b32e66e9855bb326459f9f2dd58898e80d609213fb9064588597f5dc83366cc22e51904061ac2a9cdd408b9f032567
+  data.tar.gz: e364a949d017317191bb870e53ac40b891970486dbd629fd85684ed949f27f3738f2c0634b5886f574c2d734b65beafcc2880604d01fcf2f8ab950259cab1ad9

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

@@ -4,6 +4,8 @@ module Ecom
       belongs_to :attendance_sheet
       belongs_to :crew
       has_many :crew_times
+
+      validates :total_hours, presence: true, numericality: { greater_than_or_equal_to: 0 }
     end
   end
 end

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

@@ -10,6 +10,10 @@ module Ecom
 
       validates :hours, :raw_hours, presence: true
       validate :validate_overtime_by_type
+      validates :hours, presence: true, numericality: { greater_than_or_equal_to: 0 }
+      validates :overtime_type_id,
+                uniqueness: { scope: :overtime_sheet_entry_id,
+                              message: 'There exists a crew overtime for the given overtime sheet and overtime type' }
 
       scope :by_overtime, lambda { |id|
         joins(:overtime_sheet_entry).where(ecom_core_overtime_sheet_entries: { overtime_sheet_id: id })
@@ -23,8 +27,11 @@ module Ecom
 
         start = Time.zone.parse(overtime_type.from)
         finish = Time.zone.parse(overtime_type.to)
-        diff = ((finish - start) / 3600).round
-
+        diff = if finish >= start
+                 ((finish - start) / 3600).round
+               else
+                 ((start - finish) / 3600).round
+               end
         return unless raw_hours > diff
 
         errors.add(:crew_overtime, 'The selected overtime type does not allow the specified amount of hours.')

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

@@ -13,6 +13,7 @@ module Ecom
 
       validates :checkin_time, presence: true, if: :checkout_time
       validate :time_range_validation, :total_time_validation
+      validates :hours, presence: true, numericality: { greater_than_or_equal_to: 0 }
 
       scope :by_attendance, lambda { |id|
         joins(:attendance_sheet_entry).where(ecom_core_attendance_sheet_entries: { attendance_sheet_id: id })
@@ -31,9 +32,13 @@ module Ecom
       def total_time_validation
         return if checkout_time.nil? || checkin_time.nil?
 
-        return unless attendance_sheet_entry.total_hours + compute_hours > 8
-
-        errors.add(:attendance_sheet_entry, 'has more than 8 hours')
+        if new_record? & !persisted?
+          if attendance_sheet_entry.total_hours + compute_hours > 8
+            errors.add(:attendance_sheet_entry, 'has more than 8 hours')
+          end
+        elsif attendance_sheet_entry.total_hours + compute_hours - computed_hour > 8
+          errors.add(:attendance_sheet_entry, 'has more than 8 hours')
+        end
       end
 
       def calculate_hours
@@ -109,6 +114,21 @@ module Ecom
         time -= 1 if day_part == FULL_DAY
         time
       end
+
+      # A similar method as `compute_hours` but this one computes hours for
+      # the the currently presisted checkin_time and checkout_time
+      def computed_hour
+        # Reparse time to avoid errors caused by date differences
+        range = define_range
+        start = Time.zone.parse(checkin_time_was.strftime('%I:%M%p'))
+        finish = Time.zone.parse(checkout_time_was.strftime('%I:%M%p'))
+        day_part = find_range(start, finish)
+        left = start.before?(range[day_part][:start]) ? range[day_part][:start] : start
+        right = finish.after?(range[day_part][:finish]) ? range[day_part][:finish] : finish
+        time = (right - left) / 1.hour
+        time -= 1 if day_part == FULL_DAY
+        time
+      end
     end
   end
 end

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

@@ -10,10 +10,13 @@ module Ecom
       belongs_to :equipment_item
       belongs_to :maintenance_type
       belongs_to :prepared_by, class_name: 'Ecom::Core::User'
-      belongs_to :approved_by, class_name: 'Ecom::Core::User'
+      belongs_to :approved_by, class_name: 'Ecom::Core::User', optional: true
 
-      validates :title, :status, :current_reading, presence: true
+      validates :title, :status, presence: true
       validates :status, inclusion: STATUSES
+
+      scope :approved, -> { where(approved: true) }
+      scope :unapproved, -> { where(approved: false) }
     end
   end
 end

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

@@ -4,6 +4,8 @@ module Ecom
       belongs_to :overtime_sheet
       belongs_to :crew
       has_many :crew_overtimes
+
+      validates :total_overtime, presence: true, numericality: { greater_than_or_equal_to: 0 }
     end
   end
 end

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

@@ -5,7 +5,7 @@ module Ecom
       belongs_to :payment
 
       validates :hours, :ot_hours, :base_salary, :overtime, :gross_salary, :tax, :pension, :net_salary, :net_pay,
-                :advance, presence: true
+                :advance, presence: true, numericality: { greater_than_or_equal_to: 0 }
     end
   end
 end

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

@@ -11,7 +11,7 @@ module Ecom
       has_many :work_product_templates, through: :project_work_item_templates
       has_and_belongs_to_many :resource_types, join_table: 'ecom_core_task_templates_resource_types'
 
-      validates :name, :code, :takeoff_fields, :task_completion_detail, presence: true
+      validates :name, :code, presence: true
       validates :code, uniqueness: true
       validates :percentage_contribution,
                 numericality: {

data/app/services/ecom/core/filter_service.rb

@@ -0,0 +1,19 @@
+module Ecom
+  module Core
+    class FilterService
+      def get_filtered_data(type, filters)
+        positive = {}
+        negative = {}
+        obj = type.constantize
+        filters.each { |f|
+          if f[:cond] == 'P'
+            positive[f[:key]] = f[:value]
+          else
+            negative[f[:key]] = f[:value]
+          end
+        }
+        obj.where(positive).where.not(negative)
+      end
+    end
+  end
+end

data/db/migrate/20191119012030_create_ecom_core_task_templates.rb

@@ -15,7 +15,7 @@ class CreateEcomCoreTaskTemplates < ActiveRecord::Migration[6.0]
       t.integer :task_sequence
       t.boolean :has_inspection, null: false, default: false
       t.boolean :discipline, null: false, default: false
-      t.jsonb :task_completion_detail, null: false, default: {}
+      t.jsonb :task_completion_detail, null: true
 
       t.timestamps
     end

data/db/migrate/20200410111827_create_ecom_core_crew_overtimes.rb

@@ -23,5 +23,6 @@ class CreateEcomCoreCrewOvertimes < ActiveRecord::Migration[6.0]
 
       t.timestamps
     end
+    add_index :ecom_core_crew_overtimes, [:overtime_type_id, :overtime_sheet_entry_id],unique: true, name: 'ot_on_ose_name_indx'
   end
 end

data/db/migrate/20200919081338_create_ecom_core_maintenance_service_orders.rb

@@ -8,7 +8,7 @@ class CreateEcomCoreMaintenanceServiceOrders < ActiveRecord::Migration[6.0]
       t.boolean :approved, default: false
       t.string :status, null: false, default: 'New'
       t.string :remark
-      t.float :current_reading, null: false
+      t.float :current_reading, null: true
       t.references :equipment_item,
                    null: false,
                    index: { name: 'mso_on_ei_indx' },
@@ -22,7 +22,7 @@ class CreateEcomCoreMaintenanceServiceOrders < ActiveRecord::Migration[6.0]
                    index: { name: 'mso_on_pb_indx' },
                    foreign_key: { to_table: :ecom_core_users }
       t.references :approved_by,
-                   null: false,
+                   null: true,
                    index: { name: 'mso_on_ab_indx' },
                    foreign_key: { to_table: :ecom_core_users }
 

data/db/migrate/20201013094100_create_ecom_core_crew_id_cards.rb

@@ -8,7 +8,7 @@ class CreateEcomCoreCrewIdCards < ActiveRecord::Migration[6.0]
 
       t.datetime :issued_on, null: false
       t.datetime :valid_until, null: false
-      t.string :status, null: false, default: 'Active'
+      t.string :status, null: false, default: 'Valid'
 
       t.timestamps
     end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.3.4'.freeze
+    VERSION = '1.3.9'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.9
 platform: ruby
 authors:
 - Henock L.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-27 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.1
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -375,6 +375,7 @@ files:
 - app/serializers/ecom/core/user_role_serializer.rb
 - app/serializers/ecom/core/user_serializer.rb
 - app/services/ecom/core/crew_contract_transaction_service.rb
+- app/services/ecom/core/filter_service.rb
 - app/services/ecom/core/menu_service.rb
 - app/services/ecom/core/site_crew_service.rb
 - app/services/ecom/core/token_auth_service.rb
@@ -556,7 +557,7 @@ homepage: http://www.mks.com.et
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -572,7 +573,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Core engine for construction management application.
 test_files: []