renalware-core 2.0.71 → 2.0.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10ac90d9f9bff7393b4f80a8d312d0de455e29e1f3cb46c8ef937c13c8c7184b
-  data.tar.gz: d099deb0d46a4fed8f510b22d99e5f022a80cd254b17f5be69646601a8bb90cd
+  metadata.gz: 9e283c0fb737a52927b551762ea2204f875ef28cd5673206fc9e8c8d5d85500f
+  data.tar.gz: fbb0521235f06ac34c8a53c145bd11bb66e4bc64418c3b876733ce380397b987
 SHA512:
-  metadata.gz: fe427d3bb70d6a2384a54e94dd017f0c61cbde7b86e6536e804372c335a66b913114b6e6ef2735b3d31187d75c47eb5803134d48819cabf81ebbf6cb0c1dcb5d
-  data.tar.gz: eb544e8e70126471685962346b6d5332d8a26c35354e13dbdf629c6d902e81390c8db444227d38eda6e7b6e3f8d2581cf298c3adfba41252fa0e0ff35b2f2cca
+  metadata.gz: bf8c3050912034740b3909f03f4282e3c195361a25d84db3a0989184ef812e318be6d2bfd8a444674f402656827260512539fade7d56f764753edb902d358fdb
+  data.tar.gz: cc6d16506b95182555b76cb4432ef8ac4945080543a0ba994798ea75d3fb72b951b3ce39b51313129df74261f4f597fc748c386c22113fc7469bee7ca572c9cc

data/app/assets/stylesheets/renalware/medications_pdf.scss

@@ -0,0 +1,206 @@
+html {
+  overflow: hidden;
+  font-family: Helvetica, Arial;
+  font-size: 11px;
+}
+
+ul {
+  padding-left: 0;
+  list-style-position: inside;
+  line-height: 1.3em;
+  list-style-type: none;
+}
+
+dl {
+  margin-top: 0;
+  margin-bottom: 0;
+  line-height: 1.3em;
+
+  p {
+    padding-left: 0;
+  }
+
+  dt,
+  dd {
+    font-weight: normal;
+  }
+
+  dt {
+    font-weight: bold;
+    float: left;
+    width: 9rem;
+    overflow: hidden;
+    clear: left;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin-bottom: 0;
+  }
+
+  dd {
+    margin-left: 9rem + 1rem;
+    margin-bottom: 0;
+
+    &:before {
+      content: " ";
+      display: table;
+    }
+
+    &:after {
+      content: " ";
+      display: table;
+      clear: both;
+    }
+  }
+}
+
+heading {
+  text-align: right;
+
+  .our-ref {
+    float: left;
+    font-weight: normal;
+    font-size: 0.8em;
+    color: #666;
+  }
+
+  .trust {
+    float: right;
+    margin-right: 1em;
+    .title {
+      font-size: 1.5em;
+    }
+  }
+
+  .logo {
+    float: right;
+  }
+}
+
+main {
+  clear: both;
+  display: block;
+  padding-top: 1em;
+
+  h1 {
+    margin-bottom: 0.2em;
+    padding-bottom: 0em;
+  }
+
+  section {
+    margin: 2em 0;
+  }
+}
+
+.prescriptions {
+
+  table {
+    width: 100%;
+  }
+
+  th, td {
+    padding: .5rem .5rem .3rem 0;
+
+    &.date {
+      width: 6rem;
+      white-space: nowrap;
+    }
+
+    &.dose {
+      min-width: 5rem;
+    }
+
+    &.route {
+      min-width: 5rem;
+    }
+    &.drug {
+      min-width: 12rem;
+    }
+
+    &.freq {
+      min-width: 5rem;
+    }
+  }
+
+  td {
+    border-top: solid 1px #ddd;
+    border-bottom: solid 1px #ddd;
+  }
+
+  .prescription {
+    font-weight: normal;
+
+    &.recently_changed {
+      font-weight: bold;
+    }
+  }
+}
+
+.allergies {
+  th, td {
+    padding: .3rem .2rem .2rem 0;
+  }
+}
+
+.checks {
+  th, td {
+    vertical-align: middle;
+    padding: 0 1rem 0 0;
+  }
+
+  th {
+    white-space: nowrap;
+    padding-right: 1rem;
+  }
+
+  td {
+    min-width: 7rem;
+  }
+
+  img {
+    height: 1.2rem;
+    vertical-align: middle;
+    margin: 0 0 0.3rem 0.5rem;
+  }
+}
+
+.signoff {
+  border-bottom: 1px solid #ddd;
+  padding-top: 30px;
+  padding-bottom: 5px;
+
+  table {
+    width: 100%;
+
+    td.prescriber   {
+      width: 30rem;
+    }
+
+    td.signature {
+
+    }
+  }
+}
+
+.consultant {
+  span {
+    width: 30rem;
+    border-bottom: solid 1px #ccc;
+    display: inline-block;
+  }
+}
+
+
+.order-number {
+  table {
+    width: 100%;
+    // border: 1px solid #ddd;
+  }
+}
+
+table {
+  border-collapse: collapse;
+
+  thead, th {
+    text-align: left;
+  }
+}

