renalware-core 2.0.137 → 2.0.138

data/app/views/renalware/hd/protocols/_protocol.pdf.slim

@@ -11,11 +11,10 @@
         tr
           th.protocol-hd-profile HD Profile
           th.protocol-allergies
-            = clinical_patient.allergy_status&.text
+            | Allergies
             - if clinical_patient.allergy_status_updated_at
               span.allergy_status_updated_at
-                = "#{l(clinical_patient.allergy_status_updated_at&.to_date)}"
-
+                = " #{l(clinical_patient.allergy_status_updated_at&.to_date)}"
           th.protocol-prescriptions Prescriptions on HD
           th.protocol-recent-pathology Recent Pathology
       tbody

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

@@ -57,7 +57,7 @@ ruby:
             = fcm.input :line_exit_site_status,
                         wrapper: :horizontal_tiny,
                         hint: link_to("", "#",
-                                      data: {"reveal-id" => "mr-vistor-help-modal" }),
+                                      data: { "reveal-id" => "mr-vistor-help-modal" }),
                         hint_html: { class: "hint-help-link" }
 
     = render layout: "renalware/shared/fieldset",
@@ -66,7 +66,7 @@ ruby:
         = favf.input :score,
                      wrapper: :horizontal_small,
                      hint: link_to("", "#",
-                           data: {"reveal-id" => "avf-assessment-help-modal" }),
+                           data: { "reveal-id" => "avf-assessment-help-modal" }),
                      hint_html: { class: "hint-help-link" }
         = favf.input :aneurysm, as: :inline_radio_buttons, wrapper: :horizontal_medium
         = favf.input :bruit, as: :inline_radio_buttons, wrapper: :horizontal_medium
@@ -124,10 +124,6 @@ ruby:
         = fcm.input :subs_goal, wrapper: :horizontal_tiny
         = fcm.input :subs_volume, wrapper: :horizontal_tiny
 
-    = render "renalware/hd/sessions/form/drugs_to_be_administered",
-             f: f,
-             prescription_administrations: f.object.prescription_administrations
-
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Notes/Complications", name: "complications" } do
       = fd.simple_fields_for :complications, fd.object.complications do |fcm|

data/app/views/renalware/hd/sessions/_index_tabs.html.slim

@@ -0,0 +1,11 @@
+.sub-nav
+  /with-tabs
+  dl
+    dd
+      = link_to "Details",
+                patient_hd_sessions_path(patient)
+                /,data: { "trigger-masonry-refresh" => true }
+    dd
+      = link_to "Drugs given",
+                  patient_hd_prescription_administrations_path(patient)
+                  /,data: { "trigger-masonry-refresh" => true }

data/app/views/renalware/hd/sessions/_list.html.slim

@@ -2,6 +2,11 @@ article.hd-sessions
   header
     h2= t(".title")
     ul
+      li= link_to patient_hd_prescription_administrations_path(@patient),
+                  class: :button do
+        i.fas.fa-capsules
+        = t(".view_all_drugs_given")
+
       li= link_to t(".view_all"),
                   patient_hd_sessions_path(@patient),
                   class: :button
@@ -14,4 +19,19 @@ article.hd-sessions
                     new_patient_hd_session_path(@patient),
                     class: "button"
 
-  = render "renalware/hd/sessions/table", sessions: sessions
+  .sub-nav.with-tabs
+    dl
+      dd.active
+        = link_to "Details", "#hd-sessions", data: { "trigger-masonry-refresh" => true }
+      dd
+        = link_to "Drugs given", "#hd-session-drugs", data: { "trigger-masonry-refresh" => true }
+
+    hr.tab-bottom-border
+
+  = render "renalware/hd/sessions/table",
+           sessions: sessions,
+           prescription_administrations: prescription_administrations
+
+  = render "renalware/hd/prescription_administrations/table",
+           prescription_administrations: prescription_administrations,
+           initially_visible: false

data/app/views/renalware/hd/sessions/_table.html.slim

@@ -1,13 +1,6 @@
 
-.sub-nav.with-tabs
-  dl
-    dd.active
-      = link_to "Details", "#hd-sessions", data: { "trigger-masonry-refresh" => true }
-    dd
-      = link_to "Drugs given", "#hd-session-drugs", data: { "trigger-masonry-refresh" => true }
-  hr.tab-bottom-border
 / .column_hover
-table.toggleable.auto-layout.hd-sessions#hd-sessions
+table.toggleable.auto-layout.hd-sessions#hd-sessions(data-controller="toggle")
   = render "renalware/hd/sessions/thead"
 
   - sessions.each_with_index do |session, index|
