ecom_core 1.2.35 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b43b8dd7f97b9f42d8291e7de02613863b54d79062ab12079792eaabfcdcc78a
-  data.tar.gz: 35e01c0eecc8d2ee6d11599f834cd2cb5dbfcdb18a90884bf88401fe18359b8e
+  metadata.gz: f471cd5b5bddb2156f3edbd091a53fff200ac09e374d465201dd4fa930bbc384
+  data.tar.gz: 5b8bb54ba78c861e284f85bcd9c183e5213559005669245483aea63b4ddf64c3
 SHA512:
-  metadata.gz: '0428fe3fac34831c9ab94b28f4a7819dee36fd608f0d2534249b06278918e8e87313b417279a25328061500833dcf2e281fb43ef8add4b463e824bdac61c3958'
-  data.tar.gz: 673cf08cc11e5f3ddc8d8ddef5f3da3adb17292032b8e306deacf4bc326080a5da3ea8c666d71b8014a4b91e690a1267c4f18d920cf45133f864910ccac2d7aa
+  metadata.gz: ed6a04e00cf9c858ee3a9366c297f5e989bdf3bb9e0d18e6ca0c905945995a03c6312f2549b4ab7f2f5cbaefd6994933d7c05d27462e2efece7a5a922ed66c74
+  data.tar.gz: c6e0dc807e852c9ee55ab645422c2f51bf17340c7196e1665dbc24cc3081771ad2791d14cc08de64fe226561da70d934b1177fc2ea38c30ccb523264f3e1d325

data/app/controllers/ecom/core/unit_costs_controller.rb

@@ -0,0 +1,29 @@
+module Ecom
+  module Core
+    class UnitCostsController < ApplicationController
+      before_action :set_service, only: %i[update]
+
+      def index
+        unit_costs = UnitCost.where(active: true)
+        serialized = ActiveModelSerializers::SerializableResource.new(unit_costs)
+        render json: { success: true, data: serialized }
+      end
+
+      def create
+        unit_cost = UnitCost.new(unit_cost_params)
+        if unit_cost.save
+          render json: unit_cost, status: :created
+        else
+          render json: { success: false, errors: unit_cost.errors }, status: :unprocessable_entity
+        end
+      end
+
+      private
+
+      def unit_cost_params
+        params.require(:unit_cost).permit(:resource_type_id, :quantity, :measurement_unit_id,
+                                          :price, :currency_id, :utilization_factor, :effective_date, :set_by_id)
+      end
+    end
+  end
+end

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

@@ -20,6 +20,7 @@ module Ecom
       has_many :site_crews
       has_many :sites, through: :site_crews
       has_many :crew_id_cards
+      has_many :crew_contracts
 
       scope :by_active, ->(active) { where(active: active) }
       scope :by_qualification, ->(qualification) { where(qualification: qualification) }

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

@@ -14,7 +14,7 @@ module Ecom
       validates :wage, presence: true, numericality: { greater_than: 0 }
 
       validates_uniqueness_of :crew_id,
-                              conditions: -> { where(status: :in_effect) },
+                              if: -> { status == 'in_effect' },
                               message: 'There can only be one contract' \
                                ' with status `In effect` for a given crew at a time'
 

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

