cats_core 1.4.50 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ad3dbd3aebc0e64ecaab83e7de72f3784c84fa8bd5803f067fab37e39cf6f56
-  data.tar.gz: b35c308307c69db13215c43f0b6d0904e93ca94993a55a393755cf5baa0b8f82
+  metadata.gz: f44f88a61efb78a98b957e1125a822e36a3fba743e600f28da163dcf3ee8e1fd
+  data.tar.gz: ba63704a7b079b931187ca2ea007202d57e94b3b4bba19c133dd9028873cae8d
 SHA512:
-  metadata.gz: 06d1a5460d0faea8491612cc49e9576d2bec74cf0843133b4655f3cd75f8409583b06c6ec6871f06941c44aed9b1fb5bc024cb987801f19a625ca72c644f6b6d
-  data.tar.gz: bcaccca6aee6d6cfa5a4fa50a918cecfc670788a80abd5f636e7ebdd48aea1619cf510bbb0f35a2ee25fcf6894626dc20cab8b6b8cde42fb8b021ef4d31b4b31
+  metadata.gz: 8dbba69e6545334259ca98493c13a2571754ff2d1eccf9ef6178e7a38105c319c3345106683415dc1654fa35c26d03df04ce7a072b235aa8e0e4c7f2afafd390
+  data.tar.gz: 1e827e9172351fca12b42fc2910a639b2cb0556e64b1608bee56704892de22f39a897c03b0688a0cc1596b425c8ed5e41bbe9a894e20a3536f801b8d4e91bb2c

data/app/models/cats/core/dispatch_plan.rb

@@ -56,6 +56,12 @@ module Cats
       def quantity
         dispatch_plan_items.sum(:quantity)
       end
+
+      def region
+        return nil if dispatchable.instance_of?(RhnRequest)
+
+        dispatchable.region.name
+      end
     end
   end
 end

data/app/models/cats/core/transport_requisition.rb

@@ -20,6 +20,7 @@ module Cats
       delegate(:full_name, to: :approved_by, prefix: 'approver', allow_nil: true)
       delegate(:abbreviation, to: :unit, prefix: true)
       delegate(:reference_no, to: :dispatch_plan, prefix: true)
+      delegate(:region, to: :dispatch_plan)
 
       def quantity
         quantities = transport_requisition_items.map { |item| UnitConversion.convert(item.unit, unit, item.quantity) }

data/app/models/cats/core/transport_requisition_item.rb

@@ -15,10 +15,18 @@ module Cats
         dispatch_plan_item.commodity.name
       end
 
-      def woreda
+      def fdp
         dispatch_plan_item.destination.name
       end
 
+      def woreda
+        dispatch_plan_item.destination.parent.name
+      end
+
+      def zone
+        dispatch_plan_item.destination.parent.parent.name
+      end
+
       def region
         dispatch_plan_item.destination.root.name
       end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.50'.freeze
+    VERSION = '1.5.2'.freeze
   end
 end

data/spec/factories/cats/core/transport_requisitions.rb

@@ -1,6 +1,8 @@
 FactoryBot.define do
   factory :transport_requisition, class: 'Cats::Core::TransportRequisition' do
-    dispatch_plan
+    dispatch_plan do
+      create(:dispatch_plan, :with_round_plan)
+    end
     reference_no { FFaker::Name.name }
     requested_by factory: :user
     approved_by factory: :user

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.50
+  version: 1.5.2
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-14 00:00:00.000000000 Z
+date: 2022-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers