cats_core 1.4.49 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08b9c239346db9904b66db3df8c7c3461f5c3766c6739b3a039cbc96e3d7fa2e'
-  data.tar.gz: 4838b7d3720606e0581d364888771a39ec2c3c69c164bfebe838e2d8faac9314
+  metadata.gz: 173b5eefcd05f15948f0f72b41ccf44aa0492f64964e5cef82fd8e8d0560017c
+  data.tar.gz: 603bde532af179366af2a1424fe80b5c9b9dbf5eae56be14ea729d1a2d9a939a
 SHA512:
-  metadata.gz: 915436bd0e4a48d08809aedc9cbd6317c89ed6c45d2d2356f75805c41f7abb2c756173b0140a84ecad77cf2483058f42106eb31d692f75f80b874c555b59b060
-  data.tar.gz: 324ca7a987fbda8bb7dd50e06c84daeeb58acf0743335f8ce39296dcde740b54503e8caca431b159984b59ad678061c3586838e8607f9dadb12581bf972b289c
+  metadata.gz: 59a24ce4b3fe5bb908974f31b57b85656533b3ddbf031d2367c4b1ba4b0ee56b5675e7e33d8323d2f6eb0dd67e18acb453cb8d012b3d3f83a973fd0ff74cb1de
+  data.tar.gz: a19d2ec9227a63db258cc28bb25287edbe8a50d709667f67459ecdb3b00721ef6eba5f8f1d7d47c5784f05f05e2ea484c77b46fe629c7d3f112d365680a238b1

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/app/services/cats/core/beneficiary_service.rb

@@ -24,6 +24,8 @@ module Cats
         round_beneficiaries = []
         round_plan.round_plan_items.each do |rpi|
           fdp_beneficiaries = beneficiaries[rpi.fdp_id]
+          next unless fdp_beneficiaries
+
           fdp_beneficiaries.each_key do |key|
             category_rations = rations.select { |r| r.beneficiary_category_id == key }
             category_rations.each do |ration|

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.49'.freeze
+    VERSION = '1.5.1'.freeze
   end
 end

metadata

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