@@ -0,0 +1,41 @@
+module Ecom
+  module Core
+    class LookaheadPlan < ApplicationRecord
+      include AASM
+
+      belongs_to :prepared_by, class_name: 'Ecom::Core::User'
+      has_many :lookahead_plan_review_times
+      has_many :lookahead_plan_histories
+      has_and_belongs_to_many :tasks, join_table: 'ecom_core_lookahead_plan_backlogs'
+
+      validates :name, :start_date, :end_date, :status,
+                :prepared_by_id, :prepared_by, presence: true
+
+      validates :revision_number, numericality: { greater_than_or_equal_to: 0 }
+      validates :lead_time, presence: true, numericality: { greater_than_or_equal_to: 1 }
+
+      aasm column: 'status' do
+        state :new, initial: true
+        state :in_progress
+        state :in_review
+        state :completed
+
+        event :start do
+          transitions from: :new, to: :in_progress, guard: -> { status == 'new' }
+        end
+
+        event :review do
+          transitions from: :in_progress, to: :in_review, guard: -> { status == 'in_progress' }
+        end
+
+        event :continue do
+          transitions from: :in_review, to: :in_progress, guard: -> { status == 'in_review' }
+        end
+
+        event :complete do
+          transitions from: :in_review, to: :completed, guard: -> { status == 'in_review' }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Ecom
+  module Core
+    class LookaheadPlanHistory < ApplicationRecord
+      belongs_to :lookahead_plan
+      belongs_to :task
+
+      validates_with DateRangeValidator
+
+      validates :lookahead_plan_id, :lookahead_plan, :task_id, :task, :start_date, :end_date,
+                :lookahead_plan_revision_number, presence: true
+
+      validates_numericality_of :lookahead_plan_revision_number,
+                                greater_than_or_equal_to: 0
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Ecom
+  module Core
+    class LookaheadPlanReviewTime < ApplicationRecord
+      include AASM
+
+      belongs_to :lookahead_plan
+
+      validates :lookahead_plan_id, :lookahead_plan,
+                :lookahead_plan_revision_number, :review_time, :status, presence: true
+
+      validates_numericality_of :lookahead_plan_revision_number,
+                                greater_than_or_equal_to: 0
+
+      aasm column: 'status' do
+        state :awaiting, initial: true
+        state :attended
+        state :cancelled
+
+        event :attend do
+          transitions from: :awaiting, to: :attended, guard: -> { status == 'awaiting' }
+        end
+
+        event :cancel do
+          transitions from: :awaiting, to: :cancelled, guard: -> { status == 'awaiting' }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Ecom
+  module Core
+    class LookaheadPlanTaskProgress < ApplicationRecord
+      belongs_to :lookahead_plan
+      belongs_to :task
+
+      validates :lookahead_plan_id, :lookahead_plan, :task_id, :task, :started_on, :ended_on,
+                :lookahead_plan_revision_number, presence: true
+
+      validates_numericality_of :lookahead_plan_revision_number,
+                                greater_than_or_equal_to: 0
+
+      validate :date_range_validator
+
+      def date_range_validator
+        return unless started_on && ended_on && started_on > ended_on
+
+        errors.add(:base, 'Ended on cannot be before started on')
+      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/project_template.rb

@@ -6,6 +6,8 @@ module Ecom
 
       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/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/site_crew.rb

@@ -14,7 +14,7 @@ module Ecom
 
       validates_uniqueness_of :site_id,
                               scope: :crew_id,
-                              conditions: -> { where(status: 'Active') },
+                              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

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

@@ -16,7 +16,6 @@ module Ecom
       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 :client_consultant, class_name: 'Ecom::Core::User', optional: true
       belongs_to :foreman, class_name: 'Ecom::Core::User', optional: true
@@ -45,11 +44,8 @@ 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

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

@@ -4,6 +4,7 @@ module Ecom
       has_ancestry
 
       belongs_to :task_template_type
+
       has_many :task_template_inspection_checklists
       has_many :inspection_checklists, through: :task_template_inspection_checklists
       has_many :project_work_item_templates

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

