renalware-core 2.0.149 → 2.0.156

data/app/views/renalware/transplants/mdm/_bottom.html.slim

@@ -9,4 +9,6 @@
     = render "measurements", mdm: mdm
 
   .columns.medium-12.large-4
-    = render Renalware::Events::BiopsiesComponent.new(patient: current_patient)
+    = render Renalware::Events::EventListComponent.new(\
+        patient: current_patient,
+        event_class: Renalware::Events::Biopsy)

data/app/views/renalware/transplants/mdm/_prescriptions.html.slim

@@ -6,25 +6,9 @@ article
       = render "prescription_buttons", patient: mdm.patient
 
   #prescriptions.expandable
-
-    ul.tab-strip(data-tab)
-      li.tab-title.active= link_to "Current", "#current", data: { "trigger-masonry-refresh" => true }
-      li.tab-title= link_to "Current Immunosuppressant", "#current_immunosuppressant", data: { "trigger-masonry-refresh" => true }
-      li.tab-title= link_to "Historical", "#historical", data: { "trigger-masonry-refresh" => true }
-      li.tab-title= link_to "Historical Immunosuppressant", "#historical_immunosuppressant", data: { "trigger-masonry-refresh" => true }
-
-    .tabs-content
-      #current.content.active
-        = render "renalware/mdm/prescriptions/table",
-                 prescriptions: mdm.current_prescriptions
-      #current_immunosuppressant.content
-        = render "renalware/mdm/prescriptions/table",
-                 prescriptions: mdm.current_immunosuppressant_prescriptions
-      #historical.content
-        = render "renalware/mdm/prescriptions/table",
-                 prescriptions: mdm.historical_prescriptions,
-                 show_terminated_on: true
-      #historical_immunosuppressant.content
-        = render "renalware/mdm/prescriptions/table",
-                 prescriptions: mdm.historical_immunosuppressant_prescriptions,
-                 show_terminated_on: true
+    = render Renalware::Medications::TabbedPrescriptionsListComponent.new([ \
+      { title: "Current", prescriptions: mdm.current_prescriptions, show_terminated_on: false }, \
+      { title: "Current Immunosuppressant", prescriptions: mdm.current_immunosuppressant_prescriptions, show_terminated_on: false },
+      { title: "Historical", prescriptions: mdm.historical_prescriptions },
+      { title: "Historical Immunosuppressant", prescriptions: mdm.historical_immunosuppressant_prescriptions },
+      { title: "Bone Meds", prescriptions: mdm.bone_prescriptions }])

data/app/views/renalware/transplants/recipient_followups/show.html.slim

@@ -10,7 +10,7 @@
   .edit_timestamp= render "renalware/shared/last_update", record: recipient_followup
 
   .document-view
-    .grid
+    .mgrid
       .row
         = render "renalware/shared/attributes_group",
             legend: "Transplant Outcomes", destination: "transplant_failure",

data/app/views/renalware/transplants/recipient_operations/show.html.slim

@@ -10,7 +10,7 @@
   .edit_timestamp= render "renalware/shared/last_update", record: recipient_operation
 
   .document-view
-    .grid
+    .mgrid
       .row
         = render "operation", recipient_operation: recipient_operation
 

data/app/views/renalware/transplants/recipient_workups/show.html.slim

@@ -9,7 +9,7 @@
   .edit_timestamp= render "renalware/shared/last_update", record: workup
 
   .document-view
-   .grid
+   .mgrid
      .row
         - ["Historicals", "Scores"].each do |group|
           = render "renalware/shared/documents/attributes_group",

data/app/views/renalware/transplants/registrations/show.html.slim

@@ -9,7 +9,7 @@
   .edit_timestamp= render "renalware/shared/last_update", record: registration
 
   .document-view
-    .grid
+    .mgrid
       .row
           - ["Codes", "CRF", "HLA", "Transplant", "Organs"].each do |group|
             = render "renalware/shared/documents/attributes_group",

data/app/views/renalware/users/_filters.html.slim

@@ -0,0 +1,11 @@
+.filters
+  .filters__form
+    = search_form_for user_search, url: users_path do |f|
+      .row
+        .small-9.large-4.columns
+          = f.label "Name or username contains"
+          = f.search_field :family_name_or_given_name_or_username_or_email_cont
+        .small-3.large-4.columns.actions.end
+          = f.submit t("helpers.submit.filter"), class: "button"
+          '  or
+          = link_to t("helpers.reset"), users_path

