renalware-core 2.0.159 → 2.0.164

data/app/views/renalware/letters/parts/_problems.html.slim

@@ -1,5 +1,5 @@
 .list.problems
-  h3 Problems
+  b.subtitle Problems
 
   - if problems.any?
     ul.indented

data/app/views/renalware/letters/parts/_recent_pathology_results.html.slim

@@ -1,3 +1,3 @@
 .list.investigations
-  h3 Recent Investigations
+  b.subtitle Recent Investigations
   p= recent_pathology_results.results || " None"

data/app/views/renalware/medications/home_delivery/events/_edit.html.slim

@@ -7,7 +7,7 @@
       remote: true,
       authenticity_token: true,
       method: :patch,
-      data: { target: "home-delivery-modal.form" },
+      data: { "home-delivery-modal-target" => "form" },
       as: :event) do |f|
 
     .modal__header
@@ -24,7 +24,7 @@
       / - the first is initially displayed and has the print options and a print button
       / - the second is displayed once Print has been clicked, and asked asks for feedback as to
       /   whether printing was successful or not. It it was successful we set
-      .form-fields data-target="home-delivery-modal.printOptions"
+      .form-fields data-home-delivery-modal-target="printOptions"
         - homecare_forms = Renalware::Drugs::HomecareForm.all
         = f.association :drug_type,
                   collection: Renalware::Drugs::Type.where(id: homecare_forms.map(&:drug_type_id)),
@@ -32,7 +32,7 @@
                   input_html: { \
                     data: { \
                       action: "change->home-delivery-modal#refreshForm", \
-                      target: "home-delivery-modal.drugtype" \
+                      "home-delivery-modal-target" => "drugtype" \
                     } \
                   },
                   wrapper: :horizontal_medium
@@ -59,7 +59,7 @@
                   data: { action: "click->home-delivery-modal#askForPrintFeedback" },
                   **disabled_args
 
-      .show-after-printing.visuallyhidden data-target="home-delivery-modal.printFeedback"
+      .show-after-printing.visuallyhidden data-home-delivery-modal-target="printFeedback"
 
         h2 Was printing successful?
         .right

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

@@ -1,4 +1,4 @@
-h3 Current Medications
+b.subtitle Current Medications
 
 - if prescriptions.blank?
   p.prescription No medications listed

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

@@ -1,5 +1,5 @@
 - if prescriptions.any?
-  h3 Drugs to give on Haemodialysis
+  b.subtitle Drugs to give on Haemodialysis
 
   ul
       - prescriptions.each do |prescription|

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

@@ -38,16 +38,16 @@ ruby:
                      required: false,
                      wrapper: :horizontal_datepicker
 
-      span(data-target= "prescriptions.providers")
+      span(data-prescriptions-target= "providers")
         = f.input :provider,
                   collection: provider_codes,
                   as: :inline_radio_buttons,
                   label_method: :to_label,
                   wrapper: :horizontal_medium,
-                  input_html: { data: { action: "change->prescriptions#toggleDeliveryDates", target: "prescriptions.providers"} }
+                  input_html: { data: { action: "change->prescriptions#toggleDeliveryDates", "prescriptions.target" => "providers"} }
 
       / Only show this if home_delivery provider is active/selected. See prescriptions stimulus controller.
-      .home_delivery_dates(style="display:none" data-target="prescriptions.homeDeliveryDates")
+      .home_delivery_dates(style="display:none" data-prescriptions-target="homeDeliveryDates")
         .row
           .small-12.medium-4.large-3.columns
           .small-12.medium-8.large-9.columns

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

@@ -1,5 +1,4 @@
 - recently_changed = defined?(recently_changed) && recently_changed
-
 li.prescription class=("recently_changed" if recently_changed)
   = prescription.drug.name
   = blank_separator
@@ -8,6 +7,9 @@ li.prescription class=("recently_changed" if recently_changed)
   = prescription.medication_route.code
   = blank_separator
   = prescription.frequency
