renalware-core 2.0.0.pre.rc3 → 2.0.0.pre.rc4

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

@@ -0,0 +1,12 @@
+= content_for(:actions) do
+  = link_to("Add", new_admissions_admission_path, class: :button)
+
+= within_admin_layout(title: "Inpatient Admissions") do
+  .panel.radius.compact
+    | If the patient is not on Renalware yet, please 
+    = link_to("add them", new_patient_path)
+    |  first
+
+  = render "filters", form: form
+  = render "table", admissions: admissions
+  = paginate admissions

data/app/views/renalware/admissions/admissions/new.html.slim

@@ -0,0 +1,6 @@
+= within_admin_layout( \
+  title: "New",
+  breadcrumbs: breadcrumb_for("Inpatient Admissions", admissions_admissions_path) \
+  ) do
+
+  = render "form", admission: admission

data/app/views/renalware/admissions/consults/_form.html.slim

@@ -11,15 +11,14 @@
             wrapper: :horizontal_medium,
             collection: [[consult.patient&.to_s, consult.patient&.id]],
             selected: 1,
-            input_html: {\
+            input_html: { \
               class: "patient-id-select2 patient-ajax-search",
               data: { "ajax--url" => search_patients_path(format: :json),
-                      placeholder: "Search by patient name or hospital/NHS no." }\
+                      placeholder: "Search by patient name or hospital/NHS no." } \
             }
 
   = f.input :consult_site_id,
             collection: Renalware::Admissions::ConsultSite.all,
-            include_blank: true,
             wrapper: :horizontal_medium,
             include_blank: "Select local site (or enter other site below)",
             label: "Site"

data/app/views/renalware/admissions/consults/_table.html.slim

@@ -29,7 +29,7 @@
           td= yes_no(consult.requires_aki_nurse)
           td.show-for-large-up.consult-author.col-width-medium-with-ellipsis(title=consult.created_by)= consult.created_by
           td.col-width-medium-with-ellipsis(title=consult.description)= consult.description
-          td
+          td.actions-dropdown
             / As we have lots of possible actions, group them in a button group.
             / A wrapping div is required for now in order for the button group display correctly
             / (though we could style the td like a div I guess).
@@ -57,5 +57,3 @@
                   li= render "renalware/admissions/requests/create_request_link",
                              patient: consult.patient,
                              link_text: "Request Admission"
-
-= render "renalware/admissions/requests/modal_dialog_placeholder"

data/app/views/renalware/admissions/patient_admissions/index.html.slim

@@ -0,0 +1,10 @@
+= content_for(:actions) do
+  = link_to t("new_record.link_title"),
+            new_admissions_admission_path,
+            class: "button"
+
+= within_patient_layout(title: "Inpatient Admissions") do
+
+  = render "renalware/admissions/admissions/table",
+           admissions: admissions,
+           compact: true

data/app/views/renalware/clinics/clinic_visits/_table.html.slim

@@ -5,7 +5,8 @@ table.clinics.auto-layout
       th.col-width-date Date
       th.col-width-tiny DNA
       th Clinic Type
-      th.col-width-tinyish Wt
+      th.col-width-tinyish Height
+      th.col-width-tinyish Weight
       th.col-width-tinyish BMI
       th.col-width-tinyish BP
       th.col-width-tinyish Standing BP

data/app/views/renalware/clinics/clinic_visits/_table_row.html.slim

@@ -12,6 +12,7 @@ tr(class="#{'dna' if clinic_visit.did_not_attend?}")
   td.date-time= l(clinic_visit.date)
   td= yes_no(clinic_visit.did_not_attend)
   td.clinic-type= clinic_visit.clinic
+  td.bmi= clinic_visit.height
   td.bmi= clinic_visit.weight
   td.bmi= clinic_visit.bmi
   td.bp= clinic_visit.bp

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

@@ -12,6 +12,7 @@
       tr
         th.col-width-small
         th Name
+        th Dm+d Virtual Product ID
     tbody
       - @drugs.each do |drug|
         tr