data/app/views/renalware/users/index.html.slim

@@ -0,0 +1,24 @@
+= content_for(:filters) do
+  = render "filters", user_search: user_search
+
+= within_admin_layout(title: "Users") do
+  table.all-users
+    thead
+      tr
+        th Name
+        th Position
+        th Email
+        th Role
+        th.col-width-date-time Expired at
+    tbody
+      - users.each do |user|
+        tr
+          td= user.full_name
+          td= user.professional_position
+          td= user.email
+          td
+            - user.roles.each do |role|
+              span.tag(class=role.name)= role.name.humanize
+          td= l(user.expired_at)
+
+  == pagy_foundation_nav pagy

data/config/initializers/core_extensions.rb

@@ -3,7 +3,7 @@
 require "core_extensions/i18n/handle_blank_value"
 require "core_extensions/i18n/always_cascade"
 require "core_extensions/dumb_delegator"
-require "core_extensions/active_record/sort"
+# require "core_extensions/active_record/sort"
 require "core_extensions/date"
 require "core_extensions/active_support/duration"
 require "core_extensions/scenic"
@@ -14,6 +14,6 @@ require "core_extensions/ox/element_additions"
 I18n.extend CoreExtensions::I18n::HandleBlankValue
 I18n::Backend::Simple.include(I18n::Backend::Cascade)
 I18n.extend CoreExtensions::I18n::AlwaysCascade
-ActiveRecord::Base.include(CoreExtensions::ActiveRecord::Sort)
+# ActiveRecord::Base.include(CoreExtensions::ActiveRecord::Sort)
 Date.include(CoreExtensions::Date::Constants)
 Hash.include(CoreExtensions::Hash::OpenStructConversion)

data/config/initializers/delayed_job.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Delayed::Worker.logger = Logger.new(Rails.root.join("log", "delayed_job.log"))
+Delayed::Worker.logger = Logger.new(Rails.root.join("log/delayed_job.log"))
 Delayed::Worker.destroy_failed_jobs = false
 Delayed::Worker.max_attempts = 10 # overridden e.g. in FeedJob
 Delayed::Worker.max_run_time = 2.hours

data/config/initializers/inflections.rb

@@ -14,6 +14,14 @@
 
 # These inflection rules are supported but not enabled by default:
 ActiveSupport::Inflector.inflections(:en) do |inflect|
+  # For zeitwerk, handle the gem convention where the file version.rb
+  # does not define a constant Version. Alternatively we could move
+  # the version number someone else.
+  # (untested!)
+  # def camelize(basename, abspath)
+  #   abspath == app_version ? "VERSION" : basename.camelize
+  # end
+
   inflect.acronym "AKI"
   inflect.acronym "APD"
   inflect.acronym "API"
@@ -33,6 +41,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym "HIV"
   inflect.acronym "HL7"
   inflect.acronym "MDM"
+  inflect.acronym "MDMs"
   inflect.acronym "NHS"
   inflect.acronym "NHS"
   inflect.acronym "ODS"

data/config/initializers/pagy.rb

@@ -7,3 +7,8 @@
 # Foundation extra: Add nav, nav_js and combo_nav_js helpers and templates for Foundation pagination
 # See https://ddnexus.github.io/pagy/extras/foundation
 require "pagy/extras/foundation"
+
+# Allow the client to request a custom number of items per page with an optional selector UI.
+# It is useful with APIs or higly user-customizable apps.
+# Usefule for testing pagination from testing by supplying eg :items => 1
+require "pagy/extras/items"

data/config/initializers/wicked_pdf.rb

@@ -20,3 +20,15 @@ WickedPdf.config = {
   # (but can be overridden in `render :pdf` calls)
   # layout: 'pdf.html',
 }
+
+# This is a hack to get ViewComponent and WickedPDF to work together.
+# See https://github.com/github/view_component/issues/288
+# Basically in Rails 5.x, both gems monkey patch ActionView render_to_string
+# and we can get an infinite loop when rendering PDFs.
+# Once we move to Rails 6 I think think this can be removed
+class WickedPdf
+  module PdfHelper
+    remove_method(:render_to_string)
+    remove_method(:render)
+  end
+end

data/config/locales/en-GB.yml

@@ -39,7 +39,7 @@ en-GB:
     - Saturday
     formats:
       default: "%d-%b-%Y"
