ecom_core 1.3.0 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fba632beb98a55c34d0b031de8a9f01bc4dee00e27a92baa379dde89814d48f2
-  data.tar.gz: e34441bf11dbb19adb2a607967a29f4391aad8c5773bc4bebcf326504e54eeb6
+  metadata.gz: b98441f93ef2ac55a259a560966fb9700ce83f5f4db69f24fa2c25ead85725f7
+  data.tar.gz: 6a75eb6ea6dea439e47d413442d0064ba5ef5c883da5bc2cf6065d08957869d1
 SHA512:
-  metadata.gz: 4032c2062733fe19da9cf02a1ab80c381d0c1ab18134c5673b4b882beccaceaf7acbef3f13f54caf38abb1c7ee4c2882717fb9d552e41706f9b2ac1c43aa670d
-  data.tar.gz: 2f0a711d09ab1093573393ccdff4823c0679f610da4eaf6fe72ebc888b1f85f180c30ef1da20ebdf50b6a3022201f83a4bf84c1c6d45fe1e36839c3c678868b2
+  metadata.gz: 386c8d0cece70aa3f6087e0eb57ce76bc3e41e168dafb43ec53ab2405ea43223aecaf4acf34d7354929316d2ce61c320b2a8afaef76dbb46985a6853c436b720
+  data.tar.gz: 11a8ba2dc16bee865f43df73fef3118f80b47805ca011489456daa63bee26356b231dd36a1a2fa1d54a62a7e41abb9b3c9b820dc53107c2e39aea580616abad6

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

@@ -4,7 +4,6 @@ module Ecom
       has_ancestry
 
       belongs_to :task_template_type
-      belongs_to :unit_of_measure
 
       has_many :task_template_inspection_checklists
       has_many :inspection_checklists, through: :task_template_inspection_checklists
@@ -12,7 +11,7 @@ module Ecom
       has_many :work_product_templates, through: :project_work_item_templates
       has_and_belongs_to_many :resource_types, join_table: 'ecom_core_task_templates_resource_types'
 
-      validates :name, :code, :takeoff_fields, :task_completion_detail, presence: true
+      validates :name, :code, presence: true
       validates :code, uniqueness: true
       validates :percentage_contribution,
                 numericality: {

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/config/initializers/carrierwave.rb

@@ -1,5 +1,4 @@
 CarrierWave.configure do |config|
-    config.fog_provider = 'fog/google'
     config.fog_credentials = {
       provider:                         'Google',
       google_storage_access_key_id:     ENV["GOOGLE_STORAGE_ACCESS_KEY"],

data/db/migrate/20191119012030_create_ecom_core_task_templates.rb

@@ -8,18 +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 :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 :takeoff_fields, null: false, default: {}
+      t.boolean :has_takeoff_fields, null: false, default: false
+      t.jsonb :takeoff_fields, null: true
       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.jsonb :task_completion_detail, null: true
 
       t.timestamps
     end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.3.5'.freeze
   end
 end

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

@@ -6,7 +6,6 @@ FactoryBot.define do
     name { FFaker::Name.name }
     description { FFaker::Name.name }
     association :task_template_type
-    association :unit_of_measure
     has_takeoff_fields { false }
     takeoff_fields { [{ name: 'length', label: 'Length' }] }
     percentage_contribution { nil }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.5
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2020-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -160,50 +160,16 @@ dependencies:
   name: fog-google
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: google-api-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement