ecom_core 1.2.34 → 1.2.35

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,11 @@
+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
+    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/{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,
+                              conditions: -> { where(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/task.rb

@@ -5,26 +5,43 @@ 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) }
 

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,28 @@
-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'
+      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 +43,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

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

@@ -0,0 +1,8 @@
+module Ecom
+  module Core
+    class TaskTemplateInspectionChecklist < ApplicationRecord
+      belongs_to :task_template
+      belongs_to :inspection_checklist
+    end
+  end
+end

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

@@ -2,9 +2,12 @@ module Ecom
   module Core
     class WorkPackage < ApplicationRecord
       belongs_to :project
+      belongs_to :site_engineer, class_name: 'Ecom::Core::User', optional: true
+      belongs_to :project_manager, class_name: 'Ecom::Core::User', optional: true
 
       validates :code, :name, presence: true
       validates :code, uniqueness: true
+      validates :budget, numericality: true, unless: proc { budget.nil? }
 
       has_many :tasks
     end

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

@@ -15,30 +15,14 @@
 module Ecom
   module Core
     class WorkProduct < ApplicationRecord
-      include AASM
-
-      NEW = 'New'.freeze
-      UNDER_CONSTRUCTION = 'Under Construction'.freeze
-      COMPLETED = 'Completed'.freeze
-
-      STATUSES = [NEW, UNDER_CONSTRUCTION, COMPLETED].freeze
-
       belongs_to :work_product_template
       belongs_to :project
       belongs_to :product_group, 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
       has_many :tasks
       has_many :dimension_elements
 
-      validates :name, :design_reference_no, :status, :percent_completed, presence: true
-      validates :design_reference_no, uniqueness: { scope: :project_id }
-      validates :status, inclusion: STATUSES
-      validates_numericality_of :percent_completed,
-                                only_integer: true,
-                                greater_than_or_equal_to: 0,
-                                less_than_or_equal_to: 100
+      validates :name, :design_reference, presence: true
+      validates :design_reference, uniqueness: { scope: :project_id }
     end
   end
 end

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

@@ -2,8 +2,8 @@ module Ecom
   module Core
     class WorkProductTemplate < ApplicationRecord
       validates :code, :name, presence: true, uniqueness: true
-      belongs_to :task_template_type
-      has_and_belongs_to_many :task_templates
+      has_many :project_work_item_templates
+      has_many :task_templates, through: :project_work_item_templates
       has_many :product_types
     end
   end

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

@@ -0,0 +1,89 @@
+module Ecom
+  module Core
+    class CrewContractTransactionService
+      def execute(transaction_type, crew_contract)
+        Ecom::Core::CrewContractTransaction.transaction do
+          case transaction_type
+          when Ecom::Core::CrewContractTransaction::TXN_UPDATE_CREW_TYPE
+
+            create_new_id_card(crew_contract.crew, crew_contract.to)
+            # update crew type
+            crew = crew_contract.crew
+            crew.update(crew_type_id: crew_contract.crew_type_id)
+
+          when Ecom::Core::CrewContractTransaction::TXN_UPDATE_PLACE_OF_WORK
+
+            create_new_id_card(crew_contract.crew, crew_contract.to)
+
+          when Ecom::Core::CrewContractTransaction::TXN_UPDATE_WAGE
+
+            crew = crew_contract.crew
+            # update wage
+            crew.update(wage: crew_contract.wage, wage_in_words: crew_contract.wage_in_words)
+
+          when Ecom::Core::CrewContractTransaction::TXN_UPDATE_VALIDITY
+
+            # make crew active
+            create_new_id_card(crew_contract.crew, crew_contract.to)
+            make_crew_active(crew_contract.crew)
+            activate_contract(crew_contract)
+
+          when Ecom::Core::CrewContractTransaction::TXN_TERMINATE_CONTRACT
+
+            # make crew inactive
+            make_crew_inactive(crew_contract.crew)
+
+            # make ID card invalid
+            invalidate_id_card(crew_contract.crew)
+
+            # make the contract void
+            deactivate_contract(crew_contract)
+
+          end
+        end
+      end
+
+      def activate_contract(crew_contract)
+        crew_contract.update(status: :in_effect)
+      end
+
+      def deactivate_contract(crew_contract)
+        crew_contract.update(status: :void)
+      end
+
+      def make_crew_active(crew)
+        return if crew.active
+
+        crew.update(active: true)
+      end
+
+      def make_crew_inactive(crew)
+        return unless crew.active
+
+        crew.update(active: false)
+      end
+
+      # invalidate other Id cards and creates a new ID card
+      def create_new_id_card(crew, valid_until)
+        issued_on = Time.now
+
+        previous_id_card = Ecom::Core::CrewIdCard.where(crew_id: crew.id).last
+
+        previous_id_card&.update(status: 'Invalid')
+
+        new_id_card = Ecom::Core::CrewIdCard.new(
+          crew_id: crew.id,
+          issued_on: issued_on,
+          valid_until: valid_until,
+          status: 'Valid'
+        )
+        raise StandardError, new_id_card.errors.messages unless new_id_card.save
+      end
+
+      def invalidate_id_card(crew)
+        current_id_card = Ecom::Core::CrewIdCard.where(crew_id: crew.id).last
+        current_id_card.update(status: 'Invalid')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+module Ecom
+  module Core
+    class SiteCrewService
+      def update(params)
+        id = params[:site_id]
+        crew = params[:crew]
+
+        # Process new additions
+        new_crew = crew.select { |c| c[:status] == 'checked' }
+        removed = crew.select { |c| c[:status] == 'unchecked' }
+
+        crew_ids = new_crew.map { |c| c[:crew_id] }
+
+        site_crew = Ecom::Core::Crew.where(id: crew_ids)
+
+        new_entries = []
+        new_crew.each do |nc|
+          new_entries << Ecom::Core::SiteCrew.new(
+            site_id: id, crew_id: nc[:crew_id], start_date: Date.today,
+            site_crew_type: 'Temporary site crew',
+            status: 'Active'
+          )
+        end
+
+        Ecom::Core::SiteCrew.transaction do
+          new_entries.each(&:save)
+        end
+
+        removed_ids = removed.map { |r| r[:crew_id] }
+        if removed_ids.count.positive?
+          removed_crews = Ecom::Core::SiteCrew.where(site_id: id, crew_id: removed_ids, status: 'Active')
+          Ecom::Core::SiteCrew.transaction do
+            # removed_crew.map(&:delete)
+            removed_crews.each do |removed_crew|
+              removed_crew.update(status: 'Inactive')
+            end
+          end
+        end
+
+        { success: true, data: site_crew }
+      end
+    end
+  end
+end