@@ -22,7 +23,7 @@
               id: "#{drug.id}-drug",
               method: :delete,
               data: { confirm: I18n.t("prompts.confirm_delete") }
-          td
-            = link_to drug, edit_drugs_drug_path(drug)
+          td= link_to drug, edit_drugs_drug_path(drug)
+          td= drug.vmpid
 
   = paginate @drugs

data/app/views/renalware/hd/current_profile/_summary.html.slim

@@ -29,7 +29,7 @@ article
     dt= t(".cannulation_type")
     dd= profile.cannulation_type
     dt= t(".anticoagulant.type")
-    dd= profile.anticoagulant_type.try!(:text)
+    dd= profile.anticoagulant_type&.text
 
   dl.dl-horizontal.large.full-hd-profile
     dt.inset=t(".anticoagulant.loading_dose")
@@ -42,7 +42,7 @@ article
     dt= t(".needle_size")
     dd= profile.needle_size
     dt= t(".single_needle")
-    dd= profile.single_needle.try!(:text)
+    dd= profile.single_needle&.text
     dt= t(".blood_flow")
     dd= profile.blood_flow
     dt= t(".temperature")
@@ -50,23 +50,23 @@ article
     dt= t(".bicarbonate")
     dd= profile.bicarbonate
     dt= t(".has_sodium_profiling")
-    dd= profile.has_sodium_profiling.try!(:text)
+    dd= profile.has_sodium_profiling&.text
     dt.inset= t(".sodium_first_half")
     dd.inset= profile.sodium_first_half
     dt.inset= t(".sodium_second_half")
     dd.inset= profile.sodium_second_half
 
     dt= t(".drugs.on_esa")
-    dd= profile.drugs_on_esa.try!(:text)
+    dd= profile.drugs_on_esa&.text
     dt= t(".drugs.on_iron")
-    dd= profile.drugs_on_iron.try!(:text)
+    dd= profile.drugs_on_iron&.text
     dt= t(".drugs.on_warfarin")
-    dd= profile.drugs_on_warfarin.try!(:text)
+    dd= profile.drugs_on_warfarin&.text
 
     dt= t(".transport.has_transport")
-    dd= profile.transport.has_transport.try!(:text)
+    dd= profile.transport.has_transport&.text
     dt.inset= t(".transport.type")
-    dd.inset= profile.transport.type.try!(:text)
+    dd.inset= profile.transport.type&.text
     dt.inset= t(".transport.decided_on")
     dd.inset= profile.transport.present? && I18n.l(profile.transport&.decided_on)
 

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

@@ -43,21 +43,21 @@
         #dialysing_at_unit(style="display:none")
           = f.input :patient_id,
                     collection: [],
-                    input_html: {\
+                    input_html: { \
                       class: "patient-id-select2 patient-ajax-search",
                       name: "hd_diary_slot[patient_id][]",
                       data: { "ajax--url" => hd_patients_dialysing_at_unit_path(unit_id: slot.diary.hospital_unit_id, format: :json),
-                              placeholder: "Search by patient name or NHS/hosp no." }\
+                              placeholder: "Search by patient name or NHS/hosp no." } \
                     }
 
         #dialysing_at_hospital(style="display:none")
           = f.input :patient_id,
                     collection: [],
-                    input_html: {\
+                    input_html: { \
                       class: "patient-id-select2 patient-ajax-search",
                       name: "hd_diary_slot[patient_id][]",
                       data: { "ajax--url" => hd_patients_dialysing_at_hospital_path(format: :json),
-                              placeholder: "Search by patient name or NHS/hosp no." }\
+                              placeholder: "Search by patient name or NHS/hosp no." } \
                     }
   = f.submit "Add for this week only", class: "button save weekly"
   |  

data/app/views/renalware/hd/mdm_patients/_patient.html.slim

@@ -1,6 +1,5 @@
 / We try and keep cross-module dependencies in the View layer.
 - access_patient = Renalware::Accesses::PatientPresenter.new(patient)
