renalware-forms 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 347e9f7644d2f72db868d81b7c16a22403285db8bed1bdf545041f53fcae2b79
-  data.tar.gz: b909b6addb49a49c618324e41c34cadb19eb04ce9140d1a48562cbbab0deea0f
+  metadata.gz: 7b8cdf83759e6c1ddacfa9d339f9c9b2baeca1a0a380a7e19e88fd7c318f5274
+  data.tar.gz: aae863d39847a60411fa8dba064e4523cc6e64a663bb5961b30056f6cbd05410
 SHA512:
-  metadata.gz: d2d1937839e25b9ceabc0e4eb03e21e571a831f795fce8cea0194cdfd5f6c2147d53d18174bee50125854872bcee892c865522cecbe7bb0a8c46b573ea2d0440
-  data.tar.gz: 95f1eb71ec37fbaac84f61956a9193812feb613ee9188966cf1c4d139d10e5fbb30d4f1ba7202b114a2f7a346a5ec3c749637a0f919bfe7d1cf59d8a9fc2524a
+  metadata.gz: 3b8e557c9259bf7fe13d28d5b9157cab38d8bd3efca56f2d719b9c67d95901c8da9d440c02a5b7cc5811e5b969f45eda96db829d7c8688d5c125861afcec5d33
+  data.tar.gz: 43c1fecc6aec66d9cafae6ab6c1a113043d9dd876ca32e658c0b44e2b326deda459313f51d8be8a5d8c076f8f31d764d2df58211f73005ab63bdbb0f2185df1d

data/README.md

