ecom_core 1.2.34 → 1.3.2

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

@@ -0,0 +1,18 @@
+module Ecom
+  module Core
+    class MaterialItem < ApplicationRecord
+      before_save :assign_serial_number
+
+      belongs_to :material_identity
+
+      validates :serial_number, presence: true, uniqueness: true
+      validates :material_identity_id, :material_identity, presence: true
+      validates :serial_number, format: { with: /^SN_\d+$/, message: 'Invalid serial number format', multiline: true }
+      validates :price, numericality: { greater_than: 0 }, allow_nil: true
+
+      def assign_serial_number
+        self.serial_number = "SN_#{(Time.now.to_f * 1000).to_i}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Ecom
+  module Core
+    class MaterialSubType < ApplicationRecord
+      after_save :create_material_identity
+
+      belongs_to :material_type
+      has_many :material_identity
+
+      validates :name, presence: true, uniqueness: { case_sensitive: false, scope: :material_type_id }
+      validates :material_type_id, :material_type, presence: true
+
+      def create_material_identity
+        Ecom::Core::MaterialIdentity.create(
+          material_type_id: material_type_id,
+          material_sub_type_id: id
+        )
+      end
+    end
+  end
+end

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

@@ -28,7 +28,10 @@ module Ecom
       validates :physical_quantity, inclusion: PHYSICAL_QUANTITIES
 
       validate :si_unit_with_conversion_factor
-      validate :si_unit_system_of_measurement_and_physical_quantity
+      validates_uniqueness_of :is_si_unit, scope: %i[physical_quantity system_of_measurement],
+                                           if: -> { is_si_unit == true },
+                                           message: 'There exist an si unit of measurement for the '\
+                                            'given physical quantity and system of measurement'
 
       def si_unit_with_conversion_factor
         if is_si_unit && conversion_factor != 1
@@ -37,19 +40,6 @@ module Ecom
           errors.add(:base, 'Only SI units can have a conversion factor 1')
         end
       end
-
-      # scope si unit with system of measurement and physical quantity
-      def si_unit_system_of_measurement_and_physical_quantity
-        return if system_of_measurement.nil? || physical_quantity.nil?
-
-        existing_record = MeasurementUnit
-                          .where(system_of_measurement: system_of_measurement,
-                                 physical_quantity: physical_quantity, is_si_unit: true).first
-        return unless (new_record? && existing_record.present?) || (persisted? && existing_record != self)
-
-        errors.add(:is_si_unit,
-                   'There exist an si unit of measurement for the given physical quantity and system of measurement')
-      end
     end
   end
 end

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

@@ -1,39 +1,37 @@
 module Ecom
   module Core
     class OvertimeSheet < ApplicationRecord
-      validates :date, :opened_at, presence: true, uniqueness: { scope: :project_id }
+      validates :date, :opened_at, presence: true, uniqueness: { scope: :site_id }
       validates :status, inclusion: StatusConstants::STATUSES
 
-      belongs_to :project
+      belongs_to :site
 
       has_many :overtime_sheet_entries
       has_many :crew_overtimes, through: :overtime_sheet_entries
 
-      scope :by_project, ->(id) { where(project_id: id) }
+      scope :by_site, ->(id) { where(site_id: id) }
       scope :by_date, ->(date) { where(date: date) }
       scope :by_status, ->(status) { where(status: status) }
       scope :by_date_between, ->(from, to) { where('date BETWEEN ? AND ?', from, to) }
-      # scope :open, ->(id) { where(status: StatusConstants::OPEN, project_id: id) }
-      # scope :submitted, ->(id) { where(status: StatusConstants::SUBMITTED, project_id: id) }
 
-      def self.open_exists?(project_id)
+      def self.open_exists?(site_id)
         OvertimeSheet
-          .by_project(project_id)
+          .by_site(site_id)
           .by_status(StatusConstants::OPEN)
           .exists?
       end
 