@@ -0,0 +1,27 @@
+module Ecom
+  module Core
+    class UnitCost < ApplicationRecord
+      before_save :update_previous_unit_cost
+
+      belongs_to :resource_type
+      belongs_to :measurement_unit
+      belongs_to :currency
+      belongs_to :set_by, class_name: 'Ecom::Core::User'
+
+      validates :quantity, :effective_date, :utilization_factor, :set_by_id, :set_by, presence: true
+
+      validates :price, presence: true, numericality: { greater_than: 0 }
+      validates :utilization_factor, presence: true, numericality: { greater_than: 0, less_than_or_equal_to: 1 }
+
+      def update_previous_unit_cost
+        return if resource_type_id.nil?
+
+        return if active_changed?(from: true, to: false)
+
+        Ecom::Core::UnitCost
+          .where(resource_type_id: resource_type_id, active: true)
+          .update(active: false)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Ecom
+  module Core
+    class UnitOfMeasure < ApplicationRecord
+      validates :code, :name, presence: true
+      validates :code, uniqueness: true
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Ecom
+  module Core
+    class WorkItemResourceRequirementTemplate < ApplicationRecord
+      belongs_to :project_work_item_template
+      belongs_to :resource_type
+      belongs_to :work_item_quantity_measurement_unit, class_name: 'Ecom::Core::MeasurementUnit'
+      belongs_to :resource_quantity_measurement_unit, class_name: 'Ecom::Core::MeasurementUnit'
+
+      validates :project_work_item_template_id, :project_work_item_template,
+                :resource_type_id, :resource_type, :work_item_quantity_measurement_unit_id,
+                :work_item_quantity_measurement_unit, :resource_quantity_measurement_unit_id,
+                :resource_quantity_measurement_unit, presence: true
+
+      validates :work_item_quantity, presence: true, numericality: { greater_than: 0 }
+      validates :resource_quantity, presence: true, numericality: { greater_than: 0 }
+    end
+  end
+end

data/app/serializers/ecom/core/unit_cost_serializer.rb

@@ -0,0 +1,21 @@
+module Ecom
+  module Core
+    class UnitCostSerializer < ActiveModel::Serializer
+      attributes :id, :resource_type_id, :quantity, :measurement_unit_id,
+                 :price, :currency_id, :utilization_factor, :effective_date, :set_by_id,
+                 :resource_type, :measurement_unit, :currency
+
+      def resource_type
+        object.resource_type
+      end
+
+      def measurement_unit
+        object.measurement_unit
+      end
+
+      def currency
+        object.currency.name
+      end
+    end
+  end
+end

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

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

data/app/uploaders/ecom/core/photo_uploader.rb

@@ -1,7 +1,11 @@
 module Ecom
   module Core
     class PhotoUploader < CarrierWave::Uploader::Base
-      storage :file
+      if Rails.env.production?
+        storage :fog
+      else
+        storage :file
+      end
 
       def store_dir
         "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"

data/app/uploaders/ecom/core/task_attachment_uploader.rb

@@ -0,0 +1,11 @@
+module Ecom
+  module Core
+    class TaskAttachmentUploader < CarrierWave::Uploader::Base
+      storage :file
+
+      def store_dir
+        "#{ENV.fetch('UPLOAD_PREFIX')}uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+      end
+    end
+  end
+end

data/config/initializers/carrierwave.rb

@@ -0,0 +1,8 @@
+CarrierWave.configure do |config|
+    config.fog_credentials = {
+      provider:                         'Google',
+      google_storage_access_key_id:     ENV["GOOGLE_STORAGE_ACCESS_KEY"],
+      google_storage_secret_access_key: ENV["GOOGLE_STORAGE_SECRETE_KEY"]
+    }
+    config.fog_directory = ENV["GOOGLE_STORAGE_BUCKET_NAME"]
+end

data/config/routes.rb

@@ -17,4 +17,6 @@ Ecom::Core::Engine.routes.draw do
   get '/default_company', controller: :companies, action: :default_company
   get '/sites/:id/crew', controller: :site_crews, action: :index
   post '/site_crews', controller: :site_crews, action: :update
+
+  resources :unit_costs, only: %i[index create]
 end

data/db/migrate/20191118052213_create_ecom_core_unit_of_measures.rb

@@ -0,0 +1,11 @@
+class CreateEcomCoreUnitOfMeasures < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_unit_of_measures do |t|
+      t.string :code, unique: true
+      t.string :name, null: false
+      t.string :description
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20191207103730_create_ecom_core_lookahead_plans.rb