-- pathology_patient = Renalware::Pathology::PatientPresenter.new(patient)
 - transplant_patient = Renalware::Transplants::PatientPresenter.new(patient)
 
 tr

data/app/views/renalware/hd/protocols/_profile.html.slim

@@ -13,14 +13,14 @@ dl
   dt.new_line= t(".needle_size")
   dd= profile.needle_size
   dt= t(".single_needle")
-  dd= profile.single_needle.try!(:text)
+  dd= profile.single_needle&.text
   dt= t(".dialyser")
   dd= profile.dialyser
   dt= t(".dialysate")
   dd= profile.dialysate
 
   dt.new_line= t(".has_sodium_profiling")
-  dd= profile.has_sodium_profiling.try!(:text)
+  dd= profile.has_sodium_profiling&.text
   dt= t(".sodium_first_half")
   dd= profile.sodium_first_half
   dt= t(".sodium_second_half")
@@ -41,8 +41,8 @@ dl
   dd= profile.last_update
 
   dt.new_line= t(".transport.has_transport")
-  dd= profile.transport_has_transport.try!(:text)
+  dd= profile.transport_has_transport&.text
   dt= t(".transport.type")
-  dd= profile.transport_type.try!(:text)
+  dd= profile.transport_type&.text
   dt= t(".transport.decided_on")
   dd= profile.transport_decided_on

data/app/views/renalware/letters/contacts/_contact.html.slim

@@ -1,6 +1,10 @@
-tr
+= content_tag_for(:tr, contact) do
   td= link_to contact, directory_person_path(contact.person)
   td= contact.description_name
   td= yes_no(contact.default_cc)
   td= contact.address
   td= contact.notes
+  td
+    = link_to("Edit",
+                edit_patient_letters_contact_path(patient, contact),
+                data: { "reveal-id" => "edit-patient-contact-modal", "reveal-ajax" => "true" })

data/app/views/renalware/letters/contacts/_edit.html.slim

@@ -0,0 +1,30 @@
+.modal
+  .modal__header
+    h2
+      = "#{controller.action_name.capitalize} Patient Contact /"
+      |  
+    h3.muted= contact
+    = render "renalware/shared/modal_close_link"
+
+  .modal__body
+    = render "renalware/shared/errors", model: contact
+
+    = simple_form_for(contact,
+                      url: patient_letters_contact_path(patient, contact),
+                      method: :patch,
+                      remote: true,
+                      wrapper: :horizontal_form) do |f|
+
+      = f.input :default_cc, as: :inline_radio_buttons
+      = f.input :description_id, collection: contact_descriptions
+      = f.input :other_description
+      = f.input :notes, as: :text
+
+      = f.submit class: :button
+      span= " or "
+      = link_to "Cancel",
+               "#",
+               "aria-label" => "Close",
+                class: "reveal-modal-close"
+
+    .modal__footer

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

@@ -2,7 +2,7 @@
             "Pick person from directory",
             class: "right inline"
 = text_field_tag "person_auto_complete", \