@@ -1,3 +1,7 @@
+[![Gem Version](https://badge.fury.io/rb/renalware-forms.svg)](https://badge.fury.io/rb/renalware-forms)
+[![Maintainability](https://api.codeclimate.com/v1/badges/945cd0c49335e9e4595d/maintainability)](https://codeclimate.com/github/airslie/renalware-forms/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/945cd0c49335e9e4595d/test_coverage)](https://codeclimate.com/github/airslie/renalware-forms/test_coverage)
+
 # Renalware::Forms
 
 This gem
@@ -63,4 +67,4 @@ for it to open on a Mac).
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT)

data/lib/renalware/forms.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
 
+require "zeitwerk"
 require "prawn"
 require "prawn/table"
 require "attr_extras"
-require "active_support"
+
+# Set up autoloading with zeitwerk
+# As we are nested in lib/renalware/forms, be sure to push an absolute
+# path to the lib folder.
+loader = Zeitwerk::Loader.new
+loader.push_dir File.expand_path("../", __dir__)
+loader.setup
 
 module Renalware
   module Forms
-    extend ActiveSupport::Autoload
-
-    autoload :Helpers
-    autoload :Base
-    autoload :Homecare
-    autoload :Generic
   end
 end

data/lib/renalware/forms/base.rb

@@ -3,8 +3,8 @@
 module Renalware::Forms
   class Base
     include Prawn::View
-    EMPTY_CHECKBOX = "o     " # in ZapfDingbats
-    CHECKBOX = "3    "
+    EMPTY_CHECKBOX = "o     " #  ❏ in ZapfDingbats
+    CHECKBOX = "n    "        #  ■ in ZapfDingbats
 
     # lower case o is an empty checkbox in ZapfDingbats
     def cell_with_leading_checkbox(text, checked: false, **options)
@@ -22,5 +22,40 @@ module Renalware::Forms
         }
       end
     end
+
+    def cell_with_trailing_checkbox(text, checked: false, **options)
+      if checked
+        {
+          content: "#{text} <font name='ZapfDingbats'>#{CHECKBOX}</font>",
+          inline_format: true,
+          **options
+        }
+      else
+        {
+          content: "#{text} <font name='ZapfDingbats'>#{EMPTY_CHECKBOX}</font>",
+          inline_format: true,
+          **options
+        }
+      end
+    end
+
+    def underlined_table_style
+      {
+        cell_style: {
+          padding: [2, 5, 2, 0],
+          border_width: 0.5,
+          border_color: "AAAAAA",
+          borders: [:bottom]
+        }
+      }
+    end
+
+    def borderless_table_style
+      {
+        cell_style: {
+          border_width: 0.5
+        }
+      }
+    end
   end
 end

data/lib/renalware/forms/generic.rb

@@ -2,8 +2,5 @@
 
 module Renalware::Forms
   module Generic
-    extend ActiveSupport::Autoload
-
-    autoload :Homecare
   end
 end

data/lib/renalware/forms/generic/homecare.rb

@@ -3,9 +3,6 @@
 module Renalware::Forms
   module Generic
     module Homecare
-      extend ActiveSupport::Autoload
-
-      autoload :V1
     end
   end
 end

data/lib/renalware/forms/generic/homecare/v1.rb

@@ -3,10 +3,6 @@
 module Renalware::Forms::Generic
   module Homecare
     module V1
-      extend ActiveSupport::Autoload
-
-      autoload :Base
-      autoload :Document
     end
   end
 end

data/lib/renalware/forms/generic/homecare/v1/allergies.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Renalware::Forms::Generic
+  module Homecare::V1
+    class Allergies < Base
+      def build
+        move_down 30
+        font_size 10
+        text "Known Allergies", style: :bold
+        args.allergies.each do |allergy|
+          text allergy
+        end
+      end
+    end
+  end
+end

data/lib/renalware/forms/generic/homecare/v1/base.rb

@@ -4,6 +4,26 @@ module Renalware::Forms::Generic
   module Homecare::V1
     class Base < Renalware::Forms::Base
       pattr_initialize :document, :args
+      TABLE_WIDTH = 555
+
+      def table_styles(**options)
+        {
+          cell_style: {
+            padding: [1, 5, 1, 1],
+            border_width: 0.5,
+            border_color: "AAAAAA",
+            **options
+          }
+        }
+      end
+
+      def heading(text, **options)
+        {
+          content: text,
+          font_style: :bold,
+          **options
+        }
+      end
     end
   end
 end

data/lib/renalware/forms/generic/homecare/v1/delivery_frequencies.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Renalware::Forms::Generic
+  module Homecare::V1
+    class DeliveryFrequencies < Base
+      def build
+        font_size 10
+        move_down 10
+        row = [heading("Frequency of deliveries:")]
+        args.delivery_frequencies.each do |freq|
+          row.concat << cell_with_leading_checkbox(freq)
+        end
+
+        table(
+          [row],
+          **table_styles(border_width: 0, padding: [1, 30, 1, 0]),
+          column_widths: { 0 => 150 }
+        )
+      end
+    end
+  end
+end

data/lib/renalware/forms/generic/homecare/v1/document.rb

@@ -10,10 +10,21 @@ module Renalware::Forms::Generic
       end
 
       def document
-        @document ||= Prawn::Document.new(page_size: "A4", page_layout: :portrait, margin: 15)
+        @document ||= Prawn::Document.new(page_size: "A4", page_layout: :portrait, margin: 25)
       end
 
-      def build; end
+      def build
+        Prawn::Font::AFM.hide_m17n_warning = true
+        [
+          Heading,
+          PatientDetails,
+          Medications,
+          Allergies,
+          PrescriptionDurations,
+          DeliveryFrequencies,
+          Signoff
+        ].each { |klass| klass.new(document, args).build }
+      end
     end
   end
 end

data/lib/renalware/forms/generic/homecare/v1/heading.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Renalware::Forms::Generic
+  module Homecare::V1
+    class Heading < Base
+      def build
+        move_down 10
+        font_size 12
+        text "PO: #{args.po_number}"
+        font_size 8
+        text "RW ref: #{args.hospital_number}"
+        text "Drugs types: #{args.drug_type}"
+        move_down 30
+        font_size 16
+        text "Home Delivery Medication List", style: :bold
+        font_size 8
+        text "As at #{args.generated_at}"
+        image(
+          File.join(File.dirname(__dir__), "v1/assets/nhs_logo.jpg"),
+          width: 60,
+          at: [490, 800]
+        )
+      end
+    end
+  end
+end

data/lib/renalware/forms/generic/homecare/v1/medications.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Renalware::Forms::Generic
+  module Homecare::V1
+    class Medications < Base
+      def build
+        move_down 20
+        font_size 10
+
+        rows = []
+        rows << [
+          heading("Date"),
+          heading("Drug"),
+          heading("Dose"),
+          heading("Route"),
+          heading("Freq"),
+          heading("Pharmacy comments")
+        ]
+
+        args.medications.map do |med|
+          rows << [
+            med.date.to_s,
+            med.drug,
+            med.dose,
+            med.route,
+            med.frequency,
+            ""
+          ]
+        end
+
+        table(
+          rows,
+          column_widths: {
+            0 => 60,
+            1 => 140,
+            2 => 80,
+            3 => 75,
+            4 => 75,
+            5 => 110
+          },
+          **table_styles,
+          **underlined_table_style
+        )
+      end
+    end
+  end
+end

data/lib/renalware/forms/generic/homecare/v1/patient_details.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Renalware::Forms::Generic
+  module Homecare::V1
+    class PatientDetails < Base
+      def build
+        move_down 10
+        font_size 10
+        table(
+          [
+            [heading("Name"), args.patient_name],
+            [heading("Modality"), args.modality],
+            [heading("Date of Birth"), args.born_on],
+            [heading("NHS Number"), args.nhs_number],
+            [heading("Hospital no"), args.hospital_number],
+            [heading("Address"), args.formatted_address_and_postcode]
+          ],
+          **table_styles(border_width: 0)
+        )
+      end
+    end
+  end
+end

data/lib/renalware/forms/generic/homecare/v1/prescription_durations.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Renalware::Forms::Generic
+  module Homecare::V1
+    # List our the available prescription_durations and is selected_prescription_duration
+    # supplied then mark that one as checked.
+    class PrescriptionDurations < Base
+      def build
+        font_size 10
+        move_down 20
+        row = [heading("Repeat prescription for:")]
+        args.prescription_durations.each do |duration|
+          checked = duration == args.selected_prescription_duration
+          row.concat << cell_with_leading_checkbox(duration, checked: checked)
+        end
+
+        table(
+          [row],
+          **table_styles(border_width: 0, padding: [1, 30, 1, 0]),
+          column_widths: { 0 => 150 }
+        )
+      end
+    end
+  end
+end

data/lib/renalware/forms/generic/homecare/v1/signoff.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Renalware::Forms::Generic
+  module Homecare::V1
+    class Signoff < Base
+      def build
+        move_down 40
+        font_size 10
+        consultant
+        move_down 40
+        prescriber
+        move_down 40
+        text "Order number:", style: :bold
+        move_down 10
+        text "Other pharmacy comments:", style: :bold
+      end
+
+      private
+
+      def consultant
+        table(
+          [
+            [heading("Consultant:"), args.consultant]
+          ],
+          column_widths: { 0 => 80, 1 => 210 },
+          **table_styles,
+          **underlined_table_style
+        )
+      end
+
+      def prescriber
+        table(
+          [
+            [heading("Prescriber:"), heading("Signature:"), heading("Date:")]
+          ],
+          column_widths: {
+            0 => 220,
+            1 => 215,
+            2 => 100
+          },
+          **table_styles.merge(underlined_table_style)
+        )
+      end
+    end
+  end
+end

data/lib/renalware/forms/homecare.rb

@@ -3,14 +3,8 @@
 require "prawn"
 require "prawn/table"
 require "attr_extras"
-require "active_support"
 
 module Renalware::Forms
   module Homecare
-    extend ActiveSupport::Autoload
-
-    autoload :Pdf
-    autoload :Args
-    autoload :Generic
   end
 end

data/lib/renalware/forms/homecare/args.rb

@@ -3,47 +3,76 @@
 require "virtus"
 require "active_model"
 
+# rubocop:disable Metrics/ClassLength
 module Renalware::Forms
   class Homecare::Args
-    include Virtus::Model
+    include Virtus.model
     include ActiveModel::Validations
 
+    class Medication
+      include Virtus.model(strict: true)
+      include ActiveModel::Validations
+
+      attribute :date, Date
+      attribute :drug, String
+      attribute :dose, String
+      attribute :route, String
+      attribute :frequency, String
+    end
+
     # The first 2 attrbutes are used to drive what PDF to build
     attribute :provider, String
     attribute :version, Integer
-
-    attribute :title, String
+    attribute :title, String, default: ""
     attribute :given_name, String
     attribute :family_name, String
-    attribute :nhs_number, String
+    attribute :nhs_number, String, default: ""
     attribute :born_on, Date
-    attribute :fmc_patient, String
-    attribute :telephone, String
-    attribute :hospital_number, String
-    attribute :address, String
-    attribute :postcode, String
+    attribute :modality, String, default: ""
+    attribute :fmc_patient, String, default: ""
+    attribute :telephone, String, default: ""
+    attribute :hospital_number, String, default: ""
+    attribute :address, Array(String), default: []
+    attribute :postcode, String, default: ""
     attribute :modality, String
-    attribute :prescriber_name, String
+    attribute :prescriber_name, String, default: ""
     attribute :prescription_date, Date
     attribute :hospital_name, String
     attribute :hospital_department, String
     attribute :hospital_address, Array[String]
     attribute :po_number, String
+    attribute :generated_at, DateTime
     attribute :no_known_allergies, Boolean
     attribute :allergies, Array[String]
+    attribute :drug_type, String
     attribute :administration_route, String
     attribute :administration_frequency, String
     attribute :prescription_duration, String
     attribute :administration_device, String
+    attribute :medications, Array[Medication]
+    attribute :consultant, String
+    attribute :delivery_frequencies, Array[String], default: ["3 months", "6 months"]
+    attribute :prescription_durations, Array[String] # e.g. ["3 months", "6 months"]
+    attribute :selected_prescription_duration, String # e.g. "3 months"
 
     # validates! will raise eg ActiveModel::StrictValidationFailed: Family name can't be blank
     validates! :family_name, presence: true
     validates! :given_name, presence: true
 
+    def patient_name
+      name = [family_name, given_name].compact.join(", ")
+      name += " (#{title})" if title.to_s != ""
+      name
+    end
+
     def formatted_address
       format_address_array address
     end
 
+    def formatted_address_and_postcode
+      format_address_array(address << postcode)
+    end
+
     def formatted_hospital_address
       format_address_array hospital_address
     end
@@ -81,11 +110,13 @@ module Renalware::Forms
         args.fmc_patient = "123"
         args.telephone = "07000 000001"
         args.hospital_number = "ABC123"
-        args.address = ["line1", "", nil, "line2", "line3.   "]
+        args.modality = "PD"
+        args.address = ["line1", "", nil, "line2", "line3   "]
         args.postcode = "TW1 1UU"
         args.modality = "HD"
         args.prescriber_name = "Dr X Yz"
         args.prescription_date = Date.today.to_s
+        args.consultant = "Dr Pepper"
         args.hospital_name = "THE ROYAL LONDON HOSPITAL"
         args.hospital_department = ""
         args.hospital_address = [
@@ -97,13 +128,28 @@ module Renalware::Forms
         ]
         args.no_known_allergies = false
         args.allergies = ["Nuts", nil, "Penicillin", "Mown grass"]
+        args.drug_type = "ESA"
         args.administration_frequency = "Daily"
         args.administration_route = "Per Oral"
         args.prescription_duration = "1 month"
         args.administration_device = "device?"
+        args.po_number = "P123"
+        args.generated_at = Time.now
+        args.delivery_frequencies = ["1 week", "3 months", "6 months", "12 month"]
+        args.prescription_durations = ["3 months", "6 months", "12 months"]
+        args.selected_prescription_duration = "6 months"
+
+        args.medications << Medication.new(
+          date: Date.today,
+          drug: "Example drug",
+          dose: "1 unit",
+          route: "PO",
+          frequency: "3"
+        )
 
         raise ArgumentError, args.errors unless args.valid?
       end
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/lib/renalware/forms/version.rb

@@ -2,6 +2,6 @@
 
 module Renalware
   module Forms
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: renalware-forms
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Airslie Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -151,8 +151,16 @@ files:
 - lib/renalware/forms/generic.rb
 - lib/renalware/forms/generic/homecare.rb
 - lib/renalware/forms/generic/homecare/v1.rb
+- lib/renalware/forms/generic/homecare/v1/allergies.rb
+- lib/renalware/forms/generic/homecare/v1/assets/nhs_logo.jpg
 - lib/renalware/forms/generic/homecare/v1/base.rb
+- lib/renalware/forms/generic/homecare/v1/delivery_frequencies.rb
 - lib/renalware/forms/generic/homecare/v1/document.rb
+- lib/renalware/forms/generic/homecare/v1/heading.rb
+- lib/renalware/forms/generic/homecare/v1/medications.rb
+- lib/renalware/forms/generic/homecare/v1/patient_details.rb
+- lib/renalware/forms/generic/homecare/v1/prescription_durations.rb
+- lib/renalware/forms/generic/homecare/v1/signoff.rb
 - lib/renalware/forms/helpers.rb
 - lib/renalware/forms/homecare.rb
 - lib/renalware/forms/homecare/args.rb