ecom_core 1.2.34 → 1.3.2

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/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/models/ecom/core/work_package.rb

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

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

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

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

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

data/app/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/crew_contract_transaction_service.rb

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

data/app/services/ecom/core/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/services/ecom/core/site_crew_service.rb

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

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

@@ -15,6 +15,8 @@ Ecom::Core::Engine.routes.draw do
   resources :projects
   resources :companies
   get '/default_company', controller: :companies, action: :default_company
-  get '/projects/:id/crew', controller: :project_crews, action: :index
-  post '/project_crews', controller: :project_crews, action: :update
+  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/20191119012030_create_ecom_core_task_templates.rb

@@ -8,16 +8,18 @@ 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.references :unit_of_measure,
+                   null: false,
+                   index: { name: 'tt_on_uof_indx' },
+                   foreign_key: { to_table: :ecom_core_unit_of_measures }
       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.jsonb :takeoff_fields, null: false, default: {}
+      t.integer :percentage_contribution
+      t.integer :task_sequence
+      t.boolean :has_inspection, null: false, default: false
+      t.boolean :discipline, null: false, default: false
+      t.jsonb :task_completion_detail, null: false, default: {}
 
       t.timestamps
     end

data/db/migrate/20191119013236_create_ecom_core_work_product_templates.rb

@@ -4,23 +4,8 @@ class CreateEcomCoreWorkProductTemplates < ActiveRecord::Migration[6.0]
       t.string :code, null: false, unique: true
       t.string :name, null: false, unique: true
       t.string :description
-      t.references :task_template_type,
-                   null: false,
-                   index: { name: 'wpt_on_ttt_indx' },
-                   foreign_key: { to_table: :ecom_core_task_template_types }
 
       t.timestamps
     end
-
-    create_table :ecom_core_task_templates_work_product_templates do |t|
-      t.references :task_template,
-                   null: false,
-                   index: { name: 'ttwpt_on_tt_indx' },
-                   foreign_key: { to_table: :ecom_core_task_templates }
-      t.references :work_product_template,
-                   null: false,
-                   index: { name: 'ttwpt_on_wpt_indx' },
-                   foreign_key: { to_table: :ecom_core_work_product_templates }
-    end
   end
 end

data/db/migrate/20191119021405_create_ecom_core_project_templates.rb

@@ -0,0 +1,15 @@
+class CreateEcomCoreProjectTemplates < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_project_templates do |t|
+      t.string :code, unique: true
+      t.string :name, null: false
+      t.string :description
+      t.references :task_template_type,
+                   null: false,
+                   index: { name: 'pt_on_ttt_indx' },
+                   foreign_key: { to_table: :ecom_core_task_template_types }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20191119034319_create_ecom_core_project_work_item_templates.rb

@@ -0,0 +1,20 @@
+class CreateEcomCoreProjectWorkItemTemplates < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_project_work_item_templates do |t|
+      t.references :task_template,
+                   null: false,
+                   index: { name: 'pwit_on_tt_indx' },
+                   foreign_key: { to_table: :ecom_core_task_templates } 
+      t.references :work_product_template,
+                   null: false,
+                   index: { name: 'pwit_on_wpt_indx' },
+                   foreign_key: { to_table: :ecom_core_work_product_templates }
+      t.references :project_template,
+                   null: false,
+                   index: { name: 'pwit_on_pt_indx' },
+                   foreign_key: { to_table: :ecom_core_project_templates }
+
+      t.timestamps
+    end
+  end
+end