-    f.object.person.try!(:to_s),
+    f.object.person&.to_s,
     data: { \
       autocomplete_source: search_directory_people_path, \
       autocomplete_rel: "[name='letters_contact[person_id]']" \

data/app/views/renalware/letters/contacts/_table.html.slim

@@ -1,11 +1,12 @@
 table.auto-layout.contacts
   thead
     tr
-      th Name
-      th Description
-      th.col-width-small Default CC
-      th Address
+      th.col-width-medium Name
+      th.col-width-small.at-least Description
+      th.col-width-tiny Default CC
+      th.col-width-large Address
       th Notes
+      th.col-width-tiny.action
 
   tbody
-    = render contacts
+    = render contacts, patient: patient

data/app/views/renalware/letters/contacts/edit.html.slim

@@ -0,0 +1,8 @@
+// Delegate to the edit partial _edit.html.slim
+// _edit is re-rendered when have a validation error which is why it is a separate partial.
+// Normally we would render _form, but that has more markup that we need just for a edit
+// here on a couple of fields to allow defalt_cc and description to be changed
+= render "edit",
+         patient: patient,
+         contact: contact,
+         contact_descriptions: contact_descriptions

data/app/views/renalware/letters/contacts/edit.js.erb

@@ -0,0 +1,9 @@
+// Displayed when we failed to update via a modal
+// We render the edit partial _edit.html.slim
+var modal = $("#edit-patient-contact-modal")
+$(modal).html("<%=
+  j(render 'edit',
+           patient: patient,
+           contact: contact,
+           contact_descriptions: contact_descriptions)
+%>");

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

@@ -6,8 +6,14 @@
 
 = within_patient_layout do
   #contacts
-    = render "table", contacts: contacts
+    = render "table", patient: patient, contacts: contacts
 
-  / The modal dialog
+  / The add modal dialog
   #add-patient-contact-modal.reveal-modal.medium(data-reveal)
-    = render "new", patient: patient, contact: contact, contact_descriptions: contact_descriptions
+    = render "new",
+             patient: patient,
+             contact: contact,
+             contact_descriptions: contact_descriptions
+
+  / The edit modal dialog
+  #edit-patient-contact-modal.reveal-modal.medium(data-reveal)

data/app/views/renalware/letters/contacts/index.js.erb

@@ -1 +1 @@
-$("#contacts").html("<%= escape_javascript render("table", contacts: contacts) %>");
+$("#contacts").html("<%= escape_javascript render("table", patient: patient, contacts: contacts) %>");

data/app/views/renalware/letters/contacts/update.js.erb

@@ -0,0 +1,10 @@
+<%# We render this view when the request has been successfully updated.%>
+<%= refresh(".flash-message", partial: "renalware/shared/flash_messages", locals: local_assigns) %>
+$("#edit-patient-contact-modal").foundation('reveal', 'close');
+
+// Refresh the just-updated admissions request
+<%=
+  replace("#letters_contact_#{contact.id}",
+            partial: "contact",
+            locals: { patient: patient, contact: contact })
+%>

data/app/views/renalware/letters/delivery/practice_mailer/patient_letter.text.erb

@@ -0,0 +1,3 @@
+<%= ident_metadata %>
+This is an automated email - please do not reply directly to this email.
+Please call on <%= help_phone_number %> or email <%= help_email_address %> if you have any queries.

data/app/views/renalware/letters/electronic_receipts/_table.html.slim

@@ -2,6 +2,7 @@ table.letters.electronic-ccs.has-togglable-rows
   thead
     tr
       th.col-width-date Date
+      th.col-width-date-time Read at
       th.col-width-medium Author
       th.at-least.col-width-medium Patient
       th.col-width-nhs-no NHS no.
@@ -16,6 +17,7 @@ table.letters.electronic-ccs.has-togglable-rows
 
       tr(id=receipt.html_identifier)
         td= l(letter.issued_on)
+        td= l(receipt.read_at)
         td= letter.author
         td= default_patient_link(patient)
         td= patient.nhs_number
@@ -29,7 +31,7 @@ table.letters.electronic-ccs.has-togglable-rows
 
       = content_tag(:tr, id: receipt.html_preview_identifier, style: "display: none")
         td
-        td(colspan=5)
+        td(colspan=6)
           .quick-preview
             = simple_format letter.body
 

data/app/views/renalware/letters/electronic_receipts/sent.html.slim

@@ -5,29 +5,26 @@
   table.letters.electronic-ccs.sent.has-togglable-rows
     thead
       tr
-        th.col-width-date Date
-        th.col-width-medium Author
+        th.col-width-date Sent at
+        th Recipient
+        th.col-width-date-time Read at
         th.col-width-large Patient
         th.col-width-nhs-no NHS no.
         th.col-width-reference-no Hosp no.
         th Description
-        th Recipient
-        th Read?
         th
-
     tbody
       - receipts.each do |receipt|
         - letter = Renalware::Letters::LetterPresenter.new(receipt.letter)
         - patient = letter.patient
         tr
           td= l(letter.issued_on)
-          td= letter.author
+          td.col-width-medium-with-ellipsis= receipt.recipient
+          td= l(receipt.read_at)
           td= default_patient_link(patient)
           td= patient.nhs_number
           td= patient.hospital_identifiers
           td.col-width-medium-with-ellipsis= letter.description
-          td.col-width-medium-with-ellipsis= receipt.recipient
-          td= yes_no(receipt.read?)
           td.actions
             = link_to "Toggle", "##{receipt.html_preview_identifier}", data: { behaviour: "toggler" }
             = pipe_separator
@@ -37,7 +34,7 @@
 
         = content_tag(:tr, id: receipt.html_preview_identifier, style: "display: none")
           td
-          td(colspan=7)
+          td(colspan=6)
             .quick-preview
               = simple_format letter.body
           td

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

@@ -20,6 +20,7 @@ scss:
     p {
       padding: 0;
       line-height: 1.2em;
+      margin: .4rem 0;
     }
   }
 
@@ -52,21 +53,33 @@ scss:
 
       text-align: right;
 
-      .trust-name p {
-        font-size: 1.2em;
-        vertical-align: bottom;
-        margin: 0;
+      .trust-name {
+        padding: 0;
+
+        p {
+          font-size: 1.4em;
+          font-weight: bold;
+          vertical-align: bottom;
+          margin: 0;
+          padding: 0;
+        }
       }
 
-      .trust-caption p {
-        font-size: 0.8em;
-        margin-top: 5px;
+      .trust-caption {
+        padding: 0;
+
+        p {
+          font-size: 1em;
+          font-weight: bold;
+          margin-top: .1rem;
+          color: #005EB8; // NHS blue
+        }
       }
 
       .nhs-logo {
-        height: 33px;
+        // height: 33px; The height of the logo now determines the element height
         padding: 0;
-        margin: 0 0 0 10px;
+        margin: 0 0 .4rem 0;
         display: inline-block;
         vertical-align: bottom;
       }
@@ -112,7 +125,7 @@ scss:
 
       ul {
         padding-left: 20px;
-        margin-top: 7px;
+        margin-top: 0.4rem;
         margin-bottom: 7px;
       }
 
@@ -261,10 +274,10 @@ scss:
         p= letter.main_recipient.to_html
 
     .unit-block
+      span.nhs-logo
+            = image_tag(wicked_pdf_asset_base64("renalware/nhs_a4_letter_logo_black.png"))
       .trust-name
-        p
-          = raw letter.letterhead.trust_name
-          /span.nhs-logo= inline_image_tag("renalware/NHS-Black.jpg", size: "82x33")
+        p= raw letter.letterhead.trust_name
       .trust-caption
         p= letter.letterhead.trust_caption
 

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

@@ -2,7 +2,7 @@
 - recipient = letter.cc_recipient_for_contact(contact)
 tr
   = content_tag(:td, style: "width: 20px") do
-    = hidden_field_tag "letter[cc_recipients_attributes][][id]", recipient.try!(:id)
+    = hidden_field_tag "letter[cc_recipients_attributes][][id]", recipient&.id
     = hidden_field_tag "letter[cc_recipients_attributes][][person_role]", "contact"
     = hidden_field_tag "letter[cc_recipients_attributes][][addressee_id]", contact.id
 

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

@@ -73,4 +73,3 @@ ruby:
     = f.button :submit
     span= " or "
     = link_to "cancel", back_path
-

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

@@ -1,5 +1,4 @@
 ruby:
-  new_pathology_timestamp = Time.zone.now
   diff = Renalware::Pathology::ObservationsDiff.new(
     patient: letter.patient,
     observation_set_a: letter.pathology_snapshot,
@@ -16,7 +15,7 @@ ruby:
       = f.input :pathology_timestamp, as: :hidden
     - else
       = f.input :pathology_timestamp,
-                collection: [ \
+                collection: [\
                   ["Yes", Time.zone.now],
                   ["No", letter.pathology_timestamp], \
                 ], \

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

@@ -17,13 +17,22 @@
 
       .columns.large-6
         .letter-unit-block
-          p.trust-name
-            = raw letter.letterhead.trust_name
-            span.nhs-logo= image_tag("NHS-Black.jpg", size: "82x33")
-          p.trust-caption= letter.letterhead.trust_caption
+          / p.trust-name
+          /   = raw letter.letterhead.trust_name
+          /   span.nhs-logo= image_tag("NHS-Black.jpg", size: "82x33")
+          / p.trust-caption= letter.letterhead.trust_caption
 
+          / .site-info-html
+          /   p= raw letter.letterhead.site_info
+
+          span.nhs-logo
+                = image_tag(wicked_pdf_asset_base64("renalware/nhs_a4_letter_logo_black.png"))
+          .trust-name
+            p= raw letter.letterhead.trust_name
+          .trust-caption
+            p= letter.letterhead.trust_caption
           .site-info-html
-            p= raw letter.letterhead.site_info
+            = raw letter.letterhead.site_info
 
   .letter-preview-body
     .row

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

@@ -4,5 +4,5 @@
     li= inline_value("Weight", clinical_observations.weight, "kg")
     li= inline_value("Height", clinical_observations.height, "m")
     li= inline_value("BMI", clinical_observations.bmi)
-    li= inline_value("Urine Blood", clinical_observations.urine_blood.try!(:text))
-    li= inline_value("Urine Protein", clinical_observations.urine_protein.try!(:text))
+    li= inline_value("Urine Blood", clinical_observations.urine_blood&.text)
+    li= inline_value("Urine Protein", clinical_observations.urine_protein&.text)

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

@@ -1,9 +1,3 @@
 .list.investigations
   h3 Recent Investigations
-
-  - if recent_pathology_results.any?
-     - recent_pathology_results.each do |code, observation|
-        span #{l(observation[:observed_at]&.to_date)}: #{code} #{observation[:result]};
-        |  
-  - else
-    p None
+  p= recent_pathology_results.results || " None"

data/app/views/renalware/low_clearance/dashboards/_page_actions.html.slim

@@ -0,0 +1,19 @@
+= link_to(patient_low_clearance_mdm_path(patient), class: "button with-icon secondary") do
+  i.fa.fa-group
+  = t(".mdm")
+
+a.button.dropdown.with-icon(href="#"
+                            data-dropdown="pd-options"
+                            aria-controls="pd-options"
+                            aria-expanded="false")
+  i.fa.fa-plus
+  | Add
+br
+ul.f-dropdown#pd-options(data-dropdown-content aria-hidden="true")
+
+  = dropdown_btn_item enabled: dashboard.profile.new_record? && dashboard.profile_policy_edit?,
+                      title: t(".add_profile"),
+                      url: edit_patient_low_clearance_profile_path(patient)
+
+- unless patient.ever_been_on_low_clearance?
+  = render "modality_missing_warning", message: t(".missing_modality_warning")

data/app/views/renalware/low_clearance/dashboards/show.html.slim

@@ -0,0 +1,7 @@
+= content_for(:actions) do
+  = render "page_actions", dashboard: dashboard, patient: patient
+
+= within_patient_layout do
+  - if dashboard.profile&.persisted?
+    .row
+      = render "renalware/low_clearance/profiles/summary", profile: dashboard.profile

data/app/views/renalware/low_clearance/mdm_patients/_filters.html.slim

@@ -0,0 +1,9 @@
+- named_filter_param = params[:named_filter]
+
+dl.sub-nav.filters
+  dd(class=("active" unless named_filter_param.present?))
+     = link_to t(".filter.all"), low_clearance_mdm_patients_path
+  - Renalware::LowClearance::MDM_FILTERS.map(&:to_sym).each do |filter|
+    dd(class=("active" if named_filter_param == filter.to_s))
+      = link_to t(".filter.#{filter}"),
+                low_clearance_filtered_mdm_patients_path(named_filter: filter)