-      def self.open_for_date_exists?(date, project_id)
+      def self.open_for_date_exists?(date, site_id)
         OvertimeSheet
-          .by_project(project_id)
+          .by_site(site_id)
           .by_status(StatusConstants::OPEN)
           .by_date(date)
           .exists?
       end
 
-      def self.exists_for_date?(date, project_id)
+      def self.exists_for_date?(date, site_id)
         OvertimeSheet
-          .by_project(project_id)
+          .by_site(site_id)
           .by_date(date)
           .exists?
       end
@@ -43,18 +41,18 @@ module Ecom
       # 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, project_id)
-        if OvertimeSheet.exists_for_date?(date, project_id)
+      def self.create_new(date, site_id)
+        if OvertimeSheet.exists_for_date?(date, site_id)
           raise 'There is already an overtime sheet for the selected date.'
         end
 
-        if OvertimeSheet.open_exists?(project_id)
+        if OvertimeSheet.open_exists?(site_id)
           open_overtime_sheet = OvertimeSheet.find_by(status: 'Open')
           raise "There is already an open overtime sheet for #{open_overtime_sheet.date}.
  It has to be submitted before creating a new one."
         end
 
-        OvertimeSheet.create(date: date, opened_at: Time.now, status: StatusConstants::OPEN, project_id: project_id)
+        OvertimeSheet.create(date: date, opened_at: Time.now, status: StatusConstants::OPEN, site_id: site_id)
       end
 
       def submit

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

@@ -4,9 +4,9 @@ module Ecom
       validates :month, :year, presence: true
 
       has_many :payments, class_name: 'Ecom::Core::Payment'
-      belongs_to :project
+      belongs_to :site
 
-      scope :by_project, ->(id) { where(project_id: id) }
+      scope :by_site, ->(id) { where(site_id: id) }
       scope :by_month, ->(month) { where(month: month) }
       scope :by_year, ->(year) { where(year: year) }
 
@@ -17,7 +17,7 @@ module Ecom
           m = 1
           y += 1
         end
-        Payroll.create(month: m, year: y, project_id: project_id)
+        Payroll.create(month: m, year: y, site_id: site_id)
       end
     end
   end

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

@@ -9,9 +9,6 @@ module Ecom
       belongs_to :currency
       belongs_to :company
 
-      has_many :project_crews
-      has_many :crews, through: :project_crews
-
       validates :name, :location, :contract_number, :date_contract_signed, :commencement_date, :completion_date,
                 :contract_amount, :advance_payment, :retention, presence: true
     end

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

