ecom_core 1.2.30 → 1.2.35

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

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

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

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

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

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

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

@@ -12,7 +12,14 @@ module Ecom
       end
 
       def filename
-        original_filename
+        "#{secure_token}.#{file.extension}" if original_filename.present?
+      end
+
+      protected
+
+      def secure_token
+        var = :"@#{mounted_as}_secure_token"
+        model.instance_variable_get(var) || model.instance_variable_set(var, SecureRandom.uuid)
       end
     end
   end

data/config/routes.rb

@@ -15,6 +15,6 @@ 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
 end

data/db/migrate/20191119012030_create_ecom_core_task_templates.rb

@@ -10,7 +10,12 @@ class CreateEcomCoreTaskTemplates < ActiveRecord::Migration[6.0]
                    foreign_key: { to_table: :ecom_core_task_template_types }
       t.string :ancestry, index: true
       t.boolean :has_takeoff_fields, null:false, default: false
-      t.jsonb :fields
+      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

data/db/migrate/20191201145849_create_ecom_core_sites.rb

@@ -0,0 +1,16 @@
+class CreateEcomCoreSites < ActiveRecord::Migration[6.0]
+    def change
+      create_table :ecom_core_sites do |t|
+        t.string :name, null: false
+        t.string :address, null: false
+        t.string :description
+        t.references :project,
+                     null: false,
+                     index: { name: 'site_on_project_indx' },
+                     foreign_key: { to_table: :ecom_core_projects }
+        t.string :status, null: false, default: 'Active'
+  
+        t.timestamps
+      end
+    end
+  end

data/db/migrate/20191202222210_create_ecom_core_work_packages.rb

@@ -6,6 +6,18 @@ class CreateEcomCoreWorkPackages < ActiveRecord::Migration[6.0]
       t.string :description
       t.date :start_date
       t.date :end_date
+      t.string :location
+      t.decimal :budget, precision: 10, scale: 2
+      t.string :resource_required
+      t.string :concerns
+      t.references :site_engineer,
+                   null: true,
+                   index: { name: 'wp_on_si_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+      t.references :project_manager,
+                   null: true,
+                   index: { name: 'wp_on_pm_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
       t.references :project,
                    null: false,
                    index: { name: 'wp_on_project_indx' },

data/db/migrate/20191202235434_create_ecom_core_work_products.rb

@@ -3,8 +3,7 @@ class CreateEcomCoreWorkProducts < ActiveRecord::Migration[6.0]
     create_table :ecom_core_work_products do |t|
       t.string :name, null: false
       t.string :description
-      t.string :design_reference_no, unique: true
-      t.json :dimension
+      t.string :design_reference, unique: true
       t.references :product_group,
                    null: true,
                    index: { name: 'wp_on_pg_indx' },
@@ -17,28 +16,13 @@ class CreateEcomCoreWorkProducts < ActiveRecord::Migration[6.0]
                    null: false,
                    index: { name: 'projects_on_wp_indx' },
                    foreign_key: { to_table: :ecom_core_projects }
-      t.string :status, default: 'New'
-      t.integer :percent_completed, null: false, default: 0
       t.string :remark
-      t.references :approver,
-                   null: true,
-                   index: false,
-                   foreign_key: { to_table: :ecom_core_users }
-      t.references :supervisor,
-                   null: true,
-                   index: false,
-                   foreign_key: { to_table: :ecom_core_users }
-      t.references :quality_controller,
-                   null: true,
-                   index: false,
-                   foreign_key: { to_table: :ecom_core_users }
       t.datetime :start_date
       t.datetime :completion_date
-      t.boolean :tasks_generated, null: false, default: false
 
       t.timestamps
     end
 
-    add_index :ecom_core_work_products, %i[design_reference_no project_id], unique: true, name: 'wp_on_drpi_indx'
+    add_index :ecom_core_work_products, %i[design_reference project_id], unique: true, name: 'wp_on_dr_pi_indx'
   end
 end

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

@@ -10,25 +10,41 @@ class CreateEcomCoreTasks < ActiveRecord::Migration[6.0]
       t.string :status, null: false, default: :new
       t.integer :percent_completed, null: false, default: 0
       t.string :remark
+      t.date :inspection_submission_date
+      t.string :inspection_status, null: false, default: 'Not Inspected'
+      t.boolean :change_order, null: false, default: false
+      t.integer :percentage_contribution
+      t.references :change_order_for,
+                   null: true,
+                   index: { name: 'tasks_on_cot_indx' },
+                   foreign_key: { to_table: :ecom_core_tasks }
       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' },
                    foreign_key: { to_table: :ecom_core_users }
-      t.references :approver,
+      t.references :client_consultant,
                    null: true,
-                   index: { name: 'tasks_on_approver_indx' },
+                   index: { name: 'tasks_on_cc_indx' },
                    foreign_key: { to_table: :ecom_core_users }
-      t.references :supervisor,
+      t.references :foreman,
                    null: true,
-                   index: { name: 'tasks_on_supervisor_indx' },
+                   index: { name: 'tasks_on_foreman_indx' },
                    foreign_key: { to_table: :ecom_core_users }
-      t.references :quality_controller,
+      t.references :inspector,
                    null: true,
-                   index: { name: 'tasks_on_qc_indx' },
+                   index: { name: 'tasks_on_inspector_indx' },
                    foreign_key: { to_table: :ecom_core_users }
       t.references :work_product,
                    null: false,

data/db/migrate/20191225140433_create_ecom_core_attendance_sheets.rb

@@ -7,13 +7,13 @@ class CreateEcomCoreAttendanceSheets < ActiveRecord::Migration[6.0]
       t.datetime :approved_at
       t.string :remark
       t.string :status, null: false, default: 'Open'
-      t.references :project,
+      t.references :site,
                    null: false,
-                   index: { name: 'as_on_project_indx' },
-                   foreign_key: { to_table: :ecom_core_projects }
+                   index: { name: 'as_on_site_indx' },
+                   foreign_key: { to_table: :ecom_core_sites }
 
       t.timestamps
     end
-    add_index :ecom_core_attendance_sheets, %i[date project_id], unique: true
+    add_index :ecom_core_attendance_sheets, %i[date site_id], unique: true
   end
 end