@@ -15,13 +8,3 @@ table.toggleable.auto-layout.hd-sessions#hd-sessions
     = render "renalware/hd/sessions/#{session.state}/row",
             session: session,
             stripe_class: stripe_class
-
-/.column_hover
-table.toggleable.auto-layout.hd-sessions.hd-session-drugs#hd-session-drugs(style="display: none")
-  = render "renalware/hd/sessions/administered_drugs_thead"
-
-  - sessions.each_with_index do |session, index|
-    - stripe_class = index % 2 == 0 ? "even" : "odd"
-    = render "renalware/hd/sessions/#{session.state}/administered_drugs_row",
-            session: session,
-            stripe_class: stripe_class

data/app/views/renalware/hd/sessions/closed/_form.html.slim

@@ -1,5 +1,4 @@
 = render "renalware/hd/sessions/form",
          f: f,
          session: session,
-         patient: patient,
-         prescriptions_to_be_administered_on_hd: prescriptions_to_be_administered_on_hd
+         patient: patient

data/app/views/renalware/hd/sessions/edit.html.slim

@@ -12,5 +12,4 @@
       = render "renalware/hd/sessions/#{session.state}/form",
                f: f,
                session: session,
-               patient: patient,
-               prescriptions_to_be_administered_on_hd: prescriptions_to_be_administered_on_hd
+               patient: patient

data/app/views/renalware/hd/sessions/new.html.slim

@@ -13,5 +13,4 @@
       = render "renalware/hd/sessions/#{session.state}/form",
                f: f,
                session: session,
-               patient: patient,
-               prescriptions_to_be_administered_on_hd: prescriptions_to_be_administered_on_hd
+               patient: patient

data/app/views/renalware/hd/sessions/open/_form.html.slim

@@ -1,5 +1,4 @@
 = render "renalware/hd/sessions/form",
          f: f,
          session: session,
-         patient: patient,
-         prescriptions_to_be_administered_on_hd: prescriptions_to_be_administered_on_hd
+         patient: patient

data/app/views/renalware/hd/transmission_logs/index.html.slim

@@ -1,4 +1,4 @@
-= within_admin_layout(title: "HD Transmission Logs") do
+= within_new_admin_layout(title: "HD Transmission Logs") do
   .hd_transmission_logs
     table.stripeless
       thead
@@ -52,4 +52,4 @@
             td.result
               = log.error_messages.compact.uniq.join("<br>").html_safe
 
-    = paginate logs
+    == pagy_foundation_nav pagy

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

@@ -0,0 +1,49 @@
+= simple_form_for(form,
+                 remote: true,
+                 as: :form,
+                 html: { autocomplete: "off" },
+                 method: :patch,
+                 url: hd_prescription_administration_witness_path(form.prescription_administration_id)) do |f|
+  .modal
+    .modal__header
+      h2= "Witness HD Drug"
+      = render "renalware/shared/modal_close_link"
+
+    .modal__body
+
+      - prescription = Renalware::Medications::PrescriptionPresenter.new(administration.prescription)
+      .hd-drug-administration.panel
+        .summary
+          .hd-drug
+            .hd-drug--name= prescription.drug_name
+            .hd-drug--dose= prescription.dose
+            .hd-drug--route= prescription.route_code
+            .hd-drug--frequency= prescription.frequency
+            .hd-drug--prescribed-on= l(prescription.prescribed_on)
+            .hd-drug--prescriber-name= prescription.updated_by
+
+            - if prescription.terminated_on.present?
+              .hd-drug--termination
+                | Terminates
+                .hd-drug--termination-date= l(prescription.terminated_on)
+        br
+        span= "Recorded #{l(administration.recorded_on)} by #{administration.administered_by}"
+
+      = f.input :user_id,
+                as: :user_picker,
+                collection: Renalware::User.ordered,
+                wrapper: :hz_small
+      = f.input :password,
+                as: :password,
+                wrapper: :hz_small
+
+    .modal__footer
+      .right
+        = f.submit "Witness", class: "button"
+        |   
+        = f.submit "Update User Only", name: "form[update_user_only]", class: "button secondary"
+        span= " or "
+        = link_to "Cancel",
+                "#",
+                "aria-label" => "Close",
+                  class: "reveal-modal-close"

data/app/views/renalware/hd/witnesses/edit.html.slim

@@ -0,0 +1 @@
+= render "form", form: form, administration: administration

data/app/views/renalware/hd/witnesses/edit.js.erb

@@ -0,0 +1,3 @@
+// Render this to re-display the form with errors after an unsuccessful save
+var modal = $("#hd-prescription-administration-modal")
+$(modal).html("<%= j(render 'form', form: form, administration: administration) %>");

data/app/views/renalware/hd/witnesses/update.js.erb

