ecom_core 1.2.28 → 1.2.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c60cc03ce91bb6a6fcda02c9d46c4f2a612db516dab13f6068e07b7410a236e8
-  data.tar.gz: 128979b27e4fb0d111ea8c372cd3a17b312a473ad254b76b3f86ccdee9fd13d4
+  metadata.gz: a8a7e36cd705a1ecc9fd9211ee4e16695e93c02bdfec41122592a411f323914b
+  data.tar.gz: 51fea59e1ee52f090d450d667d27f45628f969aef8005caed0c56c401ae8781f
 SHA512:
-  metadata.gz: ebb78acd53dfa40dfcb4a49a0bbbf0369c1282005b45dfa8af8909dd7ab095754d688408152eddce07b8dd91f193985a1b5f0a2b003d5746d7fd190283c31ee0
-  data.tar.gz: 0327b3d3d94bc49ffd640d5557b678f62c75b75bf9f45f25d16e6016f8d31ed4e72f00a915653b1c734408bd18be3e29f3b89ad05a8337b798ec7f7ced71a489
+  metadata.gz: b12192fe563a2566ac3b8bdc3aeb74597e6a85a985e1d0d4542aa0e6443c8d21865b0161960f68b0a971d1087f42f69da0d35d91b2c22a05a000ae0cc535f209
+  data.tar.gz: 68647fa87b9ad37c2da425386c04304c91436cf079fd077d56d1917514f381ccdede99b0fe85b07701fd228cb7c01126f4a8edd5eb970e05f1fa6d140acce359

data/app/controllers/concerns/ecom/core/filterable.rb

@@ -0,0 +1,14 @@
+module Ecom
+  module Core
+    module Filterable
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def filter(filtering_params)
+          results = where(nil)
+          results.public_send('filter_by_condition', filtering_params) if filtering_params.present?
+        end
+      end
+    end
+  end
+end

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

@@ -10,9 +10,11 @@ module Ecom
       before_save :set_employment_date,
                   if: proc { |c| c.employment_date.nil? }
 
+      after_save :set_employee_id
+
       belongs_to :crew_type
 
-      validates :name, :address, :qualification, :employment, :wage, :wage_in_words, presence: true
+      validates :name, :address, :qualification, :employment, :wage, :guarantor_name, :guarantor_phone, presence: true
       validates :employment, inclusion: EMPLOYMENT_TYPES
 
       has_many :project_crews
@@ -25,6 +27,13 @@ module Ecom
       def set_employment_date
         self.employment_date = Date.today
       end
+
+      def set_employee_id
+        company = Ecom::Core::Company.first
+        date = employment_date.to_s[0..3]
+        company_name = company ? company.name : ''
+        self.employee_id = "#{company_name}/#{employment}/#{date}/#{id}"
+      end
     end
   end
 end

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

@@ -12,7 +12,7 @@ module Ecom
       has_one :revision, class_name: 'Ecom::Core::CrewTime', foreign_key: :revision_to_id
 
       validates :checkin_time, presence: true, if: :checkout_time
