renalware-core 2.0.148 → 2.0.155

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

@@ -0,0 +1,23 @@
+/ Note we can't do vioew.versions.order(...) here
+- versions = view.versions.to_a.sort{ |a, b| b.created_at <=> a.created_at }
+.rounded-md.bg-orange-200.px-3.py-2.flex.items-start.shadow.mx-1.mb-5
+  i.fas.fa-info-circle.mr-2.mt-1.text-blue-500
+  | Restore column and filter configuration to a point in time.
+  | Unsaved column/filter changes will be lost.
+table
+  thead
+    th.col-width-date-time Last updated
+    th.col-width-small Event
+    th By
+    th
+  tbody
+    - versions.each do |version|
+      tr
+        td= l(version.created_at)
+        td= version.event
+        td= Renalware::User.find(version.whodunnit)
+        td.text-right
+          = link_to("Restore",
+                    renalware.restore_system_view_metadatum_path(view, version_at: version.created_at),
+                    data: { method: :patch },
+                    class: "button compact secondary")

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

@@ -0,0 +1,66 @@
+
+/ To remember
+/ We have klass.columns which are the actual SQL view columns
+/ We view (view metadata) columns, which is an array of hashes, each representing a column
+/ with its title. and width. Its position comes from the position inthe array.
+/
+/ Here loop through all avail columns on klass and find the matching
+/ col in view.columns. If there are columns we don't recognise (the view config is stale) they
+/ will be discarded when we save. If there are new cols we given them an empty object and it will be
+/ saved away.
+/ We need to handle validation
+/ also serialisation - see https://nandovieira.com/using-postgresql-and-jsonb-with-ruby-on-rails
+
+ruby:
+  # attribute_names = klass.columns.map(&:name) - %w(id secure_id document)
+  # view.columns = attribute_names.map do |attr|
+  #  view.columns.detect{ |col| col.code == attr } || Renalware::System::ColumnDefinition.new(code: attr)
+  # end
+
+  attribute_names = klass.columns.map(&:name) - %w(id secure_id document)
+  attribute_names = (view.columns.map(&:code) + attribute_names).uniq
+  view.columns = attribute_names.map do |attr|
+    view.columns.detect{ |col| col.code == attr } || Renalware::System::ColumnDefinition.new(code: attr)
+  end
+
+= simple_form_for(view, as: "view_metadata", method: :patch) do |f|
+  = f.input :id, as: :hidden
+  .modal
+    .modal__header
+      = render "renalware/shared/modal_close_link"
+      - title = [view.category&.humanize, view.scope&.humanize, view.title&.humanize].join(" / ")
+      h2= "Edit columns for #{title}"
+    .modal__body(style="max-height: 400px")
+      .rounded-md.bg-blue-100.px-3.py-2.flex.items-start.shadow.mx-1.mb-5
+        i.fas.fa-info-circle.mr-2.mt-1.text-blue-500
+        | Please bear in mind that changes you make will be visible by all users.
+
+      / 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")
+            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")
+            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")
+            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")
+          = render "columns_table", view: view
+        .hidden.py-4.px-4.border-l.border-b.border-r(data-target="tabs.panel")
+          = render "filters_form", view: view
+        .hidden.py-4.px-4.border-l.border-b.border-r(data-target="tabs.panel")
+          = render "versions", view: view
+
+    .modal__footer
+      br
+      .right
+        = f.submit "Save", class: "button"
+        span= " or "
+        = link_to "Cancel",
+                "#",
+                "aria-label" => "Close",
+                  class: "reveal-modal-close"
+
+javascript:
+  initSortables();

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

@@ -6,7 +6,7 @@
 = within_patient_layout(title: "Workup", breadcrumbs: donor_summary_breadcrumb(patient)) do
   - return unless workup
   .document-view
-    .grid
+    .mgrid
         .row
             = render "renalware/shared/documents/attributes_group",
                 group: workup.document.comorbidities,

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/transplants/wait_lists/show.html.slim

@@ -11,7 +11,7 @@
           .small-10.columns
             = f.input :ukt_recipient_number,
                       class: "radius",
-                      wrapper: :hz_large,
+                      wrapper: :hz_lg,
                       label: "UKT recipient number"
           .small-2.columns
             = button_tag(type: "submit",

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/paper_trail.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-PaperTrail.config.track_associations = false
+# PaperTrail.config.track_associations = false

data/config/initializers/simple_form_wrappers.rb

@@ -2,13 +2,6 @@
 
 SimpleForm.setup do |config|
   def configure_label(b)
-    b.use :html5
-    b.use :placeholder
-    b.optional :maxlength
-    b.optional :pattern
-    b.optional :min_max
-    b.optional :readonly
-
     b.wrapper :label_wrapper, tag: :div, class: "wrapper__label" do |ba|
       ba.use :label
     end
@@ -24,14 +17,20 @@ SimpleForm.setup do |config|
 
   # Configure various sized wrappers. We use CSS to style the label and inputs within the top div
   # with classes of e.g. "row wrapper-medium"
-  %i(tiny small medium large).each do |size|
+  %i(xs sm md lg).each do |size|
     config.wrappers(
-      :"hz_#{size}", # eg hz_medium
+      :"hz_#{size}", # eg hz_md
       tag: "div",
       class: "row wrapper wrapper_style_horizontal wrapper_size_#{size}",
       hint_class: :field_with_hint,
       error_class: :error
     ) do |b|
+      b.use :html5
+      b.use :placeholder
+      b.optional :maxlength
+      b.optional :pattern
+      b.optional :min_max
+      b.optional :readonly
       configure_label(b)
       configure_input(b)
     end
@@ -44,6 +43,12 @@ SimpleForm.setup do |config|
     hint_class: :field_with_hint,
     error_class: :error
   ) do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
     configure_label(b)
 
     b.wrapper :right_input_wrapper, tag: :div, class: "wrapper__input" do |ba|

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