ecom_core 1.2.34 → 1.2.35

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

@@ -8,16 +8,14 @@ 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.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,7 +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.string :design_reference, unique: true
       t.references :product_group,
                    null: true,
                    index: { name: 'wp_on_pg_indx' },
@@ -16,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/20191207103735_create_ecom_core_tasks.rb

@@ -10,6 +10,14 @@ 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: 'tasks_on_work_package_indx' },
@@ -26,17 +34,17 @@ class CreateEcomCoreTasks < ActiveRecord::Migration[6.0]
                    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

data/db/migrate/20200126081005_create_ecom_core_payrolls.rb

@@ -4,10 +4,10 @@ class CreateEcomCorePayrolls < ActiveRecord::Migration[6.0]
       t.integer :month, null: false
       t.integer :year, null: false
       t.boolean :approved, null: false, default: false
-      t.references :project,
+      t.references :site,
                    null: false,
-                   index: { name: 'payroll_on_project_indx' },
-                   foreign_key: { to_table: :ecom_core_projects }
+                   index: { name: 'payroll_on_site_indx' },
+                   foreign_key: { to_table: :ecom_core_sites }
 
       t.timestamps
     end

data/db/migrate/20200410090701_create_ecom_core_overtime_sheets.rb

@@ -7,13 +7,13 @@ class CreateEcomCoreOvertimeSheets < 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: 'os_on_project_indx' },
-                   foreign_key: { to_table: :ecom_core_projects }
+                   index: { name: 'os_on_site_indx' },
+                   foreign_key: { to_table: :ecom_core_sites }
 
       t.timestamps
     end
-    add_index :ecom_core_overtime_sheets, %i[date project_id], unique: true
+    add_index :ecom_core_overtime_sheets, %i[date site_id], unique: true
   end
 end

data/db/migrate/20200616044231_create_ecom_core_material_sub_types.rb

@@ -0,0 +1,14 @@
+class CreateEcomCoreMaterialSubTypes < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_material_sub_types do |t|
+      t.string :name, null: false
+
+      t.references :material_type,
+                   null: false,
+                   index: { name: 'mst_on_mt_indx' },
+                   foreign_key: { to_table: :ecom_core_resource_types }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200616051902_create_ecom_core_material_identities.rb

@@ -0,0 +1,17 @@
+class CreateEcomCoreMaterialIdentities < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_material_identities do |t|
+      t.references :material_type,
+                   null: false,
+                   index: { name: 'mi_on_mt_indx' },
+                   foreign_key: { to_table: :ecom_core_resource_types }
+
+      t.references :material_sub_type,
+                   null: true,
+                   index: { name: 'mi_on_mst_indx' },
+                   foreign_key: { to_table: :ecom_core_material_sub_types }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200618105233_create_ecom_core_material_items.rb

@@ -0,0 +1,16 @@
+class CreateEcomCoreMaterialItems < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_material_items do |t|
+      
+      t.references :material_identity,
+                   null: false,
+                   index: { name: 'mi_on_mi_indx' },
+                   foreign_key: { to_table: :ecom_core_material_identities }
+                   
+      t.string :serial_number, null: false, unique: true
+      t.float  :price
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200813165555_create_ecom_core_available_unit_of_measurements.rb

@@ -0,0 +1,16 @@
+class CreateEcomCoreAvailableUnitOfMeasurements < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_available_unit_of_measurements do |t|
+      t.references :material_type,
+                   null: false,
+                   index: { name: 'aum_on_mt_indx' },
+                   foreign_key: { to_table: :ecom_core_resource_types }
+
+      t.references :measurement_unit,
+                   null: false,
+                   index: { name: 'aum_on_mu_indx' },
+                   foreign_key: { to_table: :ecom_core_measurement_units }
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200901085227_create_ecom_core_crew_contracts.rb

@@ -2,9 +2,12 @@ class CreateEcomCoreCrewContracts < ActiveRecord::Migration[6.0]
   def change
     create_table :ecom_core_crew_contracts do |t|
       t.string :contract_no, null: false, unique: true
