ecom_core 1.2.12 → 1.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53e6b8c84820dca6b1121f9f33ffdffc3f421c2a7aced743a21bac89c25b7580
-  data.tar.gz: 557e5da2ed61cca47e0e80002469f9798d9eb96f26a8357f897beea42c4a0062
+  metadata.gz: d4ad578f6c6d7aece965edd8d3ad059afb16ff3f90445ba63f55c6afdc530b8f
+  data.tar.gz: a31af1754f7ccdc5669a1fe5747745bb8d98d0e82371db261bee62cd08d50f38
 SHA512:
-  metadata.gz: 23b9c88cb223aa6afec885e5937089695952810e383121f9511a94b58fa5c8fe86787aad5573a61d382511d31bb643a40ba1fe0b50dafe1ea9e4ba7bbf82060f
-  data.tar.gz: d35a3ede79f6735372668c8812e2b49f3b6653bdd577f6b95b936f2a23177c2f8467c3d307a42b07363d6d36189e0374e351305c8908bcdc20ccc3ce1453d666
+  metadata.gz: 7720605e3fa55dd2ff8d12358a5ece0c11f11c47647b4ac1b9be6ca35d308592d3e2ffef33c9beea298c149f5abb301f0612a194934539ab357c78699529d3cb
+  data.tar.gz: 4c1a5cf5b05c9a8f247fb0b457b9904b9e98bb884a0b5e8a8da38b8268ae7177f631c51ab905dc947042f7117b1f8bf1525a1b92b76d3b1423c24ee157f0af5f

data/app/controllers/concerns/ecom/core/lookupable.rb

@@ -29,7 +29,6 @@ module Ecom
         end
       end
 
-
       private
 
       def set_clazz
@@ -41,4 +40,4 @@ module Ecom
       end
     end
   end
-end
+end

data/app/controllers/concerns/ecom/core/resource_typeable.rb

@@ -40,4 +40,4 @@ module Ecom
       end
     end
   end
-end
+end

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

@@ -34,7 +34,6 @@ module Ecom
       def auth_params
         params.require(:auth).permit(:email, :password)
       end
-
     end
   end
-end
+end

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

@@ -14,7 +14,6 @@ module Ecom
         @current_user ||= user if user
       end
 
-
       private
 
       def authenticate

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

@@ -30,4 +30,4 @@ module Ecom
       end
     end
   end
-end
+end

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

@@ -7,4 +7,4 @@ module Ecom
       end
     end
   end
-end
+end

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

@@ -25,7 +25,6 @@ module Ecom
         end
       end
 
-
       private
 
       def set_user_role
@@ -37,4 +36,4 @@ module Ecom
       end
     end
   end
-end
+end

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

@@ -28,7 +28,6 @@ module Ecom
         end
       end
 
-
       private
 
       def set_user
@@ -40,4 +39,4 @@ module Ecom
       end
     end
   end
-end
+end

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

@@ -52,7 +52,8 @@ module Ecom
           raise 'There is an open attendance sheet which needs to be submitted before creating a new one.'
         end
 
-        AttendanceSheet.create(date: Date.today, opened_at: Time.now, status: StatusConstants::OPEN, project_id: project_id)
+        AttendanceSheet.create(date: Date.today, opened_at: Time.now, status: StatusConstants::OPEN,
+                               project_id: project_id)
       end
 
       def self.submit_current(project_id)

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

@@ -0,0 +1,12 @@
+module Ecom
+  module Core
+    class BookedItem < ApplicationRecord
+      belongs_to :booking
+      belongs_to :requested_item
+      belongs_to :equipment_item
+
+      validates :start_date, :end_date, presence: true
+      validates_with DateRangeValidator
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Ecom
+  module Core
+    class Booking < ApplicationRecord
+      APPROVED = 'Approved'.freeze
+      UNAPPROVED = 'Unapproved'.freeze
+
+      STATUSES = [APPROVED, UNAPPROVED].freeze
+
+      belongs_to :equipment_request
+      belongs_to :booked_by, class_name: 'Ecom::Core::User'
+      has_many :booked_items
+
+      validates :status, presence: true, inclusion: STATUSES
+    end
+  end
+end

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

@@ -3,4 +3,4 @@ module Ecom
     class ComponentType < Lookup
     end
   end
-end
+end

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