@@ -0,0 +1,19 @@
+class CreateEcomCoreLookaheadPlans < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_lookahead_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.integer :revision_number, default: 0
+      t.integer :lead_time, default: 336 # default lead time 2 weeks( 336 hours )
+
+      t.references :prepared_by,
+                   null: false,
+                   index: { name: 'lprt_on_pb_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+      
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20191207103735_create_ecom_core_tasks.rb

@@ -9,6 +9,7 @@ class CreateEcomCoreTasks < ActiveRecord::Migration[6.0]
       t.date :end_date
       t.string :status, null: false, default: :new
       t.integer :percent_completed, null: false, default: 0
+      t.float :quantity
       t.string :remark
       t.date :inspection_submission_date
       t.string :inspection_status, null: false, default: 'Not Inspected'
@@ -26,10 +27,6 @@ class CreateEcomCoreTasks < ActiveRecord::Migration[6.0]
                    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/20201121064916_create_ecom_core_unit_costs.rb

@@ -0,0 +1,30 @@
+class CreateEcomCoreUnitCosts < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_unit_costs do |t|
+      t.references :resource_type,
+                   null: false,
+                   index: { name: 'uc_on_rt_indx' },
+                   foreign_key: { to_table: :ecom_core_resource_types }
+      t.float :quantity
+      t.references :measurement_unit,
+                   null: false,
+                   index: { name: 'uc_on_mu_indx' },
+                   foreign_key: { to_table: :ecom_core_measurement_units }
+      t.float :price
+      t.references :currency,
+                   null: false,
+                   index: { name: 'uc_on_currency_indx' },
+                   foreign_key: { to_table: :ecom_core_currencies }
+      t.float :utilization_factor, default: 1
+      t.date :effective_date
+      t.boolean :active, default: true
+      t.references :set_by,
+                   null: false,
+                   index: { name: 'uc_on_user_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+      
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201122123227_create_ecom_core_lookahead_plan_backlogs.rb

@@ -0,0 +1,18 @@
+class CreateEcomCoreLookaheadPlanBacklogs < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_lookahead_plan_backlogs, id: false do |t|
+      t.references :lookahead_plan,
+                   null: false,
+                   index: { name: 'lpb_on_lp_indx' },
+                   foreign_key: { to_table: :ecom_core_lookahead_plans }
+
+      t.references :task,
+                   null: false,
+                   index: { name: 'lpb_on_tas_indx' },
+                   foreign_key: { to_table: :ecom_core_tasks }
+
+      t.timestamps
+    end
+    add_index :ecom_core_lookahead_plan_backlogs, [:lookahead_plan_id, :task_id], unique: true, name: 'lpb_on_lp_and_task'
+  end
+end

data/db/migrate/20201122170645_create_ecom_core_lookahead_plan_histories.rb

@@ -0,0 +1,21 @@
+class CreateEcomCoreLookaheadPlanHistories < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_lookahead_plan_histories do |t|
+
+      t.references :lookahead_plan,
+                   null: false,
+                   index: { name: 'lph_on_lp_indx' },
+                   foreign_key: { to_table: :ecom_core_lookahead_plans }
+
+      t.references :task,
+                   null: false,
+                   index: { name: 'lph_on_tas_indx' },
+                   foreign_key: { to_table: :ecom_core_tasks }
+      t.date :start_date, null: false
+      t.date :end_date, null: false
+      t.integer :lookahead_plan_revision_number, null: false
+      
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201122170724_create_ecom_core_lookahead_plan_task_progresses.rb

@@ -0,0 +1,21 @@
+class CreateEcomCoreLookaheadPlanTaskProgresses < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_lookahead_plan_task_progresses do |t|
+
+      t.references :lookahead_plan,
+                   null: false,
+                   index: { name: 'lptp_on_lp_indx' },
+                   foreign_key: { to_table: :ecom_core_lookahead_plans }
+
+      t.references :task,
+                   null: false,
+                   index: { name: 'lptp_on_tas_indx' },
+                   foreign_key: { to_table: :ecom_core_tasks }
+      t.date :started_on, null: false
+      t.date :ended_on, null: false
+      t.integer :lookahead_plan_revision_number, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201123134917_create_ecom_core_task_attachments.rb

@@ -0,0 +1,15 @@
+class CreateEcomCoreTaskAttachments < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_task_attachments do |t|
+      t.string :title, null: false
+      t.string :description
+      t.string :file
+      t.references :task,
+                   null: false,
+                   index: { name: 'ta_on_task_indx' },
+                   foreign_key: { to_table: :ecom_core_tasks }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201124171642_create_ecom_core_lookahead_plan_review_times.rb

@@ -0,0 +1,17 @@
+class CreateEcomCoreLookaheadPlanReviewTimes < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_lookahead_plan_review_times do |t|
+
+      t.references :lookahead_plan,
+                   null: false,
+                   index: { name: 'lprt_on_lp_indx' },
+                   foreign_key: { to_table: :ecom_core_lookahead_plans }
+
+      t.datetime :review_time, null: false 
+      t.string   :status
+      t.integer  :lookahead_plan_revision_number
+      
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201125191158_create_ecom_core_work_item_resource_requirement_templates.rb

@@ -0,0 +1,31 @@
+class CreateEcomCoreWorkItemResourceRequirementTemplates < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_work_item_resource_requirement_templates do |t|
+      t.references :project_work_item_template,
+                   null: true,
+                   index: { name: 'wirrl_on_pwit_indx' },
+                   foreign_key: { to_table: :ecom_core_project_work_item_templates }
+
+      t.references :resource_type,
+                   null: true,
+                   index: { name: 'wirrl_on_rt_indx' },
+                   foreign_key: { to_table: :ecom_core_resource_types }
+
+      t.float :work_item_quantity, null: false
+
+      t.references :work_item_quantity_measurement_unit,
+                   null: true,
+                   index: { name: 'wirrl_on_wiqmu_indx' },
+                   foreign_key: { to_table: :ecom_core_measurement_units }
+
+      t.float :resource_quantity, null: false
+      
+      t.references :resource_quantity_measurement_unit,
+                   null: true,
+                   index: { name: 'wirrl_on_rqmu_indx' },
+                   foreign_key: { to_table: :ecom_core_measurement_units }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201126191334_create_ecom_core_resource_requisitions.rb

@@ -0,0 +1,23 @@
+class CreateEcomCoreResourceRequisitions < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_resource_requisitions do |t|
+      t.references :lookahead_plan,
+                   null: false,
+                   index: { name: 'rr_on_lp_indx' },
+                   foreign_key: { to_table: :ecom_core_lookahead_plans }
+
+      t.references :reviewed_by,
+                   null: true,
+                   index: { name: 'rr_on_rb_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+      t.references :approved_by,
+                   null: true,
+                   index: { name: 'rr_on_ab_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+      t.string :delivery_point, null:false
+      t.string :status, null: false, default: 'Draft'
+      
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201126191349_create_ecom_core_resource_requisition_items.rb

@@ -0,0 +1,33 @@
+class CreateEcomCoreResourceRequisitionItems < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_resource_requisition_items do |t|
+      t.references :resource_requisition,
+                   null: false,
+                   index: { name: 'rri_on_rr_indx' },
+                   foreign_key: { to_table: :ecom_core_resource_requisitions }
+
+      t.references :resource_type,
+                   null: false,
+                   index: { name: 'rri_on_rt_indx' },
+                   foreign_key: { to_table: :ecom_core_resource_types }
+
+      t.float :requested_quantity, null: false
+
+      t.references :requested_quantity_measurement_unit,
+                   null: false,
+                   index: { name: 'rri_on_rqmu_indx' },
+                   foreign_key: { to_table: :ecom_core_measurement_units }
+
+      t.float :awaiting_quantity, null: false
+
+      t.references :awaiting_quantity_measurement_unit,
+                   null: false,
+                   index: { name: 'rri_on_aqmu_indx' },
+                   foreign_key: { to_table: :ecom_core_measurement_units }
+      t.string :status, null: false, default: 'Pending'
+      t.datetime :due_date, null: false
+      
+      t.timestamps
+    end
+  end
+end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.35'.freeze
+    VERSION = '1.3.3'.freeze
   end
 end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :lookahead_plan_history, class: Ecom::Core::LookaheadPlanHistory do
+    association :lookahead_plan
+    association :task
+    start_date { Time.now }
+    end_date { Time.now + 2.day }
+    lookahead_plan_revision_number { 1 }
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :lookahead_plan_review_time, class: Ecom::Core::LookaheadPlanReviewTime do
+    association :lookahead_plan
+    review_time { Time.now + 10.day }
+    status { :awaiting }
+    lookahead_plan_revision_number { 0 }
+  end
+end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :lookahead_plan_task_progress, class: Ecom::Core::LookaheadPlanTaskProgress do
+    association :lookahead_plan
+    association :task
+    started_on { Time.now }
+    ended_on { Time.now + 2.day }
+    lookahead_plan_revision_number { 1 }
+  end
+end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :lookahead_plan, class: Ecom::Core::LookaheadPlan do
+    name { FFaker::Name.name }
+    start_date { Time.now }
+    end_date { (Time.now + 1.day).to_s }
+    status { :new }
+    revision_number { 1 }
+    association :prepared_by, factory: :user
+  end
+end

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

@@ -0,0 +1,12 @@
+FactoryBot.define do
+  factory :resource_requisition_item, class: Ecom::Core::ResourceRequisitionItem do
+    association :resource_requisition
+    association :resource_type
+    requested_quantity { 2000 }
+    association :requested_quantity_measurement_unit, factory: :measurement_unit
+    association :awaiting_quantity_measurement_unit, factory: :non_si_measurement_unit
+    awaiting_quantity { 1 }
+    due_date { Time.now + 1.week }
+    status { 'Pending' }
+  end
+end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :resource_requisition, class: Ecom::Core::ResourceRequisition do
+    association :lookahead_plan
+    association :reviewed_by, factory: :user
+    association :approved_by, factory: :user
+    status { 'Draft' }
+    delivery_point { FFaker::Name.name }
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :task_attachment, class: Ecom::Core::TaskAttachment do
+    title { FFaker::Name.name }
+    description { FFaker::Name.name }
+    file { FFaker::Name.name }
+    association :task
+  end
+end

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

@@ -15,6 +15,7 @@ FactoryBot.define do
     change_order { false }
     change_order_for { nil }
     percentage_contribution { nil }
+    quantity { nil }
     association :performer, factory: :user
     association :client_consultant, factory: :user
     association :foreman, factory: :user

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

@@ -0,0 +1,13 @@
+FactoryBot.define do
+  factory :unit_cost, class: Ecom::Core::UnitCost do
+    association :resource_type
+    quantity { 55 }
+    association :measurement_unit
+    price { 100 }
+    association :currency
+    effective_date { Time.now }
+    active { true }
+    utilization_factor { 1 }
+    association :set_by, factory: :user
+  end
+end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :unit_of_measure, class: Ecom::Core::UnitOfMeasure do
+    code { FFaker::Name.name }
+    name { FFaker::Name.name }
+    description { FFaker::Name.name }
+  end
+end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :work_item_resource_requirement_template, class: Ecom::Core::WorkItemResourceRequirementTemplate do
+    association :project_work_item_template
+    association :resource_type
+    work_item_quantity { 120 }
+    association :work_item_quantity_measurement_unit, factory: :non_si_measurement_unit
+    resource_quantity { 100 }
+    association :resource_quantity_measurement_unit, factory: :non_si_measurement_unit
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.35
+  version: 1.3.3
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2020-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -156,6 +156,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog-google
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -264,6 +278,7 @@ files:
 - app/controllers/ecom/core/menus_controller.rb
 - app/controllers/ecom/core/projects_controller.rb
 - app/controllers/ecom/core/site_crews_controller.rb
+- app/controllers/ecom/core/unit_costs_controller.rb
 - app/controllers/ecom/core/user_roles_controller.rb
 - app/controllers/ecom/core/users_controller.rb
 - app/models/ecom/core/application_module.rb
@@ -298,6 +313,10 @@ files:
 - app/models/ecom/core/inspection_checklist.rb
 - app/models/ecom/core/job_card.rb
 - app/models/ecom/core/location_type.rb
+- app/models/ecom/core/lookahead_plan.rb
+- app/models/ecom/core/lookahead_plan_history.rb
+- app/models/ecom/core/lookahead_plan_review_time.rb
+- app/models/ecom/core/lookahead_plan_task_progress.rb
 - app/models/ecom/core/lookup.rb
 - app/models/ecom/core/maintenance_category.rb
 - app/models/ecom/core/maintenance_cost.rb
@@ -317,13 +336,14 @@ 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
 - app/models/ecom/core/project_template.rb
 - app/models/ecom/core/project_work_item_template.rb
 - app/models/ecom/core/requested_item.rb
+- app/models/ecom/core/resource_requisition.rb
+- app/models/ecom/core/resource_requisition_item.rb
 - app/models/ecom/core/resource_type.rb
 - app/models/ecom/core/schedule_setting.rb
 - app/models/ecom/core/schedule_unit.rb
@@ -333,13 +353,17 @@ files:
 - app/models/ecom/core/stakeholder_type.rb
 - app/models/ecom/core/takeoff.rb
 - app/models/ecom/core/task.rb
+- app/models/ecom/core/task_attachment.rb
 - app/models/ecom/core/task_inspection_checklist.rb
 - app/models/ecom/core/task_resource.rb
 - app/models/ecom/core/task_template.rb
 - app/models/ecom/core/task_template_inspection_checklist.rb
 - app/models/ecom/core/task_template_type.rb
+- app/models/ecom/core/unit_cost.rb
+- app/models/ecom/core/unit_of_measure.rb
 - app/models/ecom/core/user.rb
 - app/models/ecom/core/user_role.rb
+- app/models/ecom/core/work_item_resource_requirement_template.rb
 - app/models/ecom/core/work_order.rb
 - app/models/ecom/core/work_package.rb
 - app/models/ecom/core/work_product.rb
@@ -347,6 +371,7 @@ files:
 - app/serializers/ecom/core/application_module_serializer.rb
 - app/serializers/ecom/core/lookup_serializer.rb
 - app/serializers/ecom/core/resource_type_serializer.rb
+- app/serializers/ecom/core/unit_cost_serializer.rb
 - app/serializers/ecom/core/user_role_serializer.rb
 - app/serializers/ecom/core/user_serializer.rb
 - app/services/ecom/core/crew_contract_transaction_service.rb
@@ -354,12 +379,15 @@ files:
 - app/services/ecom/core/site_crew_service.rb
 - app/services/ecom/core/token_auth_service.rb
 - app/uploaders/ecom/core/photo_uploader.rb
+- app/uploaders/ecom/core/task_attachment_uploader.rb
 - app/validators/ecom/core/date_range_validator.rb
 - config/database.ci.yml
+- config/initializers/carrierwave.rb
 - config/routes.rb
 - db/migrate/20190101085530_create_ecom_core_companies.rb
 - db/migrate/20190101112620_create_ecom_core_lookups.rb
 - db/migrate/20190101112625_create_ecom_core_overtime_types.rb
+- db/migrate/20191118052213_create_ecom_core_unit_of_measures.rb
 - db/migrate/20191119010518_create_ecom_core_task_template_types.rb
 - db/migrate/20191119012030_create_ecom_core_task_templates.rb
 - db/migrate/20191119013236_create_ecom_core_work_product_templates.rb
@@ -381,7 +409,7 @@ files:
 - 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/20191207103730_create_ecom_core_lookahead_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
@@ -424,6 +452,15 @@ files:
 - db/migrate/20201013094100_create_ecom_core_crew_id_cards.rb
 - db/migrate/20201113050953_create_ecom_core_task_inspection_checklists.rb
 - db/migrate/20201113094302_create_ecom_core_task_template_inspection_checklists.rb
+- db/migrate/20201121064916_create_ecom_core_unit_costs.rb
+- db/migrate/20201122123227_create_ecom_core_lookahead_plan_backlogs.rb
+- db/migrate/20201122170645_create_ecom_core_lookahead_plan_histories.rb
+- db/migrate/20201122170724_create_ecom_core_lookahead_plan_task_progresses.rb
+- db/migrate/20201123134917_create_ecom_core_task_attachments.rb
+- db/migrate/20201124171642_create_ecom_core_lookahead_plan_review_times.rb
+- db/migrate/20201125191158_create_ecom_core_work_item_resource_requirement_templates.rb
+- db/migrate/20201126191334_create_ecom_core_resource_requisitions.rb
+- db/migrate/20201126191349_create_ecom_core_resource_requisition_items.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
@@ -460,6 +497,10 @@ files:
 - spec/factories/ecom/core/inspection_checklists.rb
 - spec/factories/ecom/core/job_cards.rb
 - spec/factories/ecom/core/location_types.rb
+- spec/factories/ecom/core/lookahead_plan_histories.rb
+- spec/factories/ecom/core/lookahead_plan_review_times.rb
+- spec/factories/ecom/core/lookahead_plan_task_progresses.rb
+- spec/factories/ecom/core/lookahead_plans.rb
 - spec/factories/ecom/core/lookups.rb
 - spec/factories/ecom/core/maintenance_categories.rb
 - spec/factories/ecom/core/maintenance_costs.rb
@@ -479,13 +520,14 @@ 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_templates.rb
 - spec/factories/ecom/core/project_work_item_templates.rb
 - spec/factories/ecom/core/projects.rb
 - spec/factories/ecom/core/requested_items.rb
+- spec/factories/ecom/core/resource_requisition_items.rb
+- spec/factories/ecom/core/resource_requisitions.rb
 - spec/factories/ecom/core/resource_types.rb
 - spec/factories/ecom/core/schedule_settings.rb
 - spec/factories/ecom/core/schedule_units.rb
@@ -494,14 +536,18 @@ files:
 - spec/factories/ecom/core/stakeholder_types.rb
 - spec/factories/ecom/core/stakeholders.rb
 - spec/factories/ecom/core/takeoffs.rb
+- spec/factories/ecom/core/task_attachments.rb
 - spec/factories/ecom/core/task_inspection_checklists.rb
 - spec/factories/ecom/core/task_resources.rb
 - spec/factories/ecom/core/task_template_inspection_checklists.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/unit_costs.rb
+- spec/factories/ecom/core/unit_of_measures.rb
 - spec/factories/ecom/core/user_roles.rb
 - spec/factories/ecom/core/users.rb
+- spec/factories/ecom/core/work_item_resource_requirement_templates.rb
 - spec/factories/ecom/core/work_orders.rb
 - spec/factories/ecom/core/work_packages.rb
 - spec/factories/ecom/core/work_product_templates.rb

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

@@ -1,18 +0,0 @@
-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/db/migrate/20191207103730_create_ecom_core_plans.rb

@@ -1,12 +0,0 @@
-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/spec/factories/ecom/core/plans.rb

@@ -1,8 +0,0 @@
-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