+      t.string :status, null: false, default: :draft
       t.date :from, null: false
       t.date :to, null: false
       t.string :place_of_work, null: false
+      t.float :wage, null: false
+      t.string :wage_in_words, null: false
       t.integer :probation_period, null: false
       t.string :contract_type, null: false
       t.boolean :contract_signed, null: false, default: false
@@ -13,7 +16,10 @@ class CreateEcomCoreCrewContracts < ActiveRecord::Migration[6.0]
                    null: false,
                    index: { name: 'cc_on_crew_indx' },
                    foreign_key: { to_table: :ecom_core_crews }
-
+      t.references :crew_type,
+                   null: false,
+                   index: { name: 'cc_on_ct_indx' },
+                   foreign_key: { to_table: :ecom_core_resource_types }
       t.timestamps
     end
   end

data/db/migrate/20201013072924_create_ecom_core_crew_contract_transactions.rb

@@ -0,0 +1,16 @@
+class CreateEcomCoreCrewContractTransactions < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_crew_contract_transactions do |t|
+      t.string :transaction_type, null: false
+      t.string :status, null: false, default: 'Pending'
+      t.datetime :effective_date, null: false
+
+      t.references :crew_contract,
+                   null: false,
+                   index: { name: 'cct_on_cc_indx' },
+                   foreign_key: { to_table: :ecom_core_crew_contracts }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201013090609_create_ecom_core_site_crews.rb.rb

@@ -0,0 +1,22 @@
+class CreateEcomCoreSiteCrews < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_site_crews do |t|
+      t.references :crew,
+                   null: false,
+                   index: { name: 'gp_on_crew_indx' },
+                   foreign_key: { to_table: :ecom_core_crews }
+
+    t.references :site,
+                   null: false,
+                   index: { name: 'gp_on_site_indx' },
+                   foreign_key: { to_table: :ecom_core_sites }
+
+      t.string :site_crew_type, null: false
+      t.string :start_date, null: false
+      t.string :end_date
+      t.string :status, null: false, default: 'Inactive'
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201013094100_create_ecom_core_crew_id_cards.rb

@@ -0,0 +1,16 @@
+class CreateEcomCoreCrewIdCards < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_crew_id_cards do |t|
+      t.references :crew,
+                   null: false,
+                   index: { name: 'ci_on_crew_indx' },
+                   foreign_key: { to_table: :ecom_core_crews }
+
+      t.datetime :issued_on, null: false
+      t.datetime :valid_until, null: false
+      t.string :status, null: false, default: 'Active'
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201113050953_create_ecom_core_task_inspection_checklists.rb

@@ -0,0 +1,22 @@
+class CreateEcomCoreTaskInspectionChecklists < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_task_inspection_checklists do |t|
+      t.string :name, null: false
+      t.date :date_of_inspection
+      t.references :inspected_by,
+                   null: true,
+                   index: { name: 'tic_on_ib_indx' },
+                   foreign_key: { to_table: :ecom_core_users }
+      t.string :status, null: false, default: 'Not Inspected'
+      t.string :remark
+      t.string :recommendation
+      t.references :task,
+                   null: false,
+                   index: { name: 'tic_on_task_indx' },
+                   foreign_key: { to_table: :ecom_core_tasks }
+      t.string :standard
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20201113094302_create_ecom_core_task_template_inspection_checklists.rb

@@ -0,0 +1,17 @@
+class CreateEcomCoreTaskTemplateInspectionChecklists < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_task_template_inspection_checklists do |t|
+      t.references :task_template,
+                   null: false,
+                   index: { name: 'ttic_on_tt_indx' },
+                   foreign_key: { to_table: :ecom_core_task_templates }
+      t.references :inspection_checklist,
+                   null: false,
+                   index: { name: 'ttic_on_ic_indx' },
+                   foreign_key: { to_table: :ecom_core_lookups }
+      t.string :standard
+
+      t.timestamps
+    end
+  end
+end