ecom_core 1.2.30 → 1.2.35

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

@@ -1,31 +1,39 @@
 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)
-        OvertimeSheet.open(project_id).exists?
+      def self.open_exists?(site_id)
+        OvertimeSheet
+          .by_site(site_id)
+          .by_status(StatusConstants::OPEN)
+          .exists?
       end
 
-      def self.open_for_date_exists?(date, project_id)
-        OvertimeSheet.open(project_id).where(date: date).exists?
+      def self.open_for_date_exists?(date, site_id)
+        OvertimeSheet
+          .by_site(site_id)
+          .by_status(StatusConstants::OPEN)
+          .by_date(date)
+          .exists?
       end
 
-      def self.exists_for_date?(date, project_id)
-        OvertimeSheet.by_project(project_id).by_date(date).exists?
+      def self.exists_for_date?(date, site_id)
+        OvertimeSheet
+          .by_site(site_id)
+          .by_date(date)
+          .exists?
       end
 
       # Overtime sheet should be created using the
@@ -33,16 +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)
-          raise 'There is already an open overtime sheet. It has to be submitted before creating a new one.'
+        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/plan.rb

@@ -0,0 +1,18 @@
+module Ecom
+  module Core
+    class Plan < ApplicationRecord
+      NEW = 'New'.freeze
+      READY_TO_START = 'Ready to start'.freeze
+      IN_PROGRESS = 'In Progress'.freeze
+      COMPLETED = 'Completed'.freeze
+
+      STATUSES = [NEW, READY_TO_START, IN_PROGRESS, COMPLETED].freeze
+
+      validates :name, :start_date, :end_date, :status, presence: true
+
+      validates :status, presence: true, inclusion: STATUSES
+
+      has_many :tasks
+    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,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/schedule_setting.rb

@@ -1,9 +1,11 @@
-module Ecom::Core
-  class ScheduleSetting < ApplicationRecord
-    belongs_to :equipment
-    belongs_to :maintenance_type
-    belongs_to :schedule_unit
+module Ecom
+  module Core
+    class ScheduleSetting < ApplicationRecord
+      belongs_to :equipment
+      belongs_to :maintenance_type
+      belongs_to :schedule_unit
 
-    validates :value, presence: true
+      validates :value, presence: true
+    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/takeoff.rb

@@ -0,0 +1,10 @@
+module Ecom
+  module Core
+    class Takeoff < ApplicationRecord
+      validates :task_id, :takeoff_quantity, :task, presence: true
+      validates :takeoff_quantity, numericality: { greater_than: 0 }
+
+      belongs_to :task
+    end
+  end
+end

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

@@ -5,24 +5,52 @@ 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
 
-      validates :code, :name, :status, :percent_completed, presence: true
+      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, :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
         state :under_review

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_resource.rb

@@ -1,6 +1,8 @@
 module Ecom
   module Core
     class TaskResource < ApplicationRecord
+      validates :task_id, :task, :resource_type_id, :resource_type, presence: true
+
       belongs_to :task
       belongs_to :resource_type
 

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

@@ -4,13 +4,26 @@ module Ecom
       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'
 
-      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 :percentage_contribution_sum_validator
+
       def full_name
         parent_name = parent&.name
         return name unless parent_name
@@ -29,6 +42,13 @@ module Ecom
       def equipment_types
         resource_types.where(type: 'Ecom::Core::EquipmentType')
       end
+
+      def percentage_contribution_sum_validator
+        return if percentage_contribution.nil?
+
+        sum = siblings.sum(:percentage_contribution)
+        errors.add(:task, 'Sum of percentage contributions has to be 100') if sum > 100
+      end
     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_order.rb

@@ -0,0 +1,26 @@
+module Ecom
+  module Core
+    class WorkOrder < ApplicationRecord
+      before_save :add_reference_number
+
+      NEW = 'New'.freeze
+      IN_PROGRESS = 'In Progress'.freeze
+      COMPLETED = 'Completed'.freeze
+
+      STATUSES = [NEW, IN_PROGRESS, COMPLETED].freeze
+
+      validates :name, :assigned_to_id, :generated_by_id, :status,
+                :start_date, :end_date, presence: true
+
+      validates :status, presence: true, inclusion: STATUSES
+
+      belongs_to :assigned_to, class_name: 'Ecom::Core::Crew'
+      belongs_to :generated_by, class_name: 'Ecom::Core::User'
+      has_many :tasks
+
+      def add_reference_number
+        self.reference_number = "WO-#{(Time.now.to_f * 1000).to_i}"
+      end
+    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,29 +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