+  = blank_separator
+  i
+    b= prescription.provider_suffix
 
   / We pass in date_changed if the prescription is recently_changed or recently_stopped
   / It could be the prescribed_on or terminated_on date

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

@@ -1,4 +1,4 @@
-h3 Recently Stopped Medications
+b.subtitle Recently Stopped Medications
 
 - if prescriptions.blank?
   p.prescription None

data/app/views/renalware/system/downloads/index.html.slim

@@ -22,7 +22,7 @@
     - items.each do |item|
       .download
         .file
-          = link_to(system_download_path(item), target: "_blank") do
+          = link_to(system_download_path(item), target: "_blank", rel: "noopener") do
             i.far.fa-file-alt
         .details
           h3= link_to(item.name, system_download_path(item), target: "_blank")

data/app/views/renalware/system/messages/_form.html.slim

@@ -1,4 +1,4 @@
-- severities = Renalware::System::Message.severity.values.map{|val| [val&.humanize, val] }
+- severities = Renalware::System::Message.severity.values.map{ |val| [val&.humanize, val] }
 = simple_form_for(message,
                   as: :message,
                   html: { autocomplete: "off" }) do |f|

data/app/views/renalware/system/view_metadata/edit.html.slim

@@ -38,18 +38,18 @@ ruby:
       / Tabs - see also js stimulus tabs-controller
       div(data-controller="tabs" data-tabs-active-tab="-mb-px border-l border-t border-r rounded-t")
         ul.list-reset.flex.border-b.ml-0
-          li.-mb-px.mr-1(data-target="tabs.tab" data-action="click->tabs#change")
+          li.-mb-px.mr-1(data-tabs-target="tab" data-action="click->tabs#change")
             a.bg-white.inline-block.py-2.px-4.text-blue-500.hover:text-blue-700.font-semibold.no-underline(href="#") Columns
-          li.-mb-px.mr-1(data-target="tabs.tab" data-action="click->tabs#change")
+          li.-mb-px.mr-1(data-tabs-target="tab" data-action="click->tabs#change")
             a.bg-white.inline-block.py-2.px-4.text-blue-500.hover:text-blue-700.font-semibold.no-underline(href="#") Filters
-          li.-mb-px.mr-1(data-target="tabs.tab" data-action="click->tabs#change")
+          li.-mb-px.mr-1(data-tabs-target="tab" data-action="click->tabs#change")
             a.bg-white.inline-block.py-2.px-4.text-blue-500.hover:text-blue-700.font-semibold.no-underline(href="#") Previous versions
 
-        .hidden.py-4.px-4.border-l.border-b.border-r(data-target="tabs.panel")
+        .hidden.py-4.px-4.border-l.border-b.border-r(data-tabs-target="panel")
           = render "columns_table", view: view
-        .hidden.py-4.px-4.border-l.border-b.border-r(data-target="tabs.panel")
+        .hidden.py-4.px-4.border-l.border-b.border-r(data-tabs-target="panel")
           = render "filters_form", view: view
-        .hidden.py-4.px-4.border-l.border-b.border-r(data-target="tabs.panel")
+        .hidden.py-4.px-4.border-l.border-b.border-r(data-tabs-target="panel")
           = render "versions", view: view
 
     .modal__footer

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

@@ -0,0 +1,5 @@
+li.patient-alert.vaccination
+    i.fas.fa-syringe
+    - title = Renalware::Virology::VaccinationType.find_by(code: event.document&.type)&.name
+    span.title= link_to title, renalware.patient_virology_dashboard_path(event.patient)
+    span.date= l(event.date_time.to_date)

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

@@ -1,5 +1,6 @@
 / See Vaccination.to_partial_path etc
 / 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 :type, wrapper: :horizontal_medium
+  = fd.input :type, wrapper: :horizontal_medium, collection: Renalware::Virology::VaccinationType.ordered.pluck(:name, :code)
   = 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

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

data/config/initializers/core_extensions.rb