data/app/controllers/renalware/medications/home_delivery/prescriptions_controller.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/medications"
+
+module Renalware
+  module Medications
+    module HomeDelivery
+      class PrescriptionsController < BaseController
+        include Renalware::Concerns::PdfRenderable
+        include PresenterHelper
+
+        def index
+          respond_to do |format|
+            format.pdf do
+              authorize prescriptions
+              render_index_pdf prescriptions
+            end
+          end
+        end
+
+        private
+
+        def prescriptions
+          @prescriptions ||= begin
+            patient
+              .prescriptions
+              .current
+              .where(provider: :home_delivery)
+              .includes(:medication_route, :drug)
+          end
+        end
+
+        def render_index_pdf(prescriptions)
+          options = default_pdf_options.merge!(
+            pdf: pdf_filename,
+            layout: "renalware/layouts/letter",
+            locals: {
+              patient: patient,
+              prescriptions: present(prescriptions, PrescriptionPresenter)
+            }
+          )
+          render options
+        end
+
+        def pdf_filename
+          "#{patient.local_patient_id} prescriptions-for-home-delivery"
+        end
+      end
+    end
+  end
+end

data/app/mailers/renalware/ukrdc/summary_mailer.rb

@@ -8,7 +8,7 @@ module Renalware
       def export_summary(to: "dev@airslie.com", **args)
         mail(
           to: Array(to),
-          subject: "UKRC export summary #{I18n.l(Time.zone.today)}"
+          subject: "UKRDC export summary #{I18n.l(Time.zone.today)}"
         ) do |format|
           format.text { render(locals: args) }
           format.html { render(locals: args) }

data/app/models/renalware/renal/aki_alert.rb

@@ -18,6 +18,8 @@ module Renalware
       scope :today, ->{ where(created_at: Time.zone.today.all_day) }
       scope :hotlist, ->{ where(hotlist: true) }
 
+      has_paper_trail class_name: "Renalware::Renal::Version", on: [:create, :update, :destroy]
+
       ransacker :created_at_casted do |_parent|
         Arel.sql("date(renal_aki_alerts.created_at)")
       end

data/app/presenters/renalware/ukrdc/pathology_observation_presenter.rb

@@ -8,11 +8,17 @@ module Renalware
       # For non-HD patients, all the tests are NA
       def pre_post(patient_is_on_hd:)
         if patient_is_on_hd
-          description_code.casecmp("UREP") == 0 ? "POST" : "PRE"
+          description_code.casecmp("UREP").zero? ? "POST" : "PRE"
         else
           "NA"
         end
       end
+
+      # Truncate long result text to satisfy XSD validation - it might be notes
+      # like eg "No recent Urea result"
+      def result
+        (super || "")[0..19]
+      end
     end
   end
 end

data/app/views/renalware/api/ukrdc/patients/_address.xml.builder

