renalware-core 2.0.160 → 2.0.161

data/app/components/renalware/medications/tabbed_prescriptions_list_component.html.slim

@@ -2,11 +2,11 @@ div(data-controller="tabs" data-tabs-active-tab="active")
   .tabs-container
     ul.list-reset.sub-nav
       - groups.each do |group|
-        li(data-target="tabs.tab" data-action="click->tabs#change")
+        li(data-tabs-target="tab" data-action="click->tabs#change")
           a(class="" href="#" data-trigger-masonry-refresh="true")= group.title
 
   - groups.each do |group|
-    .hidden(data-target="tabs.panel")
+    .hidden(data-tabs-target="panel")
       table.prescriptions-list
         thead
           tr

data/app/components/renalware/pathology/sparkline_component.html.slim

@@ -6,7 +6,7 @@
       / This is the stimulusjs version. See sparklines_controller.js
       div(data-controller="pathology-sparklines"
           data-pathology-sparklines-chart-data='[["2010-06-03T16:37:00.000+01:00","106"], ["2011-06-03T16:37:00.000+01:00","110"]]')
-        div(data-target="pathology-sparklines.chart")
+        div(data-pathology-sparklines-target="chart")
     - else
       / This implementation uses ChartKick to insert the chart javascript into the
       / page. It works fine, but when there are 50 path results on screen, we are

data/app/components/renalware/pd/pet_results_component.html.slim

@@ -7,12 +7,12 @@
       .flex.justify-end
 
         .inline-flex
-          a.reset.opacity-50.bg-white.m-05.pt-px.pb-0.px-1(href="#" data-target="tabs.tab"
+          a.reset.opacity-50.bg-white.m-05.pt-px.pb-0.px-1(href="#" data-tabs-target="tab"
             data-action="click->tabs#change")
             svg.h-6.w-6.fill-current.text-black xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"
               path d="M1 4h2v2H1V4zm4 0h14v2H5V4zM1 9h2v2H1V9zm4 0h14v2H5V9zm-4 5h2v2H1v-2zm4 0h14v2H5v-2z"
 
-          a.reset.opacity-50.bg-white.m-0.pt-px.px-2(data-target="tabs.tab" href="#"
+          a.reset.opacity-50.bg-white.m-0.pt-px.px-2(data-tabs-target="tab" href="#"
             data-action="click->tabs#change")
             svg.h-6.w-6.stroke-current.text-black viewBox="0 0 24 26"  stroke-width="3" stroke-linecap="round" stroke-linejoin="round"
               path d="M12 20V10M18 20V4M6 20v-4"
@@ -20,7 +20,7 @@
         = link_to "Show all", renalware.patient_pd_pet_results_path(patient), remote: true, class: "float-none button flex-initial secondary"
         = link_to "Add", renalware.new_patient_pd_pet_result_path(patient), class: "float-none button flex-initial"
 
-    div#pet-results-table data-target="tabs.panel"
+    div#pet-results-table data-tabs-target="panel"
 
       = render "renalware/pd/pet_results/table",
                patient: patient,
@@ -28,7 +28,7 @@
                pagination: pagination,
                current_user: current_user
 
-    .chart.hidden.mt-5 data-target="tabs.panel"
+    .chart.hidden.mt-5 data-tabs-target="panel"
       div(style="display:block; position:relative; height: 400px; width: 100%; text-align: center; margin-bottom: 20px")
         #containerx(data-controller="pd-pet-chart"
                     data-pd-pet-chart-url=renalware.patient_pd_pet_results_path(patient, format: :json)

data/app/javascript/renalware/controllers/modal_controller.js

@@ -11,7 +11,7 @@
 //   <span>Open Modal</span>
 //  </a>
 //  <!-- Modal Container -->
-//  <div data-target="modal.container" data-action="click->modal#closeBackground keyup@window->modal#closeWithKeyboard" class="hidden animated fadeIn fixed inset-0 overflow-y-auto flex items-center justify-center" style="z-index: 9999;">
+//  <div data-modal-target="container" data-action="click->modal#closeBackground keyup@window->modal#closeWithKeyboard" class="hidden animated fadeIn fixed inset-0 overflow-y-auto flex items-center justify-center" style="z-index: 9999;">
 //    <!-- Modal Inner Container -->
 //    <div class="max-h-screen w-full max-w-lg relative">
 //      <!-- Modal Card -->

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

@@ -17,12 +17,20 @@ module Renalware
       end
 
       class Document < Document::Embedded
-        attribute :type, ::Document::Enum # See i18n for options
+        attribute :type # This used to be a ::Document::Enum but now we load options from the db
         attribute :drug, String
         validates :type, presence: true
 
         def to_s
-          [type&.text, drug].reject(&:blank?).join(" - ")
+          [type_name, drug].reject(&:blank?).join(" - ")
+        end
+
+        # Try and find the proper name for the vaccination type - we only store the vaccination
+        # type code in the jsonb document. If no match found just display the code eg 'hbv_booster'.
+        # The Type mighjt have been deleted (has a deleted_at date) but we still want to display the
+        # actual name depite this, we include deleted rows when searching.
+        def type_name
+          VaccinationType.with_deleted.find_by(code: type)&.name || type
         end
       end
       has_document

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/virology"
+
+module Renalware
+  module Virology
+    class VaccinationType < ApplicationRecord
+      validates :name, presence: true, uniqueness: true
+      validates :code, presence: true, uniqueness: true
+
+      acts_as_paranoid
+
+      scope :ordered, -> { order(position: :asc, name: :asc) }
+    end
+  end
+end

data/app/views/renalware/admin/playgrounds/show.html.slim

@@ -34,7 +34,7 @@ css:
                             url: pathology_chart_data_admin_playground_path,
                             wrapper: nil,
                             method: :get,
-                            data: { target: "charts.form", action: "ajax:success->charts#redisplay" }) do |f|
+                            data: { "charts-target" => "form", action: "ajax:success->charts#redisplay" }) do |f|
 
             = f.input :patient_id,
                       collection: [[form.patient_id, form.patient_id]],
