renalware-core 2.0.153 → 2.0.155

data/app/views/renalware/letters/letters/_form.html.slim

@@ -17,7 +17,7 @@ ruby:
 
     = f.association :letterhead, autofocus: true
     = f.input :description,
-              collection: Renalware::Letters::Description.pluck(:text).uniq,
+              collection: Renalware::Letters::Description.ordered.pluck(:text).uniq,
               input_html: { class: "searchable_select" }
     = hidden_field_tag "description_id"
     = f.input :clinical, as: :hidden

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

@@ -3,5 +3,9 @@
            prescriptions: prescriptions.current,
            recently_changed: prescriptions.recently_changed
 
+  = render "renalware/medications/prescriptions/current_hd",
+         prescriptions: prescriptions.current_hd,
+         recently_changed: prescriptions.recently_changed
+
   = render "renalware/medications/prescriptions/recently_stopped",
          prescriptions: prescriptions.recently_stopped

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

@@ -9,19 +9,10 @@ article
   #prescriptions.expandable
     - if local_assigns[:with_esa] == true
 
-      ul.tab-strip(data-tab)
-        li.tab-title.active= link_to "Current", "#current", data: { "trigger-masonry-refresh" => true }
-        li.tab-title= link_to "EPO History", "#epo-history", data: { "trigger-masonry-refresh" => true }
+      = render Renalware::Medications::TabbedPrescriptionsListComponent.new([ \
+        { title: "Current", show_administer_on_hd: true, prescriptions: mdm.current_prescriptions, show_terminated_on: false }, \
+        { title: "EPO History", prescriptions: mdm.esa_prescriptions },
+        { title: "Bone Meds", prescriptions: mdm.bone_prescriptions }])
 
-      .tabs-content
-        #current.content.active
-          = render "renalware/mdm/prescriptions/table",
-                   prescriptions: mdm.current_prescriptions,
-                   show_administer_on_hd: true
-        #epo-history.content
-          = render "renalware/mdm/prescriptions/table",
-                   prescriptions: mdm.esa_prescriptions,
-                   show_terminated_on: true,
-                   show_administer_on_hd: true
     - else
       = render "current_prescriptions", mdm: mdm

data/app/views/renalware/mdm/prescriptions/_table.html.slim

@@ -24,7 +24,9 @@ table.mdm.prescriptions
         td= prescription.route_code
         - if local_assigns[:show_administer_on_hd]
           td= prescription.administer_on_hd?
-        td= prescription.provider
+        td
+          /- byebug
+          = prescription.provider
         td= I18n.l prescription.prescribed_on
         - if local_assigns[:show_terminated_on]
           td= l(prescription.terminated_on)

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

@@ -0,0 +1,13 @@
+- if prescriptions.any?
+  h3 Drugs to give on Haemodialysis
+
+  ul
+      - prescriptions.each do |prescription|
+        - if recently_changed.include?(prescription)
+            = render "renalware/medications/prescriptions/prescription",
+                    prescription: prescription,
+                    date_changed: prescription.prescribed_on,
+                    recently_changed: true
+        - else
+            = render "renalware/medications/prescriptions/prescription",
+                    prescription: prescription

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

@@ -1,16 +1,29 @@
 .medications-filter
-  = search_form_for search, url: patient_prescriptions_path(@patient) do |f|
-    = hidden_field_tag :treatable_id, treatable.id
-    = hidden_field_tag :treatable_type, treatable.class.to_s
-    = hidden_field_tag :filter, 1
+  .search-form.filters.filters--flex.max-w-screen-md
+    = simple_form_for search, as: :q, url: patient_prescriptions_path(@patient), method: :get do |f|
+      = hidden_field_tag :treatable_id, treatable.id
+      = hidden_field_tag :treatable_type, treatable.class.to_s
+      = hidden_field_tag :filter, 1
 
-    = f.select(:drug_drug_types_id_eq,
-                options_from_collection_for_select(drug_types,
-                                                   "id",
-                                                   "name",
-                                                   search.drug_drug_types_id_eq),
-                 include_blank: "All drug types")
+      .flex.flex-col.sm:flex-row.items-end.pb-4
+        .w-full.sm:max-w-xs.pr-3
+          = f.input :drug_drug_types_id_in,
+                    collection: drug_types,
+                    include_blank: "All",
+                    label_method: :name,
+                    label: "Drug type"
+        .w-full.sm:min-w-md.pr-3
+          = f.input :provider_eq,
+                    collection: Renalware::Medications::Provider.codes.map.each_with_index { |z, i| [Renalware::Medications::ProviderCodePresenter.new(z).to_label, i]},
+                    include_blank: "Any",
+                    label: "Provider"
+        .w-full.pr-3
+          = f.input :administer_on_hd_eq,
+                    collection: [["Yes", true], ["No", false]],
+                    include_blank: "Any",
+                    label: "Give on HD"
 