@@ -9,7 +9,7 @@ xml.Address(use: "H") do
   xml.Street address.street
   xml.Town address.town
   xml.County address.county
-  xml.Postcode address.postcode
+  xml.Postcode address.postcode&.strip
   xml.Country do
     xml.CodingStandard "ISO3166-1"
     xml.Code address&.country&.alpha3

data/app/views/renalware/api/ukrdc/patients/_patient.xml.builder

@@ -50,8 +50,12 @@ xml.Patient do
   end
 
   xml.FamilyDoctor do
-    xml.GPPracticeId patient.practice&.code
-    xml.GPId patient.primary_care_physician&.code
+    if patient.practice.present?
+      xml.GPPracticeId patient.practice.code
+    end
+    if patient.primary_care_physician.present?
+      xml.GPId patient.primary_care_physician.code
+    end
   end
 
   if patient.ethnicity.present?

data/app/views/renalware/api/ukrdc/patients/lab_orders/_result_item.xml.builder

@@ -3,27 +3,22 @@
 xml = builder
 observation = Renalware::Pathology::ObservationPresenter.new(observation)
 observation = Renalware::UKRDC::PathologyObservationPresenter.new(observation)
-result = observation.result || ""
 
-# The UKRDC XSD Schema specifies that observations cannot be longer than 20 characters.
-# KCH regularly get notes in the result, saying things like "No recent Urea result" - which in this
-# case exceeds 20 characters. We need to skip these.
-if result.length <= 20
-  xml.ResultItem do
-    xml.EnteredOn observation.updated_at&.iso8601
-    xml.PrePost observation.pre_post(patient_is_on_hd: patient.current_modality_hd?)
-    xml.ServiceId do
-      if observation.description_loinc_code.present?
-        xml.CodingStandard "PV"
-        xml.Code observation.description_loinc_code
-      else
-        xml.CodingStandard "LOCAL"
-        xml.Code observation.description_code
-      end
-      xml.Description observation.description_name
+xml.ResultItem do
+  xml.EnteredOn observation.updated_at&.iso8601
+  xml.PrePost observation.pre_post(patient_is_on_hd: patient.current_modality_hd?)
+  xml.ServiceId do
+    if observation.description_loinc_code.present?
+      xml.CodingStandard "PV"
+      xml.Code observation.description_loinc_code
+    else
+      xml.CodingStandard "LOCAL"
+      xml.Code observation.description_code
     end
-    xml.ResultValue observation.result
-    xml.ResultValueUnits observation.measurement_unit_name
-    xml.ObservationTime observation.observed_at&.iso8601
+    xml.Description observation.description_name
   end
+
+  xml.ResultValue observation.result
+  xml.ResultValueUnits observation.measurement_unit_name
+  xml.ObservationTime observation.observed_at&.iso8601
 end

data/app/views/renalware/layouts/pdf.pdf.slim

@@ -4,8 +4,10 @@ html
     meta content=("text/html; charset=UTF-8") http-equiv="Content-Type" /
     meta charset="utf-8" /
 
+
     = yield(:head)
     = wicked_pdf_stylesheet_link_tag "renalware/pdf"
+    = yield(:head2)
 
   body
     = yield

data/app/views/renalware/medications/home_delivery/prescriptions/index.pdf.slim