-      validate :checkout_is_greater_than_checkin
+      validate :time_range_validation, :total_time_validation
 
       scope :by_attendance, lambda { |id|
         joins(:attendance_sheet_entry).where(ecom_core_attendance_sheet_entries: { attendance_sheet_id: id })
@@ -20,14 +20,22 @@ module Ecom
       scope :revised, ->(revised) { where(revised: revised) }
 
       before_save :calculate_hours
-      after_save :calculate_total
+      after_save :compute_total_for_entry # :calculate_total
 
-      def checkout_is_greater_than_checkin
+      def time_range_validation
         return unless checkin_time && checkout_time && checkout_time <= checkin_time
 
         errors.add(:checkout_time, "can't be less than checkin time.")
       end
 
+      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')
+      end
+
       def calculate_hours
         self.hours = if checkout_time.nil? || checkin_time.nil?
                        0

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

@@ -0,0 +1,22 @@
+module Ecom
+  module Core
+    class DimensionElement < ApplicationRecord
+      LENGTH = 'Length'.freeze
+      WIDTH = 'Width'.freeze
+      HEIGHT = 'Height'.freeze
+      RADIUS = 'Radius'.freeze
+      DIAMETER = 'Diameter'.freeze
+      DIMENSION_ELEMENT_NAMES = %w[LENGTH WIDTH HEIGHT RADIUS DIAMETER].freeze
+
+      validates :work_product_id, :work_product, :measurement_unit_id, :measurement_unit,
+                :amount, :dimension_element_name, presence: true
+
+      validates :dimension_element_name, inclusion: DIMENSION_ELEMENT_NAMES
+
+      validates :amount, numericality: { greater_than: 0 }
+
+      belongs_to :work_product
+      belongs_to :measurement_unit
+    end
+  end
+end

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

@@ -13,4 +13,4 @@ module Ecom
       validates :code, presence: true, uniqueness: true
     end
   end
-end
+end

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

@@ -0,0 +1,55 @@
+module Ecom
+  module Core
+    class MeasurementUnit < ApplicationRecord
+      METRIC = 'Metric'.freeze
+      IMPERIAL = 'Imperial'.freeze
+      SYSTEM_OF_MEASURMENT = [METRIC, IMPERIAL].freeze
+
+      # commonly used physical quantities in construction
+      LENGTH = 'Length'.freeze
+      MASS = 'Mass'.freeze
+      TIME = 'Time'.freeze
+      CURRENT = 'Current'.freeze
+      TEMPRATURE = 'Temprature'.freeze
+
+      AREA = 'Area'.freeze
+      VOLUME = 'Volume'.freeze
+      ENERGY = 'Energy'.freeze
+      DENSITY = 'DENSITY'.freeze
+
+      PHYSICAL_QUANTITIES = [LENGTH, MASS, TIME, CURRENT, TEMPRATURE, AREA, VOLUME, ENERGY, DENSITY].freeze
+
+      validates :name, :abbrivation, :physical_quantity,
+                :conversion_factor, :system_of_measurement, presence: true
+
+      validates :is_si_unit, inclusion: { in: [true, false] }
+
+      validates :system_of_measurement, inclusion: SYSTEM_OF_MEASURMENT
+      validates :physical_quantity, inclusion: PHYSICAL_QUANTITIES
+
+      validate :si_unit_with_conversion_factor
+      validate :si_unit_system_of_measurement_and_physical_quantity
+
+      def si_unit_with_conversion_factor
+        if is_si_unit && conversion_factor != 1
+          errors.add(:base, 'Conversion factor for an SI unit has to be 1')
+        elsif !is_si_unit && conversion_factor == 1
+          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

@@ -13,19 +13,29 @@ module Ecom
       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) }
+      # 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?
+        OvertimeSheet
+          .by_project(project_id)
+          .by_status(StatusConstants::OPEN)
+          .exists?
       end
 
       def self.open_for_date_exists?(date, project_id)
