ecom_core 1.2.10 → 1.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2de520c3c443ad4a66801803d93805335bc40375187899958bbb448c7e15d38e
-  data.tar.gz: b9f4f9977b97175fc0cb2ee3bc46e50a8b136ad9ace5410eb35d134a3da2f813
+  metadata.gz: 6e47a28bd7b3ce16d86c8ae18b5ff906bfba496c0a862dc97c41babd5760ea9e
+  data.tar.gz: '09dd7a50a6ac74286a82557aa1561c308a2ac295b75a3472fbe6d4af583bce22'
 SHA512:
-  metadata.gz: c331269793e3eb5ff70c2d0e7061ca5d8aa9c8260e26dbe28e854e518b3a6448845e587b9b5d85ea3f2c94cb5afe7a92e59feaa37fb1a7d87be882d6682b8f6d
-  data.tar.gz: 38912a987b162fa8739458f37d2161e33f0064cc3bf953028dae39bd478edd4df6d8fd5d332a9e078deaa87122d66b0a755a26b50e82d006a5a8024543220297
+  metadata.gz: a1d13e668d8382fe3a87d8386df80300488c09785b7357e7e33a061a058765abbab8ff84d798e49a065ac44c8708adebe68a5423b5387b702f8919da565871e4
+  data.tar.gz: e377ee5714e4e21c3e73bef63bb1aeec0e7621215eba0bfd81c8fd804974cb1e6b72ee1fbfd53cc746e465cf988c254dc89d2413a5ae47a8fa6e755851bc0d28

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

@@ -0,0 +1,6 @@
+module Ecom
+  module Core
+    class ComponentType < Lookup
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+module Ecom
+  module Core
+    class Country < Lookup
+    end
+  end
+end

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

@@ -14,6 +14,10 @@ module Ecom
       validates :name, :address, :qualification, :employment, :wage, :wage_in_words, presence: true
       validates :employment, inclusion: EMPLOYMENT_TYPES
 
+      scope :by_active, ->(active) { where(active: active) }
+      scope :by_qualification, ->(qualification) { where(qualification: qualification) }
+      scope :by_sub_contracted, ->(sub_contracted) { where(sub_contracted: sub_contracted) }
+
       def set_employment_date
         self.employment_date = Date.today
       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_component.rb

@@ -2,6 +2,7 @@ module Ecom
   module Core
     class EquipmentComponent < ApplicationRecord
       belongs_to :equipment_item
+      belongs_to :component_type
 
       validates :name, presence: true
     end

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

@@ -1,13 +1,26 @@
 module Ecom
   module Core
     class EquipmentItem < ApplicationRecord
-      READY = 'Ready'
-      UNDER_MAINTENANCE = 'Under Maintenance'
+      # Equipment Statuses
+      READY = 'Ready'.freeze
+      UNDER_MAINTENANCE = 'Under Maintenance'.freeze
+      EQUIPMENT_STATUSES = [READY, UNDER_MAINTENANCE].freeze
+
+      # Duty Statuses
+      AVAILABLE = 'Available'.freeze
+      BOOKED = 'Booked'.freeze
+      ON_DUTY = 'On Duty'.freeze
+      DUTY_STATUSES = [AVAILABLE, BOOKED, ON_DUTY].freeze
 
       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
+      validates :duty_status, inclusion: DUTY_STATUSES
+
       validates :serial_number, uniqueness: true
 
       def self.search(param)

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,7 @@
+module Ecom::Core
+  class ProductGroup < ApplicationRecord
+    belongs_to :project
+
+    validates :name, presence: true, uniqueness: true
+  end
+end

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,49 @@
 module Ecom
   module Core
     class Task < ApplicationRecord
-      belongs_to :project
+      include AASM
+
+      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
+
+      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,10 @@
+module Ecom
+  module Core
+    class WorkPackage < ApplicationRecord
+      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,31 @@
 # 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
+
+      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,7 +2,7 @@ module Ecom
   module Core
     class WorkProductTemplate < ApplicationRecord
       validates :code, :name, presence: true, uniqueness: true
-      belongs_to :task_template
+      has_and_belongs_to_many :task_templates
       has_many :product_types
 
       scope :filtered_by_template_type, lambda { |id|