@@ -5,7 +5,7 @@ require "core_extensions/i18n/always_cascade"
 require "core_extensions/dumb_delegator"
 # require "core_extensions/active_record/sort"
 require "core_extensions/date"
-require "core_extensions/active_support/duration"
+require "core_extensions/active_support/duration_additions"
 require "core_extensions/scenic"
 require "core_extensions/hash"
 require "core_extensions/active_record/migration_helpers"

data/config/initializers/inflections.rb

@@ -32,6 +32,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym "CCs"
   inflect.acronym "CM"
   inflect.acronym "CSV"
+  inflect.acronym "CRF"
   inflect.acronym "DNA"
   inflect.acronym "EDTA"
   inflect.acronym "ESRF"
@@ -55,6 +56,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym "EQ5D"
   inflect.acronym "EQ5D5L"
   inflect.acronym "POS"
+  inflect.acronym "YAML"
   inflect.irregular "feedback", "feedback"
   inflect.acronym "NHS"
   inflect.uncountable %w(cache)

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

@@ -26,4 +26,6 @@ en:
         hbv_booster: HBV Booster
         influenza: Influenza
         pneumococcus: Pneumococcus
+        covid19_1: COVID-19 1
+        covid19_2: COVID-19 2
         patient_refused: Patient Refused

data/db/migrate/20210105163944_create_virology_vaccination_types.rb

@@ -0,0 +1,13 @@
+class CreateVirologyVaccinationTypes < ActiveRecord::Migration[5.2]
+  within_renalware_schema do
+    def change
+      create_table :virology_vaccination_types do |t|
+        t.string :code, null: false, index: { unique: true }
+        t.string :name, null: false, index: { unique: true }
+        t.integer :position, null: false, default: 0
+        t.datetime :deleted_at
+        t.timestamps null: false
+      end
+    end
+  end
+end

data/db/migrate/20210115181817_create_event_type_alert_triggers.rb

@@ -0,0 +1,15 @@
+class CreateEventTypeAlertTriggers < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      create_table(
+        :event_type_alert_triggers,
+        comment: "Matching alerts are displayed on patient pages"
+      ) do |t|
+        t.references :event_type, foreign_key: true, null: false
+        t.text :when_event_document_contains
+        t.text :when_event_description_contains
+        t.timestamps null: false
+      end
+    end
+  end
+end

data/db/seeds/default/seeds.rb

@@ -20,3 +20,4 @@ require_relative "./practices/seeds"
 require_relative "./pd/seeds"
 require_relative "./renal/seeds"
 require_relative "./transplants/seeds"
+require_relative "./virology/seeds"

data/db/seeds/default/virology/seeds.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative "./vaccination_types"

data/db/seeds/default/virology/vaccination_types.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Virology
+    log "Adding virology vaccination types" do
+      {
+        hbv1: "HBV Vaccination 1",
+        hbv2: "HBV Vaccination 2",
+        hbv3: "HBV Vaccination 3",
+        hbv4: "HBV Vaccination 4",
+        hbv_booster: "HBV Booster",
+        influenza: "Influenza",
+        pneumococcus: "Pneumococcus",
+        covid19_1: "COVID-19 1",
+        covid19_2: "COVID-19 2",
+        patient_refused: "Patient Refused",
+        patient_refused_covid19: "Patient refused Covid-19 vaccine",
+        patient_refused_covid19_pfizer: "Patient refused Covid-19 vaccine Pfizer",
+        patient_refused_covid19_astrazenica: "Patient refused Covid-19 vaccine Astra Zeneca"
+      }.each do |code, name|
+        VaccinationType.find_or_create_by!(code: code, name: name)
+      end
+    end
+  end
+end

data/lib/failure.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require "service_result"
+
+class Failure < ServiceResult
+end

data/lib/gpg_encrypt_folder.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "attr_extras"
-
 # Shell out to gpg with a a command like this
 # gpg --armor --no-default-keyring --keyring keyring.gpg
 #     --trust-model always -r 'renalware_test'