@@ -52,7 +52,7 @@ css:
                       include_blank: false
             = f.submit "Refresh", class: :button
 
-      #chart1 style="height: 300px; width: 500px" data-target="charts.chart"
+      #chart1 style="height: 300px; width: 500px" data-charts-target="chart"
 
     / To test tailwindcss
     .max-w-sm.rounded.overflow-hidden.shadow-lg  

data/app/views/renalware/hd/prescription_administrations/_form.html.slim

@@ -16,7 +16,7 @@
 
       = fpa.input :prescription_id, as: :hidden
 
-      .hd-drug-administration(data-target="hd-prescription-administration.container")
+      .hd-drug-administration(data-hd-prescription-administration-target="container")
         .summary
           .hd-drug
             .hd-drug--name= prescription.drug_name
@@ -40,7 +40,7 @@
                       label: false,
                       input_html: { \
                         data: { \
-                          target: "hd-prescription-administration.radio",
+                          "hd-prescription-administration-target" => "radio",
                           action: "change->hd-prescription-administration#toggleAdministered",
                         } \
                       }

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/_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/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/_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/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/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/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.160"
+    VERSION = "2.0.161"
   end
 end

data/spec/factories/virology/vaccination_types.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :vaccination_type, class: "Renalware::Virology::VaccinationType" do
+    code { "code" }
+    name { "name" }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.160
+  version: 2.0.161
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -2205,6 +2205,7 @@ files:
 - app/models/renalware/virology/patient.rb
 - app/models/renalware/virology/profile.rb
 - app/models/renalware/virology/vaccination.rb
+- app/models/renalware/virology/vaccination_type.rb
 - app/models/renalware/virology/version.rb
 - app/models/renalware/zip_archive.rb
 - app/pdfs/renalware/events/event_pdf.rb
@@ -4076,6 +4077,7 @@ files:
 - db/migrate/20201023092859_remove_unused_indexes.rb
 - db/migrate/20201105153422_update_medication_current_prescriptions_view.rb
 - db/migrate/20201112152752_update_pd_mdm_patients_view1.rb
+- db/migrate/20210105163944_create_virology_vaccination_types.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -4167,6 +4169,8 @@ files:
 - db/seeds/default/ukrdc/modality_codes.csv
 - db/seeds/default/ukrdc/modality_codes.rb
 - db/seeds/default/ukrdc/seeds.rb
+- db/seeds/default/virology/seeds.rb
+- db/seeds/default/virology/vaccination_types.rb
 - db/seeds/seeds_helper.rb
 - db/triggers/feed_messages_preprocessing_trigger_v01.sql
 - db/triggers/update_current_observation_set_trigger_v01.sql
@@ -4442,6 +4446,7 @@ files:
 - spec/factories/transplants/rejection_treatments.rb
 - spec/factories/ukrdc/modality_codes.rb
 - spec/factories/virology/patients.rb
+- spec/factories/virology/vaccination_types.rb
 - spec/factories/virology/vaccinations.rb
 - spec/support/ajax_helpers.rb
 - spec/support/capybara_helper.rb
@@ -4530,7 +4535,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Renalware core functionality as a mountable engine.