ecom_core 1.3.2 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 621b9066b1247c45b0327f64ea03e820b175888a78d1e4819301763cee03b279
-  data.tar.gz: cfebe590afc77b32cbe81da6c4cb848d6d40d856c235b914938df2c71f3d85a4
+  metadata.gz: 5e8e8893a70210a4ad36fa2468d4a692a532e273f3d66be4eb50c83068aa771d
+  data.tar.gz: ae8c128f18b9d473da5cb4f3278bad9edba5b6137e8ef0e216b511583548781d
 SHA512:
-  metadata.gz: f5a936576f1fb6caf3774bdcda05d10f7583253b45e8d1f89ff5b0300fe99346642582f92094b4cc62b347013b1daa6ac07ef65341ab529a870b070be6ea7bab
-  data.tar.gz: bbb27165e2ebc8bd422a2ac6b8f04de12029a9683fcf408d089ae64ebfeb28c5176b16ec44555d857bf502e7e2ffc5e8f06763d309dcfeb17f52cb796a85e852
+  metadata.gz: 61849355dbdc3879f310d7d8b59e2ff1ffa334535813bcd268c09986310e1ba8cd7196829cdf03364856b3e1ea75a760ddfb084f55731bc137dded25ecefb54d
+  data.tar.gz: b20b9ce507e05925dc5e71a894620cc611a6fa3ebf17e4bd296ca74376b4b81804176d62e07c31fed30fb39535be013b36178526dc57bbfaace44cc1944e05d5

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,9 +10,9 @@ 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
     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

@@ -4,7 +4,6 @@ module Ecom
       has_ancestry
 
       belongs_to :task_template_type
-      belongs_to :unit_of_measure
 
       has_many :task_template_inspection_checklists
       has_many :inspection_checklists, through: :task_template_inspection_checklists
@@ -12,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

@@ -8,18 +8,14 @@ class CreateEcomCoreTaskTemplates < ActiveRecord::Migration[6.0]
                    null: false,
                    index: { name: 'tt_on_ttt_indx' },
                    foreign_key: { to_table: :ecom_core_task_template_types }
-      t.references :unit_of_measure,
-                   null: false,
-                   index: { name: 'tt_on_uof_indx' },
-                   foreign_key: { to_table: :ecom_core_unit_of_measures }
       t.string :ancestry, index: true
-      t.boolean :has_takeoff_fields, null:false, default: false
-      t.jsonb :takeoff_fields, null: false, default: {}
+      t.boolean :has_takeoff_fields, null: false, default: false
+      t.jsonb :takeoff_fields, null: true
       t.integer :percentage_contribution
       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.2'.freeze
+    VERSION = '1.3.7'.freeze
   end
 end

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

@@ -6,7 +6,6 @@ FactoryBot.define do
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     association :task_template_type
-    association :unit_of_measure
     has_takeoff_fields { false }
     takeoff_fields { [{ name: 'length', label: 'Length' }] }
     percentage_contribution { nil }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.7
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-19 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -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
@@ -571,7 +572,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Core engine for construction management application.