-      long: "%a %e %b %Y"
+      long: "%a %d %b %Y"
       short: "%d %b"
       compact: "%d-%b-%y"
     month_names:

data/config/locales/renalware/clinical/allergies.en.yml

@@ -6,6 +6,7 @@ en:
           legend: Allergies
           description: Description
           recorded_at: Recorded
+          recorded_by: By
           add: Add
           delete: Delete
           edit: Edit

data/config/locales/renalware/events/advanced_care_plan.en.yml

@@ -0,0 +1,12 @@
+en:
+  renalware/events/advanced_care_plan:
+    title: "Advanced Care Plans"
+    description_column_title: State
+  enumerize:
+    renalware/events/advanced_care_plan/document:
+      state:
+        not_required: "ACP not required"
+        required_but_not_started: "ACP required but not started"
+        acp_in_progress: "ACP in progress"
+        acp_complete: "ACP complete"
+        acp_declined: "ACP declined"

data/config/locales/renalware/events/biopsy.en.yml

@@ -1,4 +1,6 @@
 en:
+  renalware/events/biopsy:
+    title: "Biopsies"
   activemodel:
     attributes:
       renalware/events/biopsy/document:

data/config/locales/renalware/events/clinical_frailty_score.en.yml

@@ -0,0 +1,16 @@
+en:
+  renalware/events/clinical_frailty_score:
+    title: "Clinical Frailty Scores"
+    description_column_title: Score
+  enumerize:
+    renalware/events/clinical_frailty_score/document:
+      score:
+        1: 1
+        2: 2
+        3: 3
+        4: 4
+        5: 5
+        6: 6
+        7: 7
+        8: 8
+        9: 9

data/config/locales/renalware/events/clinical_frailty_score_component.en.yml

@@ -0,0 +1,8 @@
+en:
+  renalware:
+    events:
+      clinical_frailty_score_component:
+        date_time: Date time
+        score: Score
+        created_at: Created
+        created_by: By

data/config/locales/renalware/medications/tabbed_prescriptions_list_component.yml

@@ -0,0 +1,15 @@
+en:
+  renalware:
+    medications:
+      tabbed_prescriptions_list_component:
+        title: Prescriptions
+        view_all: View All
+        drug_name: Drug
+        drug_type: Type
+        dose: Dose
+        frequency: Freq
+        route: Route
+        provider: Provider
+        administer_on_hd: Give on HD
+        terminated_on: Term on
+        started_on: Started on

data/config/locales/renalware/navigation/renal.en.yml

@@ -18,6 +18,7 @@ en:
         studies: Clinical Studies
         renal_registry_checks: Renal Registry Checks
         hospital_units: Dialysis Units
+        users: Users
       mdms:
         menu_title: MDMs
         hd: HD

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

@@ -0,0 +1,6 @@
+en:
+  activerecord:
+    errors:
+      messages:
+        nhs_number_invalid_checkdigit: "is invalid - please check"
+        nhs_number_not_numeric: "is invalid -  must be 10 digits"

data/config/locales/renalware/patients/side_menu.en.yml

@@ -26,6 +26,7 @@ en:
           demographics: Demographics
           clinical_summary: Clinical Summary
           inpatient_admissions: Inpatient Admissions (%{count})
+          messages: Messages
           proms: PROMS
         modalities:
           heading: Modalities

data/config/locales/renalware/pd/adequacy_result.en.yml

@@ -0,0 +1,9 @@
+en:
+  activerecord:
+    attributes:
+      renalware/pd/adequacy_result:
+        dial_24_vol_in: Dial 24 vol in (ml)
+        dial_24_vol_out: Dial 24 vol out (ml)
+        urine_24_vol: Urine 24 vol (ml)
+        height: Height (m)
+        weight: Weight (kg)

data/config/locales/renalware/pd/dashboard.en.yml

@@ -8,6 +8,9 @@ en:
             add_capd_regime: CAPD Regime
             add_apd_regime: APD Regime
             add_pet_adequacy: PET Adequacy
+            add_unified_pet_adequacy: PET & Adequacy
+            add_pet: PET
+            add_adequacy: Adequacy
             add_exit_site_infection: Exit Site Infection
             add_peritonitis_episode: Peritonitis Episode
             add_pd_assessment: PD Assessment

data/config/locales/renalware/pd/pet_result.en.yml