@@ -0,0 +1,93 @@
+- clinical_patient = Renalware::Clinical.cast_patient(patient)
+
+html
+  meta content=("text/html; charset=UTF-8") http-equiv="Content-Type" /
+  meta charset="utf-8" /
+
+  head
+    = wicked_pdf_stylesheet_link_tag "renalware/medications_pdf"
+  heading
+    .our-ref= "RW ref: #{patient.hospital_identifier}"
+    span.logo= wicked_pdf_image_tag "renalware/NHS-Black.jpg", width: 50
+  main
+    h1 Home Delivery Medication List
+    = "As at #{l(Time.zone.now)}"
+
+    section.extended_patient_details
+      - with_format(:html) do
+        = render "renalware/medications/prescriptions/extended_patient_details", patient: patient
+
+    section.prescriptions
+      table
+        thead
+          th.date Date
+          th.drug Drug
+          th.dose Dose
+          th.route Route
+          th.freq Freq
+          th.comments Pharmacy comments
+        tbody
+          - prescriptions.each do |prescription|
+            tr
+              td.date= l(prescription.prescribed_on)
+              td= prescription.drug.name
+              td= prescription.dose
+              td= prescription.medication_route.code
+              td= prescription.frequency
+              td
+
+    section.allergies
+      table
+        thead
+          th
+            = clinical_patient.allergy_status&.text
+            - if clinical_patient.allergy_status_updated_at
+              span.allergy_status_updated_at
+                |  
+                = l(clinical_patient.allergy_status_updated_at&.to_date)
+        tbody
+          - clinical_patient.allergies.each do |allergy|
+            tr
+              td= allergy.description
+
+    section.checks
+      table
+        tbody
+          tr
+            th Repeat prescription for
+            td
+              span 3 months
+              = wicked_pdf_image_tag "renalware/checkbox-empty"
+            td
+              span 6 months
+              = wicked_pdf_image_tag "renalware/checkbox-empty"
+          tr
+            th Frequency of deliveries
+            td
+              span 3 months
+              = wicked_pdf_image_tag "renalware/checkbox-empty"
+            td
+              span 6 months
+              = wicked_pdf_image_tag "renalware/checkbox-empty"
+
+    section.consultant
+      p
+        b Consultant:
+        span  
+    section.signoff
+      table
+        tr
+          td Prescriber:
+          td
+          td
+        tr
+          td.prescriber= [current_user.signature, current_user.professional_position].compact.join(", ")
+          td.signature Signature:
+          td Date:
+
+    section.order-number
+      table
+        thead
+          th Order number:
+      p
+        b Other pharmacy comments:

data/app/views/renalware/medications/prescriptions/_extended_patient_details.html.slim

@@ -0,0 +1,13 @@
+dl
+  dt Name
+  dd= patient.to_s
+  dt Modality
+  dd= patient.current_modality
+  dt Date of Birth
+  dd= l(patient.born_on)
+  dt NHS Number
+  dd= patient.nhs_number
+  dt Hospital no
+  dd= patient.hospital_identifier
+  dt Address
+  dd= Renalware::AddressPresenter.new(patient.current_address).to_a.join("<br>").html_safe

data/app/views/renalware/medications/prescriptions/_patient_details.html.slim

@@ -0,0 +1,10 @@
+section
+  dl
+    dt Name
+    dd= patient.to_s
+    dt Date of Birth
+    dd= l(patient.born_on)
+    dt NHS Number
+    dd= patient.nhs_number
+    dt Hospital no
+    dd= patient.hospital_identifier

data/app/views/renalware/medications/prescriptions/index.html.slim

@@ -7,9 +7,16 @@
   = link_to patient_prescriptions_path(@patient,
                                        treatable,
                                        format: :pdf),
-            class: "button secondary with-icon" do
+            class: "button secondary with-icon",
+            target: :blank do
     i.fas.fa-print
     | Print
+  | 
+  = link_to patient_medications_home_delivery_prescriptions_path(@patient),
+            class: "button secondary with-icon",
+            target: :blank do
+    i.fa.fa-print
+    | Print home delivery drugs
 
 = within_patient_layout(title: "Prescriptions") do
   = render "filter_form", search: current_search, drug_types: drug_types, treatable: treatable

data/app/views/renalware/medications/prescriptions/index.pdf.slim

@@ -1,148 +1,39 @@
-scss:
-  html {
-    overflow: hidden;
-    font-family: Helvetica, Arial;
-    font-size: 13px;
-  }
+html
+  meta content=("text/html; charset=UTF-8") http-equiv="Content-Type" /
+  meta charset="utf-8" /
 
-  ul {
-    padding-left: 0;
-    list-style-position: inside;
-    line-height: 1.3em;
-    list-style-type: none;
-  }
+  head
+    = wicked_pdf_stylesheet_link_tag "renalware/medications_pdf"
 
