ecom_core 1.3.1 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eda813a28d309d4d0c69554387680286f822304a01ca6148c31e2bb39cfffb4
-  data.tar.gz: 66d0904746ae71d5b0647f1b500492c5bb0cd53366cad9556e33de38118b36f1
+  metadata.gz: ce6cc11612b16aefac6121429ece4bee60b97ada78dcfdba961c792fedc0c0f4
+  data.tar.gz: 52a55fb8f1e97dc391a7ccede45bf7ed97d318f8f7029a2a465960ec089db864
 SHA512:
-  metadata.gz: ce78c84074487ea4794572450122156c0d6c799b94d274269a4fac690d3ec47e46eeba14822a7f970aeef7b32ba31c036e99e0de5cbf52eda4753349b30b66b7
-  data.tar.gz: 219a960401bdbfb0b9b73922242ff043d89984304b938f1835677230a06b57fc41e0ea25bd6bcd602e9cf3886c13d121ea9aeaeff3982ec8cf3f769a507e35d4
+  metadata.gz: 5bbacc01ee8a03bf4c2c16f3774da1657faa9f00d449ee3368625652f0d562ea22e0721bcaf0038de3de9d4245de2f955746f7f5006cc0835965f2db87a84ee7
+  data.tar.gz: 13b332676a15fa87e7fecb4ac22e15aaeb359ca498bc1b05ae7b0d4bb202eff3c849f4a2cfb5e7fde3af413c0a9937f2e0a63fcbb0f65fdca005ab5d83069133

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

@@ -9,12 +9,12 @@ module Ecom
         SQL
         menu = Menu.joins(join_sql).where('UR.id IN (?)', role_ids).order(:id).distinct
         menu_list = menu.select { |m| m.parent.nil? }.each_with_object([]) do |item, list|
-          list << { id: item.id, text: item.label, iconCss: item.icon, items: [] }
+          list << { id: item.id, label: item.label, icon: item.icon, items: [] }
         end
 
         menu_list.each do |ml|
           ml[:items] = menu.reject { |m| m.parent.nil? }.each_with_object([]) do |item, list|
-            list << { id: item.id, text: item.label, iconCss: item.icon, url: item.route } if item.parent_id == ml[:id]
+            list << { id: item.id, label: item.label, icon: item.icon, url: item.route } if item.parent_id == ml[:id]
           end
         end
         { success: true, data: menu_list }

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/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.1'.freeze
+    VERSION = '1.3.6'.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.1
+  version: 1.3.6
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-01-26 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.