cats_core 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9a6ea1b862a6804a3e215898c7aac9966ffedbdf7aa3c8d9661f9356c4b8a24
-  data.tar.gz: f08e17d946b62d02d148cffbe97ab52c9b1f113245d4dffca6f5d67256ec7ea0
+  metadata.gz: a6b9bb64c4119d94cb514bf76741d6160682cb7adfb376daf9aff38b14fccf77
+  data.tar.gz: 0c5b176315cfbd52ed72f3214831705bdd9a8e7fc524e2689517a3e1ff0d29cd
 SHA512:
-  metadata.gz: ea2045f6a7a7954a4157952747c932e096f5df6e8ab2a56e888ca1f656a85eb7bd08a572ad0f15a05b53b0defc51354c27755be960c69c4c0ec49b232ad9b5db
-  data.tar.gz: d91d382689b7abab6221e64457123334bc93bc0357ffdf6eb28e71466d46183ba3aeab2b0d01b24abb0184a7b01b06ae5d0e2331220b710b3a193ac751061ad6
+  metadata.gz: d3e0601550aebf25d5238ac8d9aabb57d933f3f48208bfe3a0cd39872a32e267dc97826c77eec6db841e40ae712ad4c7fded2ddb59b69da38f4ae874c5e4548b
+  data.tar.gz: '09ae2320e6fdfa2ec17b922068240768a0f614947b7de1ebbdc91fa412ecbd08e7b874593352e205975bb8647ddcf3e42959f51bdb14a9be335ef6a41d407376'

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

@@ -12,6 +12,8 @@ module Cats
       delegate(:name, to: :beneficiary_category, prefix: true)
       delegate(:abbreviation, to: :unit_of_measure, prefix: true)
       delegate(:reference_no, to: :round_plan, prefix: true)
+
+      alias_attribute :unit, :unit_of_measure
     end
   end
 end

data/app/services/cats/core/round_plan_service.rb

@@ -13,17 +13,18 @@ module Cats
         rations = round_plan.round_rations
         plan = round_plan.plan
         no_of_days = plan.total_days / plan.rounds
+        mt = UnitOfMeasure.find_by(abbreviation: 'mt')
         round_plan.beneficiary_round_plan_items.each do |plan_item|
           round_rations = rations.select { |r| r.beneficiary_category_id == plan_item.beneficiary_category_id }
           round_rations.each do |ration|
+            quantity = (no_of_days / ration.no_of_days * ration.quantity) * plan_item.beneficiaries *
+                       round_plan.rounds.count
+            quantity = UnitConversion.convert(ration.unit, mt, quantity) if ration.unit.abbreviation.downcase != 'pcs'
+
             details << {
               beneficiary_round_plan_item_id: plan_item.id,
               round_ration_id: ration.id,
-              quantity: (
-                (no_of_days / ration.no_of_days * ration.quantity) *
-                plan_item.beneficiaries *
-                round_plan.rounds.count
-              )
+              quantity: quantity
             }
           end
         end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.5.4'.freeze
+    VERSION = '1.5.5'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Henock L.