@@ -9,7 +9,7 @@ module Ecom
       TIME_RANGE = {
         MORNING => { start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('9:00 AM') },
         AFTERNOON => { start: Time.zone.parse('10:00 AM'), end: Time.zone.parse('2:00 PM') },
-        BOTH => {start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('2:00 PM')}
+        BOTH => { start: Time.zone.parse('5:00 AM'), end: Time.zone.parse('2:00 PM') }
       }.freeze
 
       belongs_to :attendance_sheet_entry

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

@@ -15,6 +15,7 @@ module Ecom
       belongs_to :equipment
       belongs_to :country
       belongs_to :current_location, class_name: 'Ecom::Core::EquipmentLocation'
+      has_many :equipment_components
 
       validates :name, :status, :serial_number, :purchase_date, :purchase_price, presence: true
       validates :status, inclusion: EQUIPMENT_STATUSES

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

@@ -18,7 +18,8 @@ module Ecom
         joins(:location_type).where(
           'ecom_core_lookups.name = ? AND ecom_core_lookups.type = ?',
           LocationType::STORE,
-          Ecom::Core::LocationType)
+          Ecom::Core::LocationType
+        )
       }
     end
   end

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

@@ -0,0 +1,19 @@
+module Ecom
+  module Core
+    class EquipmentRequest < ApplicationRecord
+      DRAFT = 'Draft'.freeze
+      UNDER_REVIEW = 'Under Review'.freeze
+      APPROVED = 'Approved'.freeze
+      REJECTED = 'Rejected'.freeze
+
+      STATUSES = [DRAFT, UNDER_REVIEW, APPROVED, REJECTED].freeze
+      belongs_to :project
+      belongs_to :requested_by, class_name: 'Ecom::Core::User'
+      has_one :booking
+
+      validates :status, presence: true, inclusion: STATUSES
+
+      scope :by_status, ->(status) { where(status: status) }
+    end
+  end
+end

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

@@ -17,4 +17,4 @@ module Ecom
       end
     end
   end
-end
+end

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

@@ -0,0 +1,9 @@
+module Ecom
+  module Core
+    class ProductGroup < ApplicationRecord
+      belongs_to :project
+
+      validates :name, presence: true, uniqueness: true
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Ecom
       belongs_to :contractor, class_name: 'Ecom::Core::Stakeholder'
       belongs_to :consultant, class_name: 'Ecom::Core::Stakeholder'
       belongs_to :project_manager, class_name: 'Ecom::Core::Stakeholder'
-      belongs_to :task_template
+      belongs_to :task_template_type
       belongs_to :currency
       belongs_to :company
 

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

@@ -0,0 +1,13 @@
+module Ecom
+  module Core
+    class RequestedItem < ApplicationRecord
+      belongs_to :equipment_request
+      belongs_to :equipment
+      belongs_to :country, optional: true
+
+      validates :start_date, :end_date, :quantity, presence: true
+      validates :quantity, numericality: { only_integer: true, greater_than: 0 }
+      validates_with DateRangeValidator
+    end
+  end
+end

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

@@ -1,10 +1,53 @@
 module Ecom
   module Core
     class Task < ApplicationRecord
-      belongs_to :project
+      include AASM
+
+      has_ancestry
+
+      belongs_to :work_product
       belongs_to :task_template
+      belongs_to :work_package, optional: true
+      belongs_to :performer, class_name: 'Ecom::Core::User', 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
+
+      validates :code, :name, :status, :percent_completed, presence: true
+      validates_numericality_of :percent_completed,
+                                only_integer: true,
+                                greater_than_or_equal_to: 0,
+                                less_than_or_equal_to: 100
+
+      scope :by_status, ->(status) { where(status: status) }
+
+      aasm column: 'status' do
+        state :new, initial: true
+        state :in_progress
+        state :submitted
+        state :under_review
+        state :completed
+
+        event :start do
+          transitions from: :new, to: :in_progress
+        end
+
+        event :submit do
+          transitions from: :in_progress, to: :submitted
+        end
+
+        event :review do
+          transitions from: :submitted, to: :under_review
+        end
+
+        event :complete do
+          transitions from: %i[submitted under_review], to: :completed
+        end
 
-      validates :code, :name, presence: true
+        event :rework do
+          transitions from: :under_review, to: :in_progress
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,10 @@
+module Ecom
+  module Core
+    class TaskResource < ApplicationRecord
+      belongs_to :task
+      belongs_to :resource_type
+
+      validates :amount, presence: true, numericality: { greater_than: 0 }
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Ecom
       has_ancestry
 
       belongs_to :task_template_type