data/lib/month_period.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class MonthPeriod
+  attr_reader :month, :year, :start, :finish
+
+  def initialize(month:, year:)
+    @month = month
+    @year = year
+    @start = Time.new(year, month, 1, 0, 0, 0)
+    @finish = start.end_of_month.end_of_day
+  end
+
+  def to_range
+    start..finish
+  end
+end

data/lib/renalware/configuration.rb

@@ -136,6 +136,9 @@ module Renalware
     # Note that the standard HL7 PID admin sex values are not adhered to here. For reference
     # they are:
     # F Female, M Male, O Other, U Unknown, A Ambiguous, N Not applicable
+    # Note
+    # - NS = Not Stated
+    # - NK = Not Known
     config_accessor(:hl7_pid_sex_map) do
       {
         "MALE" => "M",
@@ -144,7 +147,8 @@ module Renalware
         "UNKNOWN" => "NK",
         "NOTKNOWN" => "NK",
         "AMBIGUOUS" => "NS",
-        "NOT APPLICABLE" => "NS"
+        "NOT APPLICABLE" => "NS",
+        "BOTH" => "NS"
       }.freeze
     end
   end

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.159"
+    VERSION = "2.0.164"
   end
 end

data/lib/service_result.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class ServiceResult
+  attr_reader :object
+
+  def initialize(object)
+    @object = object
+  end
+
+  def success?
+    false
+  end
+
+  def failure?
+    !success?
+  end
+end

data/lib/sql/indexed_case_stmt.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "attr_extras"
-
-module SQL
+module Sql
   # Example:
   #
   #     indexed_case_stmt(:code, "DT", "AC", "XY")

data/lib/success.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "service_result"
+
+class Success < ServiceResult
+  def success?
+    true
+  end
+end

data/lib/tasks/ukrdc.rake

@@ -39,7 +39,7 @@ namespace :ukrdc do
       RubyProf.start
     end
     # Renalware::UKRDC::TreatmentTimeline::GenerateTreatments.call
-    Renalware::UKRDC::CreateEncryptedPatientXMLFiles.new(
+    Renalware::UKRDC::CreateEncryptedPatientXmlFiles.new(
       changed_since: ENV["changed_since"],
       patient_ids: ENV.fetch("patient_ids", "").split(",").map(&:to_i),
       force_send: ENV["force_send"] == "true"

data/lib/week_period.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+class WeekPeriod
+  attr_reader :year, :week_number, :date_on_first_day_of_week
+
+  def self.from_date(date)
+    date = date.to_date
+    new(week_number: date.cweek, year: date.cwyear)
+  end
+
+  def initialize(week_number:, year:)
+    @week_number = week_number.to_i
+    @year = year.to_i
+    validate_week_number
+    validate_year
+    @date_on_first_day_of_week = Date.commercial(@year, @week_number)
+  end
+
+  def next
+    self.class.from_date(date_on_first_day_of_week + 1.week)
+  end
+
+  def previous
+    self.class.from_date(date_on_first_day_of_week - 1.week)
+  end
+
+  def to_a
+    [week_number, year]
+  end
+
+  def to_s
+    "#{I18n.l(date_on_first_day_of_week, format: :long)} " \
+    "to #{I18n.l(last_day_of_week, format: :long)}"
+  end
+
+  # The date of last day of the week (a Sunday)
+  def last_day_of_week
+    @last_day_of_week ||= (date_on_first_day_of_week + 1.week - 1.minute).to_date
+  end
+
+  def validate_week_number
+    if week_number < 1 || week_number > 53
+      raise(ArgumentError, "invalid date: week_number must be 1-53")
+    end
+  end
+
+  def validate_year
+    raise(ArgumentError, "invalid date year must be >= 2000") if year <= 2000
+  end
+
+  def to_h
+    {
+      year: year,
+      week_number: week_number
+    }
+  end
+end