@@ -0,0 +1,4 @@
+<%# We render this on successful creation %>
+<%= refresh(".flash-message", partial: "renalware/shared/flash_messages", locals: local_assigns) %>
+$('#hd-prescription-administration-modal').foundation('reveal', 'close');
+window.location.reload();

data/app/views/renalware/layouts/_admin.html.slim

@@ -0,0 +1,28 @@
+- generate_page_title(local_assigns: local_assigns)
+
+nav.patient-side-nav.admin-side-nav.full-screenable
+  .layout-wrapper
+    = render Renalware::System::AdminMenuComponent.new(current_user: current_user)
+
+.non-patient-page.main-content
+  .layout-wrapper
+    .non-patient-page-header(class=("with-tabs" if content_for?(:tabs)))
+      .row
+        .columns.small-12
+          ul.page-heading
+            li
+              h1
+                = breadcrumbs_and_title(breadcrumbs: local_assigns[:breadcrumbs],
+                                        title: local_assigns[:title])
+            li.page-actions
+              / Output any page-level actions
+              = yield(:actions)
+
+          - if content_for?(:tabs)
+
+            = yield(:tabs)
+
+    .row
+      .columns.small-12
+        = yield(:filters)
+        = yield

data/app/views/renalware/layouts/_patient.html.slim

@@ -6,7 +6,7 @@
 
 nav.patient-side-nav.full-screenable
   .layout-wrapper
-    = render Renalware::Patients::SideMenuComponent, patient: current_patient
+    = render Renalware::Patients::SideMenuComponent.new(patient: current_patient)
 
 .main-content.patient-content.full-screenable
   .layout-wrapper

data/app/views/renalware/letters/batches/index.html.slim

@@ -1,4 +1,4 @@
-= within_admin_layout(title: "Print Batches") do
+= within_new_admin_layout(title: "Print Batches") do
 
   table
     thead

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

@@ -1,6 +1,6 @@
 - columns = local_assigns[:columns] || []
 - cache([letter, columns.join("-")]) do
-  tr(class=letter.state.dasherize)
+  tr(class=letter.state.dasherize data-controller="toggle")
     td.noprint= toggler("#letter-quick-preview-#{letter.id}")
     td.noprint.actions
       = link_to letter.view_label, patient_letters_letter_path(letter.patient, letter)

data/app/views/renalware/modalities/descriptions/edit.html.slim