-  dl {
-    margin-top: 0;
-    margin-bottom: 0;
-    line-height: 1.3em;
+  heading
+    .our-ref= "RW ref: #{patient.hospital_identifier}"
 
-    p {
-      padding-left: 0;
-    }
+    span.logo= wicked_pdf_image_tag "renalware/NHS-Black.jpg", width: 50
 
-    dt,
-    dd {
-      font-weight: normal;
-    }
+  main
+    h1 Medication List
+    = "As at #{l(Time.zone.now)}"
 
-    dt {
-      font-weight: bold;
-      float: left;
-      width: 9rem;
-      overflow: hidden;
-      clear: left;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      margin-bottom: 0;
-    }
-
-    dd {
-      margin-left: 9rem + 1rem;
-      margin-bottom: 0;
-
-      &:before {
-        content: " ";
-        display: table;
-      }
-
-      &:after {
-        content: " ";
-        display: table;
-        clear: both;
-      }
-    }
-  }
-
-  heading {
-    text-align: right;
-
-    .our-ref {
-      float: left;
-      font-weight: normal;
-      font-size: 0.8em;
-      color: #666;
-    }
-
-    .trust {
-      float: right;
-      margin-right: 1em;
-      .title {
-        font-size: 1.5em;
-      }
-    }
-
-    .logo {
-      float: right;
-    }
-  }
-
-  main {
-    clear: both;
-    display: block;
-    padding-top: 1em;
-
-    h1 {
-      margin-bottom: 0.2em;
-      padding-bottom: 0em;
-    }
-
-    section {
-      margin: 2em 0;
-    }
-  }
-
-  .prescriptions {
-    .prescription {
-      font-weight: normal;
-
-      &.recently_changed {
-        font-weight: bold;
-      }
-    }
-  }
-
-heading
-  .our-ref= "RW ref: #{patient.hospital_identifier}"
-
-  span.logo= wicked_pdf_image_tag "renalware/NHS-Black.jpg", width: 50
-  / .trust
-  /   .title Barts and the London
-  /   span NHS Trust
-
-main
-
-  h1 Medication List
-  = "As at #{l(Time.zone.now)}"
-
-  section
-    dl
-      dt Name
-      dd= patient.to_s
-      dt Date of Birth
-      dd= l(patient.born_on)
-      dt NHS Number
-      dd= patient.nhs_number
-      dt Hospital no
-      dd= patient.hospital_identifier
-
-  section
-    h3 Allergies
-    - allergies = Renalware::Clinical.cast_patient(patient).allergies
-    - if allergies.any?
-      ul.allergies
-        - allergies.each do |allergy|
-          li= allergy.description
-    - else
-      p None
-
-  section.prescriptions
-    - with_format(:html) do
-      = render "current",
-               prescriptions: current_prescriptions,
-               recently_changed: recently_changed_prescriptions
-
-  section.prescriptions
     - with_format(:html) do
-      = render "recently_stopped",
-               prescriptions: recently_stopped_prescriptions
+      = render "patient_details", patient: patient
+
+    section
+      h3 Allergies
+      - allergies = Renalware::Clinical.cast_patient(patient).allergies
+      - if allergies.any?
+        ul.allergies
+          - allergies.each do |allergy|
+            li= allergy.description
+      - else
+        p None
+
+    section.prescriptions
+      - with_format(:html) do
+        = render "current",
+                prescriptions: current_prescriptions,
+                recently_changed: recently_changed_prescriptions
+
+    section.prescriptions
+      - with_format(:html) do
+        = render "recently_stopped",
+                prescriptions: recently_stopped_prescriptions

data/config/routes.rb

@@ -372,6 +372,12 @@ Renalware::Engine.routes.draw do
     # Medications
     resources :prescriptions, controller: "medications/prescriptions", except: [:destroy]
     namespace :medications do
+      namespace :home_delivery do
+        resources :prescriptions,
+                  only: [:index],
+                  constraints: { format: /(pdf)/ },
+                  defaults: { format: :pdf }
+      end
       resources :prescriptions, only: [] do
         resource :termination, only: [:new, :create]
       end