@@ -0,0 +1,13 @@
+module Ecom
+  module Core
+    class ProjectTemplate < ApplicationRecord
+      belongs_to :task_template_type
+      has_many :project_work_item_templates
+
+      validates :code, :name, presence: true
+      validates_uniqueness_of :code
+
+      delegate(:name, to: :task_template_type, prefix: true)
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Ecom
+  module Core
+    class ProjectWorkItemTemplate < ApplicationRecord
+      belongs_to :task_template
+      belongs_to :work_product_template
+      belongs_to :project_template
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Ecom
+  module Core
+    class ResourceRequisition < ApplicationRecord
+      DRAFT = 'Draft'.freeze
+      SUBMITTED = 'Submitted'.freeze
+      APPROVED = 'Approved'.freeze
+      REJECTED = 'Rejected'.freeze
+
+      STATUSES = [DRAFT, SUBMITTED, APPROVED, REJECTED].freeze
+
+      belongs_to :lookahead_plan
+      belongs_to :reviewed_by, class_name: 'Ecom::Core::User', optional: true
+      belongs_to :approved_by, class_name: 'Ecom::Core::User', optional: true
+      has_many :resource_requisition_items
+
+      validates :delivery_point, presence: true
+
+      validates :status, presence: true, inclusion: STATUSES
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+module Ecom
+  module Core
+    class ResourceRequisitionItem < ApplicationRecord
+      PENDING = 'Pending'.freeze
+      APPROVED = 'Approved'.freeze
+      REJECTED = 'Rejected'.freeze
+
+      STATUSES = [PENDING, APPROVED, REJECTED].freeze
+
+      belongs_to :resource_requisition
+      belongs_to :resource_type
+      belongs_to :requested_quantity_measurement_unit, class_name: 'Ecom::Core::MeasurementUnit'
+      belongs_to :awaiting_quantity_measurement_unit, class_name: 'Ecom::Core::MeasurementUnit'
+
+      validates :due_date, presence: true
+
+      validates :requested_quantity, presence: true, numericality: { greater_than: 0 }
+      validates :awaiting_quantity, presence: true, numericality: { greater_than: 0 }
+
+      validates :status, presence: true, inclusion: STATUSES
+
+      validate :quantity_validator
+
+      def quantity_validator
+        if requested_quantity.nil? || awaiting_quantity.nil? ||
+           requested_quantity_measurement_unit_id.nil? ||
+           awaiting_quantity_measurement_unit_id.nil?
+          return
+        end
+
+        requested_quantity_measurement_unit =
+          Ecom::Core::MeasurementUnit.find_by(id: requested_quantity_measurement_unit_id)
+        awaiting_quantity_measurement_unit =
+          Ecom::Core::MeasurementUnit.find_by(id: awaiting_quantity_measurement_unit_id)
+
+        requested_quantity_in_si_unit = requested_quantity / requested_quantity_measurement_unit.conversion_factor
+        awaiting_quantity_in_si_unit = awaiting_quantity / awaiting_quantity_measurement_unit.conversion_factor
+
+        return unless awaiting_quantity_in_si_unit > requested_quantity_in_si_unit
+
+        errors.add(:awaiting_quantity, 'awaiting quantity can not be greater than requested quantity')
+      end
+    end
+  end
+end

data/app/models/ecom/core/{project_crew.rb → site.rb}

@@ -1,15 +1,19 @@
 module Ecom
   module Core
-    class ProjectCrew < ApplicationRecord
+    class Site < ApplicationRecord
       ACTIVE = 'Active'.freeze
       INACTIVE = 'Inactive'.freeze
+
       STATUSES = [ACTIVE, INACTIVE].freeze
 
-      belongs_to :project
-      belongs_to :crew
+      validates :name, :project_id, :project, :address, :status, presence: true
 
-      validates :start_date, :status, presence: true
       validates :status, inclusion: STATUSES
+
+      belongs_to :project
+
+      has_many :site_crews
+      has_many :crews, through: :site_crews
     end
   end
 end

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

@@ -0,0 +1,27 @@
+module Ecom
+  module Core
+    class SiteCrew < ApplicationRecord
+      TEMPORARY_SITE_CREW = 'Temporary site crew'.freeze
+      PERMANENT_SITE_CREW = 'Permanent site crew'.freeze
+
+      SITE_CREW_TYPES = [TEMPORARY_SITE_CREW, PERMANENT_SITE_CREW].freeze
+
+      ACTIVE = 'Active'.freeze
+      INACTIVE = 'Inactive'.freeze
+      STATUSES = [ACTIVE, INACTIVE].freeze
+
+      validates :crew_id, :crew, :site_id, :site, :start_date, :site_crew_type, :status, presence: true
+
+      validates_uniqueness_of :site_id,
+                              scope: :crew_id,
+                              if: -> { status == 'Active' },
+                              message: 'There can only be one record with status `Active` for a given site and crew'
+
+      validates :site_crew_type, inclusion: SITE_CREW_TYPES
+      validates :status, inclusion: STATUSES
+
+      belongs_to :crew
+      belongs_to :site
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Ecom
 
       validates :name, presence: true, uniqueness: true
 
-      delegate :name, to: :stakeholder_type, prefix: true
+      delegate(:name, to: :stakeholder_type, prefix: true)
     end
   end
 end

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

@@ -5,34 +5,47 @@ module Ecom
 
       has_ancestry
 