-    = f.button t("helpers.submit.filter"), class: "button secondary"
-    '  or
-    = link_to "reset", patient_prescriptions_path(@patient)
+        .flex-shrink-0.pt-4.filters--actions
+          = f.submit t("helpers.submit.filter"), class: "button secondary"
+          '  or
+          = link_to "reset", patient_prescriptions_path(@patient)

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

@@ -62,6 +62,7 @@ ruby:
 
     .row.actions
       .small-9.columns
-        = f.button :submit, "Save"
-        '  or
+        - if policy(prescription).create?
+          = f.button :submit, "Save"
+          '  or
         = link_to "cancel", patient_prescriptions_path(patient, treatable), remote: true

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

@@ -1,7 +1,7 @@
-- if prescription.current?
-    = link_to "Edit", edit_patient_prescription_path(patient, prescription), remote: true
+- if prescription.current? && policy(prescription).edit?
+  = link_to "Edit", edit_patient_prescription_path(patient, prescription), remote: true
 - unless prescription.terminated_or_marked_for_termination?
-    = pipe_separator
+  - if policy(prescription).destroy?
     = link_to "Terminate",
               new_patient_medications_prescription_termination_path(patient,
                                                                     prescription,

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

@@ -1,4 +1,5 @@
 - if prescriptions.any?
+  - display_termination_date = !current_scope || local_assigns.fetch(:display_termination_date, false)
   .row
     .large-12.columns
       table[class="auto-layout" id="#{id}"]
@@ -20,7 +21,7 @@
             th.col-width-date.wide
               = sort_link_if(treatable.sortable?, search, :prescribed_on, "Prescribed on")
             th Recorded By
-            - unless current_scope
+            - if display_termination_date
               th.col-width-date Terminated On
               th Terminated By
         tbody
@@ -29,8 +30,8 @@
               - if current_scope
                 td
                   input.discardable-checkbox-used-when-reviewing-drugs-with-patient(type="checkbox")
-                td= render partial: "renalware/medications/prescriptions/options",
-                  locals: { patient: patient, prescription: prescription }
+                td.actions= render partial: "renalware/medications/prescriptions/options",
+                              locals: { patient: patient, prescription: prescription }
               td= prescription.drug.name
               td= prescription.drug_type_names
               td= prescription.dose
@@ -42,7 +43,7 @@
               td= prescription.notes
               td= I18n.l prescription.prescribed_on
               td= prescription.created_by.full_name
-              - unless current_scope
+              - if display_termination_date
                 td= I18n.l prescription.terminated_on
                 td= prescription.terminated_by&.full_name
 - else

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

@@ -3,27 +3,24 @@ article
     h2 Current
     ul
       li
-        = link_to "Add Prescription",
-            new_patient_prescription_path(patient, treatable),
-            remote: true,
-            class: %i(button add_prescription)
+        - if policy(Renalware::Medications::Prescription).new?
+          = link_to "Add Prescription",
+              new_patient_prescription_path(patient, treatable),
+              remote: true,
+              class: %i(button add_prescription)
 
   = render "renalware/medications/prescriptions/table",
-        id: "current-prescriptions",
-        patient: patient,
-        treatable: treatable,
-        prescriptions: current_prescriptions,
-        search: current_search,
-        current_scope: true
+            id: "current-prescriptions",
+            **local_assigns.update(prescriptions: current_prescriptions,
+                                  search: current_search,
+                                  current_scope: true)
 
 - if defined? historical_prescriptions
   article
     header
       h2 Historical
     = render "renalware/medications/prescriptions/table",
-        id: "historical-prescriptions",
-        patient: patient,
-        treatable: treatable,
-        prescriptions: historical_prescriptions,
-        search: historical_prescriptions_search,
-        current_scope: false
+              id: "historical-prescriptions",
+              **local_assigns.update(prescriptions: historical_prescriptions,
+                                    search: historical_prescriptions_search,
+                                    current_scope: false)

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

@@ -1,8 +1,9 @@
 = content_for(:actions) do
-  = link_to "Add",
-            new_patient_prescription_path(@patient),
-            remote: true,
-            class: "button"
+  - if policy(Renalware::Medications::Prescription).new?
+    = link_to "Add",
+              new_patient_prescription_path(@patient),
+              remote: true,
+              class: "button"
   | 
   = link_to patient_prescriptions_path(@patient,
                                        treatable,

data/app/views/renalware/messaging/internal/messages/_form.html.slim

@@ -5,6 +5,8 @@
                 as: :internal_message,
                 url: messaging_internal_messages_path(patient_id: patient) do |f|
     h2= t(".title")
+    .rounded-md.bg-yellow-100.border.px-4.py-2.mb-2
+      | Messages are viewable by all users in the patient's clinical summary
     = f.input :replying_to_message_id, as: :hidden
 
     / NB the inline styling here prevents an initial flash and re-jiggle of dropdown content which
@@ -24,6 +26,7 @@
     = f.input :subject
     = f.input :urgent, as: :boolean, boolean_style: :inline
     = f.input :body, as: :text, input_html: { rows: 7 }
+    = f.input :public, as: :hidden
     = f.submit "Send", class: :button
     '  or
     = link_to t(".cancel"),

data/app/views/renalware/messaging/internal/messages/index.html.slim

@@ -0,0 +1,36 @@
+= within_patient_layout(title: "Messages", current_patient: patient) do
+
+  table.toggleable.easy-read data-controller="toggle"
+    thead
+      tr
+        th.togglers.noprint= rows_toggler
+        th.col-width-tiny
+        th.col-width-date-time Date
+        th.col-width-medium Author
+        th.col-width-large Subject
+        th
+          ' Body
+          i(style="font-weight: normal") - toggle to see complete message
+    - messages.each do |message|
+      tbody
+        tr
+          td= row_toggler
+          - if message.urgent?
+            td
+              span.rounded.bg-orange-300.px-2 urgent
+          - else
+            td
+          td= l(message.created_at)
+          td= message.author
+          td.with-ellipsis= message.subject
+          td.with-ellipsis= message.body
+        tr
+          td
+          td
+          td(colspan=4)
+            p
+              b
+                ' Sent to:
+              span = message.recipients.map(&:to_s).join(" & ")
+            p= message.body
+  == pagy_foundation_nav pagination

data/app/views/renalware/navigation/_mdms.html.slim

@@ -5,3 +5,8 @@ li.has-dropdown
     li= link_to t(".pd"), pd_mdm_patients_path
     li= link_to t(".transplants"), transplants_mdm_patients_path
     li= link_to t(".low_clearance"), low_clearance_mdm_patients_path
+
+    - if current_user_is_super_admin?
+      li.info New MDMs
+      - Renalware::Patients::MDMMenu.items.each do |item|
+        li= link_to item.humanize, patients_mdms_path(scope: item)

data/app/views/renalware/navigation/_renal.html.slim

@@ -15,5 +15,6 @@ li.has-dropdown
     li= link_to t(".audits"), reporting_audits_path
     li= link_to t(".aki_alerts"), renal_aki_alerts_path
     li= link_to t(".studies"), research_studies_path
+    li= link_to t(".users"), renalware.users_path
     li= link_to t(".hospital_units"), hospitals_units_path
     li= link_to t(".renal_registry_checks"), patients_renal_registry_preflight_checks_path

data/app/views/renalware/pathology/code_groups/edit.html.slim

@@ -1,8 +1,8 @@
-= within_admin_layout(title: "Pathology Code Group") do
-  h3= group.name
-  = simple_form_for(group, 
-                    url: renalware.pathology_code_group_path(group), 
+= within_new_admin_layout(title: "Code group <code>#{group.name}</code>".html_safe) do
+
+  = simple_form_for(group,
+                    url: renalware.pathology_code_group_path(group),
                     method: :patch,
                     as: :code_group) do |f|
     = f.input :description
-    = f.submit "Save", class: :button
+    = f.submit "Save", class: :button

data/app/views/renalware/pathology/code_groups/index.html.slim

@@ -1,8 +1,8 @@
-= within_admin_layout(title: "Pathology Code Groups") do
-  
+= within_new_admin_layout(title: "Pathology Code Groups") do
+
   table.code-groups-table
-    thead 
-      tr  
+    thead
+      tr
         th Group name
         th Description
     tbody
@@ -13,4 +13,3 @@
               = link_to "View", pathology_code_group_path(group)
           td= group.name
           td= group.description
-

data/app/views/renalware/pathology/code_groups/show.html.slim

@@ -1,34 +1,33 @@
-= within_admin_layout(title: group.name) do
+= within_new_admin_layout(title: "Code group <code>#{group.name}</code>".html_safe) do
 
   .panel.info.radius.columns
-    | Editing code groups here is not currently support, sorry. 
+    | Editing code groups here is not currently supported, sorry.
     | You'll need to update the database directly for now.
 
-  h5= group.description
-  = link_to "Edit group", edit_pathology_code_group_path(group)
+  span
+    .text-lg.font-bold Description
+    .mr-2.inline = group.description
+    = link_to "Edit", edit_pathology_code_group_path(group)
 
   br
   br
-  
-  article 
-    header 
-      h2 Codes
 
-    table.pathology-code-group-memberships.sortables
-      thead
-        /th.col-width-tiny
-        th.col-width-tiny Subgroup 
-        th.col-width-small Position inside sub group
-        th.col-width-small Code
-        th Name
-        
-      tbody
-        - group.memberships.order(:subgroup, :position_within_subgroup ).each do |membership|
-          tr.sortable
-            /td
-              i.fas.fa-bars
-            td= membership.subgroup
-            td= membership.position_within_subgroup
-            td= membership.observation_description.code
-            td= membership.observation_description.name
-            
+  .text-lg.font-bold Codes
+
+  table.pathology-code-group-memberships.sortables
+    thead
+      /th.col-width-tiny
+      th.col-width-tiny Subgroup
+      th.col-width-small Pos. within sub group
+      th.col-width-small Code
+      th Name
+
+    tbody
+      - group.memberships.order(:subgroup, :position_within_subgroup ).each do |membership|
+        tr.sortable
+          /td
+            i.fas.fa-bars
+          td= membership.subgroup
+          td= membership.position_within_subgroup
+          td= membership.observation_description.code
+          td= membership.observation_description.name

data/app/views/renalware/pathology/observation_descriptions/_filters.html.slim

@@ -0,0 +1,14 @@
+.search-form.filters.w-full.max-w-lg
+  = simple_form_for query,
+                    url: url,
+                    method: :get,
+                    html: { autocomplete: "off" } do |f|
+
+    .flex.flex-wrap.-mx-3.mb-6
+      .w-full.md:w-1/2.px-3.mb-6.md:mb-0
+        = f.input :code_cont, label: "Code contains"
+      .w-full.md:w-1/2.px-3.mb-6.md:mb-0
+
+        = f.submit t("helpers.submit.filter"), class: "button", name: nil
+        '  or
+        = link_to t("helpers.reset"), url

data/app/views/renalware/pathology/observation_descriptions/edit.html.slim

@@ -0,0 +1,21 @@
+= within_admin_layout(title: "Editing #{description.code}") do
+  = simple_form_for(description) do |f|
+    .w-full.max-w-lg
+      = f.input :code, input_html: { disabled: :disabled }
+      = f.input :name
+
+      h5 Measurement units
+      .border.rounded.px-4.py-2.mb-2
+
+        .mr-2.mb-2
+          | Unit suggested by recent HL7 messages:
+          code.ml-2= description.suggested_measurement_unit&.name
+        = f.association :measurement_unit,
+                        label: "Current Unit",
+                        collection: Renalware::Pathology::MeasurementUnit.for_collection_select
+
+      = f.input :lower_threshold, hint: "Value below which a result can be deemed abnormal"
+      = f.input :upper_threshold, hint: "Value above which a result can be deemed abnormal"
+      = f.submit class: :button
+      '  or
+      = link_to "Cancel", pathology_observation_descriptions_path

data/app/views/renalware/pathology/observation_descriptions/index.html.slim

@@ -0,0 +1,38 @@
+= content_for :filters do
+  = render "filters", query: query, url: renalware.pathology_observation_descriptions_path
+
+= within_admin_layout(title: "Observation descriptions (OBX)") do
+  table
+    thead
+      tr
+        th(colspan=5)
+        th.text-center.bg-gray-100(colspan=3) Measurement unit
+      tr
+        th.col-width-tiny
+        th.col-width-small= sort_link(query, :code, "Code")
+        th.col-width-large= sort_link(query, :name, "Name")
+        th.col-width-small RR Type
+        th.col-width-medium RR Coding Standard
+        th.bg-gray-100.text-center= sort_link(query, :measurement_unit_name, "Current")
+        th.bg-gray-100.text-center= sort_link(query, :suggested_measurement_unit, "Suggested")
+        th.bg-gray-100.text-center UKRDC unit
+    tbody
+      - descriptions.each do |description|
+        tr
+          td.actions= link_to_if(policy(description).edit?, "Edit", [:edit, description])
+          td= description.code
+          td= description.name
+          td= description.rr_type
+          td
+            = description.rr_coding_standard
+          td
+            - unit = description.measurement_unit
+            = unit&.title
+          td
+            - unit = description.suggested_measurement_unit
+            = unit&.title
+          td
+            - unit = description.measurement_unit&.ukrdc_measurement_unit
+            = unit&.title
+
+  == pagy_foundation_nav pagy