data/lib/renalware/engine.rb

@@ -127,6 +127,8 @@ module Renalware
       app.config.assets.precompile += %w(renalware/iframeResizer.contentWindow.js)
       app.config.assets.precompile += %w(renalware/pdf.css renalware/watermark.css)
       app.config.assets.precompile += %w(renalware/protocol_pdf.css)
+      app.config.assets.precompile += %w(renalware/medications_pdf.css)
+      app.config.assets.precompile += %w(renalware/medications/prescriptions_pdf.css)
       app.config.assets.precompile += %w(renalware/hd_diary_pdf.css)
       app.config.assets.precompile += %w(renalware/table_pdf.css)
       app.config.assets.precompile += %w(

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.71"
+  VERSION = "2.0.72"
 end

data/spec/factories/drugs/drug.rb

@@ -9,5 +9,11 @@ FactoryBot.define do
         instance.drug_types << create(:drug_type, :immunosuppressant)
       end
     end
+
+    trait :esa do
+      after(:create) do |instance|
+        instance.drug_types << create(:drug_type, :esa)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.71
+  version: 2.0.72
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -949,6 +949,7 @@ files:
 - app/assets/images/renalware/NHS-Black.jpg
 - app/assets/images/renalware/ajax-loader.gif
 - app/assets/images/renalware/barts_health_nhs_logo.png
+- app/assets/images/renalware/checkbox-empty.png
 - app/assets/images/renalware/chosen-sprite.png
 - app/assets/images/renalware/chosen-sprite@2x.png
 - app/assets/images/renalware/clippy.svg
@@ -1014,6 +1015,7 @@ files:
 - app/assets/stylesheets/renalware/lib/_clockpicker.css
 - app/assets/stylesheets/renalware/lib/_foundation_and_overrides.scss
 - app/assets/stylesheets/renalware/lib/_select2-foundation5-overrides.scss
+- app/assets/stylesheets/renalware/medications_pdf.scss
 - app/assets/stylesheets/renalware/modules/_admissions.scss
 - app/assets/stylesheets/renalware/modules/_clinical.scss
 - app/assets/stylesheets/renalware/modules/_clinical_summaries.scss
@@ -1160,6 +1162,7 @@ files:
 - app/controllers/renalware/mdm_controller.rb
 - app/controllers/renalware/mdm_patients_controller.rb
 - app/controllers/renalware/medications/drug_types/prescriptions_controller.rb
+- app/controllers/renalware/medications/home_delivery/prescriptions_controller.rb
 - app/controllers/renalware/medications/prescriptions_controller.rb
 - app/controllers/renalware/medications/terminations_controller.rb
 - app/controllers/renalware/messaging/internal/messages_controller.rb
@@ -2410,11 +2413,14 @@ files:
 - app/views/renalware/medications/drug_types/prescriptions/_filters.html.slim
 - app/views/renalware/medications/drug_types/prescriptions/_table.html.slim
 - app/views/renalware/medications/drug_types/prescriptions/index.html.slim
+- app/views/renalware/medications/home_delivery/prescriptions/index.pdf.slim
 - app/views/renalware/medications/prescriptions/_current.html.slim
+- app/views/renalware/medications/prescriptions/_extended_patient_details.html.slim
 - app/views/renalware/medications/prescriptions/_filter_form.html.slim
 - app/views/renalware/medications/prescriptions/_form.html.slim
 - app/views/renalware/medications/prescriptions/_index.html.slim
 - app/views/renalware/medications/prescriptions/_options.html.slim
+- app/views/renalware/medications/prescriptions/_patient_details.html.slim
 - app/views/renalware/medications/prescriptions/_prescription.html.slim
 - app/views/renalware/medications/prescriptions/_recently_stopped.html.slim
 - app/views/renalware/medications/prescriptions/_table.html.slim
@@ -3787,8 +3793,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Renalware core functionality as a mountable engine.