-        OvertimeSheet.open(project_id).where(date: date).exists?
+        OvertimeSheet
+          .by_project(project_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?
+        OvertimeSheet
+          .by_project(project_id)
+          .by_date(date)
+          .exists?
       end
 
       # Overtime sheet should be created using the

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/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/schedule_unit.rb

@@ -3,4 +3,4 @@ module Ecom
     class ScheduleUnit < Lookup
     end
   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/takeoff_calculator.rb

@@ -0,0 +1,115 @@
+module Ecom
+  module Core
+    class TakeoffCalculator < ApplicationRecord
+      INPUT_PARAMETERS_SCHEMA = {
+        'type' => 'object',
+        'required' => %w[name label input_type],
+        'additionalProperties' => false,
+        'properties' => {
+          'name' => { 'type' => 'string' },
+          'label' => { 'type' => 'string' },
+          'input_type' => {
+            'type' => 'string',
+            'enum' => %w[string number measurement enum]
+          }
+        },
+        "patternProperties": {
+          "enum_values": {
+            'type' => 'array'
+          },
+          "default_value": {
+            'type' => 'object',
+            'required' => %w[value],
+            'properties' => {
+              'value' => { 'type' => 'string' }
+            },
+            "patternProperties": {
+              "measurement_unit_id": { 'type' => 'integer' }
+            }
+          },
+          "validation": {
+            'type' => 'object',
+            'required' => %w[required],
+            'properties' => {
+              'required' => { 'type' => 'boolean' }
+            },
+            "patternProperties": {
+              "minimum": { 'type' => 'number' },
+              "maximum": { 'type' => 'number' }
+            }
+          }
+        }
+      }.freeze
+
+      REBAR_TAKEOFF_CALCULATOR = 'Rebar Takeoff Calculator'.freeze
+      FORMWORK_TAKEOFF_CALCULATOR = 'Formwork Takeoff Calculator'.freeze
+      CONCRETE_POURING_TAKEOFF_CALCULATOR =
+        'Concrete Pouring Takeoff Calculator'.freeze
+
+      TAKEOFF_CALCULATOR_NAMES =
+        [
+          REBAR_TAKEOFF_CALCULATOR,
+          FORMWORK_TAKEOFF_CALCULATOR,
+          CONCRETE_POURING_TAKEOFF_CALCULATOR
+        ].freeze
+
+      validates :name, :input_parameters, presence: true
+      validates :name, inclusion: TAKEOFF_CALCULATOR_NAMES
+
+      validates :name, uniqueness: true
+
+      validate :input_parameters_schema
+      validate :measurement_unit_id_in_input_parameters
+      validate :enum_in_input_parameters
+
+      def input_parameters_schema
+        return if input_parameters.nil?
+
+        errors.add(:input_parameters, 'There has to be one or more input parameters') if input_parameters.count.zero?
+
+        validation_errors = JSON::Validator.fully_validate(INPUT_PARAMETERS_SCHEMA,
+                                                           input_parameters, strict: true,
+                                                                             list: true, clear_cache: true)
+
+        errors.add(:input_parameters, validation_errors) unless validation_errors.empty?
+      end
+
+      def measurement_unit_id_in_input_parameters
+        return if input_parameters.nil?
+
+        input_parameters.each do |input_parameter|
+          next unless input_parameter['input_type'] == 'measurement' && !input_parameter['default_value'].nil?
+
+          if input_parameter['default_value']['measurement_unit_id'].nil?
+            errors.add(:base, 'measurement_unit_id is required')
+            next
+          end
+
+          measurement_unit_id = input_parameter['default_value']['measurement_unit_id']
+          measurement_unit = Ecom::Core::MeasurementUnit.find_by(id: measurement_unit_id)
+
+          errors.add(:base, "measurement unit with id #{measurement_unit_id} does not exist") if measurement_unit.nil?
+        end
+      end
+
+      def enum_in_input_parameters
+        return if input_parameters.nil?
+
+        input_parameters.each do |input_parameter|
+          next if input_parameter['input_type'] != 'enum'
+
+          if input_parameter['enum_values'].nil?
+            errors.add(:base, 'enum_values are requiered if the input_type is enum')
+            next
+          end
+
+          next unless !input_parameter['enum_values'].nil? &&
+                      input_parameter['enum_values'].class == Array &&
+                      input_parameter['enum_values'].count.zero?
+
+          errors.add(:base, 'Provide at least one enum value')
+        end
+      end
+    end
+  end
+end

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

@@ -8,11 +8,18 @@ module Ecom
       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
 
+      has_many :task_steps
+      has_many :task_resources
+      has_one :takeoff
+
+      validates_with DateRangeValidator
       validates :code, :name, :status, :percent_completed, presence: true
       validates_numericality_of :percent_completed,
                                 only_integer: true,
@@ -21,8 +28,12 @@ module Ecom
 
       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_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_step.rb

@@ -0,0 +1,85 @@
+module Ecom
+  module Core
+    class TaskStep < ApplicationRecord
+      include Filterable
+
+      before_save :update_task_progress
+
+      scope :filter_by_condition, ->(condition) { where(condition) }
+
+      validates :name, :total_contribution_percentage_to_task, presence: true
+      validates_with DateRangeValidator
+      validate :date_range_validator
+      validates_numericality_of :total_contribution_percentage_to_task,
+                                greater_than: 0,
+                                less_than_or_equal_to: 100
+
+      validate :task_step_percentage_validator, on: :create
+
+      validate :task_step_in_task_template_inclusion_validator
+
+      belongs_to :task
+      has_many :dependent_task_steps,
+               class_name: 'Ecom::Core::TaskStepDependency', foreign_key: 'dependent_task_step_id'
+      has_many :dependee_task_steps,
+               class_name: 'Ecom::Core::TaskStepDependency', foreign_key: 'dependee_task_step_id'
+
+      def date_range_validator
+        task_ = Ecom::Core::Task.find_by(id: task_id)
+
+        return if task_.nil?
+
+        if !start_date.nil? && start_date < task_.start_date
+          errors.add(:start_date, "The task steps start date can not be before the task's start date")
+        end
+
+        return unless !end_date.nil? && end_date > task_.end_date
+
+        errors.add(:end_date, "The task steps end date can not be after the task's end date")
+      end
+
+      def task_step_percentage_validator
+        return if task_id.nil?
+
+        task = Ecom::Core::Task.find_by(id: task_id)
+
+        return if task.nil?
+
+        total_contribution_of_all_task_steps = task.task_steps.sum(:total_contribution_percentage_to_task)
+
+        max_total_contribution = 100 - total_contribution_of_all_task_steps
+        return unless total_contribution_percentage_to_task > max_total_contribution
+
+        errors
+          .add(:total_contribution_of_all_task_steps,
+               "The maximum that this task step can contribute to the total task is #{max_total_contribution}")
+      end
+
+      def update_task_progress
+        return unless completed_changed? && completed == true
+
+        # update the task progress
+        task = self.task
+        percent_completed = task.percent_completed
+        task.percent_completed = (percent_completed + total_contribution_percentage_to_task).to_i
+        task.save
+      end
+
+      def task_step_in_task_template_inclusion_validator
+        return if task_id.nil?
+
+        task = Ecom::Core::Task.find_by(id: task_id)
+
+        return if task.nil?
+
+        task_template = task.task_template
+
+        return unless task_template.task_steps.nil?
+
+        errors.add(:base,
+                   'Task steps are not defined for the given task in the
+           task template, please first define the task steps in the task template.')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module Ecom
+  module Core
+    class TaskStepDependency < ApplicationRecord
+      validates :dependent_task_step_id, :dependee_task_step_id, presence: true
+
+      belongs_to :dependent_task_step, class_name: 'Ecom::Core::TaskStep'
+      belongs_to :dependee_task_step, class_name: 'Ecom::Core::TaskStep'
+    end
+  end
+end

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

@@ -1,16 +1,58 @@
+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_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 :code, uniqueness: 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
+
       def full_name
         parent_name = parent&.name
         return name unless parent_name
@@ -29,6 +71,56 @@ module Ecom
       def equipment_types
         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
+
+          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
+      end
     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_product.rb

@@ -30,6 +30,7 @@ module Ecom
       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 }

data/db/migrate/20191119012027_create_ecom_core_takeoff_calculators.rb

@@ -0,0 +1,11 @@
+class CreateEcomCoreTakeoffCalculators < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_takeoff_calculators do |t|
+      t.string :name, unique: true
+      t.boolean :is_custom_calculator, null: false, default: false
+      t.jsonb :input_parameters
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20191119012030_create_ecom_core_task_templates.rb

@@ -8,9 +8,16 @@ 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 :takeoff_calculator,
+                   null: true,
+                   index: { name: 'tt_on_tc_indx' },
+                   foreign_key: { to_table: :ecom_core_takeoff_calculators }
       t.string :ancestry, index: true
       t.boolean :has_takeoff_fields, null:false, default: false
       t.jsonb :fields
+      t.jsonb :takeoff_fields
+      t.jsonb :task_steps
+      t.jsonb :milestones
 
       t.timestamps
     end

data/db/migrate/20191202235434_create_ecom_core_work_products.rb

@@ -4,7 +4,6 @@ class CreateEcomCoreWorkProducts < ActiveRecord::Migration[6.0]
       t.string :name, null: false
       t.string :description
       t.string :design_reference_no, unique: true
-      t.json :dimension
       t.references :product_group,
                    null: true,
                    index: { name: 'wp_on_pg_indx' },

data/db/migrate/{20191225100054_create_ecom_core_crews.rb → 20191207103729_create_ecom_core_crews.rb}

@@ -9,12 +9,12 @@ class CreateEcomCoreCrews < ActiveRecord::Migration[6.0]
       t.string :qualification, null: false
       t.string :employment, null: false
       t.float :wage, null: false
-      t.string :wage_in_words, null: false
+      t.string :wage_in_words
       t.date :employment_date
       t.boolean :sub_contracted, null: false, default: false
       t.string :photo
-      t.string :guarantor_name
-      t.string :guarantor_phone
+      t.string :guarantor_name, null: false
+      t.string :guarantor_phone, null: false
       t.boolean :active, null: false, default: true
       t.references :crew_type,
                    null: false,

data/db/migrate/20191207103730_create_ecom_core_plans.rb

@@ -0,0 +1,12 @@
+class CreateEcomCorePlans < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_plans do |t|
+      t.string :name, null: false
+      t.date :start_date, null: false
+      t.date :end_date, null: false
+      t.string :status, null: false, default: 'New'
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20191207103731_create_ecom_core_work_orders.rb

@@ -0,0 +1,23 @@
+class CreateEcomCoreWorkOrders < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_work_orders do |t|
+      t.string :name
+      t.string :reference_number
+      t.references :assigned_to,
+                   null: false,
+                   index: { name: 'wo_on_at_indx' },
+                   foreign_key: { to_table: :ecom_core_crews }
+
+      t.references :generated_by,
+                   null: false,
+                   index: { name: 'wo_on_gb_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+
+      t.date :start_date, null: false
+      t.date :end_date, null: false
+      t.string :status, null: false, default: :new
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20191207103735_create_ecom_core_tasks.rb

@@ -12,8 +12,16 @@ class CreateEcomCoreTasks < ActiveRecord::Migration[6.0]
       t.string :remark
       t.references :work_package,
                    null: true,
-                   index: { name: 'wp_on_wp_indx' },
+                   index: { name: 'tasks_on_work_package_indx' },
                    foreign_key: { to_table: :ecom_core_work_packages }
+      t.references :work_order,
+                   null: true,
+                   index: { name: 'tasks_on_wo_indx' },
+                   foreign_key: { to_table: :ecom_core_work_orders }
+      t.references :plan,
+                   null: true,
+                   index: { name: 'tasks_on_plan_indx' },
+                   foreign_key: { to_table: :ecom_core_plans }
       t.references :performer,
                    null: true,
                    index: { name: 'tasks_on_performer_indx' },

data/db/migrate/20200813165553_create_ecom_core_measurement_units.rb

@@ -0,0 +1,14 @@
+class CreateEcomCoreMeasurementUnits < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_measurement_units do |t|
+      t.string :name, null: false
+      t.string :abbrivation, null: false
+      t.string :physical_quantity, null: false
+      t.boolean :is_si_unit, null: false, default: false
+      t.float :conversion_factor, null: false
+      t.string :system_of_measurement, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200814043632_create_ecom_core_takeoffs.rb

@@ -0,0 +1,14 @@
+class CreateEcomCoreTakeoffs < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_takeoffs do |t|
+      t.references :task,
+                   null: false,
+                   index: { name: 'takeoff_on_task_indx' },
+                   foreign_key: { to_table: :ecom_core_tasks }
+
+      t.float :takeoff_quantity, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200820123719_create_ecom_core_task_steps.rb

@@ -0,0 +1,17 @@
+class CreateEcomCoreTaskSteps < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_task_steps do |t|
+      t.references :task,
+                   null: false,
+                   index: { name: 'ts_on_task_indx' },
+                   foreign_key: { to_table: :ecom_core_tasks }
+      t.string :name, null: false
+      t.date :start_date
+      t.date :end_date
+      t.float :total_contribution_percentage_to_task, null: false
+      t.boolean :completed, null: false, default: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200821130934_create_ecom_core_task_step_dependencies.rb

@@ -0,0 +1,16 @@
+class CreateEcomCoreTaskStepDependencies < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_task_step_dependencies do |t|
+      t.references :dependent_task_step,
+                   null: false,
+                   index: { name: 'tsd_on_dts_indx' },
+                   foreign_key: { to_table: :ecom_core_task_steps }
+
+      t.references :dependee_task_step,
+                   null: false,
+                   index: { name: 'tsd_on_dependee_ts_indx' },
+                   foreign_key: { to_table: :ecom_core_task_steps }
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200901134912_create_ecom_core_dimension_elements.rb

@@ -0,0 +1,23 @@
+class CreateEcomCoreDimensionElements < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_dimension_elements do |t|
+
+      t.references :work_product,
+                   null: false,
+                   index: { name: 'dimension_on_wp_indx' },
+                   foreign_key: { to_table: :ecom_core_work_products }
+
+      t.references :measurement_unit,
+                   null: false,
+                   index: { name: 'dimension_on_mu_indx' },
+                   foreign_key: { to_table: :ecom_core_measurement_units }
+
+      t.string  :dimension_element_name, null: false
+      t.float :amount
+
+      t.timestamps
+    end
+
+    add_index :ecom_core_dimension_elements, [:work_product_id, :dimension_element_name], unique: true, name: 'de_on_wp_and_den'
+  end
+end

data/db/migrate/20200919085613_create_ecom_core_job_cards.rb

@@ -9,6 +9,7 @@ class CreateEcomCoreJobCards < ActiveRecord::Migration[6.0]
       t.boolean :approved, null: false, default: false
       t.boolean :checkin_confirmed, null: false, default: false
       t.boolean :checkout_confirmed, null: false, default: false
+      t.boolean :costs_approved, null: false, default: false
       t.references :maintenance_service_order,
                    null: false,
                    index: { name: 'jc_on_mso_indx' },
@@ -18,11 +19,11 @@ class CreateEcomCoreJobCards < ActiveRecord::Migration[6.0]
                    index: { name: 'jc_on_sp_indx' },
                    foreign_key: { to_table: :ecom_core_equipment_locations }
       t.references :checkout_by,
-                   null: false,
+                   null: true,
                    index: { name: 'jc_on_cb_indx' },
                    foreign_key: { to_table: :ecom_core_users }
       t.references :checkout_to,
-                   null: false,
+                   null: true,
                    index: { name: 'jc_on_ct_indx' },
                    foreign_key: { to_table: :ecom_core_equipment_locations }
       t.references :maintenance_status,
@@ -30,11 +31,11 @@ class CreateEcomCoreJobCards < ActiveRecord::Migration[6.0]
                    index: { name: 'jc_on_ms_indx' },
                    foreign_key: { to_table: :ecom_core_lookups }
       t.references :checkin_by,
-                   null: false,
+                   null: true,
                    index: { name: 'jc_on_cib_indx' },
                    foreign_key: { to_table: :ecom_core_users }
       t.references :checkin_to,
-                   null: false,
+                   null: true,
                    index: { name: 'jc_on_cit_indx' },
                    foreign_key: { to_table: :ecom_core_equipment_locations }
       t.references :prepared_by,

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.28'.freeze
+    VERSION = '1.2.33'.freeze
   end
 end

data/spec/factories/dimension_elements.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :dimension_element, class: Ecom::Core::DimensionElement do
+    association :work_product
+    association :measurement_unit
+    amount { 5 }
+    dimension_element_name { Ecom::Core::DimensionElement::DIMENSION_ELEMENT_NAMES.sample }
+  end
+end

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

@@ -2,6 +2,6 @@ FactoryBot.define do
   factory :attendance_sheet_entry, class: Ecom::Core::AttendanceSheetEntry do
     association :attendance_sheet
     association :crew
-    total_hours { FFaker::Random.rand(0..8) }
+    total_hours { 0 }
   end
 end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
   factory :maintenance_status, class: Ecom::Core::MaintenanceStatus, parent: :lookup do
-    type { 'Ecom::Core::MaintenanceStatus'}
+    type { 'Ecom::Core::MaintenanceStatus' }
   end
 end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :plan, class: Ecom::Core::Plan do
+    name { FFaker::Name.name }
+    start_date { Time.now }
+    end_date { (Time.now + 1.day).to_s }
+    status { Ecom::Core::Plan::STATUSES.sample }
+  end
+end

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

@@ -0,0 +1,18 @@
+FactoryBot.define do
+  factory :takeoff_calculator, class: Ecom::Core::TakeoffCalculator do
+    name { Ecom::Core::TakeoffCalculator::TAKEOFF_CALCULATOR_NAMES.sample }
+    is_custom_calculator { false }
+    input_parameters do
+      [
+        {
+          name: 'number_of_bar',
+          label: 'Number Of Bar',
+          input_type: 'number',
+          default_value: {
+            value: '1'
+          }
+        }
+      ]
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :takeoff, class: Ecom::Core::Takeoff do
+    association :task
+    takeoff_quantity { 33 }
+  end
+end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :task_step_dependency, class: Ecom::Core::TaskStepDependency do
+    association :dependent_task_step, factory: :task_step
+    association :dependee_task_step, factory: :task_step
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :task_step, class: Ecom::Core::TaskStep do
+    association :task
+    name { 'Cutting' }
+    total_contribution_percentage_to_task { 30 }
+    completed { false }
+  end
+end

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

@@ -8,5 +8,11 @@ FactoryBot.define do
     association :task_template_type
     has_takeoff_fields { false }
     fields { [{ name: 'length', label: 'Length' }] }
+    task_steps do
+      [{
+        "name": 'Cutting',
+        "total_contribution_percentage_to_task": 100
+      }]
+    end
   end
 end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :work_order, class: Ecom::Core::WorkOrder do
+    name { FFaker::Name.unique.name }
+    association :assigned_to, factory: :crew
+    association :generated_by, factory: :user
+    start_date { (Time.now + 1.day).to_s }
+    end_date { (Time.now + 1.month).to_s }
+    status { Ecom::Core::WorkOrder::STATUSES.sample }
+  end
+end

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

@@ -3,7 +3,6 @@ FactoryBot.define do
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     design_reference_no { FFaker::Guid.guid }
-    dimension { [{ label: 'Length', name: 'length', value: 12 }] }
     association :product_group
     association :work_product_template
     association :project

data/spec/factories/measurement_units.rb

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :measurement_unit, class: Ecom::Core::MeasurementUnit do
+    name { 'Meter' }
+    abbrivation { 'm' }
+    physical_quantity { Ecom::Core::MeasurementUnit::LENGTH }
+    is_si_unit { true }
+    conversion_factor { 1 }
+    system_of_measurement { Ecom::Core::MeasurementUnit::METRIC }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.28
+  version: 1.2.33
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-19 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -142,6 +142,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.0.3
+- !ruby/object:Gem::Dependency
+  name: json-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +252,7 @@ files:
 - README.md
 - Rakefile
 - app/constants/ecom/core/status_constants.rb
+- app/controllers/concerns/ecom/core/filterable.rb
 - app/controllers/concerns/ecom/core/lookupable.rb
 - app/controllers/concerns/ecom/core/resource_typeable.rb
 - app/controllers/ecom/core/access_controller.rb
@@ -269,6 +284,7 @@ files:
 - app/models/ecom/core/crew_type.rb
 - app/models/ecom/core/currency.rb
 - app/models/ecom/core/custom_payment_detail.rb
+- app/models/ecom/core/dimension_element.rb
 - app/models/ecom/core/equipment.rb
 - app/models/ecom/core/equipment_category.rb
 - app/models/ecom/core/equipment_component.rb
@@ -286,6 +302,7 @@ files:
 - app/models/ecom/core/maintenance_status.rb
 - app/models/ecom/core/maintenance_type.rb
 - app/models/ecom/core/material_type.rb
+- app/models/ecom/core/measurement_unit.rb
 - app/models/ecom/core/menu.rb
 - app/models/ecom/core/overtime_sheet.rb
 - app/models/ecom/core/overtime_sheet_entry.rb
@@ -293,6 +310,7 @@ files:
 - app/models/ecom/core/payment.rb
 - app/models/ecom/core/payment_detail.rb
 - app/models/ecom/core/payroll.rb
+- app/models/ecom/core/plan.rb
 - app/models/ecom/core/product_group.rb
 - app/models/ecom/core/product_type.rb
 - app/models/ecom/core/project.rb
@@ -303,12 +321,17 @@ files:
 - app/models/ecom/core/schedule_unit.rb
 - app/models/ecom/core/stakeholder.rb
 - app/models/ecom/core/stakeholder_type.rb
+- app/models/ecom/core/takeoff.rb
+- app/models/ecom/core/takeoff_calculator.rb
 - app/models/ecom/core/task.rb
 - app/models/ecom/core/task_resource.rb
+- app/models/ecom/core/task_step.rb
+- app/models/ecom/core/task_step_dependency.rb
 - app/models/ecom/core/task_template.rb
 - app/models/ecom/core/task_template_type.rb
 - app/models/ecom/core/user.rb
 - app/models/ecom/core/user_role.rb
+- app/models/ecom/core/work_order.rb
 - app/models/ecom/core/work_package.rb
 - app/models/ecom/core/work_product.rb
 - app/models/ecom/core/work_product_template.rb
@@ -328,6 +351,7 @@ files:
 - db/migrate/20190101112620_create_ecom_core_lookups.rb
 - db/migrate/20190101112625_create_ecom_core_overtime_types.rb
 - db/migrate/20191119010518_create_ecom_core_task_template_types.rb
+- db/migrate/20191119012027_create_ecom_core_takeoff_calculators.rb
 - db/migrate/20191119012030_create_ecom_core_task_templates.rb
 - db/migrate/20191119013236_create_ecom_core_work_product_templates.rb
 - db/migrate/20191119144141_create_ecom_core_stakeholder_types.rb
@@ -344,9 +368,11 @@ files:
 - db/migrate/20191202221423_create_ecom_core_menus.rb
 - db/migrate/20191202222210_create_ecom_core_work_packages.rb
 - db/migrate/20191202235434_create_ecom_core_work_products.rb
+- db/migrate/20191207103729_create_ecom_core_crews.rb
+- db/migrate/20191207103730_create_ecom_core_plans.rb
+- db/migrate/20191207103731_create_ecom_core_work_orders.rb
 - db/migrate/20191207103735_create_ecom_core_tasks.rb
 - db/migrate/20191210724614_create_ecom_core_task_resources.rb
-- db/migrate/20191225100054_create_ecom_core_crews.rb
 - db/migrate/20191225121850_create_ecom_core_project_crews.rb
 - db/migrate/20191225140433_create_ecom_core_attendance_sheets.rb
 - db/migrate/20191225162539_create_ecom_core_attendance_sheet_entries.rb
@@ -368,7 +394,12 @@ files:
 - db/migrate/20200602130247_create_ecom_core_requested_items.rb
 - db/migrate/20200602830603_create_ecom_core_bookings.rb
 - db/migrate/20200603115317_create_ecom_core_booked_items.rb
+- db/migrate/20200813165553_create_ecom_core_measurement_units.rb
+- db/migrate/20200814043632_create_ecom_core_takeoffs.rb
+- db/migrate/20200820123719_create_ecom_core_task_steps.rb
+- db/migrate/20200821130934_create_ecom_core_task_step_dependencies.rb
 - db/migrate/20200901085227_create_ecom_core_crew_contracts.rb
+- db/migrate/20200901134912_create_ecom_core_dimension_elements.rb
 - db/migrate/20200919053331_create_ecom_core_maintenance_types.rb
 - db/migrate/20200919072216_create_ecom_core_schedule_settings.rb
 - db/migrate/20200919081338_create_ecom_core_maintenance_service_orders.rb
@@ -380,6 +411,7 @@ files:
 - lib/ecom/core/version.rb
 - lib/ecom_core.rb
 - lib/tasks/ecom_core_tasks.rake
+- spec/factories/dimension_elements.rb
 - spec/factories/ecom/core/application_modules.rb
 - spec/factories/ecom/core/attendance_sheet_entries.rb
 - spec/factories/ecom/core/attendance_sheets.rb
@@ -420,6 +452,7 @@ files:
 - spec/factories/ecom/core/payment_details.rb
 - spec/factories/ecom/core/payments.rb
 - spec/factories/ecom/core/payrolls.rb
+- spec/factories/ecom/core/plans.rb
 - spec/factories/ecom/core/product_groups.rb
 - spec/factories/ecom/core/product_types.rb
 - spec/factories/ecom/core/project_crews.rb
@@ -430,15 +463,21 @@ files:
 - spec/factories/ecom/core/schedule_units.rb
 - spec/factories/ecom/core/stakeholder_types.rb
 - spec/factories/ecom/core/stakeholders.rb
+- spec/factories/ecom/core/takeoff_calculators.rb
+- spec/factories/ecom/core/takeoffs.rb
 - spec/factories/ecom/core/task_resources.rb
+- spec/factories/ecom/core/task_step_dependencies.rb
+- spec/factories/ecom/core/task_steps.rb
 - spec/factories/ecom/core/task_template_types.rb
 - spec/factories/ecom/core/task_templates.rb
 - spec/factories/ecom/core/tasks.rb
 - spec/factories/ecom/core/user_roles.rb
 - spec/factories/ecom/core/users.rb
+- spec/factories/ecom/core/work_orders.rb
 - spec/factories/ecom/core/work_packages.rb
 - spec/factories/ecom/core/work_product_templates.rb
 - spec/factories/ecom/core/work_products.rb
+- spec/factories/measurement_units.rb
 homepage: http://www.mks.com.et
 licenses:
 - MIT