@@ -1,4 +1,4 @@
-= within_admin_layout(title: "Edit",
+= within_new_admin_layout(title: "Edit",
                       breadcrumbs: breadcrumb_for("Modalities", modalities_descriptions_path))
 
   = render "form",

data/app/views/renalware/modalities/descriptions/index.html.slim

@@ -3,7 +3,7 @@
             new_modalities_description_path,
             class: "button"
 
-= within_admin_layout(title: "Modalities") do
+= within_new_admin_layout(title: "Modalities") do
 
   table.modality-codes
     thead

data/app/views/renalware/modalities/descriptions/new.html.slim

@@ -1,4 +1,4 @@
-= within_admin_layout(title: "New",
+= within_new_admin_layout(title: "New",
                       breadcrumbs: breadcrumb_for("Modalities", modalities_descriptions_path))
 
   = render "form",

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

@@ -3,7 +3,7 @@ li.has-dropdown
   ul.dropdown
     li= link_to "Users", admin_users_path
     li= link_to "Request Form Print History", pathology_requests_requests_path
-    li= link_to "Pathology Requesting Configuration", pathology_requests_rules_path
+    li= link_to "Path Request Config", pathology_requests_rules_path
     li= link_to "HD Transmission Logs", hd_transmission_logs_path
     - unless Rails.env.production?
       li

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

@@ -8,12 +8,13 @@ section.top-bar-section
     = render "renalware/navigation/mdms"
     = render "renalware/navigation/patients_admin"
     = render "renalware/navigation/directory"
-    - if current_user_is_admin?
-      = render "renalware/navigation/admin"
-    - if current_user_is_super_admin?
-      = render "renalware/navigation/super_admin"
-    - if current_user_is_developer?
-      = render "renalware/navigation/developer"
+
+    - if current_user_is_admin? || current_user_is_super_admin?
+      li.menu-item.menu-item--admin
+        = link_to renalware.admin_dashboard_path
+          i
+          | Admin
+
     li.divider
     = render "renalware/navigation/sign_out"
     li.divider

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

@@ -2,11 +2,10 @@
   li.show-for-medium-up= link_to("Feedback",
               new_system_user_feedback_path,
               class: "button secondary")
-li.has-dropdown
+li.has-dropdown.menu-item.menu-item--home
   = link_to dashboard_path do
-    i.fas.fa-home
-    |  
-    = current_user.username
+    i
+    =current_user.username
   ul.dropdown
     li= link_to "My Dashboard", dashboard_path
     li= link_to "Update Profile", edit_user_registration_path

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

@@ -8,7 +8,7 @@
         = f.input :description_id_eq,
                   collection: obr_filter_options,
                   label: "Filter by Code",
-                  label_method: ->(arr){ "#{arr[0]} - #{arr[2]}"  },
+                  label_method: ->(arr) { "#{arr[0]} - #{arr[2]}" },
                   input_html: { class: "searchable_select" }
 
       .columns.medium-2.large-2.actions.end

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

@@ -1,4 +1,4 @@
-= within_admin_layout(title: "Request Form Print History") do
+= within_new_admin_layout(title: "Request Form Print History") do
   .row
     .search-form
       fieldset

data/app/views/renalware/pathology/requests/rules/index.html.slim

@@ -1,4 +1,4 @@
- = within_admin_layout(title: "Pathology Request Form Algorithm") do
+ = within_new_admin_layout(title: "Pathology Request Form Algorithm") do
   table
     thead
       tr

data/app/views/renalware/patients/_layout.html.slim

@@ -10,7 +10,7 @@
 - patient_page_title(title: title, patient: current_patient)
 
 nav.patient-side-nav
-  / = render Renalware::Patients::SideMenuComponent, patient: current_patient
+  / = render Renalware::Patients::SideMenuComponent.new(patient: current_patient)
   = render "renalware/patients/side_menu", patient: current_patient
 
 .patient-content

data/app/views/renalware/patients/_summary_part.html.slim

@@ -24,7 +24,7 @@
       header
         h2 Worryboard notes
         = link_to("Remove",
-                  patient_worry_path( summary_part.patient, summary_part.worry),
+                  patient_worry_path(summary_part.patient, summary_part.worry),
                   method: :delete,
                   data: { confirm: "Are you sure you want to remove the patient from the worryboard?" },
                   class: :button)

data/app/views/renalware/patients/primary_care_physicians/edit.html.slim

@@ -1,2 +1,2 @@
-= within_admin_layout(title: "Edit Primary Care Physician") do
+= within_new_admin_layout(title: "Edit Primary Care Physician") do
   = render "form"

data/app/views/renalware/patients/primary_care_physicians/index.html.slim

@@ -1,9 +1,7 @@
-= content_for(:tabs) do
-  dl.sub-nav
-    dd= link_to "List", patients_primary_care_physicians_path
-    dd= link_to "Add Primary Care Physician", new_patients_primary_care_physician_path
+= content_for(:actions) do
+  = link_to t("new_record.link_title"), new_patients_primary_care_physician_path, class: "button"
 
-= within_admin_layout(title: "Primary Care Physicians") do
+= within_new_admin_layout(title: "Primary Care Physicians") do
   table.primary-care-physicians
     thead
       tr

data/app/views/renalware/patients/primary_care_physicians/new.html.slim

@@ -1,2 +1,2 @@
-= within_admin_layout(title: "New Primary Care Physician") do
+= within_new_admin_layout(title: "New Primary Care Physician") do
   = render "form"

data/app/views/renalware/pd/bag_types/edit.html.slim

@@ -1,2 +1,2 @@
-= within_admin_layout(breadcrumbs: breadcrumb_for("PD Bag Types", pd_bag_types_path)) do
+= within_new_admin_layout(breadcrumbs: breadcrumb_for("PD Bag Types", pd_bag_types_path)) do
   = render "form", bag_type: bag_type

data/app/views/renalware/pd/bag_types/index.html.slim

@@ -1,7 +1,7 @@
 = content_for(:actions) do
   = link_to t("new_record.link_title"), new_pd_bag_type_path, class: "button"
 
-= within_admin_layout do
+= within_new_admin_layout do
   table
     thead
       tr

data/app/views/renalware/pd/bag_types/new.html.slim

@@ -1,2 +1,2 @@
-= within_admin_layout(breadcrumbs: breadcrumb_for("PD Bag Types", pd_bag_types_path)) do
+= within_new_admin_layout(breadcrumbs: breadcrumb_for("PD Bag Types", pd_bag_types_path)) do
   = render "form", bag_type: bag_type

data/app/views/renalware/problems/problems/_summary_part.html.slim

@@ -20,7 +20,7 @@
         = link_to patient_problems_path(summary_part.patient), class: "button" do
           | Add
 
-      table#problems.toggleable.toggleable--without-border-between-toggled-and-non-toggled-tr
+      table#problems.toggleable.toggleable--without-border-between-toggled-and-non-toggled-tr(data-controller="toggle")
         thead.toggleable--open
           th.togglers.noprint =rows_toggler
           th Description