+      NOT_INSPECTED = 'Not Inspected'.freeze
+      IN_PROGRESS = 'In Progress'.freeze
+      PASS = 'Pass'.freeze
+      FAIL = 'Fail'.freeze
+
+      INSPECTION_STATUSES = [NOT_INSPECTED, IN_PROGRESS, PASS, FAIL].freeze
+
       belongs_to :work_product
       belongs_to :task_template
       belongs_to :work_package, optional: true
       belongs_to :work_order, optional: true
-      belongs_to :plan, optional: true
       belongs_to :performer, class_name: 'Ecom::Core::User', optional: true
-      belongs_to :approver, class_name: 'Ecom::Core::User', optional: true
-      belongs_to :supervisor, class_name: 'Ecom::Core::User', optional: true
-      belongs_to :quality_controller, class_name: 'Ecom::Core::User', optional: true
+      belongs_to :client_consultant, class_name: 'Ecom::Core::User', optional: true
+      belongs_to :foreman, class_name: 'Ecom::Core::User', optional: true
+      belongs_to :inspector, class_name: 'Ecom::Core::User', optional: true
+      belongs_to :change_order_for, class_name: 'Ecom::Core::User', optional: true
 
-      has_many :task_steps
       has_many :task_resources
       has_one :takeoff
+      has_one :change_order, foreign_key: :change_order_for_id, class_name: 'Ecom::Core::Task'
 
       validates_with DateRangeValidator
-      validates :code, :name, :status, :percent_completed, presence: true
+      validates :code, :name, :status, :inspection_status, :percent_completed, presence: true
       validates_numericality_of :percent_completed,
                                 only_integer: true,
                                 greater_than_or_equal_to: 0,
                                 less_than_or_equal_to: 100
+      validates :percentage_contribution,
+                numericality: {
+                  greater_than_or_equal_to: 0,
+                  less_than_or_equal_to: 100,
+                  only_integer: true
+                },
+                allow_nil: true
+
+      validates_inclusion_of :inspection_status, in: INSPECTION_STATUSES
 
       scope :by_status, ->(status) { where(status: status) }
 
-      # State: planned -> The task has be planned for execution
-      # State: ready_to_start -> All resources for the task has been set and is ready to start
       aasm column: 'status' do
         state :new, initial: true
-        state :planned
         state :ready_to_start
         state :in_progress
         state :submitted

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

@@ -0,0 +1,11 @@
+module Ecom
+  module Core
+    class TaskAttachment < ApplicationRecord
+      mount_base64_uploader :file, TaskAttachmentUploader
+
+      belongs_to :task
+
+      validates :title, presence: true
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Ecom
+  module Core
+    class TaskInspectionChecklist < ApplicationRecord
+      NOT_INSPECTED = 'Not Inspected'.freeze
+      IN_PROGRESS = 'In Progress'.freeze
+      PASS = 'Pass'.freeze
+      FAIL = 'Fail'.freeze
+
+      INSPECTION_STATUSES = [NOT_INSPECTED, IN_PROGRESS, PASS, FAIL].freeze
+
+      belongs_to :inspected_by, class_name: 'Ecom::Core::User'
+      belongs_to :task
+
+      validates :name, :status, presence: true
+      validates :status, inclusion: INSPECTION_STATUSES
+    end
+  end
+end

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

@@ -1,57 +1,30 @@
-require 'json-schema'
 module Ecom
   module Core
     class TaskTemplate < ApplicationRecord