-      has_one :work_product_template
+      has_and_belongs_to_many :work_product_templates, join_table: 'ecom_core_task_templates_work_product_templates'
       has_and_belongs_to_many :resource_types, join_table: 'ecom_core_task_templates_resource_types'
 
       validates :name, :code, presence: true

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

@@ -0,0 +1,12 @@
+module Ecom
+  module Core
+    class WorkPackage < ApplicationRecord
+      belongs_to :project
+
+      validates :code, :name, presence: true
+      validates :code, uniqueness: true
+
+      has_many :tasks
+    end
+  end
+end

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

@@ -12,59 +12,32 @@
 # way as chart of accounts to identify parent and child relationships. Even then,
 # there needs to be a well defined coding scheme developed before using the column
 # field.
-# 
 module Ecom
   module Core
     class WorkProduct < ApplicationRecord
       include AASM
 
-      belongs_to :work_product_template
-      belongs_to :task
-      belongs_to :project
-      belongs_to :performer, class_name: 'Ecom::Core::User'
-      belongs_to :approver, class_name: 'Ecom::Core::User'
-      belongs_to :supervisor, class_name: 'Ecom::Core::User'
-      belongs_to :quality_controller, class_name: 'Ecom::Core::User'
-
-      validates :name, presence: true
-      validates :design_reference_no, uniqueness: true
-
-      aasm column: 'task_status' do
-        state :new, initial: true
-        state :in_progress
-        state :submitted
-        state :under_review
-        state :completed
-
-        event :start do
-          transitions from: :new, to: :in_progress
-        end
-
-        event :submit do
-          transitions from: :in_progress, to: :submitted
-        end
+      NEW = 'New'.freeze
+      UNDER_CONSTRUCTION = 'Under Construction'.freeze
+      COMPLETED = 'Completed'.freeze
 
-        event :review do
-          transitions from: :submitted, to: :under_review
-        end
+      STATUSES = [NEW, UNDER_CONSTRUCTION, COMPLETED].freeze
 
-        event :complete do
-          transitions from: %i[submitted under_review], to: :completed
-        end
-
-        event :rework do
-          transitions from: :under_review, to: :in_progress
-        end
-      end
-
-      aasm column: 'assignment_status' do
-        state :unassigned, initial: true
-        state :assigned
-
-        event :assign do
-          transitions from: :unassigned, to: :assigned
-        end
-      end
+      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
+
+      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
     end
   end
 end

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

@@ -2,13 +2,9 @@ module Ecom
   module Core
     class WorkProductTemplate < ApplicationRecord
       validates :code, :name, presence: true, uniqueness: true
-      belongs_to :task_template
+      belongs_to :task_template_type
+      has_and_belongs_to_many :task_templates
       has_many :product_types
-
-      scope :filtered_by_template_type, lambda { |id|
-        joins(:task_template).where('ecom_core_task_templates.task_template_type_id = ?', id)
-                             .order(:code)
-      }
     end
   end
 end

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

@@ -4,4 +4,4 @@ module Ecom
       attributes :id, :name, :type
     end
   end
-end
+end

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

@@ -4,4 +4,4 @@ module Ecom
       attributes :id, :code, :name, :base_unit, :type
     end
   end
-end
+end

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

@@ -4,4 +4,4 @@ module Ecom
       attributes :id, :name
     end
   end
-end
+end

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

@@ -7,16 +7,14 @@ module Ecom
           INNER JOIN ecom_core_menus_user_roles MUR ON MUR.menu_id = ecom_core_menus.id
           INNER JOIN ecom_core_user_roles UR ON MUR.user_role_id = UR.id
         SQL
-        menu = Menu.joins(join_sql).where('UR.id IN (?)', role_ids).distinct
+        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: [] }
         end
 
         menu_list.each do |ml|
           ml[:items] = menu.reject { |m| m.parent.nil? }.each_with_object([]) do |item, list|
-            if item.parent_id == ml[:id]
-              list << { id: item.id, text: item.label, iconCss: item.icon, url: item.route }
-            end
+            list << { id: item.id, text: item.label, iconCss: item.icon, url: item.route } if item.parent_id == ml[:id]
           end
         end
         { success: true, data: menu_list }