renalware-core 2.0.157 → 2.0.158

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7752535c3cedc34c80615f02356cf882df7875e7c6331102db999f3530941b9f
-  data.tar.gz: 7ce5aa638ff0972fdb81be2f6ff5f988c913fba8d7895864e088727e13db6164
+  metadata.gz: 8cfabdadf4d39705619dcb0f505fd9101e625599a568e313c348ba452e4e38b8
+  data.tar.gz: a26c7d37ec2292507897b910206ad034e39e7c3f633c13d2eb217fc87cd3454d
 SHA512:
-  metadata.gz: bbde270c7717349a2fce0abc4d3db70a7a07893914a3f2ab8b45f4d77927178c81bfa8983a5d58e1b779de7e0bf1974155507d8f8bb5578276409bc9c8b2d446
-  data.tar.gz: 86e5a36768fbaab56afa31d298f04f64000f9c71e59a1918e725e0d5aaa308db6528131b04ac80c2600dbbc56437cf6d08edb36e1c3266defa5a91c88360b8cc
+  metadata.gz: 6ec611de572a9b2801176bf841d81fe6f8ecfd41cc703b3fee47683f646ad13cb05b41a2ea7dc293d1181adaa1279da1dc0f637cd93494b8c2d57687085d1a46
+  data.tar.gz: 93e69f1b9e3d1b104502f98a5f83cd7bc392ff97c3d43620dfcf040e83af6a3966ae3b9d8247dde9e5cb835daf75b98774d851faca9cb18fda61adecba1d1383

data/app/components/renalware/patients/messages_component.rb

@@ -30,7 +30,7 @@ module Renalware
         if pagination.items < pagination.count
           "#{TITLE} (#{pagination.items} of #{pagination.count})"
         else
-          "#{TITLE} (#{pagination.items})"
+          "#{TITLE} (#{pagination.count})"
         end
       end
 

data/app/models/renalware/virology/vaccination.rb

@@ -18,7 +18,12 @@ module Renalware
 
       class Document < Document::Embedded
         attribute :type, ::Document::Enum # See i18n for options
+        attribute :drug, String
         validates :type, presence: true
+
+        def to_s
+          [type&.text, drug].reject(&:blank?).join(" - ")
+        end
       end
       has_document
     end

data/app/views/renalware/virology/vaccinations/_cell.html.slim

@@ -1,2 +1,2 @@
 / See Vaccination.to_partial_path etc
-= event.document.type.text
+= event.document.to_s

data/app/views/renalware/virology/vaccinations/_inputs.html.slim

@@ -2,3 +2,4 @@
 / Pulled into the New Event form via a js get to EventsController#new
 = f.simple_fields_for :document, event.document do |fd|
   = fd.input :type, wrapper: :horizontal_medium
+  = fd.input :drug, wrapper: :horizontal_medium, collection: Renalware::Drugs::Drug.for(:vaccine).pluck(:name, :name)

data/app/views/renalware/virology/vaccinations/_toggled_cell.html.slim

@@ -4,5 +4,7 @@
 dl.dl-horizontal
   dt= attr_name(document, :type, suffix: ":")
   dd= document.type&.text || t("unspecified")
+  dt= attr_name(document, :drug, suffix: ":")
+  dd= document.drug.presence || t("unspecified")
   dt= attr_name(event, :notes, suffix: ":")
   dd= event.notes&.html_safe || t("unspecified")

data/config/locales/renalware/virology/virology.en.yml

@@ -24,4 +24,6 @@ en:
         hbv3: HBV Vaccination 3
         hbv4: HBV Vaccination 4
         hbv_booster: HBV Booster
+        influenza: Influenza
+        pneumococcus: Pneumococcus
         patient_refused: Patient Refused

data/lib/renalware/version_number.rb

@@ -5,6 +5,6 @@ module Renalware
   # to creat that class even though its not used. If we don't do this zeitwerk
   # complains that version.rb does export a constant called Version.
   class VersionNumber
-    VERSION = "2.0.157"
+    VERSION = "2.0.158"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.157
+  version: 2.0.158
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-26 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activerecord-postgres_enum
   requirement: !ruby/object:Gem::Requirement