-      TASK_STEP_SCHEMA = {
-        'type' => 'object',
-        'required' => %w[name total_contribution_percentage_to_task],
-        'additionalProperties' => false,
-        'properties' => {
-          'name' => { 'type' => 'string' },
-          'total_contribution_percentage_to_task' => {
-            'type' => 'integer',
-            'minimum' => 1,
-            'maximum' => 100
-          }
-        }
-      }.freeze
-
-      # here the json schema has a bug ( including all properties as required)
-      # and because task_step_name is required on a condition ( only if the
-      # milestone is after a task step ), we can solve this with a workaround
-      # by specifying task_step_name in patternProperties.
-      MILESTONE_SCHEMA = {
-        'type' => 'object',
-        'required' => %w[name is_after_task_step],
-        'additionalProperties' => false,
-        'properties' => {
-          'name' => { 'type' => 'string' },
-          'is_after_task_step' => {
-            'type' => 'boolean'
-          }
-        },
-        "patternProperties": {
-          "task_step_name": {
-            'type' => 'string'
-          }
-        }
-      }.freeze
-
       has_ancestry
 
       belongs_to :task_template_type
-      has_and_belongs_to_many :work_product_templates, join_table: 'ecom_core_task_templates_work_product_templates'
+      belongs_to :unit_of_measure
+
+      has_many :task_template_inspection_checklists
+      has_many :inspection_checklists, through: :task_template_inspection_checklists
+      has_many :project_work_item_templates
+      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'
-      belongs_to :takeoff_calculator, optional: true
 
-      validates :name, :code, presence: true
+      validates :name, :code, :takeoff_fields, :task_completion_detail, presence: true
       validates :code, uniqueness: true
+      validates :percentage_contribution,
+                numericality: {
+                  greater_than_or_equal_to: 0,
+                  less_than_or_equal_to: 100,
+                  only_integer: true
+                },
+                allow_nil: true
+
       delegate(:name, to: :task_template_type, prefix: true)
 
-      validate :task_steps_schema_validator
-      validate :milestones_schema_validator
-      validate :validate_sum_of_task_step_contribution
-      validate :validate_milestone_task_step_association
+      validate :percentage_contribution_sum_validator
 
       def full_name
         parent_name = parent&.name
@@ -72,54 +45,11 @@ module Ecom
         resource_types.where(type: 'Ecom::Core::EquipmentType')
       end
 
-      def task_steps_schema_validator
-        return if task_steps.nil?
-
-        validation_errors = JSON::Validator.fully_validate(TASK_STEP_SCHEMA,
-                                                           task_steps, strict: true,
-                                                                       list: true, clear_cache: true)
-
-        errors.add(:task_steps, validation_errors) unless validation_errors.empty?
-      end
-
-      def milestones_schema_validator
-        return if milestones.nil?
-
-        validation_errors = JSON::Validator.fully_validate(MILESTONE_SCHEMA,
-                                                           milestones, strict: true,
-                                                                       list: true, clear_cache: true)
-
-        errors.add(:milestones, validation_errors) unless validation_errors.empty?
-      end
-
-      def validate_sum_of_task_step_contribution
-        return if task_steps.nil?
-
-        filtered_task_steps = task_steps.select { |task_step| task_step['total_contribution_percentage_to_task'] }
-
-        sum_of_task_step_contribution =
-          filtered_task_steps.sum { |task_step| task_step['total_contribution_percentage_to_task'] }
-
-        errors.add(:task_steps, 'Sum of task step contributions has to be 100') if sum_of_task_step_contribution != 100
-      end
-
-      def validate_milestone_task_step_association
-        return if milestones.nil?
-
-        task_step_names = task_steps&.map { |task_step| task_step['name'] }
-
-        milestones_associated_with_task_step = milestones.select { |milestone| milestone['is_after_task_step'] }
-
-        milestones_associated_with_task_step.each do |milestone|
-          if milestone['task_step_name'].nil?
-            errors.add(:milestones, 'if the milestone is after a task step, please specify the task step name')
-            next
-          end
+      def percentage_contribution_sum_validator
+        return if percentage_contribution.nil?
 
-          unless task_step_names.include? milestone['task_step_name']
-            errors.add(:milestone, 'task step for the given milestone does not exist in list of task steps')
-          end
-        end
+        sum = siblings.sum(:percentage_contribution)
+        errors.add(:task, 'Sum of percentage contributions has to be 100') if sum > 100
       end
     end
   end