@@ -0,0 +1,23 @@
+en:
+  activerecord:
+    attributes:
+      renalware/pd/pet_result:
+        net_uf: PET_netUF
+        d_pcr: PET_D_Pcr
+        dextrose_concentration: Dextrose
+        dextrose_concentration_id: Dextrose
+        volume_in: Volume in (ml)
+        volume_out: Volume out (ml)
+        infusion_time: Infusion time (min)
+        drain_time: Drain time (min)
+        overnight_dextrose_concentration: Overnight dextrose
+        overnight_dextrose_concentration_id: Overnight dextrose
+        overnight_volume_in: Overnight vol in (ml)
+        overnight_volume_out: Overnight vol out (ml)
+        overnight_dwell_time: Overnight dwell time (min)
+
+  enumerize:
+    renalware/pd/pet_result:
+      pet_type:
+        fast: Fast
+        full: Full

data/config/locales/renalware/renal/registry.en.yml

@@ -8,3 +8,4 @@ en:
           comorbidities_at_esrf: Comorbidities
           first_seen_on: Date first seen
           cause_of_death: Cause of death
+          esrf: ESRF

data/config/permissions.yml

@@ -7,6 +7,7 @@ super_admin:
   - Renalware::HD::Dialyser
   - Renalware::HD::CannulationType
   - Renalware::System::Download
+  - Renalware::Pathology::ObservationDescription
 admin:
   - Renalware::User
   - Renalware::BagType

data/config/routes.rb

@@ -28,6 +28,7 @@ Renalware::Engine.routes.draw do
   draw :snippets
   draw :system
   draw :transplants
+  draw :users
   draw :virology
 
   # Last

data/config/routes/messaging.rb

@@ -2,7 +2,7 @@
 
 namespace :messaging do
   namespace :internal do
-    resources :messages, only: [:new, :create] do
+    resources :messages, only: [:new, :create, :index] do
       resources :receipts, only: [] do
         patch :mark_as_read, on: :member
       end
@@ -14,3 +14,11 @@ namespace :messaging do
     end
   end
 end
+
+resources :patients, only: [] do
+  namespace :messaging do
+    namespace :internal do
+      resources :messages, only: :index
+    end
+  end
+end

data/config/routes/pathology.rb

@@ -2,6 +2,7 @@
 
 resources :patients, only: [] do
   namespace :pathology do
+    resources :charts, only: [:show]
     get "observations/current",
         to: "current_observation_results#index",
         as: "current_observations"
@@ -11,6 +12,11 @@ resources :patients, only: [] do
     get "observations/historical",
         to: "historical_observation_results#index",
         as: "historical_observations"
+    scope constraints: { format: :json, date: /\d{4}-\d{2}-\d{2}/ } do
+      get "observations/nearest/code_group/:code_group_id/date/:date",
+          to: "nearest_observation_results#index",
+          as: "nearest_observations"
+    end
     resources :observation_requests, only: [:index, :show]
     resources :patient_rules
     get "descriptions/:description_id/observations",
@@ -22,6 +28,7 @@ end
 
 namespace :pathology do
   resources :code_groups
+  resources :observation_descriptions, except: :destroy
   namespace :requests do
     # NOTE: This needs to be POST since the params may exceed url char limit in GET
     post "requests/new", to: "requests#new", as: "new_request"

data/config/routes/patients.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 namespace :patients do
+  get "mdms/:scope", to: "mdms#show", as: :mdms
   resources :primary_care_physicians
   resources :practices, only: [] do
     collection do

data/config/routes/pd.rb

@@ -15,6 +15,9 @@ resources :patients, only: [] do
     resources :peritonitis_episodes, only: [:new, :create, :show, :edit, :update]
     resources :exit_site_infections, only: [:new, :create, :show, :edit, :update]
     resources :pet_adequacy_results, except: [:destroy]
+    resources :unified_pet_adequacies, only: [:new, :create]
+    resources :pet_results
+    resources :adequacy_results
     resources :assessments, except: [:index, :destroy]
     resources :training_sessions, except: [:index, :destroy]
     resource :mdm, only: :show, controller: "mdm"
@@ -22,6 +25,8 @@ resources :patients, only: [] do
 end
 
 namespace :pd do
+  resources :pet_completions, only: :index
+  resources :adequacy_completions, only: :index
   resources :bag_types, except: [:show]
   resources :infection_organisms
   resources :mdm_patients, only: :index