ecom_core 1.3.6 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce6cc11612b16aefac6121429ece4bee60b97ada78dcfdba961c792fedc0c0f4
-  data.tar.gz: 52a55fb8f1e97dc391a7ccede45bf7ed97d318f8f7029a2a465960ec089db864
+  metadata.gz: 6a8c5e7bae18d2274c96fb6f16664a21c08bfd604489d4bf5f33a3987431a201
+  data.tar.gz: 732a9838a943cdd277950a947cb4aa46a0202fa479c2ec9f522d433986540680
 SHA512:
-  metadata.gz: 5bbacc01ee8a03bf4c2c16f3774da1657faa9f00d449ee3368625652f0d562ea22e0721bcaf0038de3de9d4245de2f955746f7f5006cc0835965f2db87a84ee7
-  data.tar.gz: 13b332676a15fa87e7fecb4ac22e15aaeb359ca498bc1b05ae7b0d4bb202eff3c849f4a2cfb5e7fde3af413c0a9937f2e0a63fcbb0f65fdca005ab5d83069133
+  metadata.gz: d5fafbcece174dd0fe5137466a5e8187e402f11f6880989c78175c3f11d0f82347f38051b731cb5b2cf8eb3a7f3f2574bdf0063187e42748404735e104319214
+  data.tar.gz: 0602eade03b0c2e500a1b91b5fa55d13118ad757eb0284cca8073f6c46e69a46016bacf5d9a7850692c2ecef923df092c37ac3ae22b728eac4a251101abbae8d

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

@@ -7,6 +7,11 @@ module Ecom
         render json: User.all
       end
 
+      def lookup
+        data = ActiveModelSerializers::SerializableResource.new(User.all, each_serializer: UserLookupSerializer)
+        render json: { success: true, data: data }
+      end
+
       def active
         render json: User.active
       end

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

@@ -10,10 +10,13 @@ module Ecom
       belongs_to :equipment_item
       belongs_to :maintenance_type
       belongs_to :prepared_by, class_name: 'Ecom::Core::User'
-      belongs_to :approved_by, class_name: 'Ecom::Core::User'
+      belongs_to :approved_by, class_name: 'Ecom::Core::User', optional: true
 
-      validates :title, :status, :current_reading, presence: true
+      validates :title, :status, presence: true
       validates :status, inclusion: STATUSES
+
+      scope :approved, -> { where(approved: true) }
+      scope :unapproved, -> { where(approved: false) }
     end
   end
 end

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

@@ -1,6 +1,11 @@
 module Ecom
   module Core
     class MaintenanceStatus < Lookup
+      EQUIPMENT_NOT_RECEIVED = 'Equipment not received'.freeze
+      RECEIVED_EQUIPMENT = 'Received equipment'.freeze
+      IN_PROGRESS = 'In progress'.freeze
+      WAITING_FOR_PARTS = 'Waiting for parts'.freeze
+      MAINTENANCE_COMPLETED = 'Maintenance completed'.freeze
     end
   end
 end

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

@@ -0,0 +1,11 @@
+module Ecom
+  module Core
+    class UserLookupSerializer < ActiveModel::Serializer
+      attributes :id, :name
+
+      def name
+        "#{object.first_name} #{object.last_name}"
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -6,6 +6,7 @@ Ecom::Core::Engine.routes.draw do
   resources :menus, only: %i[index]
   resources :users, only: %i[index create update]
   get '/users/active', controller: :users, action: :active
+  get '/users/lookup', controller: :users, action: :lookup
 
 
   resources :crew_types

data/db/migrate/20200919081338_create_ecom_core_maintenance_service_orders.rb

@@ -8,7 +8,7 @@ class CreateEcomCoreMaintenanceServiceOrders < ActiveRecord::Migration[6.0]
       t.boolean :approved, default: false
       t.string :status, null: false, default: 'New'
       t.string :remark
-      t.float :current_reading, null: false
+      t.float :current_reading, null: true
       t.references :equipment_item,
                    null: false,
                    index: { name: 'mso_on_ei_indx' },
@@ -22,7 +22,7 @@ class CreateEcomCoreMaintenanceServiceOrders < ActiveRecord::Migration[6.0]
                    index: { name: 'mso_on_pb_indx' },
                    foreign_key: { to_table: :ecom_core_users }
       t.references :approved_by,
-                   null: false,
+                   null: true,
                    index: { name: 'mso_on_ab_indx' },
                    foreign_key: { to_table: :ecom_core_users }
 

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.3.6'.freeze
+    VERSION = '1.3.11'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.11
 platform: ruby
 authors:
 - Henock L.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.1
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -372,6 +372,7 @@ files:
 - app/serializers/ecom/core/lookup_serializer.rb
 - app/serializers/ecom/core/resource_type_serializer.rb
 - app/serializers/ecom/core/unit_cost_serializer.rb
+- app/serializers/ecom/core/user_lookup_serializer.rb
 - app/serializers/ecom/core/user_role_serializer.rb
 - app/serializers/ecom/core/user_serializer.rb
 - app/services/ecom/core/crew_contract_transaction_service.rb
@@ -557,7 +558,7 @@ homepage: http://www.mks.com.et
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -572,8 +573,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Core engine for construction management application.
 test_files: []